Fix don't keep activities on add fragment.

payments-core/src/test/java/com/stripe/android/googlepaylauncher/GooglePayPaymentMethodLauncherViewModelTest.kt

@@ -185,7 +185,7 @@ class GooglePayPaymentMethodLauncherViewModelTest {
             verify(factorySpy, times(0)).fallbackInitialize(any())
             assertThat(createdViewModel).isEqualTo(viewModel)
 
-            WeakMapInjectorRegistry.staticCacheMap.clear()
+            WeakMapInjectorRegistry.clear()
         }
     }
 

payments-core/src/test/java/com/stripe/android/payments/core/authentication/threeds2/Stripe3ds2TransactionActivityTest.kt

@@ -31,7 +31,7 @@ class Stripe3ds2TransactionActivityTest {
 
     @After
     fun cleanUpInjector() {
-        WeakMapInjectorRegistry.staticCacheMap.clear()
+        WeakMapInjectorRegistry.clear()
     }
 
     @Test

payments-core/src/test/java/com/stripe/android/payments/core/authentication/threeds2/Stripe3ds2TransactionViewModelFactoryTest.kt

@@ -88,7 +88,7 @@ class Stripe3ds2TransactionViewModelFactoryTest {
             verify(factorySpy, times(0)).fallbackInitialize(any())
             assertThat(createdViewModel).isEqualTo(viewModel)
 
-            WeakMapInjectorRegistry.staticCacheMap.clear()
+            WeakMapInjectorRegistry.clear()
         }
     }
 

payments-core/src/test/java/com/stripe/android/payments/core/injection/WeakMapInjectorRegistryTest.kt

