From e24d3ca33f180234c5e9380f8b4a90aed2d994ab Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 23 Oct 2023 10:11:00 +0200
Subject: [PATCH] Fixed conversation not visible after creating it + missing
 presence in 1-1 conversation

---
 .../ui/main/chat/fragment/ConversationFragment.kt    | 11 ++++-------
 .../main/res/layout/chat_conversation_fragment.xml   | 12 ++++++++++++
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationFragment.kt b/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationFragment.kt
index cd77ffea3..3eabb717c 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationFragment.kt
@@ -141,6 +141,10 @@ class ConversationFragment : GenericFragment() {
                     Log.i(
                         "$TAG Found matching chat room for local SIP URI [$localSipUri] and remote SIP URI [$remoteSipUri]"
                     )
+                    (view.parent as? ViewGroup)?.doOnPreDraw {
+                        startPostponedEnterTransition()
+                        sharedViewModel.openSlidingPaneEvent.value = Event(true)
+                    }
                 } else {
                     (view.parent as? ViewGroup)?.doOnPreDraw {
                         Log.e("$TAG Failed to find chat room, going back")
@@ -175,13 +179,6 @@ class ConversationFragment : GenericFragment() {
             adapter.submitList(items)
             Log.i("$TAG Events (messages) list updated with [${items.size}] items")
 
-            if (currentCount == 0 && items.isNotEmpty()) {
-                (view.parent as? ViewGroup)?.doOnPreDraw {
-                    startPostponedEnterTransition()
-                    sharedViewModel.openSlidingPaneEvent.value = Event(true)
-                }
-            }
-
             if (currentCount < items.size) {
                 binding.eventsList.scrollToPosition(items.size - 1)
             }
diff --git a/app/src/main/res/layout/chat_conversation_fragment.xml b/app/src/main/res/layout/chat_conversation_fragment.xml
index 4e2735b00..54211a1f4 100644
--- a/app/src/main/res/layout/chat_conversation_fragment.xml
+++ b/app/src/main/res/layout/chat_conversation_fragment.xml
@@ -82,6 +82,18 @@
                 app:layout_constraintStart_toEndOf="@id/back"
                 app:layout_constraintTop_toTopOf="@id/back" />
 
+            <ImageView
+                android:id="@+id/presence_badge"
+                android:layout_width="@dimen/avatar_presence_badge_size"
+                android:layout_height="@dimen/avatar_presence_badge_size"
+                android:layout_marginEnd="@dimen/avatar_presence_badge_end_margin"
+                android:background="@drawable/led_background"
+                android:padding="@dimen/avatar_presence_badge_padding"
+                app:presenceIcon="@{viewModel.avatarModel.presenceStatus}"
+                android:visibility="@{viewModel.isGroup || viewModel.avatarModel.presenceStatus == ConsolidatedPresence.Offline ? View.GONE : View.VISIBLE}"
+                app:layout_constraintEnd_toEndOf="@id/avatar"
+                app:layout_constraintBottom_toBottomOf="@id/avatar"/>
+
             <ImageView
                 android:id="@+id/trust_badge"
                 android:layout_width="@dimen/avatar_presence_badge_size"