diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/SettingsDiskSource.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/SettingsDiskSource.kt index e20fadebf3..77ee69aeff 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/SettingsDiskSource.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/SettingsDiskSource.kt @@ -68,17 +68,6 @@ interface SettingsDiskSource { */ val hasUserLoggedInOrCreatedAccountFlow: Flow - /** - * The instant when the last database scheme change was applied. `null` if no scheme changes - * have been applied yet. - */ - var lastDatabaseSchemeChangeInstant: Instant? - - /** - * Emits updates that track [lastDatabaseSchemeChangeInstant]. - */ - val lastDatabaseSchemeChangeInstantFlow: Flow - /** * Clears all the settings data for the given user. */ diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/SettingsDiskSourceImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/SettingsDiskSourceImpl.kt index 65d0f51345..b497140d6b 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/SettingsDiskSourceImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/SettingsDiskSourceImpl.kt @@ -36,7 +36,6 @@ private const val HAS_USER_LOGGED_IN_OR_CREATED_AN_ACCOUNT_KEY = "hasUserLoggedI private const val SHOW_AUTOFILL_SETTING_BADGE = "showAutofillSettingBadge" private const val SHOW_UNLOCK_SETTING_BADGE = "showUnlockSettingBadge" private const val SHOW_IMPORT_LOGINS_SETTING_BADGE = "showImportLoginsSettingBadge" -private const val LAST_SCHEME_CHANGE_INSTANT = "lastDatabaseSchemeChangeInstant" private const val IS_VAULT_REGISTERED_FOR_EXPORT = "isVaultRegisteredForExport" /** @@ -76,8 +75,6 @@ class SettingsDiskSourceImpl( private val mutableHasUserLoggedInOrCreatedAccountFlow = bufferedMutableSharedFlow() - private val mutableLastDatabaseSchemeChangeInstantFlow = bufferedMutableSharedFlow() - private val mutableScreenCaptureAllowedFlowMap = mutableMapOf>() @@ -162,17 +159,6 @@ class SettingsDiskSourceImpl( get() = mutableHasUserLoggedInOrCreatedAccountFlow .onSubscription { emit(getBoolean(HAS_USER_LOGGED_IN_OR_CREATED_AN_ACCOUNT_KEY)) } - override var lastDatabaseSchemeChangeInstant: Instant? - get() = getLong(LAST_SCHEME_CHANGE_INSTANT)?.let { Instant.ofEpochMilli(it) } - set(value) { - putLong(LAST_SCHEME_CHANGE_INSTANT, value?.toEpochMilli()) - mutableLastDatabaseSchemeChangeInstantFlow.tryEmit(value) - } - - override val lastDatabaseSchemeChangeInstantFlow: Flow - get() = mutableLastDatabaseSchemeChangeInstantFlow - .onSubscription { emit(lastDatabaseSchemeChangeInstant) } - override fun clearData(userId: String) { storeVaultTimeoutInMinutes(userId = userId, vaultTimeoutInMinutes = null) storeVaultTimeoutAction(userId = userId, vaultTimeoutAction = null) diff --git a/app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/disk/SettingsDiskSourceTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/disk/SettingsDiskSourceTest.kt index 81b6e6d08c..80c81c51f8 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/disk/SettingsDiskSourceTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/disk/SettingsDiskSourceTest.kt @@ -1117,55 +1117,6 @@ class SettingsDiskSourceTest { } } - @Test - fun `lastDatabaseSchemeChangeInstant should pull from SharedPreferences`() { - val schemeChangeKey = "bwPreferencesStorage:lastDatabaseSchemeChangeInstant" - val expected: Long = Instant.now().toEpochMilli() - - fakeSharedPreferences - .edit { - remove(schemeChangeKey) - } - assertEquals(0, fakeSharedPreferences.getLong(schemeChangeKey, 0)) - assertNull(settingsDiskSource.lastDatabaseSchemeChangeInstant) - - // Updating the shared preferences should update disk source. - fakeSharedPreferences - .edit { - putLong( - schemeChangeKey, - expected, - ) - } - val actual = settingsDiskSource.lastDatabaseSchemeChangeInstant - assertEquals( - expected, - actual?.toEpochMilli(), - ) - } - - @Test - fun `setting lastDatabaseSchemeChangeInstant should update SharedPreferences`() { - val schemeChangeKey = "bwPreferencesStorage:lastDatabaseSchemeChangeInstant" - val schemeChangeInstant = Instant.now() - - // Setting to null should update disk source - settingsDiskSource.lastDatabaseSchemeChangeInstant = null - assertEquals(0, fakeSharedPreferences.getLong(schemeChangeKey, 0)) - assertNull(settingsDiskSource.lastDatabaseSchemeChangeInstant) - - // Setting to value should update disk source - settingsDiskSource.lastDatabaseSchemeChangeInstant = schemeChangeInstant - val actual = fakeSharedPreferences.getLong( - schemeChangeKey, - 0, - ) - assertEquals( - schemeChangeInstant.toEpochMilli(), - actual, - ) - } - @Test fun `getShowImportLoginsSettingBadge should pull from shared preferences`() { val mockUserId = "mockUserId" diff --git a/app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/disk/util/FakeSettingsDiskSource.kt b/app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/disk/util/FakeSettingsDiskSource.kt index 7bcef2cf0e..b7a5cdaa02 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/disk/util/FakeSettingsDiskSource.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/disk/util/FakeSettingsDiskSource.kt @@ -42,9 +42,6 @@ class FakeSettingsDiskSource : SettingsDiskSource { private val mutableScreenCaptureAllowedFlowMap = mutableMapOf>() - private val mutableLastDatabaseSchemeChangeInstant = - bufferedMutableSharedFlow() - private var storedAppTheme: AppTheme = AppTheme.DEFAULT private val storedLastSyncTime = mutableMapOf() private val storedVaultTimeoutActions = mutableMapOf() @@ -67,7 +64,6 @@ class FakeSettingsDiskSource : SettingsDiskSource { private val userShowAutoFillBadge = mutableMapOf() private val userShowUnlockBadge = mutableMapOf() private val userShowImportLoginsBadge = mutableMapOf() - private var storedLastDatabaseSchemeChangeInstant: Instant? = null private val vaultRegisteredForExport = mutableMapOf() private val mutableShowAutoFillSettingBadgeFlowMap = @@ -144,17 +140,6 @@ class FakeSettingsDiskSource : SettingsDiskSource { emit(hasUserLoggedInOrCreatedAccount) } - override var lastDatabaseSchemeChangeInstant: Instant? - get() = storedLastDatabaseSchemeChangeInstant - set(value) { - storedLastDatabaseSchemeChangeInstant = value - } - - override val lastDatabaseSchemeChangeInstantFlow: Flow - get() = mutableLastDatabaseSchemeChangeInstant.onSubscription { - emit(lastDatabaseSchemeChangeInstant) - } - override fun getAccountBiometricIntegrityValidity( userId: String, systemBioIntegrityState: String,