diff --git a/app/src/main/java/com/omgodse/notally/room/dao/BaseNoteDao.kt b/app/src/main/java/com/omgodse/notally/room/dao/BaseNoteDao.kt index 9d90a8e1..676f0c2a 100644 --- a/app/src/main/java/com/omgodse/notally/room/dao/BaseNoteDao.kt +++ b/app/src/main/java/com/omgodse/notally/room/dao/BaseNoteDao.kt @@ -148,12 +148,12 @@ interface BaseNoteDao { * filter the result accordingly. */ fun getBaseNotesByLabel(label: String): LiveData> { - val result = getBaseNotesByLabel(label, Folder.NOTES) + val result = getBaseNotesByLabelImpl(label) return Transformations.map(result) { list -> list.filter { baseNote -> baseNote.labels.contains(label) } } } - @Query("SELECT * FROM BaseNote WHERE folder = :folder AND labels LIKE '%' || :label || '%' ORDER BY pinned DESC, timestamp DESC") - fun getBaseNotesByLabel(label: String, folder: Folder): LiveData> + @Query("SELECT * FROM BaseNote WHERE folder <> 'DELETED' AND labels LIKE '%' || :label || '%' ORDER BY pinned DESC, timestamp DESC") + fun getBaseNotesByLabelImpl(label: String): LiveData> suspend fun getListOfBaseNotesByLabel(label: String): List {