Merge pull request #4441 from nextcloud/issue-4405-fix-filter

Align filter behavior with web
This commit is contained in:
Julius Linus 2024-11-14 06:55:23 -06:00 committed by GitHub
commit 3908d0ce14
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -1144,8 +1144,17 @@ class ConversationsListActivity :
private fun performFilterAndSearch(filter: String?) { private fun performFilterAndSearch(filter: String?) {
if (filter!!.length >= SEARCH_MIN_CHARS) { if (filter!!.length >= SEARCH_MIN_CHARS) {
clearMessageSearchResults() clearMessageSearchResults()
if (hasFilterEnabled()) {
adapter?.updateDataSet(conversationItems)
adapter!!.setFilter(filter) adapter!!.setFilter(filter)
adapter!!.filterItems() adapter!!.filterItems()
adapter?.updateDataSet(filterableConversationItems)
} else {
adapter!!.setFilter(filter)
adapter!!.filterItems()
}
if (isUnifiedSearchAvailable(currentUser!!.capabilities!!.spreedCapability!!)) { if (isUnifiedSearchAvailable(currentUser!!.capabilities!!.spreedCapability!!)) {
startMessageSearch(filter) startMessageSearch(filter)
} }