From 3ca05ba7b1014b2869a7382d9584ddf32a2f9455 Mon Sep 17 00:00:00 2001 From: DenBond7 Date: Fri, 26 Nov 2021 15:58:36 +0200 Subject: [PATCH 1/2] Improved EmailUtil.getDomain().| #1581 --- .../main/java/com/flowcrypt/email/api/email/EmailUtil.kt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/EmailUtil.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/EmailUtil.kt index b3d4214a8e..0e54fe2a2d 100644 --- a/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/EmailUtil.kt +++ b/FlowCrypt/src/main/java/com/flowcrypt/email/api/email/EmailUtil.kt @@ -145,12 +145,11 @@ class EmailUtil { * * @return The domain of some email. */ - fun getDomain(email: String?): String { + fun getDomain(email: String): String { return when { - TextUtils.isEmpty(email) -> "" - email?.contains("@") == true -> email.substring(email.indexOf('@') + 1) - else -> "" - }.lowercase() + email.contains("@") -> email.substring(email.indexOf('@') + 1).lowercase() + else -> throw java.lang.IllegalArgumentException() + } } /** From af239322b0bb704f7c8dbeb2807cd3449b5589ef Mon Sep 17 00:00:00 2001 From: DenBond7 Date: Sat, 27 Nov 2021 17:44:32 +0200 Subject: [PATCH 2/2] Fixed GeneralUtil.isEmailValid().| #1581 --- .../main/java/com/flowcrypt/email/util/GeneralUtil.kt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/util/GeneralUtil.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/util/GeneralUtil.kt index a3e37778bd..7491bf5eb4 100644 --- a/FlowCrypt/src/main/java/com/flowcrypt/email/util/GeneralUtil.kt +++ b/FlowCrypt/src/main/java/com/flowcrypt/email/util/GeneralUtil.kt @@ -23,6 +23,7 @@ import android.net.Uri import android.provider.OpenableColumns import android.provider.Settings import android.text.TextUtils +import android.util.Patterns import android.webkit.MimeTypeMap import androidx.browser.customtabs.CustomTabsIntent import androidx.core.content.ContextCompat @@ -275,8 +276,13 @@ class GeneralUtil { * @return true if the email has valid format, otherwise false. */ fun isEmailValid(email: CharSequence?): Boolean { - return email?.isNotEmpty() == true && (android.util.Patterns.EMAIL_ADDRESS.matcher(email) - .matches() || EmailUtil.getDomain(email.toString()).lowercase(Locale.ROOT) == "localhost") + email ?: return false + val isLocalhostAddress = try { + EmailUtil.getDomain(email.toString()).lowercase() == "localhost" + } catch (e: IllegalArgumentException) { + false + } + return Patterns.EMAIL_ADDRESS.matcher(email).matches() || isLocalhostAddress } /**