diff options
| author | Christian Schneppe <christian@pix-art.de> | 2018-01-27 21:43:09 +0100 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2018-01-27 21:43:09 +0100 |
| commit | 97504840d176c2b2dbd51e23d3c2b47c61d1331c (patch) | |
| tree | 4008545eb4bb76e85d707674b8e9486c0696d0ab /src/main/java/de/pixart/messenger/crypto/axolotl | |
| parent | 3d18291b6ef0df2f693efb872bc9bfddec9a864a (diff) | |
make chat markers opportunistic in private mucs
Diffstat (limited to 'src/main/java/de/pixart/messenger/crypto/axolotl')
| -rw-r--r-- | src/main/java/de/pixart/messenger/crypto/axolotl/AxolotlService.java | 4 |
1 files changed, 2 insertions, 2 deletions
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())) { |