removed duplicates from muc suggestions

iNPUTmice created 11 years ago

Change summary

src/eu/siacs/conversations/generator/AbstractGenerator.java    | 11 ++-
src/eu/siacs/conversations/services/XmppConnectionService.java |  2 
2 files changed, 7 insertions(+), 6 deletions(-)

Detailed changes

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();

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);
 				}
 			}