diff options
| author | steckbrief <steckbrief@chefmail.de> | 2016-02-09 21:51:44 +0100 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2016-02-09 21:51:44 +0100 |
| commit | e0219ae4cef0cd1a65e9727a02417de14caa67ff (patch) | |
| tree | b9125e2c43b144b75dd862cda1c1b3ac03b32fb3 /src/main | |
| parent | 69145c02f2ba357a95b38575bdc0eca40a837bae (diff) | |
| parent | 362c00d31b31690b7debebc68213851456b422dd (diff) | |
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Diffstat (limited to '')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/services/NotificationService.java | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/main/java/eu/siacs/conversations/services/NotificationService.java b/src/main/java/eu/siacs/conversations/services/NotificationService.java index c025d580..fe78bfcc 100644 --- a/src/main/java/eu/siacs/conversations/services/NotificationService.java +++ b/src/main/java/eu/siacs/conversations/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) { |