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/entities | |
| parent | f81d60f9a84ebe491b9343f4dfbdf0e893100cd3 (diff) | |
introduce setting to completely disable (OMEMO) encryption
Diffstat (limited to 'src/main/java/de/pixart/messenger/entities')
| -rw-r--r-- | src/main/java/de/pixart/messenger/entities/Conversation.java | 3 |
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 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(); |