diff options
author | Fup Duck <fupduck@sacknagel.com> | 2018-02-08 15:21:55 +0100 |
---|---|---|
committer | Fup Duck <fupduck@sacknagel.com> | 2018-02-08 15:21:55 +0100 |
commit | a14bfd300dccd79dbd3685710e5d8b40b5906a41 (patch) | |
tree | 996be52accafc408b84d68fc89a6b0731ceed729 /app/src/main/java/se/leap/bitmaskclient/MainActivity.java | |
parent | ae2813a0fe77c265a42221f6153d8f5bca26a467 (diff) | |
parent | ae938c20a11b6195936f97eebd32abd35335bceb (diff) |
Merge branch 'leap_0.9.8' into 8827_handle_switch_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 | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/MainActivity.java b/app/src/main/java/se/leap/bitmaskclient/MainActivity.java index d3865559..9c047bc9 100644 --- a/app/src/main/java/se/leap/bitmaskclient/MainActivity.java +++ b/app/src/main/java/se/leap/bitmaskclient/MainActivity.java @@ -17,6 +17,7 @@ import static se.leap.bitmaskclient.Constants.REQUEST_CODE_CONFIGURE_LEAP; import static se.leap.bitmaskclient.Constants.REQUEST_CODE_LOG_IN; import static se.leap.bitmaskclient.Constants.REQUEST_CODE_SWITCH_PROVIDER; import static se.leap.bitmaskclient.Constants.SHARED_PREFERENCES; +import static se.leap.bitmaskclient.EipFragment.ASK_TO_CANCEL_VPN; public class MainActivity extends AppCompatActivity { @@ -66,13 +67,25 @@ public class MainActivity extends AppCompatActivity { return; } + Fragment fragment = null; switch (intent.getAction()) { case ACTION_SHOW_VPN_FRAGMENT: - showEipFragment(); + fragment = new EipFragment(); + if (intent.hasExtra(ASK_TO_CANCEL_VPN)) { + Bundle bundle = new Bundle(); + bundle.putBoolean(ASK_TO_CANCEL_VPN, true); + fragment.setArguments(bundle); + } break; default: break; } + + if (fragment != null) { + new FragmentManagerEnhanced(getSupportFragmentManager()).beginTransaction() + .replace(R.id.container, fragment) + .commit(); + } } @Override @@ -91,6 +104,7 @@ public class MainActivity extends AppCompatActivity { ConfigHelper.storeProviderInPreferences(preferences, provider); navigationDrawerFragment.refresh(); + switch (requestCode) { case REQUEST_CODE_SWITCH_PROVIDER: EipCommand.stopVPN(this); @@ -100,13 +114,9 @@ public class MainActivity extends AppCompatActivity { case REQUEST_CODE_LOG_IN: EipCommand.startVPN(this); break; - } - showEipFragment(); } - } - private void showEipFragment() { Fragment fragment = new EipFragment(); Bundle arguments = new Bundle(); arguments.putParcelable(PROVIDER_KEY, provider); @@ -115,5 +125,4 @@ public class MainActivity extends AppCompatActivity { .replace(R.id.container, fragment) .commit(); } - } |