From 53533ca74e4b395917088ffd26391cb8da1d2a73 Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Mon, 30 Jun 2014 10:36:21 +0200 Subject: [PATCH] added error message for #240 --- res/values/strings.xml | 1 + .../conversations/ui/ContactsActivity.java | 22 ++++++++++++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index dc8753491..4f8ff473c 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -249,4 +249,5 @@ OpenPGP encrypted messages found Click here to enter passphrase and decrypt messages Reception failed + No suitable Conference Server found \ No newline at end of file diff --git a/src/eu/siacs/conversations/ui/ContactsActivity.java b/src/eu/siacs/conversations/ui/ContactsActivity.java index 4e9c8af67..811ae876f 100644 --- a/src/eu/siacs/conversations/ui/ContactsActivity.java +++ b/src/eu/siacs/conversations/ui/ContactsActivity.java @@ -240,6 +240,15 @@ public class ContactsActivity extends XmppActivity { String mucName = CryptoHelper.randomMucName(xmppConnectionService.getRNG()); String serverName = account.getXmppConnection() .getMucServer(); + if (serverName==null) { + List servers = getMucServers(); + if (servers.size() >= 1) { + serverName = servers.get(0); + } else { + displayErrorDialog(R.string.no_muc_server_found); + return; + } + } String jid = mucName + "@" + serverName; Conversation conversation = xmppConnectionService .findOrCreateConversation(account, jid, true); @@ -462,15 +471,22 @@ public class ContactsActivity extends XmppActivity { } } - private boolean isMuc(Contact contact) { + private List getMucServers() { ArrayList mucServers = new ArrayList(); for(Account account : accounts) { if (account.getXmppConnection()!=null) { - mucServers.add(account.getXmppConnection().getMucServer()); + String server = account.getXmppConnection().getMucServer(); + if (server!=null) { + mucServers.add(server); + } } } + return mucServers; + } + + private boolean isMuc(Contact contact) { String server = contact.getJid().split("@")[1]; - return mucServers.contains(server); + return getMucServers().contains(server); } public void startConversation(Contact contact, Account account, boolean muc) {