Allow excluding trash/spam for account search

4 years ago · 86c2ee5f66
parent 697bda090b
commit 86c2ee5f66
2 changed files with 2 additions and 2 deletions
--- a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
+++ b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
@ -225,7 +225,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
                " matches=" + (state.matches == null ? null : state.matches.size()));

        long[] exclude = new long[0];
-        if (account == null) {
+        if (folder == null) {
            List<Long> folders = new ArrayList<>();
            if (!criteria.in_trash) {
                List<EntityFolder> trash = db.folder().getFoldersByType(EntityFolder.TRASH);
--- a/app/src/main/java/eu/faircode/email/FragmentDialogSearch.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogSearch.java
@ -227,7 +227,7 @@ public class FragmentDialogSearch extends FragmentDialogBase {
                        cbHeaders.setVisibility(View.VISIBLE);
                        cbHtml.setVisibility(View.VISIBLE);
                    }
-                    if (account < 0) {
+                    if (folder < 0) {
                        cbSearchTrash.setVisibility(View.VISIBLE);
                        cbSearchJunk.setVisibility(View.VISIBLE);
                    }