aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2016-10-03 21:04:10 +0200
committerDaniel Gultsch <daniel@gultsch.de>2016-10-03 21:04:10 +0200
commit5ac0e9267d8ff98dcb6a28d1837e81b4572e8b03 (patch)
tree0b46d6e4862dc81d8b05fb830b43fef6e71b2f61 /src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java
parentcea52b0722bc352815e3c3e1c1982ddd13f54984 (diff)
fixed omemo shown as unavailable in 1:1 chats
Diffstat (limited to 'src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java')
-rw-r--r--src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java b/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java
index ddfe2d8e..508168c8 100644
--- a/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java
+++ b/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java
@@ -660,7 +660,8 @@ public class AxolotlService implements OnAdvancedStreamFeaturesLoaded {
}
public Pair<AxolotlCapability,Jid> isConversationAxolotlCapableDetailed(Conversation conversation) {
- if (conversation.getMucOptions().membersOnly() && conversation.getMucOptions().nonanonymous()) {
+ if (conversation.getMode() == Conversation.MODE_SINGLE
+ || (conversation.getMucOptions().membersOnly() && conversation.getMucOptions().nonanonymous())) {
final List<Jid> jids = getCryptoTargets(conversation);
for(Jid jid : jids) {
if (!hasAny(jid) && (!deviceIds.containsKey(jid) || deviceIds.get(jid).isEmpty())) {