Revert "always notify by default in conferences"

Daniel Gultsch created 9 years ago

This reverts commit e9494af098e6d3dad4f0a5328ae7342664ce853c.

Now that new conferences are private by default this setting makes more sense

Change summary

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

Detailed changes

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;

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