From 11aa3aacc94651a8347aaa8d4030e7a15278e088 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Thu, 23 Aug 2018 20:29:31 +0200
Subject: catch NPE while detecting installedFrom()

---
 src/main/java/de/pixart/messenger/ui/ConversationsActivity.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main/java')

diff --git a/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java b/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java
index 30c54990f..9c9949770 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java
@@ -559,7 +559,7 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
                 return true;
             case R.id.action_check_updates:
                 if (xmppConnectionService.hasInternetConnection()) {
-                    if (!installFromUnknownSourceAllowed() && !xmppConnectionService.installedFrom().equals(PlayStore)) {
+                    if (!installFromUnknownSourceAllowed() && (xmppConnectionService.installedFrom() != null && !xmppConnectionService.installedFrom().equals(PlayStore))) {
                         openInstallFromUnknownSourcesDialogIfNeeded();
                     } else {
                         UpdateService task = new UpdateService(this, xmppConnectionService.installedFrom(), xmppConnectionService);
-- 
cgit v1.2.3