Skip to content

Commit 0413cdc

Browse files
PM-15412 🍒 Pull-to-refresh operations should not invoke a forced sync. (#4389)
1 parent 019bf8d commit 0413cdc

File tree

8 files changed

+11
-11
lines changed

8 files changed

+11
-11
lines changed

‎app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/SendViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ class SendViewModel @Inject constructor(
321321
mutableStateFlow.update { it.copy(isRefreshing = true) }
322322
// The Pull-To-Refresh composable is already in the refreshing state.
323323
// We will reset that state when sendDataStateFlow emits later on.
324-
vaultRepo.sync(forced = true)
324+
vaultRepo.sync(forced = false)
325325
}
326326
}
327327

‎app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ class VaultItemListingViewModel @Inject constructor(
307307
mutableStateFlow.update { it.copy(isRefreshing = true) }
308308
// The Pull-To-Refresh composable is already in the refreshing state.
309309
// We will reset that state when sendDataStateFlow emits later on.
310-
vaultRepository.sync(forced = true)
310+
vaultRepository.sync(forced = false)
311311
}
312312

313313
private fun handleConfirmOverwriteExistingPasskeyClick(

‎app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ class VaultViewModel @Inject constructor(
359359
mutableStateFlow.update { it.copy(isRefreshing = true) }
360360
// The Pull-To-Refresh composable is already in the refreshing state.
361361
// We will reset that state when sendDataStateFlow emits later on.
362-
vaultRepository.sync(forced = true)
362+
vaultRepository.sync(forced = false)
363363
}
364364

365365
private fun handleOverflowOptionClick(action: VaultAction.OverflowOptionClick) {

‎app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/verificationcode/VerificationCodeViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ class VerificationCodeViewModel @Inject constructor(
127127
mutableStateFlow.update { it.copy(isRefreshing = true) }
128128
// The Pull-To-Refresh composable is already in the refreshing state.
129129
// We will reset that state when sendDataStateFlow emits later on.
130-
vaultRepository.sync(forced = true)
130+
vaultRepository.sync(forced = false)
131131
}
132132

133133
private fun handleSearchIconClick() {

‎app/src/test/java/com/x8bit/bitwarden/ui/tools/feature/send/SendViewModelTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -419,13 +419,13 @@ class SendViewModelTest : BaseViewModelTest() {
419419

420420
@Test
421421
fun `RefreshPull should call vault repository sync`() {
422-
every { vaultRepo.sync(forced = true) } just runs
422+
every { vaultRepo.sync(forced = false) } just runs
423423
val viewModel = createViewModel()
424424

425425
viewModel.trySendAction(SendAction.RefreshPull)
426426

427427
verify(exactly = 1) {
428-
vaultRepo.sync(forced = true)
428+
vaultRepo.sync(forced = false)
429429
}
430430
}
431431

‎app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModelTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ class VaultItemListingViewModelTest : BaseViewModelTest() {
135135
every { vaultFilterType } returns VaultFilterType.AllVaults
136136
every { vaultDataStateFlow } returns mutableVaultDataStateFlow
137137
every { lockVault(any()) } just runs
138-
every { sync(forced = true) } just runs
138+
every { sync(forced = any()) } just runs
139139
coEvery {
140140
getDecryptedFido2CredentialAutofillViews(any())
141141
} returns DecryptFido2CredentialAutofillViewResult.Error
@@ -2127,7 +2127,7 @@ class VaultItemListingViewModelTest : BaseViewModelTest() {
21272127
viewModel.trySendAction(VaultItemListingsAction.RefreshPull)
21282128

21292129
verify(exactly = 1) {
2130-
vaultRepository.sync(forced = true)
2130+
vaultRepository.sync(forced = false)
21312131
}
21322132
}
21332133

‎app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultViewModelTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1365,7 +1365,7 @@ class VaultViewModelTest : BaseViewModelTest() {
13651365
viewModel.trySendAction(VaultAction.RefreshPull)
13661366

13671367
verify(exactly = 1) {
1368-
vaultRepository.sync(forced = true)
1368+
vaultRepository.sync(forced = false)
13691369
}
13701370
}
13711371

‎app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/verificationcode/VerificationCodeViewModelTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class VerificationCodeViewModelTest : BaseViewModelTest() {
4747
private val vaultRepository: VaultRepository = mockk {
4848
every { vaultFilterType } returns VaultFilterType.AllVaults
4949
every { getAuthCodesFlow() } returns mutableAuthCodeFlow.asStateFlow()
50-
every { sync(forced = true) } just runs
50+
every { sync(forced = any()) } just runs
5151
}
5252

5353
private val environmentRepository: EnvironmentRepository = mockk {
@@ -456,7 +456,7 @@ class VerificationCodeViewModelTest : BaseViewModelTest() {
456456
viewModel.trySendAction(VerificationCodeAction.RefreshPull)
457457

458458
verify(exactly = 1) {
459-
vaultRepository.sync(forced = true)
459+
vaultRepository.sync(forced = false)
460460
}
461461
}
462462

0 commit comments

Comments
 (0)