fixup! Adapt message requests to support invite flow.

signalapp · May 12, 2020 · 8e6066d · 8e6066d
1 parent 2844d5b
commit 8e6066d
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/ProfileKeySendJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/ProfileKeySendJob.java
@@ -41,6 +41,9 @@ public class ProfileKeySendJob extends BaseJob {
   private final long              threadId;
   private final List<RecipientId> recipients;
 
+  /**
+   * Suitable for a 1:1 conversation or a GV1 group only.
+   */
   @WorkerThread
   public static ProfileKeySendJob create(@NonNull Context context, long threadId) {
     Recipient conversationRecipient = DatabaseFactory.getThreadDatabase(context).getRecipientForThreadId(threadId);
@@ -49,6 +52,10 @@ public static ProfileKeySendJob create(@NonNull Context context, long threadId)
       throw new AssertionError("We have a thread but no recipient!");
     }
 
+    if (conversationRecipient.isPushV2Group()) {
+      throw new AssertionError("Do not send profile keys directly for GV2");
+    }
+
     List<RecipientId> recipients = conversationRecipient.isGroup() ? Stream.of(conversationRecipient.getParticipants()).map(Recipient::getId).toList()
                                                                    : Stream.of(conversationRecipient.getId()).toList();