diff options
author | cyBerta <cyberta@riseup.net> | 2018-02-08 15:37:15 +0100 |
---|---|---|
committer | cyBerta <cyberta@riseup.net> | 2018-02-08 15:37:15 +0100 |
commit | 6770f041300fa592dfb93fb4296c55218c05cc45 (patch) | |
tree | 17dd25e0b17e50358cef4e464fa4bc2503cc2859 /app/src/main/java/se/leap/bitmaskclient/StartActivity.java | |
parent | ef805faec61a4cb3155dd336f5db08cd2c40aece (diff) | |
parent | ae938c20a11b6195936f97eebd32abd35335bceb (diff) |
Merge branch 'mirror_0xacab_0.9.8' into #8830_onBoot_alwaysOn
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/StartActivity.java')
-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 26385f67..e4758ac9 100644 --- a/app/src/main/java/se/leap/bitmaskclient/StartActivity.java +++ b/app/src/main/java/se/leap/bitmaskclient/StartActivity.java @@ -18,7 +18,6 @@ import se.leap.bitmaskclient.userstatus.User; import static se.leap.bitmaskclient.Constants.APP_ACTION_CONFIGURE_ALWAYS_ON_PROFILE; import static se.leap.bitmaskclient.Constants.EIP_ACTION_START; -import static se.leap.bitmaskclient.Constants.EIP_RECEIVER; import static se.leap.bitmaskclient.Constants.EIP_RESTART_ON_BOOT; import static se.leap.bitmaskclient.Constants.PREFERENCES_APP_VERSION; import static se.leap.bitmaskclient.Constants.REQUEST_CODE_CONFIGURE_LEAP; @@ -155,14 +154,11 @@ public class StartActivity extends Activity { configureLeapProvider(); } else { Log.d(TAG, "vpn provider is configured"); - if (getIntent() != null && getIntent().getBooleanExtra(EIP_RESTART_ON_BOOT, false)) { - Log.d(TAG, "start VPN in background"); eipCommand(EIP_ACTION_START); finish(); return; } - Log.d(TAG, "show MainActivity!"); showMainActivity(); } } else { @@ -197,6 +193,7 @@ public class StartActivity extends Activity { private void showMainActivity() { Intent intent = new Intent(this, MainActivity.class); + intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP | Intent.FLAG_ACTIVITY_CLEAR_TOP); intent.setAction(ACTION_SHOW_VPN_FRAGMENT); startActivity(intent); finish(); |