From 0ad6d0616f9663814f6f9f24590833425f6ad372 Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Thu, 20 Nov 2014 18:20:42 +0100
Subject: brought ad hoc conferences back. fixed #688 fixed #367

---
 src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java')

diff --git a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
index f7a86802a..dc895eadb 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
@@ -1049,7 +1049,14 @@ public class XmppConnection implements Runnable {
 	}
 
 	public String getMucServer() {
-		return findDiscoItemByFeature("http://jabber.org/protocol/muc");
+		final List<String> items = new ArrayList<>();
+		for (Entry<String, List<String>> cursor : disco.entrySet()) {
+			final List<String> value = cursor.getValue();
+			if (value.contains("http://jabber.org/protocol/muc") && !value.contains("jabber:iq:gateway")) {
+				return cursor.getKey();
+			}
+		}
+		return null;
 	}
 
 	public int getTimeToNextAttempt() {
-- 
cgit v1.2.3