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

Skip matching text in encrypted messages

Browse Source
This commit is contained in:
M66B
2022-01-10 08:12:51 +01:00
parent e7d4434e06
commit e78a63314c
2 changed files with 13 additions and 8 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

@@ -125,11 +125,13 @@ public class EntityRule {
private static ExecutorService executor = Helper.getBackgroundExecutor(1, "rule");
static boolean needsHeaders(List<EntityRule> rules) {
static boolean needsHeaders(EntityMessage message, List<EntityRule> rules) {
return needs(rules, "header");
}
static boolean needsBody(List<EntityRule> rules) {
static boolean needsBody(EntityMessage message, List<EntityRule> rules) {
if (message.encrypt != null && !EntityMessage.ENCRYPT_NONE.equals(message.encrypt))
return false;
return needs(rules, "body");
}
@@ -334,7 +336,10 @@ public class EntityRule {
}
// Body
JSONObject jbody = jcondition.optJSONObject("body");
JSONObject jbody = null;
if (message.encrypt == null ||
EntityMessage.ENCRYPT_NONE.equals(message.encrypt))
jbody = jcondition.optJSONObject("body");
if (jbody != null) {
String value = jbody.getString("value");
boolean regex = jbody.getBoolean("regex");