diff options
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt | 11 |
2 files changed, 10 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f5e3e6cb4..531c768837 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -45,6 +45,8 @@ Line wrap the file at 100 chars. Th - Fix attempt to connect when the app doesn't have the VPN permission. - Fix crash that happened sometimes when the WireGuard key was loaded too quickly. - Fix crash when entering split-screen mode whilst on the Report a Problem screen. +- Fix invalid back stack history when connection to service is lost and the app returns to the + launch screen. #### Windows - Fix race in network adapter monitor that could result in data corruption and crashes. diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt index a4595a9a92..10e886f73e 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt @@ -7,6 +7,7 @@ import android.os.Build import android.os.Bundle import android.os.IBinder import android.support.v4.app.FragmentActivity +import android.support.v4.app.FragmentManager import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch @@ -119,9 +120,13 @@ class MainActivity : FragmentActivity() { } fun returnToLaunchScreen() { - supportFragmentManager?.beginTransaction()?.apply { - replace(R.id.main_fragment, LaunchFragment()) - commit() + supportFragmentManager?.apply { + popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE) + + beginTransaction().apply { + replace(R.id.main_fragment, LaunchFragment()) + commit() + } } } |