aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2016-04-14 22:37:05 +0200
committerDaniel Gultsch <daniel@gultsch.de>2016-04-14 22:37:05 +0200
commite9494af098e6d3dad4f0a5328ae7342664ce853c (patch)
tree1c016b96503234f5939c6e02a76539a8afe04704 /src/main
parenteb63cdb9adcf6b0324898fc45d8bdbad964a1892 (diff)
always notify by default in conferences
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/eu/siacs/conversations/Config.java2
-rw-r--r--src/main/java/eu/siacs/conversations/entities/Conversation.java2
2 files changed, 1 insertions, 3 deletions
diff --git a/src/main/java/eu/siacs/conversations/Config.java b/src/main/java/eu/siacs/conversations/Config.java
index 55fff255..bfbf9a7f 100644
--- a/src/main/java/eu/siacs/conversations/Config.java
+++ b/src/main/java/eu/siacs/conversations/Config.java
@@ -50,8 +50,6 @@ 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 boolean LEGACY_NAMESPACE_HTTP_UPLOAD = false;
public static final int PING_MAX_INTERVAL = 300;
diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java
index a3ae906b..b1d597df 100644
--- a/src/main/java/eu/siacs/conversations/entities/Conversation.java
+++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java
@@ -809,7 +809,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) {