brought ad hoc conferences back. fixed #688 fixed #367

1 files changed, 8 insertions, 1 deletions

diff --git a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
index f7a86802..dc895ead 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() {