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

Added received time to expression

Browse Source
This commit is contained in:
M66B
2024-04-30 09:51:26 +02:00
parent fb02b318e0
commit 04265c6a7d
4 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -155,10 +155,6 @@ public class EntityRule {
private static final int MAX_NOTES_LENGTH = 512; // characters
private static final int URL_TIMEOUT = 15 * 1000; // milliseconds
private static final List<String> EXPR_VARIABLES = Collections.unmodifiableList(Arrays.asList(
"to", "from", "subject", "text", "hasAttachments"
));
static boolean needsHeaders(EntityMessage message, List<EntityRule> rules) {
return needsHeaders(rules);
}
@@ -691,16 +687,8 @@ public class EntityRule {
void validate(Context context) throws JSONException, IllegalArgumentException {
try {
Expression expression = ExpressionHelper.getExpression(this, null, null, null, context);
if (expression != null) {
for (String variable : expression.getUsedVariables()) {
Log.i("EXPR variable=" + variable);
if (!EXPR_VARIABLES.contains(variable))
throw new IllegalArgumentException("Unknown variable '" + variable + "'");
}
Log.i("EXPR validating");
expression.validate();
Log.i("EXPR validated");
}
if (expression != null)
ExpressionHelper.check(expression);
} catch (ParseException | MessagingException ex) {
Log.w("EXPR", ex);
String message = ex.getMessage();

16
app/src/main/java/eu/faircode/email/ExpressionHelper.java
View File

@@ -60,6 +60,21 @@ import javax.mail.internet.InternetAddress;
import javax.mail.internet.InternetHeaders;
public class ExpressionHelper {
private static final List<String> EXPR_VARIABLES = Collections.unmodifiableList(Arrays.asList(
"received", "to", "from", "subject", "text", "hasAttachments"
));
static void check(Expression expression) throws ParseException {
for (String variable : expression.getUsedVariables()) {
Log.i("EXPR variable=" + variable);
if (!EXPR_VARIABLES.contains(variable))
throw new IllegalArgumentException("Unknown variable '" + variable + "'");
}
Log.i("EXPR validating");
expression.validate();
Log.i("EXPR validated");
}
static Expression getExpression(EntityRule rule, EntityMessage message, List<Header> headers, String html, Context context) throws JSONException, ParseException, MessagingException {
// https://ezylang.github.io/EvalEx/
@@ -120,6 +135,7 @@ public class ExpressionHelper {
configuration.getOperatorDictionary().addOperator("Matches", oMatches);
Expression expression = new Expression(eval, configuration)
.with("received", message == null ? null : message.received)
.with("to", to)
.with("from", from)
.with("subject", message == null ? null : message.subject)