pop back stack on back pressed

stripe · Sep 27, 2024 · 7f65fd9 · 7f65fd9
1 parent 46c2d58
commit 7f65fd9
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/link/src/main/java/com/stripe/android/link/LinkActivityViewModel.kt b/link/src/main/java/com/stripe/android/link/LinkActivityViewModel.kt
@@ -15,7 +15,11 @@ internal class LinkActivityViewModel : ViewModel() {
     }
 
     private fun handleBackPressed() {
-        dismissWithResult?.invoke(LinkActivityResult.Canceled())
+        navController?.let { navController ->
+            if (!navController.popBackStack()) {
+                dismissWithResult?.invoke(LinkActivityResult.Canceled())
+            }
+        }
     }
 
     fun unregisterActivity() {

diff --git a/link/src/test/java/com/stripe/android/link/LinkActivityViewModelTest.kt b/link/src/test/java/com/stripe/android/link/LinkActivityViewModelTest.kt
@@ -12,7 +12,9 @@ import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.mockito.kotlin.mock
+import org.mockito.kotlin.times
 import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
 import org.robolectric.RobolectricTestRunner
 
 @RunWith(RobolectricTestRunner::class)
@@ -35,12 +37,25 @@ internal class LinkActivityViewModelTest {
     }
 
     @Test
-    fun `test that cancel result is called on back pressed`() = runTest(dispatcher) {
+    fun `test that cancel result is called on back pressed with empty stack`() = runTest(dispatcher) {
+        whenever(navController.popBackStack()).thenReturn(false)
+
         vm.handleViewAction(LinkAction.BackPressed)
 
+        verify(navController).popBackStack()
         verify(dismissWithResult).invoke(LinkActivityResult.Canceled())
     }
 
+    @Test
+    fun `test that cancel result is called on back pressed with non-empty stack`() = runTest(dispatcher) {
+        whenever(navController.popBackStack()).thenReturn(true)
+
+        vm.handleViewAction(LinkAction.BackPressed)
+
+        verify(navController).popBackStack()
+        verify(dismissWithResult, times(0)).invoke(LinkActivityResult.Canceled())
+    }
+
     @Test
     fun `test that activity unregister removes dismissWithResult and nav controller`() = runTest(dispatcher) {
         vm.unregisterActivity()