mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Groups: Show in left pane more often, proper join message

Browse source
This commit is contained in:
Scott Nonnenberg 2022-05-16 07:53:54 -07:00 • committed by GitHub
parent 4e76259917
commit dfd1190e8b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 403 additions and 276 deletions
Download patch file Download diff file Expand all files Collapse all files

12
ts/textsecure/MessageReceiver.ts
View file

@ -1238,9 +1238,13 @@ export default class MessageReceiver
// Note: we need to process this as part of decryption, because we might need this
// sender key to decrypt the next message in the queue!
let isGroupV2 = false;
try {
const content = Proto.Content.decode(plaintext);
isGroupV2 = Boolean(content.dataMessage?.groupV2);
if (
content.senderKeyDistributionMessage &&
Bytes.isNotEmpty(content.senderKeyDistributionMessage)
@ -1258,12 +1262,14 @@ export default class MessageReceiver
);
}
// We want to process GroupV2 updates, even from blocked users. We'll drop them later.
if (
(envelope.source && this.isBlocked(envelope.source)) ||
(envelope.sourceUuid && this.isUuidBlocked(envelope.sourceUuid))
!isGroupV2 &&
((envelope.source && this.isBlocked(envelope.source)) ||
(envelope.sourceUuid && this.isUuidBlocked(envelope.sourceUuid)))
) {
log.info(
'MessageReceiver.decryptEnvelope: Dropping message from blocked sender'
'MessageReceiver.decryptEnvelope: Dropping non-GV2 message from blocked sender'
);
return { plaintext: undefined, envelope };
}