diff options
author | steckbrief <steckbrief@chefmail.de> | 2015-10-22 00:19:44 +0200 |
---|---|---|
committer | steckbrief <steckbrief@chefmail.de> | 2015-10-22 00:19:44 +0200 |
commit | 01bfe0c59a5bc3eba1db111d3bc687aac9be7847 (patch) | |
tree | e7d6d63eeed8514b9f3992dd09e1abd84932e9a5 /src/main/java/eu/siacs/conversations/entities | |
parent | 0a5a985cbe582e6f7ece37ec257fe53ccee4bb42 (diff) | |
parent | 85a25984f4bf4dfa2432fbc2c92f8117cf927fcf (diff) |
Merge trz/rename into trz/rebase
Diffstat (limited to 'src/main/java/eu/siacs/conversations/entities')
-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 6ff0e270..1f3d35e7 100644 --- a/src/main/java/eu/siacs/conversations/entities/Conversation.java +++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java @@ -20,6 +20,7 @@ import java.util.Iterator; import java.util.List; import eu.siacs.conversations.Config; +import de.thedevstack.conversationsplus.ConversationsPlusPreferences; import eu.siacs.conversations.xmpp.chatstate.ChatState; import eu.siacs.conversations.xmpp.jid.InvalidJidException; import eu.siacs.conversations.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; |