empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Do not send group updates for group join requests/cancelations.

Browse source
This commit is contained in:
Greyson Parrelli 2022-01-21 17:56:41 -05:00
parent 6e71514209
commit 78acc485fc
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/org/thoughtcrime/securesms/groups/GroupManagerV2.java
View file

@ -850,10 +850,8 @@ final class GroupManagerV2 {
} else if (requestToJoin) { } else if (requestToJoin) {
Log.i(TAG, "Requested to join, cannot send update"); Log.i(TAG, "Requested to join, cannot send update");
RecipientAndThread recipientAndThread = sendGroupUpdate(groupMasterKey, new GroupMutation(null, decryptedChange, decryptedGroup), signedGroupChange);
return new GroupManager.GroupActionResult(groupRecipient, return new GroupManager.GroupActionResult(groupRecipient,
recipientAndThread.threadId, SignalDatabase.threads().getThreadIdIfExistsFor(groupRecipientId),
0, 0,
Collections.emptyList()); Collections.emptyList());
} else { } else {
@ -1073,8 +1071,6 @@ final class GroupManagerV2 {
DecryptedGroup newGroup = DecryptedGroupUtil.applyWithoutRevisionCheck(decryptedGroup, decryptedChange); DecryptedGroup newGroup = DecryptedGroupUtil.applyWithoutRevisionCheck(decryptedGroup, decryptedChange);
groupDatabase.update(groupId, resetRevision(newGroup, decryptedGroup.getRevision())); groupDatabase.update(groupId, resetRevision(newGroup, decryptedGroup.getRevision()));
sendGroupUpdate(groupMasterKey, new GroupMutation(decryptedGroup, decryptedChange, newGroup), signedGroupChange);
} catch (VerificationFailedException | InvalidGroupStateException | NotAbleToApplyGroupV2ChangeException e) { } catch (VerificationFailedException | InvalidGroupStateException | NotAbleToApplyGroupV2ChangeException e) {
throw new GroupChangeFailedException(e); throw new GroupChangeFailedException(e);
} }