aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/services/NotificationService.java
diff options
context:
space:
mode:
authorlookshe <github@lookshe.org>2016-03-06 17:28:09 +0100
committerlookshe <github@lookshe.org>2016-03-06 17:28:09 +0100
commit83cbc2b33b607ee97a770e1cdc2cfc06e3bd15d2 (patch)
treee7b368b4b3d3adbd9f2a0802fb0f92fdb13a1b80 /src/main/java/eu/siacs/conversations/services/NotificationService.java
parent5d21abac1dd2fed7a5e87f8fb23bc15ee0912322 (diff)
Implements: FS#142 - Fix Conference notifications
Diffstat (limited to '')
-rw-r--r--src/main/java/eu/siacs/conversations/services/NotificationService.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/main/java/eu/siacs/conversations/services/NotificationService.java b/src/main/java/eu/siacs/conversations/services/NotificationService.java
index 467924ef..0f40e8d7 100644
--- a/src/main/java/eu/siacs/conversations/services/NotificationService.java
+++ b/src/main/java/eu/siacs/conversations/services/NotificationService.java
@@ -64,9 +64,7 @@ public class NotificationService {
&& !message.isRead()
&& ConversationsPlusPreferences.showNotification()
&& !message.getConversation().isMuted()
- && (message.getConversation().getMode() == Conversation.MODE_SINGLE
- || ConversationsPlusPreferences.alwaysNotifyInConference()
- || wasHighlightedOrPrivate(message)
+ && (message.getConversation().alwaysNotify() || wasHighlightedOrPrivate(message)
);
}