mirror of
https://github.com/Kunzisoft/KeePassDX.git
synced 2025-12-04 15:49:33 +01:00
Fix error message in password generator
This commit is contained in:
@@ -167,7 +167,6 @@ class GeneratePasswordDialogFragment : DialogFragment() {
|
||||
var password = ""
|
||||
try {
|
||||
val length = Integer.valueOf(root?.findViewById<EditText>(R.id.length)?.text.toString())
|
||||
|
||||
password = PasswordGenerator(resources).generatePassword(length,
|
||||
uppercaseBox?.isChecked == true,
|
||||
lowercaseBox?.isChecked == true,
|
||||
@@ -178,6 +177,7 @@ class GeneratePasswordDialogFragment : DialogFragment() {
|
||||
specialsBox?.isChecked == true,
|
||||
bracketsBox?.isChecked == true,
|
||||
extendedBox?.isChecked == true)
|
||||
passwordInputLayoutView?.error = null
|
||||
} catch (e: NumberFormatException) {
|
||||
passwordInputLayoutView?.error = getString(R.string.error_wrong_length)
|
||||
} catch (e: IllegalArgumentException) {
|
||||
@@ -193,7 +193,6 @@ class GeneratePasswordDialogFragment : DialogFragment() {
|
||||
}
|
||||
|
||||
companion object {
|
||||
|
||||
const val KEY_PASSWORD_ID = "KEY_PASSWORD_ID"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -65,14 +65,14 @@ class PasswordGenerator(private val resources: Resources) {
|
||||
|
||||
// No option has been checked
|
||||
if (!upperCase
|
||||
&& !lowerCase
|
||||
&& !digits
|
||||
&& !minus
|
||||
&& !underline
|
||||
&& !space
|
||||
&& !specials
|
||||
&& !brackets
|
||||
&& !extended) {
|
||||
&& !lowerCase
|
||||
&& !digits
|
||||
&& !minus
|
||||
&& !underline
|
||||
&& !space
|
||||
&& !specials
|
||||
&& !brackets
|
||||
&& !extended) {
|
||||
throw IllegalArgumentException(resources.getString(R.string.error_pass_gen_type))
|
||||
}
|
||||
|
||||
@@ -114,35 +114,27 @@ class PasswordGenerator(private val resources: Resources) {
|
||||
if (upperCase) {
|
||||
charSet.append(UPPERCASE_CHARS)
|
||||
}
|
||||
|
||||
if (lowerCase) {
|
||||
charSet.append(LOWERCASE_CHARS)
|
||||
}
|
||||
|
||||
if (digits) {
|
||||
charSet.append(DIGIT_CHARS)
|
||||
}
|
||||
|
||||
if (minus) {
|
||||
charSet.append(MINUS_CHAR)
|
||||
}
|
||||
|
||||
if (underline) {
|
||||
charSet.append(UNDERLINE_CHAR)
|
||||
}
|
||||
|
||||
if (space) {
|
||||
charSet.append(SPACE_CHAR)
|
||||
}
|
||||
|
||||
if (specials) {
|
||||
charSet.append(SPECIAL_CHARS)
|
||||
}
|
||||
|
||||
if (brackets) {
|
||||
charSet.append(BRACKET_CHARS)
|
||||
}
|
||||
|
||||
if (extended) {
|
||||
charSet.append(extendedChars())
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user