aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/Config.java
diff options
context:
space:
mode:
authorChristian S <christian@pix-art.de>2015-10-10 20:51:12 +0200
committerChristian S <christian@pix-art.de>2015-10-10 20:51:12 +0200
commitb5b31133393db2e541da260cb0f80a3f4d17f136 (patch)
tree34cb89f843c84da16b9abaf3a4ee7f3e9c6ce047 /src/main/java/eu/siacs/conversations/Config.java
parent226b33d3f7ce49ca961f2df95f5f5c136fa250ce (diff)
show encryption in ui
Diffstat (limited to '')
-rw-r--r--src/main/java/eu/siacs/conversations/Config.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/Config.java b/src/main/java/eu/siacs/conversations/Config.java
index a3bf20489..a019b4cad 100644
--- a/src/main/java/eu/siacs/conversations/Config.java
+++ b/src/main/java/eu/siacs/conversations/Config.java
@@ -12,7 +12,7 @@ public final class Config {
public static final String DOMAIN_LOCK = "pix-art.de"; //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 = true; //some more consumer focused clients might want to disable OpenPGP
- public static final boolean HIDE_ENCRYPTION_IN_UI = true; //completely hide encryption options in menu bar
+ public static final boolean HIDE_ENCRYPTION_IN_UI = false; //completely hide encryption options in menu bar
public static final boolean LEGACY_NAMESPACE_HTTP_UPLOAD = true; // true = 'eu:siacs:conversations:http:upload' false = 'urn:xmpp:http:upload'
@@ -56,7 +56,7 @@ public final class Config {
public static final ChatState DEFAULT_CHATSTATE = ChatState.ACTIVE;
public static final int TYPING_TIMEOUT = 5;
- public static final String UPDATE_URL = "http://xmpp.pix-art.de/update/";
+ public static final String UPDATE_URL = "http://xmpp.pix-art.de/update/beta";
public static final long UPDATE_CHECK_TIMER = 24 * 60 * 60; // in seconds
public static final String ENABLED_CIPHERS[] = {