diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2016-05-13 11:47:29 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2016-05-13 21:56:28 +0200 |
| commit | e23147211532a04dd2c5b1dc1c8a56f91bb91afb (patch) | |
| tree | b315bc782ae0101d427c59de96c810ee8db0ea58 /src/main/java | |
| parent | 763383a88f04338f8bbd65014284197270ee9a46 (diff) | |
only default to omemo when all our devices support it
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/entities/Conversation.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java index b8cbc0bd4..a86002862 100644 --- a/src/main/java/eu/siacs/conversations/entities/Conversation.java +++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java @@ -697,6 +697,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; } |