Refactoring

app/src/main/java/eu/faircode/email/EntityRule.java

@@ -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);
         }
     }