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

PM-14379: Stop storing 'null' in as the word separator (#4219)

Browse source
This commit is contained in:
David Perez 2024-11-01 14:03:03 -05:00 • committed by GitHub
parent 2eb41e932b
commit 9240fb82e4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorViewModel.kt
View file

@ -351,7 +351,7 @@ class GeneratorViewModel @Inject constructor(
GeneratorState.MainType.Passphrase( GeneratorState.MainType.Passphrase(
numWords = max(options.numWords, minNumWords), numWords = max(options.numWords, minNumWords),
minNumWords = minNumWords, minNumWords = minNumWords,
wordSeparator = options.wordSeparator.toCharArray().first(), wordSeparator = options.wordSeparator.toCharArray().firstOrNull(),
capitalize = options.allowCapitalize || policy.capitalize == true, capitalize = options.allowCapitalize || policy.capitalize == true,
capitalizeEnabled = policy.capitalize != true, capitalizeEnabled = policy.capitalize != true,
includeNumber = options.allowIncludeNumber || policy.includeNumber == true, includeNumber = options.allowIncludeNumber || policy.includeNumber == true,
@ -462,7 +462,7 @@ class GeneratorViewModel @Inject constructor(
val newOptions = options.copy( val newOptions = options.copy(
type = PasscodeGenerationOptions.PasscodeType.PASSPHRASE, type = PasscodeGenerationOptions.PasscodeType.PASSPHRASE,
numWords = passphrase.numWords, numWords = passphrase.numWords,
wordSeparator = passphrase.wordSeparator.toString(), wordSeparator = passphrase.wordSeparator?.toString().orEmpty(),
allowCapitalize = passphrase.capitalize, allowCapitalize = passphrase.capitalize,
allowIncludeNumber = passphrase.includeNumber, allowIncludeNumber = passphrase.includeNumber,
) )