From 0c9c59b444b5ef0c7d8b61021c8e5bf802b59228 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Thu, 23 Aug 2018 20:09:42 +0200
Subject: try to catch rare NPE

---
 .../java/de/pixart/messenger/ui/StartConversationActivity.java    | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src/main/java/de/pixart/messenger')

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) -> {
-- 
cgit v1.2.3