Prevent searching for empty keywords (non ascii)

4 years ago · f2d2577fbf
parent e113b3a5d1
commit f2d2577fbf
1 changed files with 7 additions and 2 deletions
--- a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
+++ b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
@ -762,8 +762,13 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
                            or.add(new SubjectTerm(search));
                        }

-                if (in_keywords && hasKeywords)
-                    or.add(new FlagTerm(new Flags(MessageHelper.sanitizeKeyword(search)), true));
+                if (in_keywords && hasKeywords) {
+                    String keyword = MessageHelper.sanitizeKeyword(search);
+                    if (TextUtils.isEmpty(keyword))
+                        Log.w("Keyword empty=" + search);
+                    else
+                        or.add(new FlagTerm(new Flags(keyword), true));
+                }

                if (in_message)
                    if (plus.size() + minus.size() + opt.size() == 0)