got it working

Signed-off-by: rapterjet2004 <juliuslinus1@gmail.com>
nextcloud · Feb 3, 2025 · 96e35a8 · 96e35a8
1 parent d497965
commit 96e35a8
Showing 1 changed file with 8 additions and 16 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
@@ -429,8 +429,7 @@ class ConversationsListActivity :
                             userItems.add(contactItem)
                         }
 
-                        // TODO add users to adapter
-
+                        searchableConversationItems.addAll(userItems)
                     }
 
                     else -> {}
@@ -460,7 +459,10 @@ class ConversationsListActivity :
             currentUser!!,
             intArrayOf(ApiUtils.API_V4, ApiUtils.API_V3, 1)
         )
-        fetchOpenConversations(apiVersion, "")
+        fetchOpenConversations(apiVersion)
+
+        // Get users
+        fetchUsers()
     }
 
     private fun hasFilterEnabled(): Boolean {
@@ -985,7 +987,7 @@ class ConversationsListActivity :
         }
     }
 
-    private fun fetchOpenConversations(apiVersion: Int, filter: String?) {
+    private fun fetchOpenConversations(apiVersion: Int) {
         searchableConversationItems.clear()
         searchableConversationItems.addAll(conversationItemsWithHeader)
         if (hasSpreedFeatureCapability(
@@ -997,7 +999,7 @@ class ConversationsListActivity :
             openConversationsQueryDisposable = ncApi.getOpenConversations(
                 credentials,
                 ApiUtils.getUrlForOpenConversations(apiVersion, currentUser!!.baseUrl!!),
-                filter ?: ""
+                ""
             )
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
@@ -1019,7 +1021,6 @@ class ConversationsListActivity :
                         openConversationItems.add(conversationItem)
                     }
                     searchableConversationItems.addAll(openConversationItems)
-                    conversationItemsWithHeader.addAll(openConversationItems)
                 }, { throwable: Throwable ->
                     Log.e(TAG, "fetchData - getRooms - ERROR", throwable)
                     handleHttpExceptions(throwable)
@@ -1030,8 +1031,7 @@ class ConversationsListActivity :
         }
     }
 
-    private fun fetchUsers(filter: String?) {
-        contactsViewModel.updateSearchQuery(filter ?: "")
+    private fun fetchUsers() {
         contactsViewModel.getContactsFromSearchParams()
     }
 
@@ -1238,14 +1238,6 @@ class ConversationsListActivity :
                 adapter!!.filterItems()
             }
 
-            val apiVersion = ApiUtils.getConversationApiVersion(
-                currentUser!!,
-                intArrayOf(ApiUtils.API_V4, ApiUtils.API_V3, 1)
-            )
-            fetchOpenConversations(apiVersion, filter)
-
-            fetchUsers(filter)
-
             if (isUnifiedSearchAvailable(currentUser!!.capabilities!!.spreedCapability!!)) {
                 startMessageSearch(filter)
             }