From 06949b76490736783520d783f0ec889e58707062 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian.schneppe@pix-art.de>
Date: Sat, 2 Nov 2019 17:18:45 +0100
Subject: introduce setting to completely disable (OMEMO) encryption

---
 src/main/java/de/pixart/messenger/entities/Conversation.java | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/main/java/de/pixart/messenger/entities')

diff --git a/src/main/java/de/pixart/messenger/entities/Conversation.java b/src/main/java/de/pixart/messenger/entities/Conversation.java
index b20976316..cc0d5525f 100644
--- a/src/main/java/de/pixart/messenger/entities/Conversation.java
+++ b/src/main/java/de/pixart/messenger/entities/Conversation.java
@@ -805,6 +805,9 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
         if (OmemoSetting.isAlways()) {
             return suitableForOmemoByDefault(this) ? Message.ENCRYPTION_AXOLOTL : Message.ENCRYPTION_NONE;
         }
+        if (OmemoSetting.isNever()) {
+            return Message.ENCRYPTION_NONE;
+        }
         final int defaultEncryption;
         if (suitableForOmemoByDefault(this)) {
             defaultEncryption = OmemoSetting.getEncryption();
-- 
cgit v1.2.3