mirror of
https://github.com/bitwarden/android.git
synced 2026-11-19 17:40:12 -06:00
Add storage for the last sync date (#732)
This commit is contained in:
committed by
Álison Fernandes
parent
c3cb61e43a
commit
bc1f5cb020
+28
@@ -13,6 +13,7 @@ import org.junit.jupiter.api.Assertions.assertFalse
|
||||
import org.junit.jupiter.api.Assertions.assertNull
|
||||
import org.junit.jupiter.api.Assertions.assertTrue
|
||||
import org.junit.jupiter.api.Test
|
||||
import java.time.Instant
|
||||
|
||||
class SettingsDiskSourceTest {
|
||||
private val fakeSharedPreferences = FakeSharedPreferences()
|
||||
@@ -89,6 +90,10 @@ class SettingsDiskSourceTest {
|
||||
userId = userId,
|
||||
isApprovePasswordlessLoginsEnabled = true,
|
||||
)
|
||||
settingsDiskSource.storeLastSyncTime(
|
||||
userId = userId,
|
||||
lastSyncTime = Instant.parse("2023-10-27T12:00:00Z"),
|
||||
)
|
||||
|
||||
settingsDiskSource.clearData(userId = userId)
|
||||
|
||||
@@ -98,6 +103,29 @@ class SettingsDiskSourceTest {
|
||||
assertNull(settingsDiskSource.getInlineAutofillEnabled(userId = userId))
|
||||
assertNull(settingsDiskSource.getBlockedAutofillUris(userId = userId))
|
||||
assertNull(settingsDiskSource.getApprovePasswordlessLoginsEnabled(userId = userId))
|
||||
assertNull(settingsDiskSource.getLastSyncTime(userId = userId))
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `getLastSyncTime should pull from and update SharedPreferences`() {
|
||||
val userId = "userId-1234"
|
||||
val lastVaultSync = "bwPreferencesStorage:vaultLastSyncTime_$userId"
|
||||
val instantLong = 1_698_408_000_000L
|
||||
val instant = Instant.ofEpochMilli(instantLong)
|
||||
|
||||
// Assert that the default value in disk source is null
|
||||
assertNull(settingsDiskSource.getLastSyncTime(userId = userId))
|
||||
|
||||
// Updating the shared preferences should update disk source.
|
||||
fakeSharedPreferences.edit { putLong(lastVaultSync, instantLong) }
|
||||
assertEquals(instant, settingsDiskSource.getLastSyncTime(userId = userId))
|
||||
|
||||
// Updating the disk source updates the shared preferences
|
||||
settingsDiskSource.storeLastSyncTime(userId = userId, lastSyncTime = instant)
|
||||
assertEquals(
|
||||
fakeSharedPreferences.getLong(lastVaultSync, 0L),
|
||||
instantLong,
|
||||
)
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
+23
@@ -8,6 +8,7 @@ import com.x8bit.bitwarden.ui.platform.feature.settings.appearance.model.AppThem
|
||||
import kotlinx.coroutines.flow.Flow
|
||||
import kotlinx.coroutines.flow.MutableSharedFlow
|
||||
import kotlinx.coroutines.flow.onSubscription
|
||||
import java.time.Instant
|
||||
|
||||
/**
|
||||
* Fake, memory-based implementation of [SettingsDiskSource].
|
||||
@@ -17,6 +18,8 @@ class FakeSettingsDiskSource : SettingsDiskSource {
|
||||
private val mutableAppThemeFlow =
|
||||
bufferedMutableSharedFlow<AppTheme>(replay = 1)
|
||||
|
||||
private val mutableLastSyncCallFlowMap = mutableMapOf<String, MutableSharedFlow<Instant?>>()
|
||||
|
||||
private val mutableVaultTimeoutActionsFlowMap =
|
||||
mutableMapOf<String, MutableSharedFlow<VaultTimeoutAction?>>()
|
||||
|
||||
@@ -30,6 +33,7 @@ class FakeSettingsDiskSource : SettingsDiskSource {
|
||||
bufferedMutableSharedFlow<Boolean?>()
|
||||
|
||||
private var storedAppTheme: AppTheme = AppTheme.DEFAULT
|
||||
private val storedLastSyncTime = mutableMapOf<String, Instant?>()
|
||||
private val storedVaultTimeoutActions = mutableMapOf<String, VaultTimeoutAction?>()
|
||||
private val storedVaultTimeoutInMinutes = mutableMapOf<String, Int?>()
|
||||
|
||||
@@ -76,6 +80,18 @@ class FakeSettingsDiskSource : SettingsDiskSource {
|
||||
|
||||
mutableVaultTimeoutActionsFlowMap.remove(userId)
|
||||
mutableVaultTimeoutInMinutesFlowMap.remove(userId)
|
||||
mutableLastSyncCallFlowMap.remove(userId)
|
||||
}
|
||||
|
||||
override fun getLastSyncTime(userId: String): Instant? = storedLastSyncTime[userId]
|
||||
|
||||
override fun getLastSyncTimeFlow(userId: String): Flow<Instant?> =
|
||||
getMutableLastSyncTimeFlow(userId = userId)
|
||||
.onSubscription { emit(getLastSyncTime(userId = userId)) }
|
||||
|
||||
override fun storeLastSyncTime(userId: String, lastSyncTime: Instant?) {
|
||||
storedLastSyncTime[userId] = lastSyncTime
|
||||
getMutableLastSyncTimeFlow(userId = userId).tryEmit(lastSyncTime)
|
||||
}
|
||||
|
||||
override fun getVaultTimeoutInMinutes(userId: String): Int? =
|
||||
@@ -152,6 +168,13 @@ class FakeSettingsDiskSource : SettingsDiskSource {
|
||||
|
||||
//region Private helper functions
|
||||
|
||||
private fun getMutableLastSyncTimeFlow(
|
||||
userId: String,
|
||||
): MutableSharedFlow<Instant?> =
|
||||
mutableLastSyncCallFlowMap.getOrPut(userId) {
|
||||
bufferedMutableSharedFlow(replay = 1)
|
||||
}
|
||||
|
||||
private fun getMutableVaultTimeoutActionsFlow(
|
||||
userId: String,
|
||||
): MutableSharedFlow<VaultTimeoutAction?> =
|
||||
|
||||
Reference in New Issue
Block a user