diff options
author | Christian Schneppe <christian@pix-art.de> | 2016-05-30 21:08:42 +0200 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2016-05-30 21:08:42 +0200 |
commit | 3184e8208bec6ab750649823a6a3883bd99559d4 (patch) | |
tree | 4ac582f82e3f4ddd7af1c6dd42eecbad2d69b06e /src/main/java/eu/siacs/conversations/entities | |
parent | c70ad81e684076d21deafd8c52a6b1ce8026d01a (diff) | |
parent | be0fc59314cc9dd2fb34059333b9d6a6269653b3 (diff) |
Merge remote-tracking branch 'refs/remotes/siacs/master'
Diffstat (limited to 'src/main/java/eu/siacs/conversations/entities')
-rw-r--r-- | src/main/java/eu/siacs/conversations/entities/Conversation.java | 2 |
1 files changed, 1 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 a8f809b08..409440345 100644 --- a/src/main/java/eu/siacs/conversations/entities/Conversation.java +++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java @@ -820,7 +820,7 @@ public class Conversation extends AbstractEntity implements Blockable { } public boolean alwaysNotify() { - return mode == MODE_SINGLE || getBooleanAttribute(ATTRIBUTE_ALWAYS_NOTIFY, true); + return mode == MODE_SINGLE || getBooleanAttribute(ATTRIBUTE_ALWAYS_NOTIFY, Config.ALWAYS_NOTIFY_BY_DEFAULT || isPnNA()); } public boolean setAttribute(String key, String value) { |