diff options
author | cyBerta <cyberta@riseup.net> | 2018-02-06 16:28:34 +0100 |
---|---|---|
committer | cyBerta <cyberta@riseup.net> | 2018-02-06 16:28:34 +0100 |
commit | 3d827e7295d37ecb25332b39057338496f6f970d (patch) | |
tree | f8c5272e125ed9abae72fb3598d25b1c09f06f89 /app/src/main/java/se/leap/bitmaskclient/MainActivity.java | |
parent | 646e2ec7b868920f71c29243d2bbeb13deb811e3 (diff) | |
parent | edd34192484f4eb618fdcc2a68b18168c155d63c (diff) |
Merge branch 'origin_0.9.8' into 8823_cw_tablet_layout
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/MainActivity.java')
-rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/MainActivity.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/MainActivity.java b/app/src/main/java/se/leap/bitmaskclient/MainActivity.java index 3fc1637e..7629f0b7 100644 --- a/app/src/main/java/se/leap/bitmaskclient/MainActivity.java +++ b/app/src/main/java/se/leap/bitmaskclient/MainActivity.java @@ -74,7 +74,7 @@ public class MainActivity extends AppCompatActivity { switch (intent.getAction()) { case ACTION_SHOW_VPN_FRAGMENT: - fragment = new VpnFragment(); + fragment = new EipFragment(); break; default: break; @@ -89,10 +89,14 @@ public class MainActivity extends AppCompatActivity { @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)) { Provider provider = data.getParcelableExtra(Provider.KEY); - provider.storeInPreferences(preferences); + ConfigHelper.storeProviderInPreferences(preferences, provider); } } } |