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 e1f3c9ee6..42d447c0d 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 @@ -334,30 +334,37 @@ class ChatRoomViewModel(val chatRoom: ChatRoom) : ViewModel(), ContactDataInterf return } - val timestamp = friend.presenceModel?.timestamp ?: -1 - lastPresenceInfo.value = when { - TimestampUtils.isToday(timestamp) -> { - val time = TimestampUtils.timeToString(timestamp, timestampInSecs = true) - val text = AppUtils.getString(R.string.chat_room_presence_last_seen_online_today) - "$text $time" - } - TimestampUtils.isYesterday(timestamp) -> { - val time = TimestampUtils.timeToString(timestamp, timestampInSecs = true) - val text = AppUtils.getString( - R.string.chat_room_presence_last_seen_online_yesterday - ) - "$text $time" - } - else -> { - val date = TimestampUtils.toString( - timestamp, - onlyDate = true, - shortDate = false, - hideYear = true - ) - val text = AppUtils.getString(R.string.chat_room_presence_last_seen_online) - "$text $date" + val timestamp = friend.presenceModel?.latestActivityTimestamp ?: -1L + lastPresenceInfo.value = if (timestamp != -1L) { + when { + TimestampUtils.isToday(timestamp) -> { + val time = TimestampUtils.timeToString(timestamp, timestampInSecs = true) + val text = + AppUtils.getString(R.string.chat_room_presence_last_seen_online_today) + "$text $time" + } + + TimestampUtils.isYesterday(timestamp) -> { + val time = TimestampUtils.timeToString(timestamp, timestampInSecs = true) + val text = AppUtils.getString( + R.string.chat_room_presence_last_seen_online_yesterday + ) + "$text $time" + } + + else -> { + val date = TimestampUtils.toString( + timestamp, + onlyDate = true, + shortDate = false, + hideYear = true + ) + val text = AppUtils.getString(R.string.chat_room_presence_last_seen_online) + "$text $date" + } } + } else { + AppUtils.getString(R.string.chat_room_presence_away) } } diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index e07cc3633..250324cfe 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -766,6 +766,7 @@ En ligne aujourd\'hui à En ligne hier à En ligne le + Absent Ne pas déranger Voulez-vous supprimer votre compte ? Votre compte sera supprimé localement.\nPour le supprimer de manière définitive, rendez-vous sur le site internet de votre fournisseur SIP. diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 55458a86a..9299f83da 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -239,6 +239,7 @@ Online today at Online yesterday at Online on + Away Do not disturb