diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-09-09 08:46:45 -0300 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-09-09 08:46:45 -0300 |
| commit | 5d87a4eca94a6f9c0e9ade1958b4b89f59690cd5 (patch) | |
| tree | 3ea807990cf3fe2cd13ee695562e782a339d8462 | |
| parent | b587864c9a9f2ef26678efa396e54cb3e444aa0d (diff) | |
| parent | 7df83a6851c798c42ff9b5a50c31672251cfdb61 (diff) | |
| download | mullvadvpn-5d87a4eca94a6f9c0e9ade1958b4b89f59690cd5.tar.xz mullvadvpn-5d87a4eca94a6f9c0e9ade1958b4b89f59690cd5.zip | |
Merge branch 'use-single-task-for-app'
4 files changed, 4 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index aaf0d94bd7..40f7767a4d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -44,6 +44,7 @@ Line wrap the file at 100 chars. Th - Fix rare crash that happened with large text sizes and long location names on the main screen. - Fix UI not updating in split screen mode when the window is unfocused. - Fix split tunneling not being correctly configured after restarting the app. +- Fix app reopening after pressing the Quit button because app was running multiple tasks. ## [2020.6-beta2] - 2020-08-27 diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml index 3894b5570f..0093dbcb21 100644 --- a/android/src/main/AndroidManifest.xml +++ b/android/src/main/AndroidManifest.xml @@ -13,6 +13,7 @@ tools:ignore="GoogleAppIndexingWarning"> <activity android:name="net.mullvad.mullvadvpn.ui.MainActivity" android:label="@string/app_name" + android:launchMode="singleTask" android:configChanges="orientation|screenSize|screenLayout" android:screenOrientation="portrait" android:windowSoftInputMode="adjustPan"> 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) |