From a4fd2e6a4bb6848f5bafe4a267dd14c21e9b16f7 Mon Sep 17 00:00:00 2001
From: rapterjet2004 <juliuslinus1@gmail.com>
Date: Wed, 21 Aug 2024 11:36:41 -0500
Subject: [PATCH] Got the highlighting fixed - need to fix the submit button
 (or disable it) as tapping it destroys the searchViewDisposable for some
 reason

Signed-off-by: rapterjet2004 <juliuslinus1@gmail.com>
---
 .../talk/conversationlist/ConversationsListActivity.kt   | 9 ++++++---
 1 file changed, 6 insertions(+), 3 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
index bdef55cb8..348e868f4 100644
--- a/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt
@@ -625,15 +625,18 @@ class ConversationsListActivity :
                 showSearchView(searchView, searchItem)
                 viewThemeUtils.platform.themeStatusBar(this)
             }
-            searchView!!.setOnCloseListener {
+            searchView!!.findViewById<View>(R.id.search_close_btn).setOnClickListener {
                 if (TextUtils.isEmpty(searchView!!.query.toString())) {
                     searchView!!.onActionViewCollapsed()
                     viewThemeUtils.platform.resetStatusBar(this)
                 } else {
-                    searchView!!.post { searchView!!.setQuery(TAG, true) }
+                    resetSearchResults()
+                    searchView!!.setQuery("", false)
                 }
-                true
             }
+
+
+
             searchItem!!.setOnActionExpandListener(object : MenuItem.OnActionExpandListener {
                 override fun onMenuItemActionExpand(item: MenuItem): Boolean {
                     initSearchDisposable()