mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2025-03-16 03:08:50 +03:00
Code Issues Projects Releases Packages Wiki Activity

BIT-2247: Persists screen recording flag past a logout (#1280)

Browse source
This commit is contained in:
David Perez 2024-04-17 11:39:30 -05:00 • committed by Álison Fernandes
parent da277ed32a
commit e58710b3e8
4 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/SettingsDiskSourceImpl.kt
View file

@ -148,9 +148,12 @@ class SettingsDiskSourceImpl(
isApprovePasswordlessLoginsEnabled = null,
)
storeLastSyncTime(userId = userId, lastSyncTime = null)
storeScreenCaptureAllowed(userId = userId, isScreenCaptureAllowed = null)
storeClearClipboardFrequencySeconds(userId = userId, frequency = null)
removeWithPrefix(prefix = "${ACCOUNT_BIOMETRIC_INTEGRITY_VALID_KEY}_$userId")
// The following are intentionally not cleared so they can be
// restored after logging out and back in:
// - screen capture allowed
}
override fun getAccountBiometricIntegrityValidity(

6
app/src/main/java/com/x8bit/bitwarden/data/platform/repository/SettingsRepositoryImpl.kt
View file

@ -262,9 +262,9 @@ class SettingsRepositoryImpl(
autofillEnabledManager.isAutofillEnabledStateFlow
override var isScreenCaptureAllowed: Boolean
get() = activeUserId?.let {
settingsDiskSource.getScreenCaptureAllowed(it)
} ?: DEFAULT_IS_SCREEN_CAPTURE_ALLOWED
get() = activeUserId
?.let { settingsDiskSource.getScreenCaptureAllowed(it) }
?: DEFAULT_IS_SCREEN_CAPTURE_ALLOWED
set(value) {
val userId = activeUserId ?: return
settingsDiskSource.storeScreenCaptureAllowed(

3
app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/disk/SettingsDiskSourceTest.kt
View file

@ -158,7 +158,8 @@ class SettingsDiskSourceTest {
assertNull(settingsDiskSource.getBlockedAutofillUris(userId = userId))
assertNull(settingsDiskSource.getApprovePasswordlessLoginsEnabled(userId = userId))
assertNull(settingsDiskSource.getLastSyncTime(userId = userId))
assertNull(settingsDiskSource.getScreenCaptureAllowed(userId = userId))
// We don't actually clear this setting, so it's still here
assertEquals(true, settingsDiskSource.getScreenCaptureAllowed(userId = userId))
assertNull(
settingsDiskSource.getAccountBiometricIntegrityValidity(
userId = userId,

1
app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/disk/util/FakeSettingsDiskSource.kt
View file

@ -130,7 +130,6 @@ class FakeSettingsDiskSource : SettingsDiskSource {
storedPullToRefreshEnabled.remove(userId)
storedInlineAutofillEnabled.remove(userId)
storedBlockedAutofillUris.remove(userId)
storedScreenCaptureAllowed.remove(userId)
storedClearClipboardFrequency.remove(userId)
mutableVaultTimeoutActionsFlowMap.remove(userId)