Fixed regex/without domain

3 years ago · 2ac8c6f012
parent 717f0acad2
commit 2ac8c6f012
1 changed files with 7 additions and 1 deletions
--- a/app/src/main/java/eu/faircode/email/EntityIdentity.java
+++ b/app/src/main/java/eu/faircode/email/EntityIdentity.java
@ -168,7 +168,13 @@ public class EntityIdentity {
            if (user.equalsIgnoreCase(cemail[0]))
                return true;
        } else {
-            String input = (sender_extra_regex.contains("@") ? other.toLowerCase(Locale.ROOT) : cother[0]);
+            // Domain
+            boolean at = sender_extra_regex.contains("@");
+            if (!at && !cother[1].equalsIgnoreCase(cemail[1]))
+                return false;
+
+            // User
+            String input = (at ? other.toLowerCase(Locale.ROOT) : cother[0]);
            if (Pattern.matches(sender_extra_regex, input))
                return true;
        }