Remove LiveData from PaymentSessionViewModel. (#7526)

stripe · Nov 13, 2023 · dd30bf1 · dd30bf1
1 parent 93907e7
commit dd30bf1
Show file tree

Hide file tree

Showing 3 changed files with 172 additions and 163 deletions.
diff --git a/payments-core/src/main/java/com/stripe/android/PaymentSession.kt b/payments-core/src/main/java/com/stripe/android/PaymentSession.kt
@@ -13,12 +13,14 @@ import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.OnLifecycleEvent
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.ViewModelStoreOwner
+import androidx.lifecycle.lifecycleScope
 import com.stripe.android.PaymentSession.PaymentSessionListener
 import com.stripe.android.view.ActivityStarter
 import com.stripe.android.view.PaymentFlowActivity
 import com.stripe.android.view.PaymentFlowActivityStarter
 import com.stripe.android.view.PaymentMethodsActivity
 import com.stripe.android.view.PaymentMethodsActivityStarter
+import kotlinx.coroutines.launch
 
 /**
  * Represents a single start-to-finish payment operation.
@@ -63,26 +65,23 @@ class PaymentSession @VisibleForTesting internal constructor(
 
     init {
         lifecycleOwner.lifecycle.addObserver(lifecycleObserver)
-        viewModel.networkState.observe(
-            lifecycleOwner,
-            {
-                it?.let { networkState ->
-                    listener?.onCommunicatingStateChanged(
-                        when (networkState) {
-                            PaymentSessionViewModel.NetworkState.Active -> true
-                            PaymentSessionViewModel.NetworkState.Inactive -> false
-                        }
-                    )
-                }
+
+        lifecycleOwner.lifecycleScope.launch {
+            viewModel.networkState.collect { networkState ->
+                listener?.onCommunicatingStateChanged(
+                    when (networkState) {
+                        PaymentSessionViewModel.NetworkState.Active -> true
+                        PaymentSessionViewModel.NetworkState.Inactive -> false
+                    }
+                )
             }
-        )
+        }
 
-        viewModel.paymentSessionDataLiveData.observe(
-            lifecycleOwner,
-            {
-                listener?.onPaymentSessionDataChanged(it)
+        lifecycleOwner.lifecycleScope.launch {
+            viewModel.paymentSessionDataStateFlow.collect { sessionData ->
+                listener?.onPaymentSessionDataChanged(sessionData)
             }
-        )
+        }
     }
 
     /**
@@ -160,21 +159,25 @@ class PaymentSession @VisibleForTesting internal constructor(
                 }
                 false
             }
+
             Activity.RESULT_OK -> when (requestCode) {
                 PaymentMethodsActivityStarter.REQUEST_CODE -> {
                     onPaymentMethodResult(data)
                     true
                 }
+
                 PaymentFlowActivityStarter.REQUEST_CODE -> {
                     data.getParcelableExtra<PaymentSessionData>(EXTRA_PAYMENT_SESSION_DATA)?.let {
                         viewModel.onPaymentFlowResult(it)
                     }
                     true
                 }
+
                 else -> {
                     false
                 }
             }
+
             else -> false
         }
     }

diff --git a/payments-core/src/main/java/com/stripe/android/PaymentSessionViewModel.kt b/payments-core/src/main/java/com/stripe/android/PaymentSessionViewModel.kt
@@ -15,6 +15,13 @@ import com.stripe.android.model.Customer
 import com.stripe.android.model.PaymentMethod
 import com.stripe.android.utils.requireApplication
 import com.stripe.android.view.PaymentMethodsActivityStarter
+import kotlinx.coroutines.channels.BufferOverflow
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharedFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asSharedFlow
+import kotlinx.coroutines.flow.asStateFlow
 
 internal class PaymentSessionViewModel(
     application: Application,
@@ -29,12 +36,15 @@ internal class PaymentSessionViewModel(
             if (value != field) {
                 field = value
                 savedStateHandle.set(KEY_PAYMENT_SESSION_DATA, value)
-                _paymentSessionDataLiveData.value = value
+                _paymentSessionDataStateFlow.tryEmit(value)
             }
         }
 
-    private val _paymentSessionDataLiveData = MutableLiveData<PaymentSessionData>()
-    val paymentSessionDataLiveData: LiveData<PaymentSessionData> = _paymentSessionDataLiveData
+    private val _paymentSessionDataStateFlow = MutableSharedFlow<PaymentSessionData>(
+        replay = 1,
+        onBufferOverflow = BufferOverflow.DROP_OLDEST
+    )
+    val paymentSessionDataStateFlow: SharedFlow<PaymentSessionData> = _paymentSessionDataStateFlow.asSharedFlow()
 
     init {
         // read from saved state handle
@@ -43,8 +53,8 @@ internal class PaymentSessionViewModel(
         }
     }
 
-    private val _networkState: MutableLiveData<NetworkState> = MutableLiveData()
-    internal val networkState: LiveData<NetworkState> = _networkState
+    private val _networkState: MutableStateFlow<NetworkState> = MutableStateFlow(NetworkState.Inactive)
+    internal val networkState: StateFlow<NetworkState> = _networkState.asStateFlow()
 
     @JvmSynthetic
     fun updateCartTotal(@IntRange(from = 0) cartTotal: Long) {
@@ -217,7 +227,7 @@ internal class PaymentSessionViewModel(
 
     @JvmSynthetic
     fun onListenerAttached() {
-        _paymentSessionDataLiveData.value = paymentSessionData
+        _paymentSessionDataStateFlow.tryEmit(paymentSessionData)
     }
 
     sealed class FetchCustomerResult {