github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-06-01 18:26:31 -05:00
Code Issues 1.8k Packages Projects Releases 126 Wiki Activity

Clean up generator minimum length implementation (#1244)

Browse Source
This commit is contained in:
Caleb Derosier
2024-04-09 14:51:05 -06:00
committed by Álison Fernandes
parent 2ae8a76103
commit 403cfc94f0
3 changed files with 22 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -300,7 +300,7 @@ class GeneratorViewModel @Inject constructor(
is Password -> {
val minLength = policy.minLength ?: Password.PASSWORD_LENGTH_SLIDER_MIN
val password = Password(
rawLength = max(options.length, minLength),
length = max(options.length, minLength),
minLength = minLength,
useCapitals = options.hasUppercase || policy.useUpper == true,
capitalsEnabled = policy.useUpper != true,
@@ -764,14 +764,10 @@ class GeneratorViewModel @Inject constructor(
updatePasswordType { currentPasswordType ->
currentPasswordType.copy(
rawLength = adjustedLength.coerceIn(
minimumValue = currentPasswordType.minLength,
maximumValue = currentPasswordType.maxLength,
),
length = max(adjustedLength, currentPasswordType.minimumLength),
isUserInteracting = action.isUserInteracting,
)
}
updatePasswordLength()
}
private fun handleToggleCapitalLetters(
@@ -1416,11 +1412,10 @@ class GeneratorViewModel @Inject constructor(
private fun updatePasswordLength() {
updatePasswordType { currentPasswordType ->
currentPasswordType.copy(
rawLength = currentPasswordType.length,
length = max(currentPasswordType.length, currentPasswordType.minimumLength),
)
}
}
private inline fun updatePasswordType(
crossinline block: (Password) -> Password,
) {
@@ -1741,7 +1736,7 @@ data class GeneratorState(
* Represents a standard PASSWORD type, with configurable options for
* length, character types, and requirements.
*
* @property rawLength The length of the generated password.
* @property length The length of the generated password.
* @property minLength The number available on the low end of the slider.
* @property maxLength The number available on the high end of the slider.
* @property useCapitals Whether to include capital letters.
@@ -1766,7 +1761,7 @@ data class GeneratorState(
*/
@Parcelize
data class Password(
private val rawLength: Int = DEFAULT_PASSWORD_LENGTH,
val length: Int = DEFAULT_PASSWORD_LENGTH,
val minLength: Int = PASSWORD_LENGTH_SLIDER_MIN,
val maxLength: Int = PASSWORD_LENGTH_SLIDER_MAX,
val useCapitals: Boolean = true,
@@ -1790,13 +1785,6 @@ data class GeneratorState(
override val displayStringResId: Int
get() = PasscodeTypeOption.PASSWORD.labelRes
/**
* The larger of the user-set length and the minimum length this password can be
* (as determined by which characters are enabled, and how many).
*/
val length: Int
get() = max(rawLength, minimumLength)
companion object {
private const val DEFAULT_PASSWORD_LENGTH: Int = 14
private const val MIN_NUMBERS: Int = 1