summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorcyBerta <cyberta@riseup.net>2018-02-21 17:50:06 +0100
committercyBerta <cyberta@riseup.net>2018-02-21 17:50:06 +0100
commitce71463e93a0ca51a9a893a1eb666f51171e8e9d (patch)
tree3b5ca54397d89e47b37ec4c2563dc8f21093d9ab /app
parentd6db9433d9f9e0e2f1dc21cd3de7d88d1e473861 (diff)
#8861 fix splash screen handling
Diffstat (limited to 'app')
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/StartActivity.java5
1 files changed, 1 insertions, 4 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/StartActivity.java b/app/src/main/java/se/leap/bitmaskclient/StartActivity.java
index 39717bd8..b7180f5f 100644
--- a/app/src/main/java/se/leap/bitmaskclient/StartActivity.java
+++ b/app/src/main/java/se/leap/bitmaskclient/StartActivity.java
@@ -184,12 +184,9 @@ public class StartActivity extends Activity {
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
- if (data == null) {
- return;
- }
if (requestCode == REQUEST_CODE_CONFIGURE_LEAP) {
- if (resultCode == RESULT_OK && data.hasExtra(Provider.KEY)) {
+ if (resultCode == RESULT_OK && data != null && data.hasExtra(Provider.KEY)) {
Provider provider = data.getParcelableExtra(Provider.KEY);
ConfigHelper.storeProviderInPreferences(preferences, provider);
EipCommand.startVPN(this, false);