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

Warn for blocking common domains

Browse Source
This commit is contained in:
M66B
2021-10-12 09:20:47 +02:00
parent af54166a8a
commit 4599a373aa
4 changed files with 40 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -858,7 +858,7 @@ public class EntityRule {
return cal;
}
static EntityRule blockSender(Context context, EntityMessage message, EntityFolder junk, boolean block_domain, List<String> whitelist) throws JSONException {
static EntityRule blockSender(Context context, EntityMessage message, EntityFolder junk, boolean block_domain) throws JSONException {
if (message.from == null || message.from.length == 0)
return null;
@@ -873,17 +873,8 @@ public class EntityRule {
if (block_domain) {
int at = sender.indexOf('@');
if (at > 0) {
boolean whitelisted = false;
String domain = UriHelper.getParentDomain(context, sender.substring(at + 1));
for (String d : whitelist)
if (domain.matches(d)) {
whitelisted = true;
break;
}
if (!whitelisted) {
regex = true;
sender = ".*@.*" + domain + ".*";
}
regex = true;
sender = ".*@.*" + sender.substring(at + 1) + ".*";
}
}