aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2017-03-27 21:08:27 +0200
committerChristian Schneppe <christian@pix-art.de>2017-04-05 22:21:41 +0200
commita8e179ab4e8570ed468f2905fd45a8b184c22b49 (patch)
tree51067fa94a10eb85c4b4704aaf4d5c1d64778b79 /src/main
parent0be7dfe65e0cb105a6b2716e8b3e0a03f46f452d (diff)
temporarly enable OTR
Diffstat (limited to '')
-rw-r--r--src/main/java/de/pixart/messenger/Config.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/Config.java b/src/main/java/de/pixart/messenger/Config.java
index 47353b334..e06f4ad9f 100644
--- a/src/main/java/de/pixart/messenger/Config.java
+++ b/src/main/java/de/pixart/messenger/Config.java
@@ -13,7 +13,7 @@ public final class Config {
private static final int OTR = 4;
private static final int OMEMO = 8;
- private static final int ENCRYPTION_MASK = UNENCRYPTED /*| OPENPGP | OTR */| OMEMO;
+ private static final int ENCRYPTION_MASK = UNENCRYPTED /*| OPENPGP */ | OTR | OMEMO;
public static boolean supportUnencrypted() {
return (ENCRYPTION_MASK & UNENCRYPTED) != 0;