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

Refactoring

Browse source
This commit is contained in:
M66B 2024-04-17 19:30:11 +02:00
parent d337763a77
commit 613f72e769
1 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -673,11 +673,13 @@ public class EntityRule {
public EvaluationValue evaluate(
Expression expression, Token operatorToken, EvaluationValue... operands) {
Log.i("EXPR " + operands[0] + (regex ? " MATCHES " : " CONTAINS ") + operands[1] + " regex=" + regex);
String condition = operands[1].getStringValue();
List<EvaluationValue> array = operands[0].getArrayValue();
if (!TextUtils.isEmpty(condition) && array != null) {
if (TextUtils.isEmpty(condition) || array == null || array.isEmpty())
return expression.convertValue(false);
Pattern p = (regex ? Pattern.compile(condition, Pattern.DOTALL) : null);
Log.i("EXPR regex=" + (p == null ? null : p.pattern()));
for (EvaluationValue item : array) {
String value = item.getStringValue();
if (!TextUtils.isEmpty(value))
@ -689,7 +691,7 @@ public class EntityRule {
return expression.convertValue(true);
}
}
}
return expression.convertValue(false);
}
}