diff options
| author | Christian Schneppe <christian@pix-art.de> | 2018-08-23 20:29:31 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2018-08-23 20:29:31 +0200 |
| commit | 11aa3aacc94651a8347aaa8d4030e7a15278e088 (patch) | |
| tree | c92723e76054dfffb3cc1f6dfea090fd9c9618a2 /src/main/java/de/pixart/messenger/ui/ConversationsActivity.java | |
| parent | 41d57aca9a7a2a08b242ae35d3e2b21ae5f335a6 (diff) | |
catch NPE while detecting installedFrom()
Diffstat (limited to 'src/main/java/de/pixart/messenger/ui/ConversationsActivity.java')
| -rw-r--r-- | src/main/java/de/pixart/messenger/ui/ConversationsActivity.java | 2 |
1 files changed, 1 insertions, 1 deletions
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); |