Fixed search when browse disabled

pull/147/head
M66B 6 years ago
parent 7f16c1a23a
commit 9272b58c39

@ -52,10 +52,11 @@ public interface DaoFolder {
@Query("SELECT folder.* FROM folder" + @Query("SELECT folder.* FROM folder" +
" JOIN account ON account.id = folder.account" + " JOIN account ON account.id = folder.account" +
" WHERE ((:folder IS NULL AND unified) OR (NOT :folder is NULL AND folder.id = :folder))" + " 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 account.synchronize" +
" AND (NOT :browse OR account.browse)") " AND account.browse)")
List<EntityFolder> getFolders(Long folder, boolean browse); List<EntityFolder> getFolders(Long folder, boolean search);
@Query("SELECT folder.*, account.name AS accountName, account.color AS accountColor, account.state AS accountState" + @Query("SELECT folder.*, account.name AS accountName, account.color AS accountColor, account.state AS accountState" +
", COUNT(message.id) AS messages" + ", COUNT(message.id) AS messages" +

@ -95,8 +95,8 @@ public class ViewModelBrowse extends ViewModel {
DB db = DB.getInstance(state.context); DB db = DB.getInstance(state.context);
final List<EntityFolder> folders = db.folder().getFolders( final List<EntityFolder> folders = db.folder().getFolders(
state.fid < 0 ? null : state.fid, state.search == null); 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()); Log.i("Search fid=" + (state.fid < 0 ? null : state.fid) + " search=" + (state.search == null) + " count=" + folders.size());
if (folders.size() == 0) if (folders.size() == 0)
return; return;

Loading…
Cancel
Save