From b647fff5b8e7e43f39689b719908224c0974265a Mon Sep 17 00:00:00 2001 From: nielsandriesse Date: Fri, 22 May 2020 11:57:26 +1000 Subject: [PATCH] Fix inverted check --- .../thoughtcrime/securesms/groups/GroupMessageProcessor.java | 2 +- src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/org/thoughtcrime/securesms/groups/GroupMessageProcessor.java b/src/org/thoughtcrime/securesms/groups/GroupMessageProcessor.java index cd8f045507..463093b5ca 100644 --- a/src/org/thoughtcrime/securesms/groups/GroupMessageProcessor.java +++ b/src/org/thoughtcrime/securesms/groups/GroupMessageProcessor.java @@ -89,7 +89,7 @@ public class GroupMessageProcessor { builder.setType(GroupContext.Type.UPDATE); SignalServiceAttachment avatar = group.getAvatar().orNull(); - List
members = group.getMembers().isPresent() ? new LinkedList
() : null; + List
members = group.getMembers().isPresent() ? new LinkedList<>() : null; List
admins = group.getAdmins().isPresent() ? new LinkedList<>() : null; if (group.getMembers().isPresent()) { diff --git a/src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java b/src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java index 454d7d436d..43c0a42bc7 100644 --- a/src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java +++ b/src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java @@ -1500,7 +1500,7 @@ public class PushDecryptJob extends BaseJob implements InjectableType { boolean isLeaveMessage = message.getGroupInfo().isPresent() && message.getGroupInfo().get().getType() == SignalServiceGroup.Type.QUIT; boolean shouldIgnoreContentMessage = ClosedGroupsProtocol.shouldIgnoreContentMessage(context, conversation, groupId.orNull(), content); - return (isContentMessage && !isGroupActive) || (sender.isBlocked() && !isLeaveMessage) || (isContentMessage && !shouldIgnoreContentMessage); + return (isContentMessage && !isGroupActive) || (sender.isBlocked() && !isLeaveMessage) || (isContentMessage && shouldIgnoreContentMessage); } else { return sender.isBlocked(); }