diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-07-24 17:21:21 +0200 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-07-24 17:21:21 +0200 |
| commit | 52ad718251e544807f44de2a9d85ff58f06120a1 (patch) | |
| tree | ee2bc5d3e100059a66c3c2db83dd10de3a1bf353 | |
| parent | c7c3db478ad7212d3b66cf83c702cd60004ff53a (diff) | |
removed duplicates from muc suggestions
| -rw-r--r-- | src/eu/siacs/conversations/generator/AbstractGenerator.java | 11 | ||||
| -rw-r--r-- | src/eu/siacs/conversations/services/XmppConnectionService.java | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/eu/siacs/conversations/generator/AbstractGenerator.java b/src/eu/siacs/conversations/generator/AbstractGenerator.java index 49b5d614..05d5799c 100644 --- a/src/eu/siacs/conversations/generator/AbstractGenerator.java +++ b/src/eu/siacs/conversations/generator/AbstractGenerator.java @@ -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 = "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 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 String getCapHash() { StringBuilder s = new StringBuilder(); diff --git a/src/eu/siacs/conversations/services/XmppConnectionService.java b/src/eu/siacs/conversations/services/XmppConnectionService.java index de0658d4..c9813d82 100644 --- a/src/eu/siacs/conversations/services/XmppConnectionService.java +++ b/src/eu/siacs/conversations/services/XmppConnectionService.java @@ -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); } } |