diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-09-08 16:45:41 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-09-09 11:33:15 +0000 |
| commit | 289b2512e9f34cb724ce29a0addf142e217a0698 (patch) | |
| tree | 1925ec46521920d95f563c345c91661bb26d5c21 /android/src/main | |
| parent | fabc4b795236c3f9fda942382dbde6873bc35561 (diff) | |
| download | mullvadvpn-289b2512e9f34cb724ce29a0addf142e217a0698.tar.xz mullvadvpn-289b2512e9f34cb724ce29a0addf142e217a0698.zip | |
Clear the task stack as needed when opening the UI
Diffstat (limited to 'android/src/main')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/service/ConnectionProxy.kt | 1 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ConnectionProxy.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ConnectionProxy.kt index be0458e66a..bc89cc6c1e 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ConnectionProxy.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ConnectionProxy.kt @@ -169,6 +169,7 @@ class ConnectionProxy(val context: Context, val daemon: MullvadDaemon) { } else { val activityIntent = Intent(context, MainActivity::class.java).apply { addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) + addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP) putExtra(MainActivity.KEY_SHOULD_CONNECT, true) } diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt index 6c50b7a563..9ee87d015e 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt @@ -282,6 +282,7 @@ class MullvadVpnService : TalpidVpnService() { private fun openUi() { val intent = Intent(this, MainActivity::class.java).apply { addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) + addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP) } startActivity(intent) |