From 0f388f9cc0229581a3d0bd7c5dfc5b7ad7b8bd3a Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Sun, 22 May 2016 21:31:02 +0200 Subject: don't make OMEMO default --- src/main/java/eu/siacs/conversations/entities/Conversation.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/main/java/eu/siacs/conversations/entities/Conversation.java') 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(); -- cgit v1.2.3