From d3294d94361d2bef850ad42992c14590c46c154d Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Tue, 11 Sep 2018 20:58:06 +0200 Subject: catch NPE on detecting tor connection in UpdaterActivity --- src/main/java/de/pixart/messenger/ui/UpdaterActivity.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/de/pixart/messenger/ui/UpdaterActivity.java b/src/main/java/de/pixart/messenger/ui/UpdaterActivity.java index 0c59b06c6..b8a43e25f 100644 --- a/src/main/java/de/pixart/messenger/ui/UpdaterActivity.java +++ b/src/main/java/de/pixart/messenger/ui/UpdaterActivity.java @@ -57,7 +57,10 @@ public class UpdaterActivity extends XmppActivity { //set activity setContentView(R.layout.activity_updater); - this.mUseTor = mXmppConnectionService.useTorToConnect(); + this.mUseTor = false; + if (mXmppConnectionService != null) { + this.mUseTor = mXmppConnectionService.useTorToConnect(); + } this.mTheme = findTheme(); setTheme(this.mTheme); -- cgit v1.2.3