diff options
| author | Christian S <christian@pix-art.de> | 2016-04-15 22:02:52 +0200 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2016-04-15 22:02:52 +0200 |
| commit | 115a3a3396ac608a1ba855ab72a2ed5ecf28dc29 (patch) | |
| tree | b5862a7ffaa9bdd15661f636669778ace05b6b7c /src/main/java/eu/siacs/conversations/entities | |
| parent | 26850fe48b1c772cb078276c3e8b4287689d17b6 (diff) | |
| parent | e9494af098e6d3dad4f0a5328ae7342664ce853c (diff) | |
Merge remote-tracking branch 'refs/remotes/siacs/master' into development
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 2f086a34d..35c46a3de 100644 --- a/src/main/java/eu/siacs/conversations/entities/Conversation.java +++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java @@ -823,7 +823,7 @@ public class Conversation extends AbstractEntity implements Blockable { } public boolean alwaysNotify() { - return mode == MODE_SINGLE || getBooleanAttribute(ATTRIBUTE_ALWAYS_NOTIFY, Config.ALWAYS_NOTIFY_BY_DEFAULT || isPnNA()); + return mode == MODE_SINGLE || getBooleanAttribute(ATTRIBUTE_ALWAYS_NOTIFY, true); } public boolean setAttribute(String key, String value) { |