Move google pay into PaymentMethodMetadata. (#8829)

paymentsheet/api/paymentsheet.api

@@ -1890,30 +1890,6 @@ public final class com/stripe/android/paymentsheet/state/CustomerState$Permissio
 	public synthetic fun newArray (I)[Ljava/lang/Object;
 }
 
-public final class com/stripe/android/paymentsheet/state/GooglePayState$Available$Creator : android/os/Parcelable$Creator {
-	public fun <init> ()V
-	public final fun createFromParcel (Landroid/os/Parcel;)Lcom/stripe/android/paymentsheet/state/GooglePayState$Available;
-	public synthetic fun createFromParcel (Landroid/os/Parcel;)Ljava/lang/Object;
-	public final fun newArray (I)[Lcom/stripe/android/paymentsheet/state/GooglePayState$Available;
-	public synthetic fun newArray (I)[Ljava/lang/Object;
-}
-
-public final class com/stripe/android/paymentsheet/state/GooglePayState$Indeterminate$Creator : android/os/Parcelable$Creator {
-	public fun <init> ()V
-	public final fun createFromParcel (Landroid/os/Parcel;)Lcom/stripe/android/paymentsheet/state/GooglePayState$Indeterminate;
-	public synthetic fun createFromParcel (Landroid/os/Parcel;)Ljava/lang/Object;
-	public final fun newArray (I)[Lcom/stripe/android/paymentsheet/state/GooglePayState$Indeterminate;
-	public synthetic fun newArray (I)[Ljava/lang/Object;
-}
-
-public final class com/stripe/android/paymentsheet/state/GooglePayState$NotAvailable$Creator : android/os/Parcelable$Creator {
-	public fun <init> ()V
-	public final fun createFromParcel (Landroid/os/Parcel;)Lcom/stripe/android/paymentsheet/state/GooglePayState$NotAvailable;
-	public synthetic fun createFromParcel (Landroid/os/Parcel;)Ljava/lang/Object;
-	public final fun newArray (I)[Lcom/stripe/android/paymentsheet/state/GooglePayState$NotAvailable;
-	public synthetic fun newArray (I)[Ljava/lang/Object;
-}
-
 public final class com/stripe/android/paymentsheet/state/LinkState$Creator : android/os/Parcelable$Creator {
 	public fun <init> ()V
 	public final fun createFromParcel (Landroid/os/Parcel;)Lcom/stripe/android/paymentsheet/state/LinkState;

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

@@ -131,6 +131,10 @@ internal class DefaultCustomerSheetLoader(
                 preferredNetworks = configuration.preferredNetworks,
             )
 
+            val isGooglePayReadyAndEnabled = configuration.googlePayEnabled && googlePayRepositoryFactory(
+                if (isLiveModeProvider()) GooglePayEnvironment.Production else GooglePayEnvironment.Test
+            ).isReady().first()
+
             val metadata = PaymentMethodMetadata(
                 stripeIntent = elementsSession.stripeIntent,
                 billingDetailsCollectionConfiguration = billingDetailsCollectionConfig,
@@ -145,6 +149,7 @@ internal class DefaultCustomerSheetLoader(
                 sharedDataSpecs = sharedDataSpecs,
                 financialConnectionsAvailable = isFinancialConnectionsAvailable(),
                 externalPaymentMethodSpecs = emptyList(),
+                isGooglePayReady = isGooglePayReadyAndEnabled,
             )
 
             ElementsSessionWithMetadata(elementsSession = elementsSession, metadata = metadata)
@@ -194,10 +199,6 @@ internal class DefaultCustomerSheetLoader(
                     }
                 }
 
-                val isGooglePayReadyAndEnabled = configuration.googlePayEnabled && googlePayRepositoryFactory(
-                    if (isLiveModeProvider()) GooglePayEnvironment.Production else GooglePayEnvironment.Test
-                ).isReady().first()
-
                 val elementsSession = elementsSessionWithMetadata.elementsSession
                 val metadata = elementsSessionWithMetadata.metadata
 
@@ -211,7 +212,6 @@ internal class DefaultCustomerSheetLoader(
                         paymentMethodMetadata = metadata,
                         supportedPaymentMethods = validSupportedPaymentMethods,
                         customerPaymentMethods = paymentMethods,
-                        isGooglePayReady = isGooglePayReadyAndEnabled,
                         paymentSelection = paymentSelection,
                         validationError = elementsSession.stripeIntent.validate(),
                     )

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

@@ -14,7 +14,6 @@ internal sealed interface CustomerSheetState {
         val paymentMethodMetadata: PaymentMethodMetadata,
         val customerPaymentMethods: List<PaymentMethod>,
         val supportedPaymentMethods: List<SupportedPaymentMethod>,
-        val isGooglePayReady: Boolean,
         val paymentSelection: PaymentSelection?,
         val validationError: Throwable?,
     ) : CustomerSheetState

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

@@ -149,7 +149,6 @@ internal class CustomerSheetViewModel(
     private val _result = MutableStateFlow<InternalCustomerSheetResult?>(null)
     val result: StateFlow<InternalCustomerSheetResult?> = _result
 
-    private var isGooglePayReadyAndEnabled: Boolean = false
     private var paymentLauncher: PaymentLauncher? = null
 
     private var previouslySelectedPaymentMethod: SupportedPaymentMethod? = null
@@ -322,7 +321,6 @@ internal class CustomerSheetViewModel(
                     supportedPaymentMethods.addAll(state.supportedPaymentMethods)
 
                     originalPaymentSelection = state.paymentSelection
-                    isGooglePayReadyAndEnabled = state.isGooglePayReady
                     paymentMethodMetadata = state.paymentMethodMetadata
 
                     transitionToInitialScreen(
@@ -345,7 +343,7 @@ internal class CustomerSheetViewModel(
         paymentSelection: PaymentSelection?,
         cbcEligibility: CardBrandChoiceEligibility,
     ) {
-        if (paymentMethods.isEmpty() && !isGooglePayReadyAndEnabled) {
+        if (paymentMethods.isEmpty() && paymentMethodMetadata?.isGooglePayReady == false) {
             transitionToAddPaymentMethod(
                 isFirstPaymentMethod = true,
                 cbcEligibility = cbcEligibility,
@@ -625,7 +623,7 @@ internal class CustomerSheetViewModel(
             }
         }
 
-        if (newSavedPaymentMethods.isEmpty() && !isGooglePayReadyAndEnabled) {
+        if (newSavedPaymentMethods.isEmpty() && paymentMethodMetadata?.isGooglePayReady == false) {
             transitionToAddPaymentMethod(isFirstPaymentMethod = true)
         }
     }
@@ -1215,7 +1213,7 @@ internal class CustomerSheetViewModel(
                 isLiveMode = isLiveModeProvider(),
                 isProcessing = false,
                 isEditing = false,
-                isGooglePayEnabled = isGooglePayReadyAndEnabled,
+                isGooglePayEnabled = paymentMethodMetadata?.isGooglePayReady == true,
                 primaryButtonVisible = false,
                 primaryButtonLabel = resources.getString(R.string.stripe_paymentsheet_confirm),
                 errorMessage = null,

paymentsheet/src/main/java/com/stripe/android/lpmfoundations/paymentmethod/PaymentMethodMetadata.kt

@@ -37,6 +37,7 @@ internal data class PaymentMethodMetadata(
     val sharedDataSpecs: List<SharedDataSpec>,
     val externalPaymentMethodSpecs: List<ExternalPaymentMethodSpec>,
     val hasCustomerConfiguration: Boolean,
+    val isGooglePayReady: Boolean,
     val financialConnectionsAvailable: Boolean = DefaultIsFinancialConnectionsAvailable(),
 ) : Parcelable {
     fun hasIntentToSetup(): Boolean {
@@ -194,6 +195,7 @@ internal data class PaymentMethodMetadata(
             configuration: PaymentSheet.Configuration,
             sharedDataSpecs: List<SharedDataSpec>,
             externalPaymentMethodSpecs: List<ExternalPaymentMethodSpec>,
+            isGooglePayReady: Boolean,
         ): PaymentMethodMetadata {
             return PaymentMethodMetadata(
                 stripeIntent = elementsSession.stripeIntent,
@@ -211,7 +213,8 @@ internal data class PaymentMethodMetadata(
                 shippingDetails = configuration.shippingDetails,
                 hasCustomerConfiguration = configuration.customer != null,
                 sharedDataSpecs = sharedDataSpecs,
-                externalPaymentMethodSpecs = externalPaymentMethodSpecs
+                externalPaymentMethodSpecs = externalPaymentMethodSpecs,
+                isGooglePayReady = isGooglePayReady,
             )
         }
     }

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

@@ -24,7 +24,6 @@ import com.stripe.android.paymentsheet.navigation.PaymentSheetScreen
 import com.stripe.android.paymentsheet.navigation.PaymentSheetScreen.AddFirstPaymentMethod
 import com.stripe.android.paymentsheet.navigation.PaymentSheetScreen.SelectSavedPaymentMethods
 import com.stripe.android.paymentsheet.repositories.CustomerRepository
-import com.stripe.android.paymentsheet.state.GooglePayState
 import com.stripe.android.paymentsheet.state.WalletsProcessingState
 import com.stripe.android.paymentsheet.state.WalletsState
 import com.stripe.android.paymentsheet.ui.DefaultAddPaymentMethodInteractor
@@ -99,12 +98,12 @@ internal class PaymentOptionsViewModel @Inject constructor(
         linkConfigurationCoordinator.emailFlow,
         buttonsEnabled,
         paymentMethodMetadata.mapAsStateFlow { it?.supportedPaymentMethodTypes().orEmpty() },
-        googlePayState,
-    ) { isLinkAvailable, linkEmail, buttonsEnabled, paymentMethodTypes, googlePayState ->
+        paymentMethodMetadata.mapAsStateFlow { it?.isGooglePayReady == true },
+    ) { isLinkAvailable, linkEmail, buttonsEnabled, paymentMethodTypes, isGooglePayReady ->
         WalletsState.create(
             isLinkAvailable = isLinkAvailable,
             linkEmail = linkEmail,
-            googlePayState = googlePayState,
+            isGooglePayReady = isGooglePayReady,
             buttonsEnabled = buttonsEnabled,
             paymentMethodTypes = paymentMethodTypes,
             googlePayLauncherConfig = null,
@@ -138,14 +137,6 @@ internal class PaymentOptionsViewModel @Inject constructor(
     init {
         SessionSavedStateHandler.attachTo(this, savedStateHandle)
 
-        savedStateHandle[SAVE_GOOGLE_PAY_STATE] = if (args.state.isGooglePayReady) {
-            GooglePayState.Available
-        } else {
-            GooglePayState.NotAvailable
-        }
-
-        val linkState = args.state.linkState
-
         viewModelScope.launch {
             linkHandler.processingState.collect { processingState ->
                 handleLinkProcessingState(processingState)
@@ -155,7 +146,7 @@ internal class PaymentOptionsViewModel @Inject constructor(
         // This is bad, but I don't think there's a better option
         PaymentSheet.FlowController.linkHandler = linkHandler
 
-        linkHandler.setupLink(linkState)
+        linkHandler.setupLink(args.state.linkState)
 
         // After recovering from don't keep activities the paymentMethodMetadata will be saved,
         // calling setPaymentMethodMetadata would require the repository be initialized, which

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

@@ -55,7 +55,6 @@ import com.stripe.android.paymentsheet.paymentdatacollection.bacs.BacsMandateCon
 import com.stripe.android.paymentsheet.paymentdatacollection.bacs.BacsMandateConfirmationResult
 import com.stripe.android.paymentsheet.paymentdatacollection.bacs.BacsMandateData
 import com.stripe.android.paymentsheet.repositories.CustomerRepository
-import com.stripe.android.paymentsheet.state.GooglePayState
 import com.stripe.android.paymentsheet.state.PaymentSheetLoader
 import com.stripe.android.paymentsheet.state.PaymentSheetState
 import com.stripe.android.paymentsheet.state.WalletsProcessingState
@@ -218,14 +217,14 @@ internal class PaymentSheetViewModel @Inject internal constructor(
     override val walletsState: StateFlow<WalletsState?> = combineAsStateFlow(
         linkHandler.isLinkEnabled,
         linkConfigurationCoordinator.emailFlow,
-        googlePayState,
+        paymentMethodMetadata.mapAsStateFlow { it?.isGooglePayReady == true },
         buttonsEnabled,
         paymentMethodMetadata.mapAsStateFlow { it?.supportedPaymentMethodTypes().orEmpty() },
-    ) { isLinkAvailable, linkEmail, googlePayState, buttonsEnabled, paymentMethodTypes ->
+    ) { isLinkAvailable, linkEmail, isGooglePayReady, buttonsEnabled, paymentMethodTypes ->
         WalletsState.create(
             isLinkAvailable = isLinkAvailable,
             linkEmail = linkEmail,
-            googlePayState = googlePayState,
+            isGooglePayReady = isGooglePayReady,
             buttonsEnabled = buttonsEnabled,
             paymentMethodTypes = paymentMethodTypes,
             googlePayLauncherConfig = googlePayLauncherConfig,
@@ -373,17 +372,9 @@ internal class PaymentSheetViewModel @Inject internal constructor(
 
         updateSelection(state.paymentSelection)
 
-        savedStateHandle[SAVE_GOOGLE_PAY_STATE] = if (state.isGooglePayReady) {
-            GooglePayState.Available
-        } else {
-            GooglePayState.NotAvailable
-        }
-
         setPaymentMethodMetadata(state.paymentMethodMetadata)
 
-        val linkState = state.linkState
-
-        linkHandler.setupLink(linkState)
+        linkHandler.setupLink(state.linkState)
 
         val pendingFailedPaymentResult = awaitPaymentResult() as? InternalPaymentResult.Failed
         val errorMessage = pendingFailedPaymentResult?.throwable?.stripeErrorMessage()

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

@@ -12,7 +12,6 @@ import com.stripe.android.paymentsheet.navigation.NavigationHandler
 import com.stripe.android.paymentsheet.navigation.PaymentSheetScreen
 import com.stripe.android.paymentsheet.repositories.CustomerRepository
 import com.stripe.android.paymentsheet.state.CustomerState
-import com.stripe.android.paymentsheet.state.GooglePayState
 import com.stripe.android.paymentsheet.ui.DefaultAddPaymentMethodInteractor
 import com.stripe.android.paymentsheet.ui.EditPaymentMethodViewInteractor
 import com.stripe.android.paymentsheet.ui.ModifiableEditPaymentMethodViewInteractor
@@ -43,7 +42,7 @@ internal class SavedPaymentMethodMutator(
     private val updateSelection: (PaymentSelection?) -> Unit,
     private val isLiveModeProvider: () -> Boolean,
     isCbcEligible: () -> Boolean,
-    googlePayState: StateFlow<GooglePayState>,
+    isGooglePayReady: StateFlow<Boolean>,
     isLinkEnabled: StateFlow<Boolean?>,
     isNotPaymentFlow: Boolean,
 ) {
@@ -66,7 +65,7 @@ internal class SavedPaymentMethodMutator(
     private val paymentOptionsItemsMapper: PaymentOptionsItemsMapper by lazy {
         PaymentOptionsItemsMapper(
             paymentMethods = paymentMethods,
-            googlePayState = googlePayState,
+            isGooglePayReady = isGooglePayReady,
             isLinkEnabled = isLinkEnabled,
             isNotPaymentFlow = isNotPaymentFlow,
             nameProvider = providePaymentMethodName,
@@ -297,7 +296,7 @@ internal class SavedPaymentMethodMutator(
                 isCbcEligible = {
                     viewModel.paymentMethodMetadata.value?.cbcEligibility is CardBrandChoiceEligibility.Eligible
                 },
-                googlePayState = viewModel.googlePayState,
+                isGooglePayReady = viewModel.paymentMethodMetadata.mapAsStateFlow { it?.isGooglePayReady == true },
                 isLinkEnabled = viewModel.linkHandler.isLinkEnabled,
                 isNotPaymentFlow = !viewModel.isCompleteFlow,
                 isLiveModeProvider = { requireNotNull(viewModel.paymentMethodMetadata.value).stripeIntent.isLiveMode }

paymentsheet/src/main/java/com/stripe/android/paymentsheet/flowcontroller/PaymentSelectionUpdater.kt

@@ -51,7 +51,7 @@ internal class DefaultPaymentSelectionUpdater @Inject constructor() : PaymentSel
                 code in allowedTypes && paymentMethod in (state.customer?.paymentMethods ?: emptyList())
             }
             is PaymentSelection.GooglePay -> {
-                state.isGooglePayReady
+                state.paymentMethodMetadata.isGooglePayReady
             }
             is PaymentSelection.Link -> {
                 state.linkState != null

paymentsheet/src/main/java/com/stripe/android/paymentsheet/state/PaymentSheetLoader.kt

@@ -96,19 +96,18 @@ internal class DefaultPaymentSheetLoader @Inject constructor(
             defaultPaymentMethodId = savedPaymentMethodSelection?.id,
         ).getOrThrow()
 
+        val isGooglePayReady = isGooglePayReady(paymentSheetConfiguration, elementsSession)
+
         val metadata = createPaymentMethodMetadata(
             paymentSheetConfiguration = paymentSheetConfiguration,
             elementsSession = elementsSession,
+            isGooglePayReady = isGooglePayReady
         )
 
-        val isGooglePayReady = async {
-            isGooglePayReady(paymentSheetConfiguration, elementsSession)
-        }
-
         val savedSelection = async {
             retrieveSavedSelection(
                 config = paymentSheetConfiguration,
-                isGooglePayReady = isGooglePayReady.await(),
+                isGooglePayReady = isGooglePayReady,
                 elementsSession = elementsSession
             )
         }
@@ -147,9 +146,7 @@ internal class DefaultPaymentSheetLoader @Inject constructor(
         val state = PaymentSheetState.Full(
             config = paymentSheetConfiguration,
             customer = customer.await(),
-            isGooglePayReady = isGooglePayReady.await(),
             linkState = linkState.await(),
-            isEligibleForCardBrandChoice = elementsSession.isEligibleForCardBrandChoice,
             paymentSelection = initialPaymentSelection.await(),
             validationError = stripeIntent.validate(),
             paymentMethodMetadata = metadata,
@@ -182,6 +179,7 @@ internal class DefaultPaymentSheetLoader @Inject constructor(
     private fun createPaymentMethodMetadata(
         paymentSheetConfiguration: PaymentSheet.Configuration,
         elementsSession: ElementsSession,
+        isGooglePayReady: Boolean,
     ): PaymentMethodMetadata {
         val sharedDataSpecsResult = lpmRepository.getSharedDataSpecs(
             stripeIntent = elementsSession.stripeIntent,
@@ -205,7 +203,8 @@ internal class DefaultPaymentSheetLoader @Inject constructor(
             elementsSession = elementsSession,
             configuration = paymentSheetConfiguration,
             sharedDataSpecs = sharedDataSpecsResult.sharedDataSpecs,
-            externalPaymentMethodSpecs = externalPaymentMethodSpecs
+            externalPaymentMethodSpecs = externalPaymentMethodSpecs,
+            isGooglePayReady = isGooglePayReady,
         )
     }
 

paymentsheet/src/main/java/com/stripe/android/paymentsheet/state/PaymentSheetState.kt

@@ -16,15 +16,13 @@ internal sealed interface PaymentSheetState : Parcelable {
     data class Full(
         val config: PaymentSheet.Configuration,
         val customer: CustomerState?,
-        val isGooglePayReady: Boolean,
         val linkState: LinkState?,
-        val isEligibleForCardBrandChoice: Boolean,
         val paymentSelection: PaymentSelection?,
         val validationError: PaymentSheetLoadingException?,
         val paymentMethodMetadata: PaymentMethodMetadata,
     ) : PaymentSheetState {
         val showSavedPaymentMethods: Boolean
-            get() = (customer != null && customer.paymentMethods.isNotEmpty()) || isGooglePayReady
+            get() = (customer != null && customer.paymentMethods.isNotEmpty()) || paymentMethodMetadata.isGooglePayReady
 
         val stripeIntent: StripeIntent
             get() = paymentMethodMetadata.stripeIntent

paymentsheet/src/main/java/com/stripe/android/paymentsheet/state/WalletsState.kt

@@ -32,7 +32,7 @@ internal data class WalletsState(
         fun create(
             isLinkAvailable: Boolean?,
             linkEmail: String?,
-            googlePayState: GooglePayState,
+            isGooglePayReady: Boolean,
             googlePayButtonType: GooglePayButtonType,
             buttonsEnabled: Boolean,
             paymentMethodTypes: List<String>,
@@ -60,7 +60,7 @@ internal data class WalletsState(
                         isPhoneNumberRequired = it.billingAddressConfig.isPhoneNumberRequired,
                     )
                 },
-            ).takeIf { googlePayState.isReadyForUse }
+            ).takeIf { isGooglePayReady }
 
             return if (link != null || googlePay != null) {
                 WalletsState(