aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-10-05 14:05:46 +0200
committeriNPUTmice <daniel@gultsch.de>2014-10-05 14:05:46 +0200
commitddb76b0e7373cfc876a88520fbcf7667088a6316 (patch)
tree81dbb7ac362e336c0c1a49ada4ce682c55588f8e
parentf7f7a73ce78bfc22fdeebfdc89946d8ffccaf25f (diff)
fixed rare npe
-rw-r--r--src/eu/siacs/conversations/ui/StartConversationActivity.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/eu/siacs/conversations/ui/StartConversationActivity.java b/src/eu/siacs/conversations/ui/StartConversationActivity.java
index 830bf2526..782183603 100644
--- a/src/eu/siacs/conversations/ui/StartConversationActivity.java
+++ b/src/eu/siacs/conversations/ui/StartConversationActivity.java
@@ -403,6 +403,10 @@ public class StartConversationActivity extends XmppActivity {
String conferenceJid = jid.getText().toString();
Account account = xmppConnectionService
.findAccountByJid(accountJid);
+ if (account==null) {
+ dialog.dismiss();
+ return;
+ }
if (bookmarkCheckBox.isChecked()) {
if (account.hasBookmarkFor(conferenceJid)) {
jid.setError(getString(R.string.bookmark_already_exists));