From ed91b6b648116690ffcab8b0a0569c4e769ad519 Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Fri, 13 Apr 2018 22:13:10 +0200 Subject: getNextEncryption does not honor ENCYPTION_MASK --- src/main/java/de/pixart/messenger/entities/Conversation.java | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/main/java/de/pixart') 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; -- cgit v1.2.3