Refactoring

shade-sdev · Oct 24, 2024 · d79a5e4 · d79a5e4
1 parent dadfb61
commit d79a5e4
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/src/main/kotlin/core/form/validation/CommonRules.kt b/src/main/kotlin/core/form/validation/CommonRules.kt
@@ -23,7 +23,7 @@ val emailIfNotNullRule: ValidationRule = ValidationRule(
 
 val urlRule: ValidationRule = ValidationRule(
     condition = { url ->
-        url.matches(Regex("^https?://(?:www\\.)?[-a-zA-Z0-9@:%._+~#=]{1,256}\\.[a-zA-Z0-9()]{1,6}\\b[-a-zA-Z0-9()@:%_+.~#?&/=]*$"))
+        url.isEmpty() || url.matches(Regex("^https?://(?:www\\.)?[-a-zA-Z0-9@:%._+~#=]{1,256}\\.[a-zA-Z0-9()]{1,6}\\b[-a-zA-Z0-9()@:%_+.~#?&/=]*$"))
     },
     errorMessage = "Invalid URL"
 )

diff --git a/src/main/kotlin/ui/components/secvault/passwordlayout/PasswordItem.kt b/src/main/kotlin/ui/components/secvault/passwordlayout/PasswordItem.kt
@@ -68,7 +68,7 @@ fun PasswordItem(passwordSummary: PasswordSummary) {
 
             Row {
                 Text(
-                    text = passwordSummary.email ?: passwordSummary.username ?: "",
+                    text = if (passwordSummary.email?.isEmpty() == true) passwordSummary.username!! else passwordSummary.email!!,
                     fontSize = 12.sp,
                     fontFamily = Font.RobotoThin,
                     color = PasswordColors.outline

diff --git a/src/main/kotlin/ui/validators/PasswordFormValidator.kt b/src/main/kotlin/ui/validators/PasswordFormValidator.kt
@@ -44,8 +44,6 @@ fun passwordFormValidator(): FormValidator {
         .addField(
             PasswordFormFieldName.WEBSITE_ICON_URL, FormField(
                 validator = Validator()
-                    .addRule(notNullRule(PasswordFormFieldName.WEBSITE_ICON_URL.fieldName))
-                    .addRule(lengthRule(PasswordFormFieldName.WEBSITE_ICON_URL.fieldName, 1))
                     .addRule(urlRule)
             )
         )