aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2018-08-23 20:09:42 +0200
committerChristian Schneppe <christian@pix-art.de>2018-08-23 20:09:42 +0200
commit0c9c59b444b5ef0c7d8b61021c8e5bf802b59228 (patch)
tree9348dc5ea820641418d1abcfd5a7ca73dd3d421a /src/main
parentbbb53526f80c14d9ddc0f25ad5516a600e1868fa (diff)
try to catch rare NPE
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/de/pixart/messenger/ui/StartConversationActivity.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java b/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java
index a58c2e0c0..4e02df3ea 100644
--- a/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java
@@ -463,6 +463,12 @@ public class StartConversationActivity extends XmppActivity implements XmppConne
if (prev != null) {
ft.remove(prev);
}
+ boolean multiAccount = false;
+ try {
+ multiAccount = xmppConnectionService.multipleAccounts();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
ft.addToBackStack(null);
EnterJidDialog dialog = EnterJidDialog.newInstance(
mActivatedAccounts,
@@ -471,7 +477,7 @@ public class StartConversationActivity extends XmppActivity implements XmppConne
prefilledJid,
null,
invite == null || !invite.hasFingerprints(),
- xmppConnectionService.multipleAccounts()
+ multiAccount
);
dialog.setOnEnterJidDialogPositiveListener((accountJid, contactJid) -> {