aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/pixart/messenger
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2017-08-01 13:25:11 +0200
committerChristian Schneppe <christian@pix-art.de>2017-08-01 13:25:11 +0200
commit2ef7562718656f682edf08f2bec3bf48749a7b95 (patch)
tree6fb82f60f8eff6b6bd352dfdf817b7633dbcee8d /src/main/java/de/pixart/messenger
parent793a50fb376cb2c9f1b97fb606e1db949127e277 (diff)
made omemo always available but in public mucs
Diffstat (limited to 'src/main/java/de/pixart/messenger')
-rw-r--r--src/main/java/de/pixart/messenger/crypto/axolotl/AxolotlService.java2
1 files changed, 1 insertions, 1 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 7f15f692e..b54c003b2 100644
--- a/src/main/java/de/pixart/messenger/crypto/axolotl/AxolotlService.java
+++ b/src/main/java/de/pixart/messenger/crypto/axolotl/AxolotlService.java
@@ -761,7 +761,7 @@ public class AxolotlService implements OnAdvancedStreamFeaturesLoaded {
}
public boolean isConversationAxolotlCapable(Conversation conversation) {
- return isConversationAxolotlCapableDetailed(conversation).first == AxolotlCapability.FULL;
+ return conversation.getMode() == Conversation.MODE_SINGLE || (conversation.getMucOptions().nonanonymous() && conversation.getMucOptions().membersOnly());
}
public Pair<AxolotlCapability, Jid> isConversationAxolotlCapableDetailed(Conversation conversation) {