M-15177: All user input syncs should be forced (#4369)

david-livefront · web-flow · commit c1be5be188ac · 2024-11-22T17:40:40.000Z
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/VaultRepository.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/VaultRepository.kt
@@ -109,7 +109,7 @@ interface VaultRepository : CipherManager, VaultLockManager {
      * Unlike [syncIfNecessary], this will always perform the requested sync and should only be
      * utilized in cases where the user specifically requested the action.
      */
-    fun sync()
+    fun sync(forced: Boolean = false)
 
     /**
      * Checks if conditions have been met to perform a sync request and, if so, syncs the vault
diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryImpl.kt
@@ -345,15 +345,15 @@ class VaultRepositoryImpl(
         }
     }
 
-    override fun sync() {
+    override fun sync(forced: Boolean) {
         val userId = activeUserId ?: return
         if (!syncJob.isCompleted) return
         mutableCiphersStateFlow.updateToPendingOrLoading()
         mutableDomainsStateFlow.updateToPendingOrLoading()
         mutableFoldersStateFlow.updateToPendingOrLoading()
         mutableCollectionsStateFlow.updateToPendingOrLoading()
         mutableSendDataStateFlow.updateToPendingOrLoading()
-        syncJob = ioScope.launch { syncInternal(userId) }
+        syncJob = ioScope.launch { syncInternal(userId = userId, forced = forced) }
     }
 
     @Suppress("MagicNumber")
@@ -374,10 +374,9 @@ class VaultRepositoryImpl(
     }
 
     override suspend fun syncForResult(): SyncVaultDataResult {
-        val userId = activeUserId
-            ?: return SyncVaultDataResult.Error(throwable = null)
+        val userId = activeUserId ?: return SyncVaultDataResult.Error(throwable = null)
         syncJob = ioScope
-            .async { syncInternal(userId) }
+            .async { syncInternal(userId = userId, forced = false) }
             .also {
                 return try {
                     it.await()
@@ -1339,51 +1338,53 @@ class VaultRepositoryImpl(
     //endregion Push Notification helpers
 
     @Suppress("LongMethod")
-    private suspend fun syncInternal(userId: String): SyncVaultDataResult {
-        val lastSyncInstant = settingsDiskSource
-            .getLastSyncTime(userId = userId)
-            ?.toEpochMilli()
-            ?: 0
-
-        val lastDatabaseSchemeChangeInstant = databaseSchemeManager
-            .lastDatabaseSchemeChangeInstant
-            ?.toEpochMilli()
-            ?: 0
-
-        syncService
-            .getAccountRevisionDateMillis()
-            .fold(
-                onSuccess = { serverRevisionDate ->
-                    if (serverRevisionDate < lastSyncInstant &&
-                        lastDatabaseSchemeChangeInstant < lastSyncInstant
-                    ) {
-                        // We can skip the actual sync call if there is no new data or database
-                        // scheme changes since the last sync.
-                        vaultDiskSource.resyncVaultData(userId)
-                        settingsDiskSource.storeLastSyncTime(
-                            userId = userId,
-                            lastSyncTime = clock.instant(),
-                        )
-                        val itemsAvailable = vaultDiskSource
-                            .getCiphers(userId)
-                            .firstOrNull()
-                            ?.isNotEmpty()
-                            ?: false
-                        return SyncVaultDataResult.Success(itemsAvailable = itemsAvailable)
-                    }
-                },
-                onFailure = {
-                    updateVaultStateFlowsToError(it)
-                    return SyncVaultDataResult.Error(it)
-                },
-            )
+    private suspend fun syncInternal(
+        userId: String,
+        forced: Boolean,
+    ): SyncVaultDataResult {
+        if (!forced) {
+            // Skip this check if we are forcing the request.
+            val lastSyncInstant = settingsDiskSource
+                .getLastSyncTime(userId = userId)
+                ?.toEpochMilli()
+                ?: 0
+            val lastDatabaseSchemeChangeInstant = databaseSchemeManager
+                .lastDatabaseSchemeChangeInstant
+                ?.toEpochMilli()
+                ?: 0
+            syncService
+                .getAccountRevisionDateMillis()
+                .fold(
+                    onSuccess = { serverRevisionDate ->
+                        if (serverRevisionDate < lastSyncInstant &&
+                            lastDatabaseSchemeChangeInstant < lastSyncInstant
+                        ) {
+                            // We can skip the actual sync call if there is no new data or database
+                            // scheme changes since the last sync.
+                            vaultDiskSource.resyncVaultData(userId = userId)
+                            settingsDiskSource.storeLastSyncTime(
+                                userId = userId,
+                                lastSyncTime = clock.instant(),
+                            )
+                            val itemsAvailable = vaultDiskSource
+                                .getCiphers(userId)
+                                .firstOrNull()
+                                ?.isNotEmpty() == true
+                            return SyncVaultDataResult.Success(itemsAvailable = itemsAvailable)
+                        }
+                    },
+                    onFailure = {
+                        updateVaultStateFlowsToError(throwable = it)
+                        return SyncVaultDataResult.Error(throwable = it)
+                    },
+                )
+        }
 
-        syncService
+        return syncService
             .sync()
             .fold(
                 onSuccess = { syncResponse ->
-                    val localSecurityStamp =
-                        authDiskSource.userState?.activeAccount?.profile?.stamp
+                    val localSecurityStamp = authDiskSource.userState?.activeAccount?.profile?.stamp
                     val serverSecurityStamp = syncResponse.profile.securityStamp
 
                     // Log the user out if the stamps do not match
@@ -1395,11 +1396,9 @@ class VaultRepositoryImpl(
                     }
 
                     // Update user information with additional information from sync response
-                    authDiskSource.userState = authDiskSource
-                        .userState
-                        ?.toUpdatedUserStateJson(
-                            syncResponse = syncResponse,
-                        )
+                    authDiskSource.userState = authDiskSource.userState?.toUpdatedUserStateJson(
+                        syncResponse = syncResponse,
+                    )
 
                     unlockVaultForOrganizationsIfNecessary(syncResponse = syncResponse)
                     storeProfileData(syncResponse = syncResponse)
@@ -1414,12 +1413,12 @@ class VaultRepositoryImpl(
                         lastSyncTime = clock.instant(),
                     )
                     vaultDiskSource.replaceVaultData(userId = userId, vault = syncResponse)
-                    val itemsAvailable = syncResponse.ciphers?.isNotEmpty() ?: false
-                    return SyncVaultDataResult.Success(itemsAvailable = itemsAvailable)
+                    val itemsAvailable = syncResponse.ciphers?.isNotEmpty() == true
+                    SyncVaultDataResult.Success(itemsAvailable = itemsAvailable)
                 },
                 onFailure = { throwable ->
-                    updateVaultStateFlowsToError(throwable)
-                    return SyncVaultDataResult.Error(throwable)
+                    updateVaultStateFlowsToError(throwable = throwable)
+                    SyncVaultDataResult.Error(throwable = throwable)
                 },
             )
     }
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/other/OtherViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/other/OtherViewModel.kt
@@ -99,7 +99,7 @@ class OtherViewModel @Inject constructor(
         mutableStateFlow.update {
             it.copy(dialogState = OtherState.DialogState.Loading(R.string.syncing.asText()))
         }
-        vaultRepo.sync()
+        vaultRepo.sync(forced = true)
     }
 
     private fun handleInternalAction(action: OtherAction.Internal) {
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/SendViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/SendViewModel.kt
@@ -255,7 +255,7 @@ class SendViewModel @Inject constructor(
 
     private fun handleRefreshClick() {
         // No need to update the view state, the vault repo will emit a new state during this time.
-        vaultRepo.sync()
+        vaultRepo.sync(forced = true)
     }
 
     private fun handleSearchClick() {
@@ -266,7 +266,7 @@ class SendViewModel @Inject constructor(
         mutableStateFlow.update {
             it.copy(dialogState = SendState.DialogState.Loading(R.string.syncing.asText()))
         }
-        vaultRepo.sync()
+        vaultRepo.sync(forced = true)
     }
 
     private fun handleCopyClick(action: SendAction.CopyClick) {
@@ -321,7 +321,7 @@ class SendViewModel @Inject constructor(
         mutableStateFlow.update { it.copy(isRefreshing = true) }
         // The Pull-To-Refresh composable is already in the refreshing state.
         // We will reset that state when sendDataStateFlow emits later on.
-        vaultRepo.sync()
+        vaultRepo.sync(forced = true)
     }
 }
 
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemViewModel.kt
@@ -245,7 +245,7 @@ class VaultItemViewModel @Inject constructor(
 
     private fun handleRefreshClick() {
         // No need to update the view state, the vault repo will emit a new state during this time
-        vaultRepository.sync()
+        vaultRepository.sync(forced = true)
     }
 
     private fun handleCopyCustomHiddenFieldClick(
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModel.kt
@@ -300,14 +300,14 @@ class VaultItemListingViewModel @Inject constructor(
     }
 
     private fun handleRefreshClick() {
-        vaultRepository.sync()
+        vaultRepository.sync(forced = true)
     }
 
     private fun handleRefreshPull() {
         mutableStateFlow.update { it.copy(isRefreshing = true) }
         // The Pull-To-Refresh composable is already in the refreshing state.
         // We will reset that state when sendDataStateFlow emits later on.
-        vaultRepository.sync()
+        vaultRepository.sync(forced = true)
     }
 
     private fun handleConfirmOverwriteExistingPasskeyClick(
@@ -877,7 +877,7 @@ class VaultItemListingViewModel @Inject constructor(
                 ),
             )
         }
-        vaultRepository.sync()
+        vaultRepository.sync(forced = true)
     }
 
     private fun handleSearchIconClick() {
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModel.kt
@@ -299,7 +299,7 @@ class VaultViewModel @Inject constructor(
         mutableStateFlow.update {
             it.copy(dialog = VaultState.DialogState.Syncing)
         }
-        vaultRepository.sync()
+        vaultRepository.sync(forced = true)
     }
 
     private fun handleLockClick() {
@@ -346,7 +346,7 @@ class VaultViewModel @Inject constructor(
     }
 
     private fun handleTryAgainClick() {
-        vaultRepository.sync()
+        vaultRepository.sync(forced = true)
     }
 
     private fun handleDialogDismiss() {
@@ -359,7 +359,7 @@ class VaultViewModel @Inject constructor(
         mutableStateFlow.update { it.copy(isRefreshing = true) }
         // The Pull-To-Refresh composable is already in the refreshing state.
         // We will reset that state when sendDataStateFlow emits later on.
-        vaultRepository.sync()
+        vaultRepository.sync(forced = true)
     }
 
     private fun handleOverflowOptionClick(action: VaultAction.OverflowOptionClick) {
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/verificationcode/VerificationCodeViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/verificationcode/VerificationCodeViewModel.kt
@@ -120,14 +120,14 @@ class VerificationCodeViewModel @Inject constructor(
     }
 
     private fun handleRefreshClick() {
-        vaultRepository.sync()
+        vaultRepository.sync(forced = true)
     }
 
     private fun handleRefreshPull() {
         mutableStateFlow.update { it.copy(isRefreshing = true) }
         // The Pull-To-Refresh composable is already in the refreshing state.
         // We will reset that state when sendDataStateFlow emits later on.
-        vaultRepository.sync()
+        vaultRepository.sync(forced = true)
     }
 
     private fun handleSearchIconClick() {
@@ -144,7 +144,7 @@ class VerificationCodeViewModel @Inject constructor(
                 ),
             )
         }
-        vaultRepository.sync()
+        vaultRepository.sync(forced = true)
     }
 
     private fun handleInternalAction(action: VerificationCodeAction.Internal) {
diff --git a/app/src/test/java/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryTest.kt
@@ -816,6 +816,21 @@ class VaultRepositoryTest {
             coVerify(exactly = 0) { syncService.sync() }
         }
 
+    @Test
+    fun `sync with forced should skip checks and call the syncService sync`() {
+        fakeAuthDiskSource.userState = MOCK_USER_STATE
+        coEvery { syncService.sync() } returns Throwable("failure").asFailure()
+
+        vaultRepository.sync(forced = true)
+
+        coVerify(exactly = 0) {
+            syncService.getAccountRevisionDateMillis()
+        }
+        coVerify(exactly = 1) {
+            syncService.sync()
+        }
+    }
+
     @Suppress("MaxLineLength")
     @Test
     fun `sync with syncService Success should unlock the vault for orgs if necessary and update AuthDiskSource and VaultDiskSource`() =
diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/search/SearchViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/search/SearchViewModelTest.kt
@@ -100,7 +100,6 @@ class SearchViewModelTest : BaseViewModelTest() {
     private val vaultRepository: VaultRepository = mockk {
         every { vaultFilterType } returns VaultFilterType.AllVaults
         every { vaultDataStateFlow } returns mutableVaultDataStateFlow
-        every { sync() } just runs
     }
     private val mutableUserStateFlow = MutableStateFlow<UserState?>(DEFAULT_USER_STATE)
     private val authRepository: AuthRepository = mockk {
diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/other/OtherViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/other/OtherViewModelTest.kt
@@ -149,7 +149,7 @@ class OtherViewModelTest : BaseViewModelTest() {
 
     @Test
     fun `on SyncNowButtonClick should sync repo`() = runTest {
-        every { vaultRepository.sync() } just runs
+        every { vaultRepository.sync(forced = true) } just runs
         val viewModel = createViewModel()
         viewModel.stateFlow.test {
             assertEquals(DEFAULT_STATE, awaitItem())
@@ -163,7 +163,7 @@ class OtherViewModelTest : BaseViewModelTest() {
                 awaitItem(),
             )
         }
-        verify { vaultRepository.sync() }
+        verify { vaultRepository.sync(forced = true) }
     }
 
     @Test
diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/send/SendViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/send/SendViewModelTest.kt
@@ -105,12 +105,12 @@ class SendViewModelTest : BaseViewModelTest() {
     @Test
     fun `RefreshClick should call sync`() {
         val viewModel = createViewModel()
-        every { vaultRepo.sync() } just runs
+        every { vaultRepo.sync(forced = true) } just runs
 
         viewModel.trySendAction(SendAction.RefreshClick)
 
         verify {
-            vaultRepo.sync()
+            vaultRepo.sync(forced = true)
         }
     }
 
@@ -223,7 +223,7 @@ class SendViewModelTest : BaseViewModelTest() {
     @Test
     fun `SyncClick should call sync`() {
         val viewModel = createViewModel()
-        every { vaultRepo.sync() } just runs
+        every { vaultRepo.sync(forced = true) } just runs
 
         viewModel.trySendAction(SendAction.SyncClick)
 
@@ -234,7 +234,7 @@ class SendViewModelTest : BaseViewModelTest() {
             viewModel.stateFlow.value,
         )
         verify {
-            vaultRepo.sync()
+            vaultRepo.sync(forced = true)
         }
     }
 
@@ -419,13 +419,13 @@ class SendViewModelTest : BaseViewModelTest() {
 
     @Test
     fun `RefreshPull should call vault repository sync`() {
-        every { vaultRepo.sync() } just runs
+        every { vaultRepo.sync(forced = true) } just runs
         val viewModel = createViewModel()
 
         viewModel.trySendAction(SendAction.RefreshPull)
 
         verify(exactly = 1) {
-            vaultRepo.sync()
+            vaultRepo.sync(forced = true)
         }
     }
 
diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemViewModelTest.kt
diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModelTest.kt
diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModelTest.kt
diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/verificationcode/VerificationCodeViewModelTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/verificationcode/VerificationCodeViewModelTest.kt

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ class OtherViewModel @Inject constructor(`
`99`	`99`	`mutableStateFlow.update {`
`100`	`100`	`it.copy(dialogState = OtherState.DialogState.Loading(R.string.syncing.asText()))`
`101`	`101`	`}`
`102`		`- vaultRepo.sync()`
	`102`	`+ vaultRepo.sync(forced = true)`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`private fun handleInternalAction(action: OtherAction.Internal) {`
Original file line number	Diff line number	Diff line change
`@@ -255,7 +255,7 @@ class SendViewModel @Inject constructor(`
`255`	`255`
`256`	`256`	`private fun handleRefreshClick() {`
`257`	`257`	`// No need to update the view state, the vault repo will emit a new state during this time.`
`258`		`- vaultRepo.sync()`
	`258`	`+ vaultRepo.sync(forced = true)`
`259`	`259`	`}`
`260`	`260`
`261`	`261`	`private fun handleSearchClick() {`
`@@ -266,7 +266,7 @@ class SendViewModel @Inject constructor(`
`266`	`266`	`mutableStateFlow.update {`
`267`	`267`	`it.copy(dialogState = SendState.DialogState.Loading(R.string.syncing.asText()))`
`268`	`268`	`}`
`269`		`- vaultRepo.sync()`
	`269`	`+ vaultRepo.sync(forced = true)`
`270`	`270`	`}`
`271`	`271`
`272`	`272`	`private fun handleCopyClick(action: SendAction.CopyClick) {`
`@@ -321,7 +321,7 @@ class SendViewModel @Inject constructor(`
`321`	`321`	`mutableStateFlow.update { it.copy(isRefreshing = true) }`
`322`	`322`	`// The Pull-To-Refresh composable is already in the refreshing state.`
`323`	`323`	`// We will reset that state when sendDataStateFlow emits later on.`
`324`		`- vaultRepo.sync()`
	`324`	`+ vaultRepo.sync(forced = true)`
`325`	`325`	`}`
`326`	`326`	`}`
`327`	`327`
Original file line number	Diff line number	Diff line change
`@@ -245,7 +245,7 @@ class VaultItemViewModel @Inject constructor(`
`245`	`245`
`246`	`246`	`private fun handleRefreshClick() {`
`247`	`247`	`// No need to update the view state, the vault repo will emit a new state during this time`
`248`		`- vaultRepository.sync()`
	`248`	`+ vaultRepository.sync(forced = true)`
`249`	`249`	`}`
`250`	`250`
`251`	`251`	`private fun handleCopyCustomHiddenFieldClick(`
Original file line number	Diff line number	Diff line change
`@@ -300,14 +300,14 @@ class VaultItemListingViewModel @Inject constructor(`
`300`	`300`	`}`
`301`	`301`
`302`	`302`	`private fun handleRefreshClick() {`
`303`		`- vaultRepository.sync()`
	`303`	`+ vaultRepository.sync(forced = true)`
`304`	`304`	`}`
`305`	`305`
`306`	`306`	`private fun handleRefreshPull() {`
`307`	`307`	`mutableStateFlow.update { it.copy(isRefreshing = true) }`
`308`	`308`	`// The Pull-To-Refresh composable is already in the refreshing state.`
`309`	`309`	`// We will reset that state when sendDataStateFlow emits later on.`
`310`		`- vaultRepository.sync()`
	`310`	`+ vaultRepository.sync(forced = true)`
`311`	`311`	`}`
`312`	`312`
`313`	`313`	`private fun handleConfirmOverwriteExistingPasskeyClick(`
`@@ -877,7 +877,7 @@ class VaultItemListingViewModel @Inject constructor(`
`877`	`877`	`),`
`878`	`878`	`)`
`879`	`879`	`}`
`880`		`- vaultRepository.sync()`
	`880`	`+ vaultRepository.sync(forced = true)`
`881`	`881`	`}`
`882`	`882`
`883`	`883`	`private fun handleSearchIconClick() {`
Original file line number	Diff line number	Diff line change
`@@ -299,7 +299,7 @@ class VaultViewModel @Inject constructor(`
`299`	`299`	`mutableStateFlow.update {`
`300`	`300`	`it.copy(dialog = VaultState.DialogState.Syncing)`
`301`	`301`	`}`
`302`		`- vaultRepository.sync()`
	`302`	`+ vaultRepository.sync(forced = true)`
`303`	`303`	`}`
`304`	`304`
`305`	`305`	`private fun handleLockClick() {`
`@@ -346,7 +346,7 @@ class VaultViewModel @Inject constructor(`
`346`	`346`	`}`
`347`	`347`
`348`	`348`	`private fun handleTryAgainClick() {`
`349`		`- vaultRepository.sync()`
	`349`	`+ vaultRepository.sync(forced = true)`
`350`	`350`	`}`
`351`	`351`
`352`	`352`	`private fun handleDialogDismiss() {`
`@@ -359,7 +359,7 @@ class VaultViewModel @Inject constructor(`
`359`	`359`	`mutableStateFlow.update { it.copy(isRefreshing = true) }`
`360`	`360`	`// The Pull-To-Refresh composable is already in the refreshing state.`
`361`	`361`	`// We will reset that state when sendDataStateFlow emits later on.`
`362`		`- vaultRepository.sync()`
	`362`	`+ vaultRepository.sync(forced = true)`
`363`	`363`	`}`
`364`	`364`
`365`	`365`	`private fun handleOverflowOptionClick(action: VaultAction.OverflowOptionClick) {`
Original file line number	Diff line number	Diff line change
`@@ -120,14 +120,14 @@ class VerificationCodeViewModel @Inject constructor(`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`private fun handleRefreshClick() {`
`123`		`- vaultRepository.sync()`
	`123`	`+ vaultRepository.sync(forced = true)`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`private fun handleRefreshPull() {`
`127`	`127`	`mutableStateFlow.update { it.copy(isRefreshing = true) }`
`128`	`128`	`// The Pull-To-Refresh composable is already in the refreshing state.`
`129`	`129`	`// We will reset that state when sendDataStateFlow emits later on.`
`130`		`- vaultRepository.sync()`
	`130`	`+ vaultRepository.sync(forced = true)`
`131`	`131`	`}`
`132`	`132`
`133`	`133`	`private fun handleSearchIconClick() {`
`@@ -144,7 +144,7 @@ class VerificationCodeViewModel @Inject constructor(`
`144`	`144`	`),`
`145`	`145`	`)`
`146`	`146`	`}`
`147`		`- vaultRepository.sync()`
	`147`	`+ vaultRepository.sync(forced = true)`
`148`	`148`	`}`
`149`	`149`
`150`	`150`	`private fun handleInternalAction(action: VerificationCodeAction.Internal) {`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,6 @@ class SearchViewModelTest : BaseViewModelTest() {`
`100`	`100`	`private val vaultRepository: VaultRepository = mockk {`
`101`	`101`	`every { vaultFilterType } returns VaultFilterType.AllVaults`
`102`	`102`	`every { vaultDataStateFlow } returns mutableVaultDataStateFlow`
`103`		`- every { sync() } just runs`
`104`	`103`	`}`
`105`	`104`	`private val mutableUserStateFlow = MutableStateFlow<UserState?>(DEFAULT_USER_STATE)`
`106`	`105`	`private val authRepository: AuthRepository = mockk {`
Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ class OtherViewModelTest : BaseViewModelTest() {`
`149`	`149`
`150`	`150`	`@Test`
`151`	`151`	fun `on SyncNowButtonClick should sync repo`() = runTest {
`152`		`- every { vaultRepository.sync() } just runs`
	`152`	`+ every { vaultRepository.sync(forced = true) } just runs`
`153`	`153`	`val viewModel = createViewModel()`
`154`	`154`	`viewModel.stateFlow.test {`
`155`	`155`	`assertEquals(DEFAULT_STATE, awaitItem())`
`@@ -163,7 +163,7 @@ class OtherViewModelTest : BaseViewModelTest() {`
`163`	`163`	`awaitItem(),`
`164`	`164`	`)`
`165`	`165`	`}`
`166`		`- verify { vaultRepository.sync() }`
	`166`	`+ verify { vaultRepository.sync(forced = true) }`
`167`	`167`	`}`
`168`	`168`
`169`	`169`	`@Test`
Original file line number	Diff line number	Diff line change
`@@ -105,12 +105,12 @@ class SendViewModelTest : BaseViewModelTest() {`
`105`	`105`	`@Test`
`106`	`106`	fun `RefreshClick should call sync`() {
`107`	`107`	`val viewModel = createViewModel()`
`108`		`- every { vaultRepo.sync() } just runs`
	`108`	`+ every { vaultRepo.sync(forced = true) } just runs`
`109`	`109`
`110`	`110`	`viewModel.trySendAction(SendAction.RefreshClick)`
`111`	`111`
`112`	`112`	`verify {`
`113`		`- vaultRepo.sync()`
	`113`	`+ vaultRepo.sync(forced = true)`
`114`	`114`	`}`
`115`	`115`	`}`
`116`	`116`
`@@ -223,7 +223,7 @@ class SendViewModelTest : BaseViewModelTest() {`
`223`	`223`	`@Test`
`224`	`224`	fun `SyncClick should call sync`() {
`225`	`225`	`val viewModel = createViewModel()`
`226`		`- every { vaultRepo.sync() } just runs`
	`226`	`+ every { vaultRepo.sync(forced = true) } just runs`
`227`	`227`
`228`	`228`	`viewModel.trySendAction(SendAction.SyncClick)`
`229`	`229`
`@@ -234,7 +234,7 @@ class SendViewModelTest : BaseViewModelTest() {`
`234`	`234`	`viewModel.stateFlow.value,`
`235`	`235`	`)`
`236`	`236`	`verify {`
`237`		`- vaultRepo.sync()`
	`237`	`+ vaultRepo.sync(forced = true)`
`238`	`238`	`}`
`239`	`239`	`}`
`240`	`240`
`@@ -419,13 +419,13 @@ class SendViewModelTest : BaseViewModelTest() {`
`419`	`419`
`420`	`420`	`@Test`
`421`	`421`	fun `RefreshPull should call vault repository sync`() {
`422`		`- every { vaultRepo.sync() } just runs`
	`422`	`+ every { vaultRepo.sync(forced = true) } just runs`
`423`	`423`	`val viewModel = createViewModel()`
`424`	`424`
`425`	`425`	`viewModel.trySendAction(SendAction.RefreshPull)`
`426`	`426`
`427`	`427`	`verify(exactly = 1) {`
`428`		`- vaultRepo.sync()`
	`428`	`+ vaultRepo.sync(forced = true)`
`429`	`429`	`}`
`430`	`430`	`}`
`431`	`431`