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

Remove mentions feature flag.

Browse Source
This commit is contained in:
Cody Henthorne
2020-10-15 10:56:08 -04:00
committed by Greyson Parrelli
parent d04e4606d2
commit b46589cd14
6 changed files with 10 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java
View File

@@ -265,8 +265,7 @@ public class DefaultMessageNotifier implements MessageNotifier {
return true;
}
return FeatureFlags.mentions() &&
recipient.isPushV2Group() &&
return recipient.isPushV2Group() &&
recipient.getMentionSetting() == RecipientDatabase.MentionSetting.ALWAYS_NOTIFY &&
DatabaseFactory.getMmsDatabase(context).getUnreadMentionCount(threadId) > 0;
}
@@ -556,7 +555,7 @@ public class DefaultMessageNotifier implements MessageNotifier {
if (threadRecipients != null && threadRecipients.isMuted()) {
boolean mentionsOverrideMute = threadRecipients.getMentionSetting() == RecipientDatabase.MentionSetting.ALWAYS_NOTIFY;
includeMessage = FeatureFlags.mentions() && mentionsOverrideMute && record.hasSelfMention();
includeMessage = mentionsOverrideMute && record.hasSelfMention();
}
if (threadRecipients == null || includeMessage) {