only default to omemo when all our devices support it

This commit is contained in:
Daniel Gultsch 2016-05-13 11:47:29 +02:00
parent aced9d2697
commit e41a9483bd

View file

@ -683,6 +683,7 @@ public class Conversation extends AbstractEntity implements Blockable {
&& axolotlService != null && axolotlService != null
&& mode == MODE_SINGLE && mode == MODE_SINGLE
&& axolotlService.isConversationAxolotlCapable(this) && 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)) {
return Message.ENCRYPTION_AXOLOTL; return Message.ENCRYPTION_AXOLOTL;
} }