mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-02-23 14:41:08 +00:00
Code Issues Releases Wiki Activity

Fixed canceling block domain rules

Browse source
This commit is contained in:
M66B 2020-09-21 23:03:13 +02:00
parent ad82c3c15b
commit d369384d3c
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
app/src/main/java/eu/faircode/email/EntityRule.java
View file

@ -728,21 +728,28 @@ public class EntityRule {
boolean isBlockingSender(EntityMessage message, EntityFolder junk) throws JSONException {
if (message.from == null || message.from.length == 0)
return false;
String sender = ((InternetAddress) message.from[0]).getAddress();
if (sender == null)
return false;
int at = sender.indexOf('@');
String domain = (at < 0 ? sender : sender.substring(at));
JSONObject jcondition = new JSONObject(condition);
if (!jcondition.has("sender"))
return false;
JSONObject jsender = jcondition.getJSONObject("sender");
if (jsender.optBoolean("regex"))
return false;
String value = jsender.optString("value");
if (!sender.equals(value) && !domain.equals(value))
return false;
boolean regex = jsender.optBoolean("regex");
if (regex) {
Pattern pattern = Pattern.compile(value, Pattern.DOTALL);
if (!pattern.matcher(sender).matches())
return false;
} else {
int at = sender.indexOf('@');
String domain = (at < 0 ? sender : sender.substring(at));
if (!sender.equals(value) && !domain.equals(value))
return false;
}
JSONObject jaction = new JSONObject(action);
if (jaction.optInt("type", -1) != TYPE_MOVE)