diff --git a/app/src/main/java/org/linphone/ui/main/chat/model/MessageModel.kt b/app/src/main/java/org/linphone/ui/main/chat/model/MessageModel.kt index d7027e537..6f7021f0f 100644 --- a/app/src/main/java/org/linphone/ui/main/chat/model/MessageModel.kt +++ b/app/src/main/java/org/linphone/ui/main/chat/model/MessageModel.kt @@ -106,6 +106,8 @@ class MessageModel val time = TimestampUtils.toString(timestamp) + val hideDeliveryStatus = !isOutgoing && coreContext.core.imdnToEverybodyThreshold == 1 + val chatRoomIsReadOnly = chatMessage.chatRoom.isReadOnly || ( !chatMessage.chatRoom.hasCapability(ChatRoom.Capabilities.Encrypted.toInt()) && LinphoneUtils.getAccountForAddress( diff --git a/app/src/main/res/layout/chat_bubble_incoming.xml b/app/src/main/res/layout/chat_bubble_incoming.xml index c3ecabbd7..dfb663728 100644 --- a/app/src/main/res/layout/chat_bubble_incoming.xml +++ b/app/src/main/res/layout/chat_bubble_incoming.xml @@ -252,7 +252,7 @@ android:paddingTop="2dp" android:contentDescription="@string/content_description_chat_bubble_delivery_status" android:src="@{model.statusIcon, default=@drawable/checks}" - android:visibility="@{model.isFromGroup ? View.VISIBLE : View.GONE}" + android:visibility="@{model.isFromGroup && !model.hideDeliveryStatus ? View.VISIBLE : View.GONE}" app:tint="?attr/color_main1_500" />