Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-05 16:43:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improved needs headers check

Browse Source
This commit is contained in:
M66B
2023-06-04 17:12:50 +02:00
parent d95cc81bcf
commit 7b621bd9ef
1 changed files with 9 additions and 2 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

@@ -150,8 +150,16 @@ public class EntityRule {
for (EntityRule rule : rules)
try {
JSONObject jcondition = new JSONObject(rule.condition);
if (jcondition.has(what))
if (jcondition.has(what)) {
if ("header".equals(what)) {
JSONObject jheader = jcondition.getJSONObject("header");
String value = jheader.getString("value");
boolean regex = jheader.getBoolean("regex");
if (!regex && value.startsWith("$$") && value.endsWith("$"))
continue;
}
return true;
}
} catch (Throwable ex) {
Log.e(ex);
}
@@ -319,7 +327,6 @@ public class EntityRule {
boolean regex = jheader.getBoolean("regex");
if (!regex &&
value != null &&
value.startsWith("$") &&
value.endsWith("$")) {
String keyword = value.substring(1, value.length() - 1);