diff options
author | fupduck <fupduck@riseup.net> | 2018-02-08 06:05:16 -0800 |
---|---|---|
committer | fupduck <fupduck@riseup.net> | 2018-02-08 06:05:16 -0800 |
commit | c3d157c91ecc3a177efc4e089904684511e7710d (patch) | |
tree | d664bf391e0fe2abda37cd78947703b186515c14 /app/src/main/java/se/leap/bitmaskclient/StartActivity.java | |
parent | e33292227eeac35194f9217edd5a243c688cb560 (diff) | |
parent | 6cd010c331cfd98078e657bb8d1107651daca49e (diff) |
Merge branch '#8829_notification_handling_new_layout' into '0.9.8'
#8829 notification handling new layout
See merge request leap/bitmask_android!37
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/StartActivity.java')
-rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/StartActivity.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/StartActivity.java b/app/src/main/java/se/leap/bitmaskclient/StartActivity.java index f5991538..2d107c27 100644 --- a/app/src/main/java/se/leap/bitmaskclient/StartActivity.java +++ b/app/src/main/java/se/leap/bitmaskclient/StartActivity.java @@ -15,6 +15,7 @@ import java.lang.annotation.RetentionPolicy; import de.blinkt.openvpn.core.VpnStatus; import se.leap.bitmaskclient.userstatus.User; +import static android.content.Intent.FLAG_ACTIVITY_SINGLE_TOP; import static se.leap.bitmaskclient.Constants.APP_ACTION_CONFIGURE_ALWAYS_ON_PROFILE; import static se.leap.bitmaskclient.Constants.PREFERENCES_APP_VERSION; import static se.leap.bitmaskclient.Constants.REQUEST_CODE_CONFIGURE_LEAP; @@ -187,6 +188,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(MainActivity.ACTION_SHOW_VPN_FRAGMENT); startActivity(intent); finish(); |