From 2e9e3459e418591dbebba4f2b421f480a407c46e Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Wed, 16 Mar 2022 14:54:22 +0100 Subject: [PATCH] Prevent read-only 1-1 chat room --- .../activities/main/chat/adapters/ChatMessagesListAdapter.kt | 2 +- .../main/chat/viewmodels/ChatMessageSendingViewModel.kt | 4 ++-- .../activities/main/chat/viewmodels/GroupInfoViewModel.kt | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/org/linphone/activities/main/chat/adapters/ChatMessagesListAdapter.kt b/app/src/main/java/org/linphone/activities/main/chat/adapters/ChatMessagesListAdapter.kt index 83ebbe442..827e56ad1 100644 --- a/app/src/main/java/org/linphone/activities/main/chat/adapters/ChatMessagesListAdapter.kt +++ b/app/src/main/java/org/linphone/activities/main/chat/adapters/ChatMessagesListAdapter.kt @@ -305,7 +305,7 @@ class ChatMessagesListAdapter( popupView.addToContactsHidden = true totalSize -= itemSize } - if (chatMessage.chatRoom.hasBeenLeft()) { + if (chatMessage.chatRoom.isReadOnly()) { popupView.replyHidden = true totalSize -= itemSize } diff --git a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatMessageSendingViewModel.kt b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatMessageSendingViewModel.kt index 72a5bec85..6f8015e74 100644 --- a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatMessageSendingViewModel.kt +++ b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatMessageSendingViewModel.kt @@ -114,7 +114,7 @@ class ChatMessageSendingViewModel(private val chatRoom: ChatRoom) : ViewModel() private val chatRoomListener: ChatRoomListenerStub = object : ChatRoomListenerStub() { override fun onStateChanged(chatRoom: ChatRoom, state: ChatRoom.State) { if (state == ChatRoom.State.Created || state == ChatRoom.State.Terminated) { - isReadOnly.value = chatRoom.hasBeenLeft() + isReadOnly.value = chatRoom.isReadOnly() } } } @@ -128,7 +128,7 @@ class ChatMessageSendingViewModel(private val chatRoom: ChatRoom) : ViewModel() attachFileEnabled.value = true sendMessageEnabled.value = false - isReadOnly.value = chatRoom.hasBeenLeft() + isReadOnly.value = chatRoom.isReadOnly() val recorderParams = coreContext.core.createRecorderParams() if (corePreferences.voiceMessagesFormatMkv) { diff --git a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/GroupInfoViewModel.kt b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/GroupInfoViewModel.kt index 807698f62..7f65033b3 100644 --- a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/GroupInfoViewModel.kt +++ b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/GroupInfoViewModel.kt @@ -97,8 +97,8 @@ class GroupInfoViewModel(val chatRoom: ChatRoom?) : MessageNotifierViewModel() { init { subject.value = chatRoom?.subject - isMeAdmin.value = chatRoom == null || (chatRoom.me?.isAdmin == true && !chatRoom.hasBeenLeft()) - canLeaveGroup.value = chatRoom != null && !chatRoom.hasBeenLeft() + isMeAdmin.value = chatRoom == null || (chatRoom.me?.isAdmin == true && !chatRoom.isReadOnly()) + canLeaveGroup.value = chatRoom != null && !chatRoom.isReadOnly() isEncrypted.value = chatRoom?.hasCapability(ChatRoomCapabilities.Encrypted.toInt()) if (chatRoom != null) updateParticipants()