From a5d2642c37d1e1a3c919b48693797f90a8feb76e Mon Sep 17 00:00:00 2001 From: adbenitez Date: Sat, 30 Nov 2024 13:13:50 +0100 Subject: [PATCH] do not notify mentions in muted 1:1 chats --- .../securesms/notifications/NotificationCenter.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/thoughtcrime/securesms/notifications/NotificationCenter.java b/src/main/java/org/thoughtcrime/securesms/notifications/NotificationCenter.java index e9b893058..9a37ec0e6 100644 --- a/src/main/java/org/thoughtcrime/securesms/notifications/NotificationCenter.java +++ b/src/main/java/org/thoughtcrime/securesms/notifications/NotificationCenter.java @@ -361,7 +361,7 @@ public class NotificationCenter { } DcMsg quotedMsg = dcMsg.getQuotedMsg(); - boolean isMention = quotedMsg != null && dcChat.isMultiUser() && quotedMsg.isOutgoing(); + boolean isMention = dcChat.isMultiUser() && quotedMsg != null && quotedMsg.isOutgoing(); maybeAddNotification(accountId, dcChat, msgId, shortLine, tickerLine, true, isMention); }); @@ -379,7 +379,8 @@ public class NotificationCenter { DcContact sender = dcContext.getContact(contactId); String shortLine = context.getString(R.string.reaction_by_other, sender.getDisplayName(), reaction, dcMsg.getSummarytext(2000)); - maybeAddNotification(accountId, dcContext.getChat(dcMsg.getChatId()), msgId, shortLine, shortLine, false, true); + DcChat dcChat = dcContext.getChat(dcMsg.getChatId()); + maybeAddNotification(accountId, dcChat, msgId, shortLine, shortLine, false, dcChat.isMultiUser()); }); } @@ -406,7 +407,8 @@ public class NotificationCenter { JSONObject info = parentMsg.getWebxdcInfo(); final String name = JsonUtils.optString(info, "name"); String shortLine = name.isEmpty()? text : (name + ": " + text); - maybeAddNotification(accountId, dcContext.getChat(dcMsg.getChatId()), msgId, shortLine, shortLine, false, true); + DcChat dcChat = dcContext.getChat(dcMsg.getChatId()); + maybeAddNotification(accountId, dcChat, msgId, shortLine, shortLine, false, dcChat.isMultiUser()); }); }