diff options
| author | fupduck <fupduck@riseup.net> | 2018-02-22 02:24:32 -0800 |
|---|---|---|
| committer | fupduck <fupduck@riseup.net> | 2018-02-22 02:24:32 -0800 |
| commit | af3ac0476f2b6320cd3e3ff8e17453d50bbace08 (patch) | |
| tree | ffdcbe5a214e6e827c04dd8aceb483a5d09bb193 /app/src/main/java/se/leap/bitmaskclient | |
| parent | 48846a44f70be665e39abe5ce56a85f36c542544 (diff) | |
| parent | ce71463e93a0ca51a9a893a1eb666f51171e8e9d (diff) | |
Merge branch '#8861_splash_screen_handling' into '0.9.8'
#8861 fix splash screen handling
See merge request leap/bitmask_android!48
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient')
| -rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/StartActivity.java | 5 |
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); |