From a683c3fa9030dec00359db3c23e7031acb29d8c4 Mon Sep 17 00:00:00 2001 From: Mikunj Date: Tue, 10 Sep 2019 15:37:26 +1000 Subject: [PATCH] Disable notification triggers on group messages. --- src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java | 3 ++- .../securesms/notifications/MessageNotifier.java | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java b/src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java index 2d4a6577ed..687ba2a604 100644 --- a/src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java +++ b/src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java @@ -988,7 +988,8 @@ public class PushDecryptJob extends BaseJob implements InjectableType { // Loki - Map message id to server id updatePublicChatMessageWithServerID(messageServerIDOrNull, insertResult); - if (threadId != null) { + boolean isGroupMessage = message.getGroupInfo().isPresent(); + if (threadId != null && !isGroupMessage) { MessageNotifier.updateNotification(context, threadId); } } diff --git a/src/org/thoughtcrime/securesms/notifications/MessageNotifier.java b/src/org/thoughtcrime/securesms/notifications/MessageNotifier.java index 85bd474a40..418afa0d5b 100644 --- a/src/org/thoughtcrime/securesms/notifications/MessageNotifier.java +++ b/src/org/thoughtcrime/securesms/notifications/MessageNotifier.java @@ -388,6 +388,11 @@ public class MessageNotifier { } private static void sendInThreadNotification(Context context, Recipient recipient) { + // Keep group messages muted! + if (recipient.isGroupRecipient()) { + return; + } + if (!TextSecurePreferences.isInThreadNotifications(context) || ServiceUtil.getAudioManager(context).getRingerMode() != AudioManager.RINGER_MODE_NORMAL) {