From fcd19170b9e4b441dfcdd804c54124b66092b7c3 Mon Sep 17 00:00:00 2001 From: M66B Date: Sun, 11 May 2025 20:10:03 +0200 Subject: [PATCH] Refactoring --- .../java/eu/faircode/email/ExpressionHelper.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/ExpressionHelper.java b/app/src/main/java/eu/faircode/email/ExpressionHelper.java index 90e8275a33..e5a02af817 100644 --- a/app/src/main/java/eu/faircode/email/ExpressionHelper.java +++ b/app/src/main/java/eu/faircode/email/ExpressionHelper.java @@ -51,6 +51,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; +import java.util.Locale; import java.util.regex.Pattern; import javax.mail.Address; @@ -507,14 +508,15 @@ public class ExpressionHelper { Boolean result = null; String flag = parameterValues[0].getStringValue(); - if (message != null) { - if ("seen".equalsIgnoreCase(flag)) + if (message != null && !TextUtils.isEmpty(flag)) { + flag = flag.trim().toLowerCase(Locale.ROOT); + if ("seen".equals(flag)) result = message.ui_seen; - else if ("answered".equalsIgnoreCase(flag)) + else if ("answered".equals(flag)) result = message.ui_answered; - else if ("flagged".equalsIgnoreCase(flag)) + else if ("flagged".equals(flag)) result = message.ui_flagged; - else if ("deleted".equalsIgnoreCase(flag)) + else if ("deleted".equals(flag)) result = message.ui_deleted; }