aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/entities
diff options
context:
space:
mode:
authorsteckbrief <steckbrief@chefmail.de>2016-02-11 22:36:17 +0100
committersteckbrief <steckbrief@chefmail.de>2016-02-11 22:40:48 +0100
commit9c87e2269cc1d427fab42047cd8993b6bfb07b6f (patch)
treecff8d8c37e416b43c8eb84216116883bdf1655fa /src/main/java/eu/siacs/conversations/entities
parentd38b3c2cf2134738781da626fa7ed49046c9a00f (diff)
Compilation errors and merge mixups fixed
Diffstat (limited to 'src/main/java/eu/siacs/conversations/entities')
-rw-r--r--src/main/java/eu/siacs/conversations/entities/Conversation.java3
-rw-r--r--src/main/java/eu/siacs/conversations/entities/Message.java2
2 files changed, 3 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 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;
}
diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java
index 8d0571a4..d7a4ef18 100644
--- a/src/main/java/eu/siacs/conversations/entities/Message.java
+++ b/src/main/java/eu/siacs/conversations/entities/Message.java
@@ -419,7 +419,7 @@ public class Message extends AbstractEntity {
message.treatAsDownloadable() == Decision.NEVER &&
this.treatAsDownloadable() == Decision.NEVER &&
!message.getBody().startsWith(ME_COMMAND) &&
- !this.getBody().startsWith(ME_COMMAND)
+ !this.getBody().startsWith(ME_COMMAND) &&
this.isTrusted() == message.isTrusted()
);
}