From 85a25984f4bf4dfa2432fbc2c92f8117cf927fcf Mon Sep 17 00:00:00 2001 From: steckbrief Date: Wed, 21 Oct 2015 23:49:06 +0200 Subject: Access to preferences moved to global utility class ConversationsPlusPreferences. Unused imports removed. Unnecessary references to XmppConnectionService removed. Bug in call order in StartConversationActivity for the setting hide_offline fixed. --- .../java/de/thedevstack/conversationsplus/entities/Conversation.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/main/java/de/thedevstack/conversationsplus/entities') diff --git a/src/main/java/de/thedevstack/conversationsplus/entities/Conversation.java b/src/main/java/de/thedevstack/conversationsplus/entities/Conversation.java index 8d4b3c27..e26f7944 100644 --- a/src/main/java/de/thedevstack/conversationsplus/entities/Conversation.java +++ b/src/main/java/de/thedevstack/conversationsplus/entities/Conversation.java @@ -20,6 +20,7 @@ import java.util.Iterator; import java.util.List; import de.thedevstack.conversationsplus.Config; +import de.thedevstack.conversationsplus.ConversationsPlusPreferences; import de.thedevstack.conversationsplus.xmpp.chatstate.ChatState; import de.thedevstack.conversationsplus.xmpp.jid.InvalidJidException; import de.thedevstack.conversationsplus.xmpp.jid.Jid; @@ -764,7 +765,7 @@ public class Conversation extends AbstractEntity implements Blockable { return count; } if (getMode() == Conversation.MODE_SINGLE - || account.getXmppConnectionService().getNotificationService().conferenceNotificationsEnabled() + || ConversationsPlusPreferences.alwaysNotifyInConference() || account.getXmppConnectionService().getNotificationService().wasHighlightedOrPrivate(message) ) { ++count; -- cgit v1.2.3