aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsteckbrief <steckbrief@chefmail.de>2016-02-09 21:48:09 +0100
committersteckbrief <steckbrief@chefmail.de>2016-02-09 21:48:09 +0100
commit362c00d31b31690b7debebc68213851456b422dd (patch)
tree77edf1df7262125ac98431bec97cb53cb0facabc
parent0594e1f8f8cf9e8589e2a86e116bef14100ed6ac (diff)
Fixes FS#135: condition NOT message.isRead() added to check if notification should be shown for a message
-rw-r--r--src/main/java/de/thedevstack/conversationsplus/services/NotificationService.java13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/main/java/de/thedevstack/conversationsplus/services/NotificationService.java b/src/main/java/de/thedevstack/conversationsplus/services/NotificationService.java
index d537ff73..f3ef271c 100644
--- a/src/main/java/de/thedevstack/conversationsplus/services/NotificationService.java
+++ b/src/main/java/de/thedevstack/conversationsplus/services/NotificationService.java
@@ -64,12 +64,13 @@ public class NotificationService {
public boolean notify(final Message message) {
return (message.getStatus() == Message.STATUS_RECEIVED)
- && ConversationsPlusPreferences.showNotification()
- && !message.getConversation().isMuted()
- && (message.getConversation().getMode() == Conversation.MODE_SINGLE
- || ConversationsPlusPreferences.alwaysNotifyInConference()
- || wasHighlightedOrPrivate(message)
- );
+ && !message.isRead()
+ && ConversationsPlusPreferences.showNotification()
+ && !message.getConversation().isMuted()
+ && (message.getConversation().getMode() == Conversation.MODE_SINGLE
+ || ConversationsPlusPreferences.alwaysNotifyInConference()
+ || wasHighlightedOrPrivate(message)
+ );
}
public void notifyPebble(final Message message) {