github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-05-10 16:45:43 -05:00
Code Issues 1.1k Packages Projects Releases 124 Wiki Activity

BIT-2296: Fix generator options disk source key (#1310)

Browse Source
This commit is contained in:
David Perez
2024-04-26 10:51:19 -05:00
committed by GitHub
parent 8aa7fd66bd
commit 9382c3a3a6
2 changed files with 15 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
app/src/main/java/com/x8bit/bitwarden/data/tools/generator/datasource/disk/GeneratorDiskSourceImpl.kt
View File

@@ -25,38 +25,31 @@ class GeneratorDiskSourceImpl(
storeUsernameGenerationOptions(userId = userId, options = null)
}
override fun getPasscodeGenerationOptions(userId: String): PasscodeGenerationOptions? {
val key = getPasswordGenerationOptionsKey(userId)
return getString(key)?.let { json.decodeFromStringOrNull(it) }
}
override fun getPasscodeGenerationOptions(userId: String): PasscodeGenerationOptions? =
getString("${BASE_KEY}:${PASSWORD_GENERATION_OPTIONS_KEY}_$userId")
?.let { json.decodeFromStringOrNull(it) }
override fun storePasscodeGenerationOptions(
userId: String,
options: PasscodeGenerationOptions?,
) {
val key = getPasswordGenerationOptionsKey(userId)
putString(
key,
"${BASE_KEY}:${PASSWORD_GENERATION_OPTIONS_KEY}_$userId",
options?.let { json.encodeToString(options) },
)
}
private fun getPasswordGenerationOptionsKey(userId: String): String =
"${BASE_KEY}_${PASSWORD_GENERATION_OPTIONS_KEY}_$userId"
override fun getUsernameGenerationOptions(userId: String): UsernameGenerationOptions? {
val key = getUsernameGenerationOptionsKey(userId)
return getString(key)?.let { json.decodeFromStringOrNull(it) }
}
override fun getUsernameGenerationOptions(userId: String): UsernameGenerationOptions? =
getString("${BASE_KEY}:${USERNAME_GENERATION_OPTIONS_KEY}_$userId")
?.let { json.decodeFromStringOrNull(it) }
override fun storeUsernameGenerationOptions(
userId: String,
options: UsernameGenerationOptions?,
) {
val key = getUsernameGenerationOptionsKey(userId)
putString(key, options?.let { json.encodeToString(it) })
putString(
"${BASE_KEY}:${USERNAME_GENERATION_OPTIONS_KEY}_$userId",
options?.let { json.encodeToString(it) },
)
}
private fun getUsernameGenerationOptionsKey(userId: String): String =
"${BASE_KEY}_${USERNAME_GENERATION_OPTIONS_KEY}_$userId"
}

8
app/src/test/java/com/x8bit/bitwarden/data/tools/generator/datasource/disk/GeneratorDiskSourceTest.kt
View File

@@ -99,7 +99,7 @@ class GeneratorDiskSourceTest {
numWords = 3,
)
val key = "bwPreferencesStorage_passwordGenerationOptions_$userId"
val key = "bwPreferencesStorage:passwordGenerationOptions_$userId"
fakeSharedPreferences.edit { putString(key, json.encodeToString(options)) }
val result = generatorDiskSource.getPasscodeGenerationOptions(userId)
@@ -136,7 +136,7 @@ class GeneratorDiskSourceTest {
numWords = 3,
)
val key = "bwPreferencesStorage_passwordGenerationOptions_$userId"
val key = "bwPreferencesStorage:passwordGenerationOptions_$userId"
generatorDiskSource.storePasscodeGenerationOptions(userId, options)
@@ -166,7 +166,7 @@ class GeneratorDiskSourceTest {
emailWebsite = "email.example.com",
)
val key = "bwPreferencesStorage_usernameGenerationOptions_$userId"
val key = "bwPreferencesStorage:usernameGenerationOptions_$userId"
fakeSharedPreferences.edit { putString(key, json.encodeToString(options)) }
val result = generatorDiskSource.getUsernameGenerationOptions(userId)
@@ -204,7 +204,7 @@ class GeneratorDiskSourceTest {
emailWebsite = "email.example.com",
)
val key = "bwPreferencesStorage_usernameGenerationOptions_$userId"
val key = "bwPreferencesStorage:usernameGenerationOptions_$userId"
generatorDiskSource.storeUsernameGenerationOptions(userId, options)