From 97504840d176c2b2dbd51e23d3c2b47c61d1331c Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Sat, 27 Jan 2018 21:43:09 +0100
Subject: make chat markers opportunistic in private mucs

---
 src/main/java/de/pixart/messenger/crypto/axolotl/AxolotlService.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/main/java/de/pixart/messenger/crypto/axolotl/AxolotlService.java')

diff --git a/src/main/java/de/pixart/messenger/crypto/axolotl/AxolotlService.java b/src/main/java/de/pixart/messenger/crypto/axolotl/AxolotlService.java
index ce5f1e4bb..6970109b8 100644
--- a/src/main/java/de/pixart/messenger/crypto/axolotl/AxolotlService.java
+++ b/src/main/java/de/pixart/messenger/crypto/axolotl/AxolotlService.java
@@ -787,11 +787,11 @@ public class AxolotlService implements OnAdvancedStreamFeaturesLoaded {
     }
 
     public boolean isConversationAxolotlCapable(Conversation conversation) {
-        return conversation.getMode() == Conversation.MODE_SINGLE || (conversation.getMucOptions().nonanonymous() && conversation.getMucOptions().membersOnly());
+        return conversation.isSingleOrPrivateAndNonAnonymous();
     }
 
     public Pair<AxolotlCapability, Jid> isConversationAxolotlCapableDetailed(Conversation conversation) {
-        if (conversation.getMode() == Conversation.MODE_SINGLE || (conversation.getMucOptions().membersOnly() && conversation.getMucOptions().nonanonymous())) {
+        if (conversation.isSingleOrPrivateAndNonAnonymous()) {
             final List<Jid> jids = getCryptoTargets(conversation);
             for (Jid jid : jids) {
                 if (!hasAny(jid) && (!deviceIds.containsKey(jid) || deviceIds.get(jid).isEmpty())) {
-- 
cgit v1.2.3