always notify by default in conferences

Daniel Gultsch created 9 years ago

Change summary

src/main/java/eu/siacs/conversations/Config.java                | 2 --
src/main/java/eu/siacs/conversations/entities/Conversation.java | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)

Detailed changes

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;

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) {