diff options
author | lookshe <github@lookshe.org> | 2015-08-16 18:33:10 +0200 |
---|---|---|
committer | lookshe <github@lookshe.org> | 2015-08-16 18:33:10 +0200 |
commit | 0321ebb7a6785b4673376f9e6458e41dd96b2230 (patch) | |
tree | f67f8ba5069f4ca9c52df685c0f8a4f890f8cc0a /src/main/java/eu/siacs/conversations/entities/Conversation.java | |
parent | 3be4dbf66ae360e16e07a8a5da01c35f67e6ddfe (diff) |
fixes FS#35 - Shortcut Badger compatible to setting always_notify_in_conference
Diffstat (limited to '')
-rw-r--r-- | src/main/java/eu/siacs/conversations/entities/Conversation.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java index 289ed4ea..6ff0e270 100644 --- a/src/main/java/eu/siacs/conversations/entities/Conversation.java +++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java @@ -759,10 +759,16 @@ public class Conversation extends AbstractEntity implements Blockable { synchronized (this.messages) { int count = 0; for(int i = this.messages.size() - 1; i >= 0; --i) { - if (this.messages.get(i).isRead()) { + Message message = this.messages.get(i); + if (message.isRead()) { return count; } - ++count; + if (getMode() == Conversation.MODE_SINGLE + || account.getXmppConnectionService().getNotificationService().conferenceNotificationsEnabled() + || account.getXmppConnectionService().getNotificationService().wasHighlightedOrPrivate(message) + ) { + ++count; + } } return count; } |