mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2024-12-27 10:17:18 +00:00
Code Issues Releases Wiki Activity

Refactoring

Browse source
This commit is contained in:
M66B 2024-04-17 19:23:33 +02:00
parent 9150746f75
commit 726ea077ff
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -208,10 +208,8 @@ public class EntityRule {
if (expression != null) { if (expression != null) {
if ("header".equals(what) && needsHeaders(expression)) if ("header".equals(what) && needsHeaders(expression))
return true; return true;
if ("body".equals(what)) if ("body".equals(what) && needsBody(expression))
for (String variable : expression.getUsedVariables()) return true;
if ("text".equalsIgnoreCase(variable))
return true;
} }
} }
} catch (Throwable ex) { } catch (Throwable ex) {
@ -759,6 +757,17 @@ public class EntityRule {
return false; return false;
} }
static boolean needsBody(Expression expression) {
try {
for (String variable : expression.getUsedVariables())
if ("text".equalsIgnoreCase(variable))
return true;
} catch (Throwable ex) {
Log.e(ex);
}
return false;
}
boolean execute(Context context, EntityMessage message, String html) throws JSONException, IOException { boolean execute(Context context, EntityMessage message, String html) throws JSONException, IOException {
boolean executed = _execute(context, message, html); boolean executed = _execute(context, message, html);
if (this.id != null && executed) { if (this.id != null && executed) {