diff options
| author | Christian S <christian@pix-art.de> | 2016-04-15 22:02:52 +0200 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2016-04-15 22:02:52 +0200 |
| commit | 115a3a3396ac608a1ba855ab72a2ed5ecf28dc29 (patch) | |
| tree | b5862a7ffaa9bdd15661f636669778ace05b6b7c /src/main/java/eu/siacs/conversations/Config.java | |
| parent | 26850fe48b1c772cb078276c3e8b4287689d17b6 (diff) | |
| parent | e9494af098e6d3dad4f0a5328ae7342664ce853c (diff) | |
Merge remote-tracking branch 'refs/remotes/siacs/master' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/Config.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/Config.java | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/Config.java b/src/main/java/eu/siacs/conversations/Config.java index f783583c4..8eca26e04 100644 --- a/src/main/java/eu/siacs/conversations/Config.java +++ b/src/main/java/eu/siacs/conversations/Config.java @@ -52,8 +52,6 @@ public final class Config { public static final boolean SHOW_DISABLE_FOREGROUND = false; //if set to true the foreground notification has a button to disable it public static final boolean USE_ALWAYS_FOREGROUND = true; //if set to true the foreground service is always enabled - public static final boolean ALWAYS_NOTIFY_BY_DEFAULT = false; - public static final boolean LEGACY_NAMESPACE_HTTP_UPLOAD = false; // true = 'eu:siacs:conversations:http:upload' false = 'urn:xmpp:http:upload' public static final int PING_MAX_INTERVAL = 300; |