colin/Signal-Desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only accept 'you left group' messages when group blocked

Browse Source
This commit is contained in:
Scott Nonnenberg
2018-09-17 15:58:27 -07:00
parent c2e0ec5636
commit 814b9cf26a
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
js/background.js
View File

@@ -920,9 +920,9 @@
updates.left = true; updates.left = true;
} }
if (details.blocked === true) { if (details.blocked) {
storage.addBlockedGroup(id); storage.addBlockedGroup(id);
} else if (details.blocked === false) { } else {
storage.removeBlockedGroup(id); storage.removeBlockedGroup(id);
} }

14
libtextsecure/message_receiver.js
View File

@@ -730,9 +730,12 @@ MessageReceiver.prototype.extend({
const groupId = message.group && message.group.id; const groupId = message.group && message.group.id;
const isBlocked = this.isGroupBlocked(groupId); const isBlocked = this.isGroupBlocked(groupId);
const isMe = envelope.source === textsecure.storage.user.getNumber(); const isMe = envelope.source === textsecure.storage.user.getNumber();
const hasGroupMetadata = Boolean(message.group); const isLeavingGroup = Boolean(
message.group &&
message.group.type === textsecure.protobuf.GroupContext.Type.QUIT
);
if (groupId && isBlocked && !(isMe && hasGroupMetadata)) { if (groupId && isBlocked && !(isMe && isLeavingGroup)) {
window.log.warn( window.log.warn(
`Message ${this.getEnvelopeId( `Message ${this.getEnvelopeId(
envelope envelope
@@ -768,9 +771,12 @@ MessageReceiver.prototype.extend({
const groupId = message.group && message.group.id; const groupId = message.group && message.group.id;
const isBlocked = this.isGroupBlocked(groupId); const isBlocked = this.isGroupBlocked(groupId);
const isMe = envelope.source === textsecure.storage.user.getNumber(); const isMe = envelope.source === textsecure.storage.user.getNumber();
const hasGroupMetadata = Boolean(message.group); const isLeavingGroup = Boolean(
message.group &&
message.group.type === textsecure.protobuf.GroupContext.Type.QUIT
);
if (groupId && isBlocked && !(isMe && hasGroupMetadata)) { if (groupId && isBlocked && !(isMe && isLeavingGroup)) {
window.log.warn( window.log.warn(
`Message ${this.getEnvelopeId( `Message ${this.getEnvelopeId(
envelope envelope