From 52ad718251e544807f44de2a9d85ff58f06120a1 Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Thu, 24 Jul 2014 17:21:21 +0200 Subject: [PATCH] removed duplicates from muc suggestions --- .../conversations/generator/AbstractGenerator.java | 11 ++++++----- .../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 49b5d61437364d7826ed720206ec7a12a61e4fc7..05d5799c25c7c4637cfd077856c3383c9567e960 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 de0658d424b6ef0bbad31120e71667dcc31f2b02..c9813d82119d7273b800bdbc156dc50251b4e79f 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); } }