From 83cbc2b33b607ee97a770e1cdc2cfc06e3bd15d2 Mon Sep 17 00:00:00 2001
From: lookshe <github@lookshe.org>
Date: Sun, 6 Mar 2016 17:28:09 +0100
Subject: Implements: FS#142 - Fix Conference notifications

---
 .../java/eu/siacs/conversations/services/NotificationService.java     | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'src/main/java/eu/siacs/conversations/services/NotificationService.java')

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)
         );
 	}
 
-- 
cgit v1.2.3