Move hasHandledScan back into CardScanState

Author: SaintPatrck

app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/cardscanner/CardScanViewModel.kt

@@ -1,25 +1,30 @@
 package com.x8bit.bitwarden.ui.vault.feature.cardscanner
 
 import android.os.Parcelable
+import androidx.lifecycle.SavedStateHandle
 import com.bitwarden.ui.platform.base.BaseViewModel
 import com.bitwarden.ui.platform.base.DeferredBackgroundEvent
 import com.bitwarden.ui.platform.feature.cardscanner.manager.CardScanManager
 import com.bitwarden.ui.platform.feature.cardscanner.util.CardScanData
 import com.bitwarden.ui.platform.feature.cardscanner.util.CardScanResult
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.flow.update
 import kotlinx.parcelize.Parcelize
 import javax.inject.Inject
 
+private const val KEY_STATE = "state"
+
 /**
  * Handles [CardScanAction] and launches [CardScanEvent] for the [CardScanScreen].
  */
 @HiltViewModel
 class CardScanViewModel @Inject constructor(
+    savedStateHandle: SavedStateHandle,
     private val cardScanManager: CardScanManager,
 ) : BaseViewModel<CardScanState, CardScanEvent, CardScanAction>(
-    initialState = CardScanState,
+    initialState = savedStateHandle[KEY_STATE]
+        ?: CardScanState(hasHandledScan = false),
 ) {
-    private var hasHandledScan = false
 
     override fun handleAction(action: CardScanAction) {
         when (action) {
@@ -39,8 +44,8 @@ class CardScanViewModel @Inject constructor(
     }
 
     private fun handleCardScanReceive(action: CardScanAction.CardScanReceive) {
-        if (hasHandledScan) return
-        hasHandledScan = true
+        if (state.hasHandledScan) return
+        mutableStateFlow.update { it.copy(hasHandledScan = true) }
         cardScanManager.emitCardScanResult(
             CardScanResult.Success(cardScanData = action.cardScanData),
         )
@@ -87,4 +92,6 @@ sealed class CardScanAction {
  * Represents the state of the card scan screen.
  */
 @Parcelize
-data object CardScanState : Parcelable
+data class CardScanState(
+    val hasHandledScan: Boolean,
+) : Parcelable

app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/cardscanner/CardScanViewModelTest.kt

@@ -1,5 +1,6 @@
 package com.x8bit.bitwarden.ui.vault.feature.cardscanner
 
+import androidx.lifecycle.SavedStateHandle
 import app.cash.turbine.test
 import com.bitwarden.ui.platform.base.BaseViewModelTest
 import com.bitwarden.ui.platform.feature.cardscanner.manager.CardScanManager
@@ -91,6 +92,7 @@ class CardScanViewModelTest : BaseViewModelTest() {
 
     private fun createViewModel(): CardScanViewModel =
         CardScanViewModel(
+            savedStateHandle = SavedStateHandle(),
             cardScanManager = cardScanManager,
         )
 }