Specify where to search

6 years ago · 917fe43daa
parent b5b7f7a49c
commit 917fe43daa
1 changed files with 10 additions and 2 deletions
--- a/app/src/main/java/eu/faircode/email/ViewModelBrowse.java
+++ b/app/src/main/java/eu/faircode/email/ViewModelBrowse.java
@ -206,13 +206,21 @@ public class ViewModelBrowse extends ViewModel {
                                }
                                if (keywords)
                                    arg.writeAtom("OR");
-                                arg.writeAtom("TEXT");
+                                arg.writeAtom("OR");
+                                arg.writeAtom("OR");
+                                arg.writeAtom("OR");
+                                arg.writeAtom("FROM");
+                                arg.writeBytes(state.search.getBytes());
+                                arg.writeAtom("TO");
+                                arg.writeBytes(state.search.getBytes());
+                                arg.writeAtom("SUBJECT");
+                                arg.writeBytes(state.search.getBytes());
+                                arg.writeAtom("BODY");
                                arg.writeBytes(state.search.getBytes());
                                if (keywords) {
                                    arg.writeAtom("KEYWORD");
                                    arg.writeBytes(state.search.getBytes());
                                }
-                                arg.writeAtom("ALL");
                                Response[] responses = protocol.command("SEARCH", arg);

                                List<Integer> msgnums = new ArrayList<>();