summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorDavid Göransson <david.goransson@mullvad.net>2024-07-03 13:20:24 +0200
committerDavid Göransson <david.goransson@mullvad.net>2024-07-03 13:20:24 +0200
commit6465c2dcf2939a6a8a836ee1f775649367bedc38 (patch)
tree78976877923aabb0e3bca0de5b4bf6d6a317b09d
parent5dc87a8326a5ee4a34f344a21d4703e0c969cdb5 (diff)
parent13cb668585347d4252f3fa30a8c3c13ca45e175b (diff)
downloadmullvadvpn-6465c2dcf2939a6a8a836ee1f775649367bedc38.tar.xz
mullvadvpn-6465c2dcf2939a6a8a836ee1f775649367bedc38.zip
Merge branch 'fix-crash-popping-privacy-screen-droid-1188'
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SplashScreen.kt4
1 files changed, 3 insertions, 1 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SplashScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SplashScreen.kt
index 082763ce1b..f5977e7b57 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SplashScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SplashScreen.kt
@@ -63,7 +63,9 @@ fun Splash(navigator: DestinationsNavigator) {
popUpTo(NavGraphs.root) { inclusive = true }
}
SplashUiSideEffect.NavigateToPrivacyDisclaimer ->
- navigator.navigate(PrivacyDisclaimerDestination) { popUpTo(NavGraphs.root) {} }
+ navigator.navigate(PrivacyDisclaimerDestination) {
+ popUpTo(NavGraphs.root) { inclusive = true }
+ }
SplashUiSideEffect.NavigateToRevoked ->
navigator.navigate(DeviceRevokedDestination) {
popUpTo(NavGraphs.root) { inclusive = true }