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 6d3a1da86..bfc870f1b 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 @@ -44,12 +44,14 @@ import org.linphone.core.Address import org.linphone.core.ChatMessage import org.linphone.core.ChatMessageListenerStub import org.linphone.core.ChatMessageReaction +import org.linphone.core.ChatRoom import org.linphone.core.Content import org.linphone.core.Factory import org.linphone.core.Player import org.linphone.core.PlayerListener import org.linphone.core.tools.Log import org.linphone.ui.main.contacts.model.ContactAvatarModel +import org.linphone.ui.main.model.isInSecureMode import org.linphone.utils.AppUtils import org.linphone.utils.AudioUtils import org.linphone.utils.Event @@ -96,7 +98,8 @@ class MessageModel @WorkerThread constructor( val time = TimestampUtils.toString(timestamp) - val chatRoomIsReadOnly = chatMessage.chatRoom.isReadOnly + val chatRoomIsReadOnly = chatMessage.chatRoom.isReadOnly || + (!chatMessage.chatRoom.hasCapability(ChatRoom.Capabilities.Encrypted.toInt()) && LinphoneUtils.getDefaultAccount()?.isInSecureMode() == true) val groupedWithNextMessage = MutableLiveData() diff --git a/app/src/main/res/layout/chat_bubble_long_press_menu.xml b/app/src/main/res/layout/chat_bubble_long_press_menu.xml index 7fbe93f54..5e5ef02cd 100644 --- a/app/src/main/res/layout/chat_bubble_long_press_menu.xml +++ b/app/src/main/res/layout/chat_bubble_long_press_menu.xml @@ -124,7 +124,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:text="@string/menu_reply_to_chat_message" - android:enabled="@{!model.chatRoomIsReadOnly}" + android:visibility="@{model.chatRoomIsReadOnly ? View.GONE : View.VISIBLE}" android:background="@drawable/menu_item_background" android:layout_marginBottom="1dp" android:drawableStart="@drawable/reply"