From 487cae16256edd9396e754f9170749a247dd2966 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 24 Mar 2022 14:00:12 +0100
Subject: [PATCH] Fixed last updated time for chat room not being updated...

---
 app/build.gradle                                         | 2 +-
 .../activities/main/chat/viewmodels/ChatRoomViewModel.kt | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 1e006e588..50c827ed4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -220,7 +220,7 @@ dependencies {
     implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.1'
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
     implementation "androidx.security:security-crypto-ktx:1.1.0-alpha03"
-    implementation 'androidx.core:core-splashscreen:1.0.0-beta01'
+    implementation 'androidx.core:core-splashscreen:1.0.0-beta02'
 
     implementation 'com.google.android.material:material:1.5.0'
     implementation 'com.google.android.flexbox:flexbox:3.0.0'
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 3a06cc41f..a370ec6a1 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
@@ -116,7 +116,7 @@ class ChatRoomViewModel(val chatRoom: ChatRoom) : ViewModel(), ContactDataInterf
         override fun onContactsUpdated() {
             Log.i("[Chat Room] Contacts have changed")
             contactLookup()
-            formatLastMessage(chatRoom.lastMessageInHistory)
+            updateLastMessageToDisplay()
         }
     }
 
@@ -202,7 +202,7 @@ class ChatRoomViewModel(val chatRoom: ChatRoom) : ViewModel(), ContactDataInterf
 
         override fun onEphemeralMessageDeleted(chatRoom: ChatRoom, eventLog: EventLog) {
             Log.i("[Chat Room] Ephemeral message deleted, updated last message displayed")
-            formatLastMessage(chatRoom.lastMessageInHistory)
+            updateLastMessageToDisplay()
         }
 
         override fun onEphemeralEvent(chatRoom: ChatRoom, eventLog: EventLog) {
@@ -219,9 +219,7 @@ class ChatRoomViewModel(val chatRoom: ChatRoom) : ViewModel(), ContactDataInterf
         chatRoom.addListener(chatRoomListener)
         coreContext.contactsManager.addListener(contactsUpdatedListener)
 
-        formatLastMessage(chatRoom.lastMessageInHistory)
         unreadMessagesCount.value = chatRoom.unreadMessagesCount
-        lastUpdate.value = TimestampUtils.toString(chatRoom.lastUpdateTime, true)
 
         subject.value = chatRoom.subject
         updateSecurityIcon()
@@ -230,7 +228,7 @@ class ChatRoomViewModel(val chatRoom: ChatRoom) : ViewModel(), ContactDataInterf
 
         contactLookup()
         updateParticipants()
-        formatLastMessage(chatRoom.lastMessageInHistory)
+        updateLastMessageToDisplay()
 
         callInProgress.value = chatRoom.core.callsNb > 0
         updateRemotesComposing()
@@ -311,6 +309,7 @@ class ChatRoomViewModel(val chatRoom: ChatRoom) : ViewModel(), ContactDataInterf
 
         builder.trim()
         lastMessageText.value = builder
+        lastUpdate.value = TimestampUtils.toString(chatRoom.lastUpdateTime, true)
     }
 
     private fun searchMatchingContact() {