aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/pixart
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2018-04-13 22:13:10 +0200
committerChristian Schneppe <christian@pix-art.de>2018-04-13 22:13:10 +0200
commited91b6b648116690ffcab8b0a0569c4e769ad519 (patch)
tree5b52bb53b0e86d3e1ab5b62025ca0fc833f61c91 /src/main/java/de/pixart
parent6921e1dab6d3170da19242d95d0d740a5161fcf9 (diff)
getNextEncryption does not honor ENCYPTION_MASK
Diffstat (limited to 'src/main/java/de/pixart')
-rw-r--r--src/main/java/de/pixart/messenger/entities/Conversation.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/main/java/de/pixart/messenger/entities/Conversation.java b/src/main/java/de/pixart/messenger/entities/Conversation.java
index d10868bf7..3769cedf6 100644
--- a/src/main/java/de/pixart/messenger/entities/Conversation.java
+++ b/src/main/java/de/pixart/messenger/entities/Conversation.java
@@ -750,6 +750,9 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
public int getNextEncryption() {
final int defaultEncryption;
+ if (!Config.supportOmemo() && !Config.supportOpenPgp() && !Config.supportOtr()) {
+ return Message.ENCRYPTION_NONE;
+ }
AxolotlService axolotlService = account.getAxolotlService();
if (contactJid.asBareJid().equals(Config.BUG_REPORTS)) {
defaultEncryption = Message.ENCRYPTION_NONE;