From 7b0de4185c0e07a90b96ab5d6fd3c93dbbd965ab Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Wed, 5 Nov 2025 14:47:13 +0100
Subject: [PATCH] Prevent message edit to overlap reply and vice-versa

---
 .../chat/viewmodel/SendMessageInConversationViewModel.kt  | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/SendMessageInConversationViewModel.kt b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/SendMessageInConversationViewModel.kt
index 690c47b70..0e9cac65c 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/SendMessageInConversationViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/SendMessageInConversationViewModel.kt
@@ -236,6 +236,10 @@ class SendMessageInConversationViewModel
 
     @UiThread
     fun editMessage(model: MessageModel) {
+        if (isReplying.value == true) {
+            cancelReply()
+        }
+
         val newValue = model.text.value?.toString() ?: ""
         textToSend.value = newValue
 
@@ -258,6 +262,10 @@ class SendMessageInConversationViewModel
 
     @UiThread
     fun replyToMessage(model: MessageModel) {
+        if (isEditing.value == true) {
+            cancelEdit()
+        }
+
         coreContext.postOnCoreThread {
             val message = model.chatMessage
             Log.i("$TAG Pending reply to message [${message.messageId}]")