mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Refactoring

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

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

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