From 5b529e8e3a068764f27b7a5e88e0cb455e90db5a Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Wed, 31 Mar 2021 12:06:48 +0200
Subject: [PATCH] Use account display name in chat rooms list when displaying
 last sent message

---
 .../main/chat/viewmodels/ChatRoomViewModel.kt       | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomViewModel.kt b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomViewModel.kt
index 41a8b1bfc..7cc5ec4dc 100644
--- a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomViewModel.kt
@@ -234,9 +234,18 @@ class ChatRoomViewModel(val chatRoom: ChatRoom) : ViewModel(), ContactViewModelI
     private fun formatLastMessage(msg: ChatMessage?): String {
         if (msg == null) return ""
 
+        val account = coreContext.core.accountList.find { account ->
+            account.params.identityAddress?.asStringUriOnly() == msg.fromAddress.asStringUriOnly()
+        }
+        val localDisplayName = account?.params?.identityAddress?.displayName
+
         val sender: String =
-            coreContext.contactsManager.findContactByAddress(msg.fromAddress)?.fullName
-            ?: LinphoneUtils.getDisplayName(msg.fromAddress)
+            if (msg.isOutgoing && localDisplayName != null) {
+                localDisplayName
+            } else {
+                coreContext.contactsManager.findContactByAddress(msg.fromAddress)?.fullName
+                    ?: LinphoneUtils.getDisplayName(msg.fromAddress)
+            }
         var body = ""
         for (content in msg.contents) {
             if (content.isFile || content.isFileTransfer) body += content.name + " "