Merge remote-tracking branch 'origin/master' into carlosmuvi/eagerly-…

…finish-activity-no-args
stripe · Dec 1, 2022 · 5d1d954 · 5d1d954
2 parents d2d573c + 4f98580
commit 5d1d954
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 5 deletions.
diff --git a/camera-core/src/main/java/com/stripe/android/camera/framework/Result.kt b/camera-core/src/main/java/com/stripe/android/camera/framework/Result.kt
@@ -6,7 +6,6 @@ import androidx.lifecycle.LifecycleEventObserver
 import androidx.lifecycle.LifecycleOwner
 import com.stripe.android.camera.framework.util.FrameRateTracker
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
@@ -187,11 +186,11 @@ abstract class ResultAggregator<
 
                 aggregatorExecutionStats?.trackResult("frame_processed")
 
-                launch { listener.onInterimResult(interimResult) }
+                listener.onInterimResult(interimResult)
 
                 if (!isFinished && finalResult != null) {
                     isFinished = true
-                    launch { listener.onResult(finalResult) }
+                    listener.onResult(finalResult)
                 }
                 isFinished
             }

diff --git a/...tity/src/main/java/com/stripe/android/identity/navigation/IdentityDocumentScanFragment.kt b/...tity/src/main/java/com/stripe/android/identity/navigation/IdentityDocumentScanFragment.kt
@@ -251,7 +251,7 @@ internal abstract class IdentityDocumentScanFragment(
                 identityViewModel.observeForVerificationPage(
                     viewLifecycleOwner,
                     onSuccess = {
-                        lifecycleScope.launch {
+                        viewLifecycleOwner.lifecycleScope.launch {
                             runCatching {
                                 postVerificationPageData(
                                     identityViewModel = identityViewModel,

diff --git a/...eet/src/main/java/com/stripe/android/paymentsheet/flowcontroller/DefaultFlowController.kt b/...eet/src/main/java/com/stripe/android/paymentsheet/flowcontroller/DefaultFlowController.kt
@@ -262,7 +262,9 @@ internal class DefaultFlowController @Inject internal constructor(
 
         paymentOptionActivityLauncher.launch(
             PaymentOptionContract.Args(
-                state = state,
+                state = state.copy(
+                    newPaymentSelection = viewModel.paymentSelection as? PaymentSelection.New,
+                ),
                 statusBarColor = statusBarColor(),
                 injectorKey = injectorKey,
                 enableLogging = enableLogging,

diff --git a/...src/test/java/com/stripe/android/paymentsheet/flowcontroller/DefaultFlowControllerTest.kt b/...src/test/java/com/stripe/android/paymentsheet/flowcontroller/DefaultFlowControllerTest.kt
@@ -968,6 +968,30 @@ internal class DefaultFlowControllerTest {
             )
         }
 
+    @Test
+    fun `Remembers previous new payment selection when presenting payment options again`() = runTest {
+        val flowController = createFlowController()
+
+        flowController.configureWithPaymentIntent(
+            paymentIntentClientSecret = PaymentSheetFixtures.CLIENT_SECRET,
+            callback = { _, _ -> },
+        )
+
+        val previousPaymentSelection = NEW_CARD_PAYMENT_SELECTION
+
+        flowController.onPaymentOptionResult(
+            paymentOptionResult = PaymentOptionResult.Succeeded(previousPaymentSelection),
+        )
+
+        flowController.presentPaymentOptions()
+
+        verify(paymentOptionActivityLauncher).launch(
+            argWhere {
+                it.state.newPaymentSelection == previousPaymentSelection
+            }
+        )
+    }
+
     private fun createFlowController(
         paymentMethods: List<PaymentMethod> = emptyList(),
         savedSelection: SavedSelection = SavedSelection.None,