diff options
author | Fup Duck <fupduck@sacknagel.com> | 2018-01-28 17:45:28 +0100 |
---|---|---|
committer | Fup Duck <fupduck@sacknagel.com> | 2018-01-28 17:45:28 +0100 |
commit | a1ac4910f062ca8aca06e0468fffef751d3bb714 (patch) | |
tree | 392a31c3627b88107ea30f25488989dcaf7a6c70 /app/src/main/java/se/leap/bitmaskclient/MainActivity.java | |
parent | 1a25b1dea9ab2d7e76cd79e8928d27f855ca9f2a (diff) | |
parent | 298c33b94c8aada449c98a24cdb2c687af40cbbd (diff) |
Merge remote-tracking branch '0xacab/0.9.8' into 8826_custom_provider
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); } } } |