sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

work around to not confuse irc transport with real conference servers

This commit is contained in:
iNPUTmice 2014-11-21 20:34:19 +01:00
parent 36f8a31d7d
commit 28fefad834
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
View File

@ -810,7 +810,12 @@ public class XmppConnection implements Runnable {
final List<Element> elements = packet.query().getChildren(); final List<Element> elements = packet.query().getChildren();
final List<String> features = new ArrayList<>(); final List<String> features = new ArrayList<>();
for (Element element : elements) { for (Element element : elements) {
if (element.getName().equals("feature")) { if (element.getName().equals("identity")) {
if ("irc".equals(element.getAttribute("type"))) {
//add fake feature to not confuse irc and real muc
features.add("siacs:no:muc");
}
} else if (element.getName().equals("feature")) {
features.add(element.getAttribute("var")); features.add(element.getAttribute("var"));
} }
} }
@ -1052,7 +1057,7 @@ public class XmppConnection implements Runnable {
final List<String> items = new ArrayList<>(); final List<String> items = new ArrayList<>();
for (Entry<String, List<String>> cursor : disco.entrySet()) { for (Entry<String, List<String>> cursor : disco.entrySet()) {
final List<String> value = cursor.getValue(); final List<String> value = cursor.getValue();
if (value.contains("http://jabber.org/protocol/muc") && !value.contains("jabber:iq:gateway")) { if (value.contains("http://jabber.org/protocol/muc") && !value.contains("jabber:iq:gateway") && !value.contains("siacs:no:muc")) {
return cursor.getKey(); return cursor.getKey();
} }
} }