mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed search when browse disabled

This commit is contained in:
M66B 2019-01-22 16:28:13 +00:00
parent 7f16c1a23a
commit 9272b58c39
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/eu/faircode/email/DaoFolder.java
View File

@ -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" +

4
app/src/main/java/eu/faircode/email/ViewModelBrowse.java
View File

@ -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;