aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs/conversations
diff options
context:
space:
mode:
Diffstat (limited to 'src/eu/siacs/conversations')
-rw-r--r--src/eu/siacs/conversations/generator/AbstractGenerator.java11
-rw-r--r--src/eu/siacs/conversations/services/XmppConnectionService.java2
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);
}
}