From 25d13f44c70511f6a93c0c9ce58990aacd3de466 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Fri, 16 May 2025 15:51:28 +0200 Subject: [PATCH] Prevent 1-1 events for conference joined/left + temporary read only state --- .../linphone/ui/main/chat/model/ConversationModel.kt | 2 +- .../ui/main/chat/viewmodel/ConversationViewModel.kt | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/linphone/ui/main/chat/model/ConversationModel.kt b/app/src/main/java/org/linphone/ui/main/chat/model/ConversationModel.kt index d6a09e53b..091799273 100644 --- a/app/src/main/java/org/linphone/ui/main/chat/model/ConversationModel.kt +++ b/app/src/main/java/org/linphone/ui/main/chat/model/ConversationModel.kt @@ -115,7 +115,7 @@ class ConversationModel @WorkerThread override fun onConferenceLeft(chatRoom: ChatRoom, eventLog: EventLog) { Log.w("TAG Conversation has been left") - isReadOnly.postValue(true) + isReadOnly.postValue(chatRoom.isReadOnly) } @WorkerThread 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 4eacab00c..92e963311 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 @@ -153,7 +153,9 @@ class ConversationViewModel @WorkerThread override fun onConferenceJoined(chatRoom: ChatRoom, eventLog: EventLog) { Log.i("$TAG Conversation was joined") - addEvents(arrayOf(eventLog)) + if (LinphoneUtils.isChatRoomAGroup(chatRoom)) { + addEvents(arrayOf(eventLog)) + } computeConversationInfo() val messageToForward = pendingForwardMessage @@ -167,8 +169,10 @@ class ConversationViewModel @WorkerThread override fun onConferenceLeft(chatRoom: ChatRoom, eventLog: EventLog) { Log.w("$TAG Conversation was left") - addEvents(arrayOf(eventLog)) - isReadOnly.postValue(true) + if (LinphoneUtils.isChatRoomAGroup(chatRoom)) { + addEvents(arrayOf(eventLog)) + } + isReadOnly.postValue(chatRoom.isReadOnly) } @WorkerThread