diff options
author | steckbrief <steckbrief@chefmail.de> | 2016-02-11 22:36:17 +0100 |
---|---|---|
committer | steckbrief <steckbrief@chefmail.de> | 2016-02-11 22:40:48 +0100 |
commit | 9c87e2269cc1d427fab42047cd8993b6bfb07b6f (patch) | |
tree | cff8d8c37e416b43c8eb84216116883bdf1655fa /src/main/java/eu/siacs/conversations/entities/Conversation.java | |
parent | d38b3c2cf2134738781da626fa7ed49046c9a00f (diff) |
Compilation errors and merge mixups fixed
Diffstat (limited to 'src/main/java/eu/siacs/conversations/entities/Conversation.java')
-rw-r--r-- | src/main/java/eu/siacs/conversations/entities/Conversation.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java index 38791d28..64472c8f 100644 --- a/src/main/java/eu/siacs/conversations/entities/Conversation.java +++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java @@ -19,6 +19,7 @@ import java.util.Comparator; import java.util.Iterator; import java.util.List; +import de.thedevstack.conversationsplus.utils.MessageUtil; import eu.siacs.conversations.Config; import de.thedevstack.conversationsplus.ConversationsPlusPreferences; import eu.siacs.conversations.crypto.axolotl.AxolotlService; @@ -831,7 +832,7 @@ public class Conversation extends AbstractEntity implements Blockable { } if (getMode() == Conversation.MODE_SINGLE || ConversationsPlusPreferences.alwaysNotifyInConference() - || account.getXmppConnectionService().getNotificationService().wasHighlightedOrPrivate(message) + || MessageUtil.wasHighlightedOrPrivate(message) ) { ++count; } |