diff options
author | Christian Schneppe <christian@pix-art.de> | 2018-06-29 22:52:50 +0200 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2018-06-29 22:52:50 +0200 |
commit | 127981e3cbfca4b2bda85c93a0ad4877df0728a7 (patch) | |
tree | 5bfc0e154898d5da4abfd0dd2358e1163fc243fb /src/main/java/de/pixart/messenger/services | |
parent | 81ba0b467e17c901c9d25dbea2331c7a848c7034 (diff) |
do not include white listed domains in room list
Diffstat (limited to 'src/main/java/de/pixart/messenger/services')
-rw-r--r-- | src/main/java/de/pixart/messenger/services/XmppConnectionService.java | 5 |
1 files changed, 2 insertions, 3 deletions
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(); |