From 11b25324b4886895f5dc3e1616b79d87ec448606 Mon Sep 17 00:00:00 2001
From: rapterjet2004 <juliuslinus1@gmail.com>
Date: Mon, 19 May 2025 10:32:27 -0500
Subject: [PATCH] small fix with messages

Signed-off-by: rapterjet2004 <juliuslinus1@gmail.com>
---
 .../conversationlist/ConversationsListActivity.kt | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 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 56e997ba8..a7bd96431 100644
--- a/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt
@@ -41,9 +41,9 @@ import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.widget.SearchView
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.ui.platform.ViewCompositionStrategy
-import androidx.core.os.bundleOf
 import androidx.core.graphics.drawable.toDrawable
 import androidx.core.net.toUri
+import androidx.core.os.bundleOf
 import androidx.core.view.MenuItemCompat
 import androidx.core.view.isVisible
 import androidx.fragment.app.DialogFragment
@@ -1387,6 +1387,7 @@ class ConversationsListActivity :
             adapter?.removeSection(firstHeader)
         } else {
             adapter?.removeItemsOfType(MessageResultItem.VIEW_TYPE)
+            adapter?.removeItemsOfType(MessagesTextHeaderItem.VIEW_TYPE)
         }
         adapter?.removeItemsOfType(LoadMoreResultsItem.VIEW_TYPE)
     }
@@ -2084,29 +2085,25 @@ class ConversationsListActivity :
             val entries = results.messages
             if (entries.isNotEmpty()) {
                 val adapterItems: MutableList<AbstractFlexibleItem<*>> = ArrayList(entries.size + 1)
+
                 for (i in entries.indices) {
+                    val showHeader = i == 0
                     adapterItems.add(
                         MessageResultItem(
                             context,
                             currentUser!!,
                             entries[i],
+                            showHeader,
                             viewThemeUtils = viewThemeUtils
                         )
                     )
                 }
+
                 if (results.hasMore) {
                     adapterItems.add(LoadMoreResultsItem)
                 }
 
                 adapter?.addItems(Int.MAX_VALUE, adapterItems)
-                val pos = adapter?.currentItems?.indexOfFirst {
-                    it is MessageResultItem
-                }
-                val item = (adapter?.currentItems?.get(pos!!) as MessageResultItem).apply { showHeader = true }
-                adapter?.addItem(pos!!, item)
-                adapter?.notifyItemInserted(pos!!)
-                adapter?.removeItem(pos!! - 1)
-                adapter?.notifyItemRemoved(pos!! - 1)
                 binding.recyclerView.scrollToPosition(0)
             }
         }