aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/pixart/messenger/services
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2018-04-12 21:41:42 +0200
committerChristian Schneppe <christian@pix-art.de>2018-04-12 21:41:42 +0200
commitfbd3083d4a39c56fa7bea5f01bede2ad1d2536eb (patch)
treed0704ee0843abbef48ad12d069daeda0f20f0fed /src/main/java/de/pixart/messenger/services
parent2b09dcd878912e7c4a5ea9bed9186a5aa48726a1 (diff)
messages coming from known muc server are treated as muc when creating conversation
Diffstat (limited to 'src/main/java/de/pixart/messenger/services')
-rw-r--r--src/main/java/de/pixart/messenger/services/XmppConnectionService.java5
1 files changed, 1 insertions, 4 deletions
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();