narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

removed duplicates from muc suggestions

Browse source
This commit is contained in:
iNPUTmice 2014-07-24 17:21:21 +02:00
parent c7c3db478a
commit 52ad718251
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/eu/siacs/conversations/generator/AbstractGenerator.java
View file

@ -19,14 +19,15 @@ public abstract class AbstractGenerator {
"jabber:x:conference",
"http://jabber.org/protocol/caps",
"http://jabber.org/protocol/disco#info"};
//public final String[] FEATURES = { "http://jabber.org/protocol/muc","http://jabber.org/protocol/disco#info", "http://jabber.org/protocol/disco#items", "http://jabber.org/protocol/caps" };
//public final String IDENTITY_NAME = "Exodus 0.9.1";
//public final String IDENTITY_TYPE = "pc";
public final String IDENTITY_NAME = "Conversations 0.5";
public final String IDENTITY_TYPE = "phone";
/*public final String[] FEATURES = { "http://jabber.org/protocol/muc","http://jabber.org/protocol/disco#info", "http://jabber.org/protocol/disco#items", "http://jabber.org/protocol/caps" };
public final String IDENTITY_NAME = "Exodus 0.9.1";
public final String IDENTITY_TYPE = "pc";*/
public String getCapHash() {
StringBuilder s = new StringBuilder();

2
src/eu/siacs/conversations/services/XmppConnectionService.java
View file

@ -1381,7 +1381,7 @@ public class XmppConnectionService extends Service {
for (Account account : accounts) {
if (account.getXmppConnection() != null) {
String server = account.getXmppConnection().getMucServer();
if (server != null) {
if (server != null && !mucServers.contains(server)) {
mucServers.add(server);
}
}