diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2016-05-13 11:47:29 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2016-05-13 11:47:29 +0200 |
| commit | e41a9483bdc1aa772b9f69695cb96643effb1827 (patch) | |
| tree | 8f969ae0a9bf1e7d30331a600a9191d85cad9ef9 | |
| parent | aced9d2697b02416d194695f23ad2d3c579fcf5d (diff) | |
only default to omemo when all our devices support it
| -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 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; } |