aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/Config.java
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2016-01-22 11:20:31 +0100
committerDaniel Gultsch <daniel@gultsch.de>2016-01-22 11:20:31 +0100
commit40005cec1b1a864c529ead082a6e41a1471c874c (patch)
tree8e42c210500630e14e354d9724871afc69aa2fef /src/main/java/eu/siacs/conversations/Config.java
parent77c0fb0b2ae257b7bf257417ed689f2334507f2c (diff)
added config variable to allow non-tls connections
Diffstat (limited to 'src/main/java/eu/siacs/conversations/Config.java')
-rw-r--r--src/main/java/eu/siacs/conversations/Config.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/Config.java b/src/main/java/eu/siacs/conversations/Config.java
index aff27504..9ee221cc 100644
--- a/src/main/java/eu/siacs/conversations/Config.java
+++ b/src/main/java/eu/siacs/conversations/Config.java
@@ -12,7 +12,8 @@ public final class Config {
public static final String DOMAIN_LOCK = null; //only allow account creation for this domain
public static final boolean DISALLOW_REGISTRATION_IN_UI = false; //hide the register checkbox
public static final boolean HIDE_PGP_IN_UI = false; //some more consumer focused clients might want to disable OpenPGP
- public static final boolean FORCE_ENCRYPTION = false; //disables ability to send unencrypted 1-on-1
+ public static final boolean FORCE_E2E_ENCRYPTION = false; //disables ability to send unencrypted 1-on-1
+ public static final boolean ALLOW_NON_TLS_CONNECTIONS = false; //very dangerous. you should have a good reason to set this to true
public static final boolean FORCE_ORBOT = false; // always use TOR
public static final boolean HIDE_MESSAGE_TEXT_IN_NOTIFICATION = false;
public static final boolean SHOW_CONNECTED_ACCOUNTS = false; //show number of connected accounts in foreground notification