Revert "Migrate CBC to CardEditUIHandler"

This reverts commit 918bf9a.

Author: toluo-stripe

paymentsheet/src/main/java/com/stripe/android/customersheet/CustomerSheetViewModel.kt

@@ -544,14 +544,21 @@ internal class CustomerSheetViewModel(
 
         transition(
             to = CustomerSheetViewState.UpdatePaymentMethod(
-                updatePaymentMethodInteractor = DefaultUpdatePaymentMethodInteractor.factory(
+                updatePaymentMethodInteractor = DefaultUpdatePaymentMethodInteractor(
                     isLiveMode = isLiveModeProvider(),
                     canRemove = customerState.canRemove,
                     displayableSavedPaymentMethod = paymentMethod,
                     cardBrandFilter = PaymentSheetCardBrandFilter(customerState.configuration.cardBrandAcceptance),
                     removeExecutor = ::removeExecutor,
+                    onBrandChoiceSelected = { brand ->
+                        eventReporter.onBrandChoiceSelected(
+                            source = CustomerSheetEventReporter.CardBrandChoiceEventSource.Edit,
+                            selectedBrand = brand
+                        )
+                    },
                     onUpdateSuccess = ::onBackPressed,
                     updatePaymentMethodExecutor = ::updatePaymentMethodExecutor,
+                    workContext = workContext,
                     // This checkbox is never displayed in CustomerSheet.
                     shouldShowSetAsDefaultCheckbox = false,
                     isDefaultPaymentMethod = false,
@@ -561,12 +568,6 @@ internal class CustomerSheetViewModel(
                             IllegalStateException("Unexpected attempt to update default from CustomerSheet.")
                         )
                     },
-                    onBrandChoiceSelected = { brand ->
-                        eventReporter.onBrandChoiceSelected(
-                            source = CustomerSheetEventReporter.CardBrandChoiceEventSource.Edit,
-                            selectedBrand = brand
-                        )
-                    }
                 ),
                 isLiveMode = isLiveModeProvider(),
             )

paymentsheet/src/main/java/com/stripe/android/paymentelement/embedded/manage/EmbeddedUpdateScreenInteractorFactory.kt

@@ -29,7 +29,7 @@ internal class DefaultEmbeddedUpdateScreenInteractorFactory @Inject constructor(
     override fun createUpdateScreenInteractor(
         displayableSavedPaymentMethod: DisplayableSavedPaymentMethod
     ): UpdatePaymentMethodInteractor {
-        return DefaultUpdatePaymentMethodInteractor.factory(
+        return DefaultUpdatePaymentMethodInteractor(
             isLiveMode = paymentMethodMetadata.stripeIntent.isLiveMode,
             canRemove = customerStateHolder.canRemove.value,
             displayableSavedPaymentMethod = displayableSavedPaymentMethod,
@@ -59,6 +59,12 @@ internal class DefaultEmbeddedUpdateScreenInteractorFactory @Inject constructor(
             setDefaultPaymentMethodExecutor = { method ->
                 savedPaymentMethodMutatorProvider.get().setDefaultPaymentMethod(method)
             },
+            onBrandChoiceSelected = {
+                eventReporter.onBrandChoiceSelected(
+                    source = EventReporter.CardBrandChoiceEventSource.Edit,
+                    selectedBrand = it
+                )
+            },
             shouldShowSetAsDefaultCheckbox = (
                 paymentMethodMetadata.customerMetadata?.isPaymentMethodSetAsDefaultEnabled == true
                 ),
@@ -70,12 +76,6 @@ internal class DefaultEmbeddedUpdateScreenInteractorFactory @Inject constructor(
             onUpdateSuccess = {
                 manageNavigatorProvider.get().performAction(ManageNavigator.Action.Back)
             },
-            onBrandChoiceSelected = {
-                eventReporter.onBrandChoiceSelected(
-                    source = EventReporter.CardBrandChoiceEventSource.Edit,
-                    selectedBrand = it
-                )
-            }
         )
     }
 }

paymentsheet/src/main/java/com/stripe/android/paymentsheet/SavedPaymentMethodMutator.kt

@@ -361,10 +361,10 @@ internal class SavedPaymentMethodMutator(
                 val isLiveMode = requireNotNull(viewModel.paymentMethodMetadata.value).stripeIntent.isLiveMode
                 viewModel.navigationHandler.transitionTo(
                     PaymentSheetScreen.UpdatePaymentMethod(
-                        DefaultUpdatePaymentMethodInteractor.factory(
+                        DefaultUpdatePaymentMethodInteractor(
                             isLiveMode = isLiveMode,
                             canRemove = canRemove,
-                            displayableSavedPaymentMethod = displayableSavedPaymentMethod,
+                            displayableSavedPaymentMethod,
                             cardBrandFilter = PaymentSheetCardBrandFilter(viewModel.config.cardBrandAcceptance),
                             removeExecutor = { method ->
                                 performRemove()
@@ -373,6 +373,12 @@ internal class SavedPaymentMethodMutator(
                                 updatePaymentMethodExecutor(cardUpdateParams)
                             },
                             setDefaultPaymentMethodExecutor = setDefaultPaymentMethodExecutor,
+                            onBrandChoiceSelected = {
+                                viewModel.eventReporter.onBrandChoiceSelected(
+                                    source = EventReporter.CardBrandChoiceEventSource.Edit,
+                                    selectedBrand = it
+                                )
+                            },
                             shouldShowSetAsDefaultCheckbox = (
                                 viewModel
                                     .paymentMethodMetadata
@@ -385,12 +391,6 @@ internal class SavedPaymentMethodMutator(
                                 )
                                 ),
                             onUpdateSuccess = viewModel.navigationHandler::pop,
-                            onBrandChoiceSelected = {
-                                viewModel.eventReporter.onBrandChoiceSelected(
-                                    source = EventReporter.CardBrandChoiceEventSource.Edit,
-                                    selectedBrand = it
-                                )
-                            },
                         )
                     )
                 )