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

Align filter behavior with web
nextcloud · Nov 14, 2024 · 3908d0c · 3908d0c
2 parents e1a3a03 + ab4b3d6
commit 3908d0c
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt b/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt
@@ -1144,8 +1144,17 @@ class ConversationsListActivity :
     private fun performFilterAndSearch(filter: String?) {
         if (filter!!.length >= SEARCH_MIN_CHARS) {
             clearMessageSearchResults()
-            adapter!!.setFilter(filter)
-            adapter!!.filterItems()
+
+            if (hasFilterEnabled()) {
+                adapter?.updateDataSet(conversationItems)
+                adapter!!.setFilter(filter)
+                adapter!!.filterItems()
+                adapter?.updateDataSet(filterableConversationItems)
+            } else {
+                adapter!!.setFilter(filter)
+                adapter!!.filterItems()
+            }
+
             if (isUnifiedSearchAvailable(currentUser!!.capabilities!!.spreedCapability!!)) {
                 startMessageSearch(filter)
             }