@@ -19,7 +19,7 @@ class WeakMapInjectorRegistryTest {
 
     @Before
     fun clearStaticCache() {
-        WeakMapInjectorRegistry.staticCacheMap.clear()
+        WeakMapInjectorRegistry.clear()
     }
 
     @Test

payments-core/src/test/java/com/stripe/android/payments/paymentlauncher/PaymentLauncherViewModelTest.kt

@@ -487,7 +487,7 @@ class PaymentLauncherViewModelTest {
         verify(factorySpy, times(0)).fallbackInitialize(any())
         assertThat(createdViewModel).isEqualTo(vmToBeReturned)
 
-        WeakMapInjectorRegistry.staticCacheMap.clear()
+        WeakMapInjectorRegistry.clear()
     }
 
     @Test

paymentsheet/api/paymentsheet.api

@@ -10,11 +10,11 @@ public abstract interface class com/stripe/android/paymentsheet/PaymentOptionCal
 }
 
 public final class com/stripe/android/paymentsheet/PaymentOptionsViewModel_Factory : dagger/internal/Factory {
-	public fun <init> (Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;)V
-	public static fun create (Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;)Lcom/stripe/android/paymentsheet/PaymentOptionsViewModel_Factory;
+	public fun <init> (Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;)V
+	public static fun create (Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;)Lcom/stripe/android/paymentsheet/PaymentOptionsViewModel_Factory;
 	public fun get ()Lcom/stripe/android/paymentsheet/PaymentOptionsViewModel;
 	public synthetic fun get ()Ljava/lang/Object;
-	public static fun newInstance (Lcom/stripe/android/paymentsheet/PaymentOptionContract$Args;Lkotlin/jvm/functions/Function1;Lcom/stripe/android/paymentsheet/analytics/EventReporter;Lcom/stripe/android/paymentsheet/repositories/CustomerRepository;Lkotlin/coroutines/CoroutineContext;Landroid/app/Application;Lcom/stripe/android/core/Logger;Ljava/lang/String;Lcom/stripe/android/ui/core/forms/resources/ResourceRepository;)Lcom/stripe/android/paymentsheet/PaymentOptionsViewModel;
+	public static fun newInstance (Lcom/stripe/android/paymentsheet/PaymentOptionContract$Args;Lkotlin/jvm/functions/Function1;Lcom/stripe/android/paymentsheet/analytics/EventReporter;Lcom/stripe/android/paymentsheet/repositories/CustomerRepository;Lkotlin/coroutines/CoroutineContext;Landroid/app/Application;Lcom/stripe/android/core/Logger;Ljava/lang/String;Lcom/stripe/android/ui/core/forms/resources/ResourceRepository;Landroidx/lifecycle/SavedStateHandle;)Lcom/stripe/android/paymentsheet/PaymentOptionsViewModel;
 }
 
 public final class com/stripe/android/paymentsheet/PaymentOptionsViewModel_Factory_MembersInjector : dagger/MembersInjector {
@@ -309,11 +309,11 @@ public abstract interface class com/stripe/android/paymentsheet/PaymentSheetResu
 }
 
 public final class com/stripe/android/paymentsheet/PaymentSheetViewModel_Factory : dagger/internal/Factory {
-	public fun <init> (Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;)V
-	public static fun create (Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;)Lcom/stripe/android/paymentsheet/PaymentSheetViewModel_Factory;
+	public fun <init> (Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;)V
+	public static fun create (Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;Ljavax/inject/Provider;)Lcom/stripe/android/paymentsheet/PaymentSheetViewModel_Factory;
 	public fun get ()Lcom/stripe/android/paymentsheet/PaymentSheetViewModel;
 	public synthetic fun get ()Ljava/lang/Object;
-	public static fun newInstance (Landroid/app/Application;Lcom/stripe/android/paymentsheet/PaymentSheetContract$Args;Lcom/stripe/android/paymentsheet/analytics/EventReporter;Ldagger/Lazy;Lcom/stripe/android/paymentsheet/repositories/StripeIntentRepository;Lcom/stripe/android/paymentsheet/model/StripeIntentValidator;Lcom/stripe/android/paymentsheet/repositories/CustomerRepository;Lcom/stripe/android/paymentsheet/PrefsRepository;Lcom/stripe/android/ui/core/forms/resources/ResourceRepository;Lcom/stripe/android/payments/paymentlauncher/StripePaymentLauncherAssistedFactory;Lcom/stripe/android/googlepaylauncher/injection/GooglePayPaymentMethodLauncherFactory;Lcom/stripe/android/core/Logger;Lkotlin/coroutines/CoroutineContext;Ljava/lang/String;)Lcom/stripe/android/paymentsheet/PaymentSheetViewModel;
+	public static fun newInstance (Landroid/app/Application;Lcom/stripe/android/paymentsheet/PaymentSheetContract$Args;Lcom/stripe/android/paymentsheet/analytics/EventReporter;Ldagger/Lazy;Lcom/stripe/android/paymentsheet/repositories/StripeIntentRepository;Lcom/stripe/android/paymentsheet/model/StripeIntentValidator;Lcom/stripe/android/paymentsheet/repositories/CustomerRepository;Lcom/stripe/android/paymentsheet/PrefsRepository;Lcom/stripe/android/ui/core/forms/resources/ResourceRepository;Lcom/stripe/android/payments/paymentlauncher/StripePaymentLauncherAssistedFactory;Lcom/stripe/android/googlepaylauncher/injection/GooglePayPaymentMethodLauncherFactory;Lcom/stripe/android/core/Logger;Lkotlin/coroutines/CoroutineContext;Ljava/lang/String;Landroidx/lifecycle/SavedStateHandle;)Lcom/stripe/android/paymentsheet/PaymentSheetViewModel;
 }
 
 public final class com/stripe/android/paymentsheet/PaymentSheetViewModel_Factory_MembersInjector : dagger/MembersInjector {

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

@@ -15,43 +15,28 @@ import androidx.fragment.app.commit
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.stripe.android.model.StripeIntent
 import com.stripe.android.core.injection.InjectorKey
-import com.stripe.android.paymentsheet.analytics.EventReporter
+import com.stripe.android.model.StripeIntent
 import com.stripe.android.paymentsheet.databinding.FragmentPaymentsheetAddPaymentMethodBinding
 import com.stripe.android.paymentsheet.forms.FormFieldValues
-import com.stripe.android.ui.core.Amount
 import com.stripe.android.paymentsheet.model.PaymentSelection
 import com.stripe.android.paymentsheet.model.SupportedPaymentMethod
 import com.stripe.android.paymentsheet.paymentdatacollection.CardDataCollectionFragment
 import com.stripe.android.paymentsheet.paymentdatacollection.ComposeFormDataCollectionFragment
 import com.stripe.android.paymentsheet.paymentdatacollection.FormFragmentArguments
 import com.stripe.android.paymentsheet.paymentdatacollection.TransformToPaymentMethodCreateParams
-import com.stripe.android.paymentsheet.ui.AddPaymentMethodsFragmentFactory
 import com.stripe.android.paymentsheet.ui.AnimationConstants
 import com.stripe.android.paymentsheet.viewmodels.BaseSheetViewModel
+import com.stripe.android.ui.core.Amount
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.launch
 
-internal abstract class BaseAddPaymentMethodFragment(
-    private val eventReporter: EventReporter
-) : Fragment() {
+internal abstract class BaseAddPaymentMethodFragment : Fragment() {
     abstract val viewModelFactory: ViewModelProvider.Factory
     abstract val sheetViewModel: BaseSheetViewModel<*>
 
     protected lateinit var addPaymentMethodHeader: TextView
 
-    private lateinit var selectedPaymentMethod: SupportedPaymentMethod
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        // When the fragment is destroyed and recreated, the child fragment is re-instantiated
-        // during onCreate, so the factory must be set before calling super.
-        childFragmentManager.fragmentFactory = AddPaymentMethodsFragmentFactory(
-            sheetViewModel::class.java, viewModelFactory
-        )
-        super.onCreate(savedInstanceState)
-    }
-
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -85,40 +70,54 @@ internal abstract class BaseAddPaymentMethodFragment(
         )
 
         val selectedPaymentMethodIndex = paymentMethods.indexOf(
-            SupportedPaymentMethod.fromCode(savedInstanceState?.getString(SELECTED_PAYMENT_METHOD))
+            sheetViewModel.getAddFragmentSelectedLPM()
         ).takeUnless { it == -1 } ?: 0
 
         if (paymentMethods.size > 1) {
             setupRecyclerView(viewBinding, paymentMethods, selectedPaymentMethodIndex)
         }
 
         if (paymentMethods.isNotEmpty()) {
-            replacePaymentMethodFragment(paymentMethods[selectedPaymentMethodIndex])
+            // If the activity is destroyed and recreated, then the fragment is already present
+            // and doesn't need to be replaced, only the selected payment method needs to be set
+            if (savedInstanceState == null) {
+                replacePaymentMethodFragment(paymentMethods[selectedPaymentMethodIndex])
+            }
         }
 
         sheetViewModel.processing.observe(viewLifecycleOwner) { isProcessing ->
             (getFragment() as? ComposeFormDataCollectionFragment)?.setProcessing(isProcessing)
         }
 
+        // If the activity was destroyed and recreated then we need to re-attach the fragment,
+        // as attach will not be called again.
+        childFragmentManager.fragments.forEach { fragment ->
+            attachComposeFragmentViewModel(fragment)
+        }
+
         childFragmentManager.addFragmentOnAttachListener { _, fragment ->
-            (fragment as? ComposeFormDataCollectionFragment)?.let { formFragment ->
-                // Need to access the formViewModel so it is constructed.
-                val formViewModel = formFragment.formViewModel
-                viewLifecycleOwner.lifecycleScope.launch {
-                    formViewModel.completeFormValues.collect { formFieldValues ->
-                        sheetViewModel.updateSelection(
-                            transformToPaymentSelection(
-                                formFieldValues,
-                                formFragment.paramKeySpec,
-                                selectedPaymentMethod
-                            )
+            attachComposeFragmentViewModel(fragment)
+        }
+
+        sheetViewModel.eventReporter.onShowNewPaymentOptionForm()
+    }
+
+    private fun attachComposeFragmentViewModel(fragment: Fragment) {
+        (fragment as? ComposeFormDataCollectionFragment)?.let { formFragment ->
+            // Need to access the formViewModel so it is constructed.
+            val formViewModel = formFragment.formViewModel
+            viewLifecycleOwner.lifecycleScope.launch {
+                formViewModel.completeFormValues.collect { formFieldValues ->
+                    sheetViewModel.updateSelection(
+                        transformToPaymentSelection(
+                            formFieldValues,
+                            formFragment.paramKeySpec,
+                            sheetViewModel.getAddFragmentSelectedLPM()
                         )
-                    }
+                    )
                 }
             }
         }
-
-        eventReporter.onShowNewPaymentOptionForm()
     }
 
     private fun setupRecyclerView(
@@ -168,13 +167,8 @@ internal abstract class BaseAddPaymentMethodFragment(
         replacePaymentMethodFragment(paymentMethod)
     }
 
-    override fun onSaveInstanceState(outState: Bundle) {
-        outState.putString(SELECTED_PAYMENT_METHOD, selectedPaymentMethod.type.code)
-        super.onSaveInstanceState(outState)
-    }
-
     private fun replacePaymentMethodFragment(paymentMethod: SupportedPaymentMethod) {
-        selectedPaymentMethod = paymentMethod
+        sheetViewModel.setAddFragmentSelectedLPM(paymentMethod)
 
         val args = requireArguments()
         args.putParcelable(
@@ -208,12 +202,15 @@ internal abstract class BaseAddPaymentMethodFragment(
         childFragmentManager.findFragmentById(R.id.payment_method_fragment_container)
 
     companion object {
-        private const val SELECTED_PAYMENT_METHOD = "selected_pm"
 
         private fun fragmentForPaymentMethod(paymentMethod: SupportedPaymentMethod) =
             when (paymentMethod) {
-                SupportedPaymentMethod.Card -> CardDataCollectionFragment::class.java
-                else -> ComposeFormDataCollectionFragment::class.java
+                SupportedPaymentMethod.Card -> {
+                    CardDataCollectionFragment::class.java
+                }
+                else -> {
+                    ComposeFormDataCollectionFragment::class.java
+                }
             }
 
         private val transformToPaymentMethodCreateParams = TransformToPaymentMethodCreateParams()

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

@@ -9,7 +9,6 @@ import androidx.annotation.VisibleForTesting
 import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.stripe.android.paymentsheet.analytics.EventReporter
 import com.stripe.android.paymentsheet.databinding.FragmentPaymentsheetPaymentMethodsListBinding
 import com.stripe.android.paymentsheet.model.FragmentConfig
 import com.stripe.android.paymentsheet.model.PaymentSelection
@@ -18,8 +17,7 @@ import com.stripe.android.paymentsheet.ui.BaseSheetActivity
 import com.stripe.android.paymentsheet.viewmodels.BaseSheetViewModel
 
 internal abstract class BasePaymentMethodsListFragment(
-    private val canClickSelectedItem: Boolean,
-    private val eventReporter: EventReporter
+    private val canClickSelectedItem: Boolean
 ) : Fragment(
     R.layout.fragment_paymentsheet_payment_methods_list
 ) {
@@ -53,7 +51,7 @@ internal abstract class BasePaymentMethodsListFragment(
         this.config = nullableConfig
 
         setHasOptionsMenu(!sheetViewModel.paymentMethods.value.isNullOrEmpty())
-        eventReporter.onShowExistingPaymentOptions()
+        sheetViewModel.eventReporter.onShowExistingPaymentOptions()
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {

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

@@ -35,7 +35,9 @@ internal class PaymentOptionsActivity : BaseSheetActivity<PaymentOptionResult>()
     internal var viewModelFactory: ViewModelProvider.Factory =
         PaymentOptionsViewModel.Factory(
             { application },
-            { requireNotNull(starterArgs) }
+            { requireNotNull(starterArgs) },
+            this,
+            intent?.extras
         )
 
     override val viewModel: PaymentOptionsViewModel by viewModels { viewModelFactory }
@@ -78,13 +80,13 @@ internal class PaymentOptionsActivity : BaseSheetActivity<PaymentOptionResult>()
         setupContinueButton(viewBinding.continueButton)
 
         viewModel.transition.observe(this) { event ->
-            val transitionTarget = event.getContentIfNotHandled()
-            if (transitionTarget != null) {
+            event?.getContentIfNotHandled()?.let { transitionTarget ->
                 onTransitionTarget(
                     transitionTarget,
                     bundleOf(
-                        EXTRA_STARTER_ARGS to starterArgs,
-                        EXTRA_FRAGMENT_CONFIG to transitionTarget.fragmentConfig
+                        PaymentSheetActivity.EXTRA_STARTER_ARGS to starterArgs,
+                        PaymentSheetActivity.EXTRA_FRAGMENT_CONFIG to
+                            transitionTarget.fragmentConfig
                     )
                 )
             }

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

@@ -1,19 +1,18 @@
 package com.stripe.android.paymentsheet
 
+import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.ViewModelProvider
-import com.stripe.android.paymentsheet.analytics.EventReporter
 
-internal class PaymentOptionsAddPaymentMethodFragment(
-    eventReporter: EventReporter
-) : BaseAddPaymentMethodFragment(eventReporter) {
+internal class PaymentOptionsAddPaymentMethodFragment : BaseAddPaymentMethodFragment() {
     override val viewModelFactory: ViewModelProvider.Factory = PaymentOptionsViewModel.Factory(
         { requireActivity().application },
         {
             requireNotNull(
                 requireArguments().getParcelable(PaymentOptionsActivity.EXTRA_STARTER_ARGS)
             )
-        }
+        },
+        (activity as? AppCompatActivity) ?: this
     )
 
     override val sheetViewModel by activityViewModels<PaymentOptionsViewModel> {

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

@@ -2,17 +2,14 @@ package com.stripe.android.paymentsheet
 
 import android.os.Bundle
 import android.view.View
+import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.isVisible
 import androidx.fragment.app.activityViewModels
-import com.stripe.android.paymentsheet.analytics.EventReporter
 import com.stripe.android.paymentsheet.databinding.FragmentPaymentsheetPaymentMethodsListBinding
 import com.stripe.android.paymentsheet.model.PaymentSelection
 
-internal class PaymentOptionsListFragment(
-    eventReporter: EventReporter
-) : BasePaymentMethodsListFragment(
-    canClickSelectedItem = true,
-    eventReporter
+internal class PaymentOptionsListFragment() : BasePaymentMethodsListFragment(
+    canClickSelectedItem = true
 ) {
     private val activityViewModel by activityViewModels<PaymentOptionsViewModel> {
         PaymentOptionsViewModel.Factory(
@@ -21,7 +18,8 @@ internal class PaymentOptionsListFragment(
                 requireNotNull(
                     requireArguments().getParcelable(PaymentOptionsActivity.EXTRA_STARTER_ARGS)
                 )
-            }
+            },
+            (activity as? AppCompatActivity) ?: this
         )
     }