getNextEncryption does not honor ENCYPTION_MASK (#2899)

ChaosKid42 created 7 years ago

Change summary

src/main/java/eu/siacs/conversations/entities/Conversation.java | 3 +++
1 file changed, 3 insertions(+)

Detailed changes

src/main/java/eu/siacs/conversations/entities/Conversation.java

@@ -593,6 +593,9 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
 
 	public int getNextEncryption() {
 		final int defaultEncryption;
+		if (!Config.supportOmemo() && !Config.supportOpenPgp()) {
+			return Message.ENCRYPTION_NONE;
+		}
 		AxolotlService axolotlService = account.getAxolotlService();
 		if (contactJid.asBareJid().equals(Config.BUG_REPORTS)) {
 			defaultEncryption = Message.ENCRYPTION_NONE;