Remove LiveData from PaymentSessionViewModel.

stripe · Oct 27, 2023 · 5331af5 · 5331af5
1 parent 12f5150
commit 5331af5
Show file tree

Hide file tree

Showing 3 changed files with 164 additions and 155 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,9 +65,9 @@ class PaymentSession @VisibleForTesting internal constructor(
 
     init {
         lifecycleOwner.lifecycle.addObserver(lifecycleObserver)
-        viewModel.networkState.observe(
-            lifecycleOwner,
-            {
+
+        lifecycleOwner.lifecycleScope.launch {
+            viewModel.networkState.collect {
                 it?.let { networkState ->
                     listener?.onCommunicatingStateChanged(
                         when (networkState) {
@@ -75,14 +77,15 @@ class PaymentSession @VisibleForTesting internal constructor(
                     )
                 }
             }
-        )
+        }
 
-        viewModel.paymentSessionDataLiveData.observe(
-            lifecycleOwner,
-            {
-                listener?.onPaymentSessionDataChanged(it)
+        lifecycleOwner.lifecycleScope.launch {
+            viewModel.paymentSessionDataStateFlow.collect { sessionData ->
+                sessionData?.let {
+                    listener?.onPaymentSessionDataChanged(it)
+                }
             }
-        )
+        }
     }
 
     /**

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,9 @@ 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.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
 
 internal class PaymentSessionViewModel(
     application: Application,
@@ -29,12 +32,12 @@ internal class PaymentSessionViewModel(
             if (value != field) {
                 field = value
                 savedStateHandle.set(KEY_PAYMENT_SESSION_DATA, value)
-                _paymentSessionDataLiveData.value = value
+                _paymentSessionDataStateFlow.value = value
             }
         }
 
-    private val _paymentSessionDataLiveData = MutableLiveData<PaymentSessionData>()
-    val paymentSessionDataLiveData: LiveData<PaymentSessionData> = _paymentSessionDataLiveData
+    private val _paymentSessionDataStateFlow = MutableStateFlow<PaymentSessionData?>(null)
+    val paymentSessionDataStateFlow: StateFlow<PaymentSessionData?> = _paymentSessionDataStateFlow.asStateFlow()
 
     init {
         // read from saved state handle
@@ -43,8 +46,8 @@ internal class PaymentSessionViewModel(
         }
     }
 
-    private val _networkState: MutableLiveData<NetworkState> = MutableLiveData()
-    internal val networkState: LiveData<NetworkState> = _networkState
+    private val _networkState: MutableStateFlow<NetworkState?> = MutableStateFlow(null)
+    internal val networkState: StateFlow<NetworkState?> = _networkState.asStateFlow()
 
     @JvmSynthetic
     fun updateCartTotal(@IntRange(from = 0) cartTotal: Long) {
@@ -217,7 +220,7 @@ internal class PaymentSessionViewModel(
 
     @JvmSynthetic
     fun onListenerAttached() {
-        _paymentSessionDataLiveData.value = paymentSessionData
+        _paymentSessionDataStateFlow.value = paymentSessionData
     }
 
     sealed class FetchCustomerResult {