sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

always notify by default in conferences

This commit is contained in:
Daniel Gultsch 2016-04-14 22:37:05 +02:00
parent eb63cdb9ad
commit e9494af098
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/eu/siacs/conversations/Config.java
View File

@ -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_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 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 boolean LEGACY_NAMESPACE_HTTP_UPLOAD = false;
public static final int PING_MAX_INTERVAL = 300; public static final int PING_MAX_INTERVAL = 300;

2
src/main/java/eu/siacs/conversations/entities/Conversation.java
View File

@ -809,7 +809,7 @@ public class Conversation extends AbstractEntity implements Blockable {
} }
public boolean alwaysNotify() { 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) { public boolean setAttribute(String key, String value) {