diff options
| author | Christian S <christian@pix-art.de> | 2016-04-30 21:10:24 +0200 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2016-04-30 21:10:24 +0200 |
| commit | ab37336d1edc446f17d7a7aaeb653efb170283d9 (patch) | |
| tree | 609ca7afbc7bd0c4af0344af310fa0bd352bd4ae /src/main/java/eu/siacs/conversations/Config.java | |
| parent | fe60bd582aee184b49d1af14357cb88ad2637c3e (diff) | |
| parent | 936006173ce11111f10c0bddd66d28c439ca584e (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 | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/main/java/eu/siacs/conversations/Config.java b/src/main/java/eu/siacs/conversations/Config.java index 305055847..2aff98dc2 100644 --- a/src/main/java/eu/siacs/conversations/Config.java +++ b/src/main/java/eu/siacs/conversations/Config.java @@ -41,9 +41,6 @@ public final class Config { public static final String DOMAIN_LOCK = "pix-art.de"; //only allow account creation for this domain public static final String MAGIC_CREATE_DOMAIN = "pix-art.de"; - public static final String CONFERENCE_DOMAIN_LOCK = null; //only allow conference creation for this domain - public static final boolean LOCK_DOMAINS_IN_CONVERSATIONS = false; //only add contacts and conferences for own domains - public static final boolean LOCK_SETTINGS = false; //set to true to disallow account and settings editing public static final boolean SINGLE_ACCOUNT = true; //set to true to allow only one account public static final boolean DISALLOW_REGISTRATION_IN_UI = false; //hide the register checkbox @@ -56,8 +53,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 LEGACY_NAMESPACE_HTTP_UPLOAD = false; // true = 'eu:siacs:conversations:http:upload' false = 'urn:xmpp:http:upload' - public static final int PING_MAX_INTERVAL = 300; public static final int PING_MIN_INTERVAL = 30; public static final int PING_TIMEOUT = 15; @@ -103,8 +98,6 @@ public final class Config { public static final boolean IGNORE_ID_REWRITE_IN_MUC = true; - public static final boolean REQUEST_DISCO = true; - public static final long MILLISECONDS_IN_DAY = 24 * 60 * 60 * 1000; public static final long MAM_MAX_CATCHUP = MILLISECONDS_IN_DAY / 2; public static final int MAM_MAX_MESSAGES = 500; |