Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-17 23:43:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Never notify for quotes in muted 1:1 chats.

Browse Source
This commit is contained in:
Greyson Parrelli
2026-03-02 13:57:55 -05:00
parent 8b2aeba3bd
commit 4e5b15cd88
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationStateProvider.kt
View File

@@ -171,9 +171,9 @@ object NotificationStateProvider {
fun includeMessage(notificationProfile: NotificationProfile?): MessageInclusion { fun includeMessage(notificationProfile: NotificationProfile?): MessageInclusion {
return if (isUnreadIncoming || stickyThread || isNotifiableGroupStoryMessage || isIncomingMissedCall) { return if (isUnreadIncoming || stickyThread || isNotifiableGroupStoryMessage || isIncomingMissedCall) {
if (threadRecipient.isMuted && (threadRecipient.isDoNotNotifyMentions || !messageRecord.hasSelfMentionOrQuoteOfSelf())) { if (threadRecipient.isMuted && (threadRecipient.isDoNotNotifyMentions || !messageRecord.shouldBreakThroughMute(threadRecipient))) {
MessageInclusion.MUTE_FILTERED MessageInclusion.MUTE_FILTERED
} else if (notificationProfile != null && !notificationProfile.isRecipientAllowed(threadRecipient.id) && !(notificationProfile.allowAllMentions && messageRecord.hasSelfMentionOrQuoteOfSelf())) { } else if (notificationProfile != null && !notificationProfile.isRecipientAllowed(threadRecipient.id) && !(notificationProfile.allowAllMentions && messageRecord.shouldBreakThroughMute(threadRecipient))) {
MessageInclusion.PROFILE_FILTERED MessageInclusion.PROFILE_FILTERED
} else { } else {
MessageInclusion.INCLUDE MessageInclusion.INCLUDE
@@ -210,6 +210,13 @@ object NotificationStateProvider {
private val Recipient.isDoNotNotifyMentions: Boolean private val Recipient.isDoNotNotifyMentions: Boolean
get() = mentionSetting == RecipientTable.MentionSetting.DO_NOT_NOTIFY get() = mentionSetting == RecipientTable.MentionSetting.DO_NOT_NOTIFY
private fun MessageRecord.shouldBreakThroughMute(threadRecipient: Recipient): Boolean {
if (!threadRecipient.isGroup) {
return false
}
return hasSelfMention() || (this is MmsMessageRecord && quote?.author == Recipient.self().id)
}
private fun MessageRecord.hasSelfMentionOrQuoteOfSelf(): Boolean { private fun MessageRecord.hasSelfMentionOrQuoteOfSelf(): Boolean {
return hasSelfMention() || (this is MmsMessageRecord && quote?.author == Recipient.self().id) return hasSelfMention() || (this is MmsMessageRecord && quote?.author == Recipient.self().id)
} }