From a9e1810158491fc8eaf83f939baabdffa1d0b459 Mon Sep 17 00:00:00 2001 From: easternkite Date: Thu, 22 May 2025 00:43:13 +0900 Subject: [PATCH] fix(navigation): prevent crash on double back press when backStack is empty --- .../developers/androidify/navigation/MainNavigation.kt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/android/developers/androidify/navigation/MainNavigation.kt b/app/src/main/java/com/android/developers/androidify/navigation/MainNavigation.kt index 1bc07ed7..7d9e2e87 100644 --- a/app/src/main/java/com/android/developers/androidify/navigation/MainNavigation.kt +++ b/app/src/main/java/com/android/developers/androidify/navigation/MainNavigation.kt @@ -121,7 +121,9 @@ fun MainNavigation() { backStack.add(Camera) }, onBackPressed = { - backStack.removeLastOrNull() + if (backStack.isNotEmpty() && backStack.last() is Create) { + backStack.removeLastOrNull() + } }, onAboutPressed = { backStack.add(About) @@ -131,7 +133,9 @@ fun MainNavigation() { entry { AboutScreen( onBackPressed = { - backStack.removeLastOrNull() + if (backStack.isNotEmpty() && backStack.last() is About) { + backStack.removeLastOrNull() + } }, ) }