From 127981e3cbfca4b2bda85c93a0ad4877df0728a7 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Fri, 29 Jun 2018 22:52:50 +0200
Subject: do not include white listed domains in room list

---
 .../java/de/pixart/messenger/services/XmppConnectionService.java     | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/main/java/de/pixart/messenger/services')

diff --git a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
index b6a28ac3c..3b2699667 100644
--- a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
+++ b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
@@ -2470,13 +2470,13 @@ public class XmppConnectionService extends Service {
                 }
                 ++i;
                 if (i >= affiliations.length) {
-                    List<Jid> members = conversation.getMucOptions().getMembers();
+                    List<Jid> members = conversation.getMucOptions().getMembers(true);
                     if (success) {
                         List<Jid> cryptoTargets = conversation.getAcceptedCryptoTargets();
                         boolean changed = false;
                         for (ListIterator<Jid> iterator = cryptoTargets.listIterator(); iterator.hasNext(); ) {
                             Jid jid = iterator.next();
-                            if (!members.contains(jid)) {
+                            if (!members.contains(jid) && !members.contains(Jid.ofDomain(jid.getDomain()))) {
                                 iterator.remove();
                                 Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": removed " + jid + " from crypto targets of " + conversation.getName());
                                 changed = true;
@@ -2487,7 +2487,6 @@ public class XmppConnectionService extends Service {
                             updateConversation(conversation);
                         }
                     }
-                    Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": retrieved members for " + conversation.getJid().asBareJid() + ": " + conversation.getMucOptions().getMembers());
                     getAvatarService().clear(conversation);
                     updateMucRosterUi();
                     updateConversationUi();
-- 
cgit v1.2.3