From 077e6255120c48b01ae9f8755fe198a4643c0b51 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Tue, 24 Oct 2023 14:33:19 +0200
Subject: [PATCH] Show message bottom sheet for 1-1 chat room

---
 .../ui/main/chat/fragment/ConversationFragment.kt  | 12 ++----------
 .../ui/main/chat/model/ChatMessageDeliveryModel.kt | 14 ++++++++------
 2 files changed, 10 insertions(+), 16 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 9ae493acd..bc016e7c1 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
@@ -195,21 +195,13 @@ class ConversationFragment : GenericFragment() {
 
         adapter.showDeliveryForChatMessageModelEvent.observe(viewLifecycleOwner) {
             it.consume { model ->
-                if (viewModel.isGroup.value == true) {
-                    showDeliveryBottomSheetDialog(model, showDelivery = true)
-                } else {
-                    Log.w("$TAG Conversation is not a group, not showing delivery bottom sheet")
-                }
+                showDeliveryBottomSheetDialog(model, showDelivery = true)
             }
         }
 
         adapter.showReactionForChatMessageModelEvent.observe(viewLifecycleOwner) {
             it.consume { model ->
-                if (viewModel.isGroup.value == true) {
-                    showDeliveryBottomSheetDialog(model, showReactions = true)
-                } else {
-                    Log.w("$TAG Conversation is not a group, not showing reactions bottom sheet")
-                }
+                showDeliveryBottomSheetDialog(model, showReactions = true)
             }
         }
 
diff --git a/app/src/main/java/org/linphone/ui/main/chat/model/ChatMessageDeliveryModel.kt b/app/src/main/java/org/linphone/ui/main/chat/model/ChatMessageDeliveryModel.kt
index eb571ab3d..59ece82ae 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/model/ChatMessageDeliveryModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/model/ChatMessageDeliveryModel.kt
@@ -67,13 +67,15 @@ class ChatMessageDeliveryModel @WorkerThread constructor(
                 )
             )
         }
-        // Always add ourselves to prevent empty list
-        displayedModels.add(
-            ChatMessageBottomSheetParticipantModel(
-                chatMessage.localAddress,
-                TimestampUtils.timeToString(chatMessage.time)
+        if (!chatMessage.isOutgoing) {
+            // Always add ourselves to prevent empty list
+            displayedModels.add(
+                ChatMessageBottomSheetParticipantModel(
+                    chatMessage.localAddress,
+                    TimestampUtils.timeToString(chatMessage.time)
+                )
             )
-        )
+        }
         val readCount = displayedModels.size.toString()
         readLabel.postValue(
             AppUtils.getFormattedString(