From 359645dc4e280f796c1861654c005c1997f20d18 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Fri, 11 Feb 2022 15:00:02 +0100
Subject: [PATCH] Make sure sent chat message will be visible

---
 .../main/chat/fragments/DetailChatRoomFragment.kt      | 10 ++++++++++
 .../chat/viewmodels/ChatMessageSendingViewModel.kt     |  6 ++++++
 2 files changed, 16 insertions(+)

diff --git a/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt b/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt
index a2041beb4..c08f1c643 100644
--- a/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt
+++ b/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt
@@ -307,6 +307,16 @@ class DetailChatRoomFragment : MasterFragment<ChatRoomDetailFragmentBinding, Cha
             }
         }
 
+        chatSendingViewModel.messageSentEvent.observe(
+            viewLifecycleOwner
+        ) {
+            it.consume {
+                Log.i("[Chat Room] Message sent")
+                // Reset this to ensure sent message will be visible
+                viewModel.isUserScrollingUp.value = false
+            }
+        }
+
         listViewModel.events.observe(
             viewLifecycleOwner
         ) { events ->
diff --git a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatMessageSendingViewModel.kt b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatMessageSendingViewModel.kt
index 37290f8f3..c9590fd08 100644
--- a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatMessageSendingViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatMessageSendingViewModel.kt
@@ -76,6 +76,10 @@ class ChatMessageSendingViewModel(private val chatRoom: ChatRoom) : ViewModel()
         MutableLiveData<Event<Boolean>>()
     }
 
+    val messageSentEvent: MutableLiveData<Event<Boolean>> by lazy {
+        MutableLiveData<Event<Boolean>>()
+    }
+
     val voiceRecordingProgressBarMax = 10000
 
     val isPendingVoiceRecord = MutableLiveData<Boolean>()
@@ -261,6 +265,8 @@ class ChatMessageSendingViewModel(private val chatRoom: ChatRoom) : ViewModel()
         attachments.value.orEmpty().forEach(ChatMessageAttachmentData::destroy)
         attachments.value = arrayListOf()
         textToSend.value = ""
+
+        messageSentEvent.value = Event(true)
     }
 
     fun transferMessage(chatMessage: ChatMessage) {