diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2016-05-29 22:55:01 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2016-05-29 22:55:01 +0200 |
| commit | 272cffe797f5955a1a1720016b1dab08a31e4103 (patch) | |
| tree | 020063e318444bfb182a7d6d17a65af5738538df /src/main | |
| parent | 762820072a4cdc5ee420ac75321b5416d5d31df3 (diff) | |
Revert "always notify by default in conferences"
This reverts commit e9494af098e6d3dad4f0a5328ae7342664ce853c.
Now that new conferences are private by default this setting makes more sense
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/Config.java | 2 | ||||
| -rw-r--r-- | src/main/java/eu/siacs/conversations/entities/Conversation.java | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/Config.java b/src/main/java/eu/siacs/conversations/Config.java index c9b430c7..48a08a4f 100644 --- a/src/main/java/eu/siacs/conversations/Config.java +++ b/src/main/java/eu/siacs/conversations/Config.java @@ -49,6 +49,8 @@ public final class Config { public static final boolean SHOW_CONNECTED_ACCOUNTS = false; //show number of connected accounts in foreground notification public static final boolean SHOW_DISABLE_FOREGROUND = true; //if set to true the foreground notification has a button to disable it + public static final boolean ALWAYS_NOTIFY_BY_DEFAULT = false; + public static final int PING_MAX_INTERVAL = 300; public static final int IDLE_PING_INTERVAL = 600; //540 is minimum according to docs; public static final int PING_MIN_INTERVAL = 30; diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java index 23420d69..017a85f5 100644 --- a/src/main/java/eu/siacs/conversations/entities/Conversation.java +++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java @@ -805,7 +805,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) { |