diff options
| author | Christian Schneppe <christian@pix-art.de> | 2016-05-22 21:31:02 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2016-05-22 21:31:02 +0200 |
| commit | 0f388f9cc0229581a3d0bd7c5dfc5b7ad7b8bd3a (patch) | |
| tree | f2071e8402e9c87224733922fa7b08036b8b9dc9 /src/main/java/eu/siacs/conversations/entities/Conversation.java | |
| parent | cf956b605c459bd8d8e08ced00a06207bbd8cdc4 (diff) | |
don't make OMEMO default
Diffstat (limited to '')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/entities/Conversation.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java index 518152356..a8f809b08 100644 --- a/src/main/java/eu/siacs/conversations/entities/Conversation.java +++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java @@ -696,7 +696,8 @@ public class Conversation extends AbstractEntity implements Blockable { && mode == MODE_SINGLE && axolotlService.isConversationAxolotlCapable(this) && getAccount().getSelfContact().getPresences().allOrNonSupport(AxolotlService.PEP_DEVICE_LIST_NOTIFY) - && getContact().getPresences().allOrNonSupport(AxolotlService.PEP_DEVICE_LIST_NOTIFY)) { + && getContact().getPresences().allOrNonSupport(AxolotlService.PEP_DEVICE_LIST_NOTIFY) + && Config.AlwayUseOMEMO){ return Message.ENCRYPTION_AXOLOTL; } else { next = this.getMostRecentlyUsedIncomingEncryption(); |