From 82107e29382206fc0c4bf2284db4b416df9ac62e Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Wed, 17 Feb 2021 08:29:58 -0500
Subject: [PATCH] Do not show GV1 manual migration if you don't have the
 capability.

---
 .../conversation/ConversationGroupViewModel.java      | 11 ++++++-----
 1 file changed, 6 insertions(+), 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
index 35041eda7..2b0b9421e 100644
--- 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 @@ final class ConversationGroupViewModel extends ViewModel {
 
   @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;