mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed regex/without domain

This commit is contained in:
M66B 2021-07-11 19:38:59 +02:00
parent 717f0acad2
commit 2ac8c6f012
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/eu/faircode/email/EntityIdentity.java
View File

@ -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;
}