From c15ea8c0b48dc0d3d0f1efc2afe25520f360a559 Mon Sep 17 00:00:00 2001
From: Alan Evans <alan@signal.org>
Date: Tue, 2 Feb 2021 15:30:20 -0400
Subject: [PATCH] Skip automigration of nameless groups.

---
 .../thoughtcrime/securesms/groups/GroupsV1MigrationUtil.java | 5 +++++
 .../org/thoughtcrime/securesms/recipients/Recipient.java     | 5 ++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/GroupsV1MigrationUtil.java b/app/src/main/java/org/thoughtcrime/securesms/groups/GroupsV1MigrationUtil.java
index a1840a3aec..046aeaee20 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/groups/GroupsV1MigrationUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/GroupsV1MigrationUtil.java
@@ -101,6 +101,11 @@ public final class GroupsV1MigrationUtil {
         List<Recipient> possibleMembers = forced ? getMigratableManualMigrationMembers(registeredMembers)
                                                  : getMigratableAutoMigrationMembers(registeredMembers);
 
+        if (!forced && !groupRecipient.hasName()) {
+          Log.w(TAG, "Group has no name. Skipping auto-migration.");
+          throw new InvalidMigrationStateException();
+        }
+
         if (!forced && possibleMembers.size() != registeredMembers.size()) {
           Log.w(TAG, "Not allowed to invite or leave registered users behind in an auto-migration! Skipping.");
           throw new InvalidMigrationStateException();
diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java b/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java
index 5acc8f0b5c..e9da73848d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java
@@ -41,7 +41,6 @@ import org.thoughtcrime.securesms.phonenumbers.PhoneNumberFormatter;
 import org.thoughtcrime.securesms.profiles.ProfileName;
 import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.thoughtcrime.securesms.util.StringUtil;
-import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.wallpaper.ChatWallpaper;
 import org.whispersystems.libsignal.util.guava.Optional;
@@ -421,6 +420,10 @@ public class Recipient {
     }
   }
 
+  public boolean hasName() {
+    return name != null;
+  }
+
   /**
    * False iff it {@link #getDisplayName} would fall back to e164, email or unknown.
    */