diff options
author | Christian S <christian@pix-art.de> | 2016-03-04 10:16:11 +0100 |
---|---|---|
committer | Christian S <christian@pix-art.de> | 2016-03-04 10:16:11 +0100 |
commit | c18696c85d5801dfd39ffe494240b5f849deedb8 (patch) | |
tree | a51ac3bbfab1c656a3e00f8725d5e09b774f94c1 /src/main/java/eu/siacs/conversations/Config.java | |
parent | 024b2c80aa6da4adf2a48d89047a72bbb2bda5ad (diff) | |
parent | cc67bfd8dbae334a121c9d40c13c3816b9eb72a0 (diff) |
Merge branch '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 | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/main/java/eu/siacs/conversations/Config.java b/src/main/java/eu/siacs/conversations/Config.java index 54fe7e45a..2bd0967c9 100644 --- a/src/main/java/eu/siacs/conversations/Config.java +++ b/src/main/java/eu/siacs/conversations/Config.java @@ -22,10 +22,6 @@ public final class Config { return (ENCRYPTION_MASK & OPENPGP) != 0; } - public static boolean supportOpenPgpOnly() { - return supportOpenPgp() && !multipleEncryptionChoices(); - } - public static boolean supportOtr() { return (ENCRYPTION_MASK & OTR) != 0; } @@ -43,8 +39,8 @@ public final class Config { public static final String DOMAIN_LOCK = "pix-art.de"; //only allow account creation for this domain 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 = true; //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 public static final boolean ALLOW_NON_TLS_CONNECTIONS = false; //very dangerous. you should have a good reason to set this to true |