From 4f0ca4adca6ef2ee6a5867bedcb98414c2a473b5 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Thu, 28 Nov 2024 13:01:31 +0100 Subject: [PATCH] Do not consider chat room as read-only if empty --- .../ui/main/chat/viewmodel/ConversationInfoViewModel.kt | 3 +-- .../ui/main/chat/viewmodel/ConversationViewModel.kt | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationInfoViewModel.kt b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationInfoViewModel.kt index 069494c74..7d7215864 100644 --- a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationInfoViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationInfoViewModel.kt @@ -481,8 +481,7 @@ class ConversationInfoViewModel @UiThread constructor() : AbstractConversationVi chatRoom.hasCapability(ChatRoom.Capabilities.Encrypted.toInt()) ) - val empty = chatRoom.hasCapability(ChatRoom.Capabilities.Conference.toInt()) && chatRoom.participants.isEmpty() - val readOnly = chatRoom.isReadOnly || empty + val readOnly = chatRoom.isReadOnly isReadOnly.postValue(readOnly) if (readOnly) { Log.w("$TAG Conversation with subject [${chatRoom.subject}] is read only!") diff --git a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationViewModel.kt b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationViewModel.kt index e6fd16b83..6db7d18c9 100644 --- a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationViewModel.kt @@ -583,11 +583,9 @@ class ConversationViewModel @UiThread constructor() : AbstractConversationViewMo val empty = chatRoom.hasCapability(ChatRoom.Capabilities.Conference.toInt()) && chatRoom.participants.isEmpty() if (empty) { - Log.w( - "$TAG Conversation has conference capability but has no participants, will be considered as read only!" - ) + Log.w("$TAG Conversation has conference capability but has no participants!") } - val readOnly = chatRoom.isReadOnly || empty + val readOnly = chatRoom.isReadOnly isReadOnly.postValue(readOnly) if (readOnly) { Log.w("$TAG Conversation with subject [${chatRoom.subject}] is read only!")