From f118ccf049dd9bd309c783ecef1623a6378efd92 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 13 Jun 2022 15:15:04 +0200
Subject: [PATCH] Fixed chat room list cell UI glitch during last update time
 computation

---
 .../org/linphone/activities/main/chat/data/ChatRoomData.kt | 3 ++-
 .../activities/main/chat/viewmodels/ChatRoomViewModel.kt   | 2 +-
 app/src/main/res/layout/chat_room_devices_fragment.xml     | 7 +------
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/org/linphone/activities/main/chat/data/ChatRoomData.kt b/app/src/main/java/org/linphone/activities/main/chat/data/ChatRoomData.kt
index 7c56f9368..489b44860 100644
--- a/app/src/main/java/org/linphone/activities/main/chat/data/ChatRoomData.kt
+++ b/app/src/main/java/org/linphone/activities/main/chat/data/ChatRoomData.kt
@@ -130,7 +130,7 @@ class ChatRoomData(private val chatRoom: ChatRoom) : ContactDataInterface {
             if (chatRoom.participants.isNotEmpty()) {
                 chatRoom.participants[0].address
             } else {
-                Log.e("[Chat Room] $chatRoom doesn't have any participant in state ${chatRoom.state}!")
+                Log.e("[Chat Room] $chatRoom doesn't have any participant (state ${chatRoom.state})!")
                 null
             }
         }
@@ -141,6 +141,7 @@ class ChatRoomData(private val chatRoom: ChatRoom) : ContactDataInterface {
 
     private fun formatLastMessage(msg: ChatMessage?) {
         val lastUpdateTime = chatRoom.lastUpdateTime
+        lastUpdate.value = "00:00"
         coroutineScope.launch {
             withContext(Dispatchers.IO) {
                 lastUpdate.postValue(TimestampUtils.toString(lastUpdateTime, true))
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 32c25bb3d..a2e511455 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
@@ -295,7 +295,7 @@ class ChatRoomViewModel(val chatRoom: ChatRoom) : ViewModel(), ContactDataInterf
             if (chatRoom.participants.isNotEmpty()) {
                 chatRoom.participants[0].address
             } else {
-                Log.e("[Chat Room] $chatRoom doesn't have any participant in state ${chatRoom.state}!")
+                Log.e("[Chat Room] $chatRoom doesn't have any participant (state ${chatRoom.state})!")
                 null
             }
         }
diff --git a/app/src/main/res/layout/chat_room_devices_fragment.xml b/app/src/main/res/layout/chat_room_devices_fragment.xml
index 61635b7f3..4df28696b 100644
--- a/app/src/main/res/layout/chat_room_devices_fragment.xml
+++ b/app/src/main/res/layout/chat_room_devices_fragment.xml
@@ -38,18 +38,13 @@
                 style="@style/toolbar_small_title_font"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_weight="0.6"
+                android:layout_weight="0.8"
                 android:gravity="center"
                 android:padding="15dp"
                 android:ellipsize="end"
                 android:singleLine="true"
                 android:text="@string/chat_room_devices_fragment_title" />
 
-            <View
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="0.2" />
-
         </LinearLayout>
 
         <androidx.core.widget.NestedScrollView