From 8f238c7e3f1afcd55ad7cc17b9d11ed4c2c04ce1 Mon Sep 17 00:00:00 2001 From: M66B Date: Wed, 23 Jan 2019 09:31:31 +0000 Subject: [PATCH] Fixed browsing messages --- app/src/main/java/eu/faircode/email/DaoFolder.java | 7 ++----- app/src/main/java/eu/faircode/email/ViewModelBrowse.java | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/DaoFolder.java b/app/src/main/java/eu/faircode/email/DaoFolder.java index e750ecefd5..b6183ff3c1 100644 --- a/app/src/main/java/eu/faircode/email/DaoFolder.java +++ b/app/src/main/java/eu/faircode/email/DaoFolder.java @@ -52,11 +52,8 @@ 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 :search" + - " OR (folder.synchronize" + - " AND account.synchronize" + - " AND account.browse)") - List getFolders(Long folder, boolean search); + " AND (:search OR (account.synchronize AND account.browse))") + List getBrowsableFolders(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 d2891b6d5b..5fc2e5e3c1 100644 --- a/app/src/main/java/eu/faircode/email/ViewModelBrowse.java +++ b/app/src/main/java/eu/faircode/email/ViewModelBrowse.java @@ -94,7 +94,7 @@ public class ViewModelBrowse extends ViewModel { return; DB db = DB.getInstance(state.context); - final List folders = db.folder().getFolders( + final List folders = db.folder().getBrowsableFolders( 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)