From fbd3083d4a39c56fa7bea5f01bede2ad1d2536eb Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Thu, 12 Apr 2018 21:41:42 +0200
Subject: messages coming from known muc server are treated as muc when
 creating conversation

---
 .../java/de/pixart/messenger/services/XmppConnectionService.java     | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

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

diff --git a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
index b2f8001b2..48c39c18b 100644
--- a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
+++ b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
@@ -3705,10 +3705,7 @@ public class XmppConnectionService extends Service {
         final Set<String> mucServers = new HashSet<>();
         for (final Account account : accounts) {
             if (account.getXmppConnection() != null) {
-                final String server = account.getXmppConnection().getMucServer();
-                if (server != null) {
-                    mucServers.add(server);
-                }
+                mucServers.addAll(account.getXmppConnection().getMucServers());
                 for (Bookmark bookmark : account.getBookmarks()) {
                     final Jid jid = bookmark.getJid();
                     final String s = jid == null ? null : jid.getDomain();
-- 
cgit v1.2.3