From 9272b58c39cfe4cdb4a7b3cb030024a2b603ec74 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 22 Jan 2019 16:28:13 +0000
Subject: [PATCH] Fixed search when browse disabled

---
 app/src/main/java/eu/faircode/email/DaoFolder.java       | 7 ++++---
 app/src/main/java/eu/faircode/email/ViewModelBrowse.java | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/DaoFolder.java b/app/src/main/java/eu/faircode/email/DaoFolder.java
index fd76f498bc..e750ecefd5 100644
--- a/app/src/main/java/eu/faircode/email/DaoFolder.java
+++ b/app/src/main/java/eu/faircode/email/DaoFolder.java
@@ -52,10 +52,11 @@ public interface DaoFolder {
     @Query("SELECT folder.* FROM folder" +
             " JOIN account ON account.id = folder.account" +
             " WHERE ((:folder IS NULL AND unified) OR (NOT :folder is NULL AND folder.id = :folder))" +
-            " AND folder.synchronize" +
+            " AND :search" +
+            " OR (folder.synchronize" +
             " AND account.synchronize" +
-            " AND (NOT :browse OR account.browse)")
-    List<EntityFolder> getFolders(Long folder, boolean browse);
+            " AND account.browse)")
+    List<EntityFolder> getFolders(Long folder, boolean search);
 
     @Query("SELECT folder.*, account.name AS accountName, account.color AS accountColor, account.state AS accountState" +
             ", COUNT(message.id) AS messages" +
diff --git a/app/src/main/java/eu/faircode/email/ViewModelBrowse.java b/app/src/main/java/eu/faircode/email/ViewModelBrowse.java
index d5a1b6a34e..d2891b6d5b 100644
--- a/app/src/main/java/eu/faircode/email/ViewModelBrowse.java
+++ b/app/src/main/java/eu/faircode/email/ViewModelBrowse.java
@@ -95,8 +95,8 @@ public class ViewModelBrowse extends ViewModel {
 
         DB db = DB.getInstance(state.context);
         final List<EntityFolder> folders = db.folder().getFolders(
-                state.fid < 0 ? null : state.fid, state.search == null);
-        Log.i("Search fid=" + (state.fid < 0 ? null : state.fid) + " browse=" + (state.search == null) + " count=" + folders.size());
+                state.fid < 0 ? null : state.fid, state.search != null);
+        Log.i("Search fid=" + (state.fid < 0 ? null : state.fid) + " search=" + (state.search == null) + " count=" + folders.size());
         if (folders.size() == 0)
             return;