From 78acc485fcbe1d522cc9a014ec0da8e7a86ac95d Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Fri, 21 Jan 2022 17:56:41 -0500
Subject: [PATCH] Do not send group updates for group join
 requests/cancelations.

---
 .../org/thoughtcrime/securesms/groups/GroupManagerV2.java   | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/GroupManagerV2.java b/app/src/main/java/org/thoughtcrime/securesms/groups/GroupManagerV2.java
index e5bbd85e83..3a8fdce52b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/groups/GroupManagerV2.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/GroupManagerV2.java
@@ -850,10 +850,8 @@ final class GroupManagerV2 {
       } else if (requestToJoin) {
         Log.i(TAG, "Requested to join, cannot send update");
 
-        RecipientAndThread recipientAndThread = sendGroupUpdate(groupMasterKey, new GroupMutation(null, decryptedChange, decryptedGroup), signedGroupChange);
-
         return new GroupManager.GroupActionResult(groupRecipient,
-                                                  recipientAndThread.threadId,
+                                                  SignalDatabase.threads().getThreadIdIfExistsFor(groupRecipientId),
                                                   0,
                                                   Collections.emptyList());
       } else {
@@ -1073,8 +1071,6 @@ final class GroupManagerV2 {
         DecryptedGroup       newGroup        = DecryptedGroupUtil.applyWithoutRevisionCheck(decryptedGroup, decryptedChange);
 
         groupDatabase.update(groupId, resetRevision(newGroup, decryptedGroup.getRevision()));
-
-        sendGroupUpdate(groupMasterKey, new GroupMutation(decryptedGroup, decryptedChange, newGroup), signedGroupChange);
       } catch (VerificationFailedException | InvalidGroupStateException | NotAbleToApplyGroupV2ChangeException e) {
         throw new GroupChangeFailedException(e);
       }