diff options
| author | Christian Schneppe <christian.schneppe@pix-art.de> | 2019-11-02 17:18:45 +0100 |
|---|---|---|
| committer | Christian Schneppe <christian.schneppe@pix-art.de> | 2019-11-02 17:18:45 +0100 |
| commit | 06949b76490736783520d783f0ec889e58707062 (patch) | |
| tree | 946b6a6d16ba1d03ee2e82dbba79e2a6b8c128e3 /src/main/java/de/pixart/messenger/ui/util | |
| parent | f81d60f9a84ebe491b9343f4dfbdf0e893100cd3 (diff) | |
introduce setting to completely disable (OMEMO) encryption
Diffstat (limited to 'src/main/java/de/pixart/messenger/ui/util')
| -rw-r--r-- | src/main/java/de/pixart/messenger/ui/util/ConversationMenuConfigurator.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/util/ConversationMenuConfigurator.java b/src/main/java/de/pixart/messenger/ui/util/ConversationMenuConfigurator.java index fd5a5c441..cb4211b1e 100644 --- a/src/main/java/de/pixart/messenger/ui/util/ConversationMenuConfigurator.java +++ b/src/main/java/de/pixart/messenger/ui/util/ConversationMenuConfigurator.java @@ -106,7 +106,7 @@ public class ConversationMenuConfigurator { final int next = conversation.getNextEncryption(); boolean visible; - if (OmemoSetting.isAlways()) { + if (OmemoSetting.isAlways() || OmemoSetting.isNever()) { visible = false; } else if (conversation.getMode() == Conversation.MODE_MULTI) { if (next == Message.ENCRYPTION_NONE && !conversation.isPrivateAndNonAnonymous() && !conversation.getBooleanAttribute(Conversation.ATTRIBUTE_FORMERLY_PRIVATE_NON_ANONYMOUS, false)) { |