Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-01 14:46:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Block sender's parent domain

Browse Source
This commit is contained in:
M66B
2020-08-03 18:11:27 +02:00
parent ef0eba9f4c
commit 31efb7a212
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/eu/faircode/email/EntityRule.java
View File

@@ -655,24 +655,27 @@ public class EntityRule {
if (TextUtils.isEmpty(sender))
return null;
boolean regex = false;
if (block_domain) {
int at = sender.indexOf('@');
if (at > 0) {
boolean whitelisted = false;
String domain = sender.substring(at + 1);
String domain = DnsHelper.getParentDomain(sender.substring(at + 1));
for (String d : whitelist)
if (domain.matches(d)) {
whitelisted = true;
break;
}
if (!whitelisted)
sender = '@' + domain;
if (!whitelisted) {
regex = true;
sender = ".*@.*" + domain + ".*";
}
}
}
JSONObject jsender = new JSONObject();
jsender.put("value", sender);
jsender.put("regex", false);
jsender.put("regex", regex);
JSONObject jcondition = new JSONObject();
jcondition.put("sender", jsender);