Do not show GV1 manual migration if you don't have the capability.

signalapp · Feb 17, 2021 · 82107e2 · 82107e2
1 parent e2f5fa6
commit 82107e2
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationGroupViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationGroupViewModel.java
@@ -190,11 +190,12 @@ private static List<RecipientId> mapToGroupV1MigrationSuggestions(@Nullable Grou
 
   @WorkerThread
   private static boolean mapToGroupV1MigrationReminder(@Nullable GroupRecord record) {
-    if (record == null                          ||
-        !record.isV1Group()                     ||
-        !record.isActive()                      ||
-        !FeatureFlags.groupsV1ManualMigration() ||
-        FeatureFlags.groupsV1ForcedMigration()  ||
+    if (record == null                                                                      ||
+        !record.isV1Group()                                                                 ||
+        !record.isActive()                                                                  ||
+        !FeatureFlags.groupsV1ManualMigration()                                             ||
+        FeatureFlags.groupsV1ForcedMigration()                                              ||
+        Recipient.self().getGroupsV1MigrationCapability() != Recipient.Capability.SUPPORTED ||
         !Recipient.resolved(record.getRecipientId()).isProfileSharing())
     {
       return false;