From e41a9483bdc1aa772b9f69695cb96643effb1827 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Fri, 13 May 2016 11:47:29 +0200 Subject: only default to omemo when all our devices support it --- src/main/java/eu/siacs/conversations/entities/Conversation.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java index 646bc2be..9d814046 100644 --- a/src/main/java/eu/siacs/conversations/entities/Conversation.java +++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java @@ -683,6 +683,7 @@ public class Conversation extends AbstractEntity implements Blockable { && axolotlService != null && mode == MODE_SINGLE && axolotlService.isConversationAxolotlCapable(this) + && getAccount().getSelfContact().getPresences().allOrNonSupport(AxolotlService.PEP_DEVICE_LIST_NOTIFY) && getContact().getPresences().allOrNonSupport(AxolotlService.PEP_DEVICE_LIST_NOTIFY)) { return Message.ENCRYPTION_AXOLOTL; } -- cgit v1.2.3