From 6f8469eb0b4eb631133912c16691422d093daf27 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Tue, 23 Jan 2024 11:29:25 +0100 Subject: [PATCH] Fixed leave group not hiding send message area --- .../main/chat/fragment/ConversationInfoFragment.kt | 1 + .../ui/main/chat/viewmodel/ConversationViewModel.kt | 13 +++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationInfoFragment.kt b/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationInfoFragment.kt index c3935b882..d4c5e28a7 100644 --- a/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationInfoFragment.kt +++ b/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationInfoFragment.kt @@ -129,6 +129,7 @@ class ConversationInfoFragment : SlidingPaneChildFragment() { viewModel.groupLeftEvent.observe(viewLifecycleOwner) { it.consume { Log.i("$TAG Group has been left, leaving conversation info...") + sharedViewModel.forceRefreshConversationInfo.value = Event(true) goBack() val message = getString(R.string.toast_group_conversation_left) (requireActivity() as MainActivity).showGreenToast( 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 ab578015b..8a30c4b4d 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 @@ -505,12 +505,6 @@ class ConversationViewModel @UiThread constructor() : ViewModel() { scrollingPosition = SCROLLING_POSITION_NOT_SET computeComposingLabel() - val empty = chatRoom.hasCapability(ChatRoom.Capabilities.Conference.toInt()) && chatRoom.participants.isEmpty() - val readOnly = chatRoom.isReadOnly || empty - isReadOnly.postValue(readOnly) - if (readOnly) { - Log.w("$TAG Conversation with subject [${chatRoom.subject}] is read only!") - } isEndToEndEncrypted.postValue( chatRoom.hasCapability(ChatRoom.Capabilities.Encrypted.toInt()) ) @@ -529,6 +523,13 @@ class ConversationViewModel @UiThread constructor() : ViewModel() { val group = LinphoneUtils.isChatRoomAGroup(chatRoom) isGroup.postValue(group) + val empty = chatRoom.hasCapability(ChatRoom.Capabilities.Conference.toInt()) && chatRoom.participants.isEmpty() + val readOnly = chatRoom.isReadOnly || empty + isReadOnly.postValue(readOnly) + if (readOnly) { + Log.w("$TAG Conversation with subject [${chatRoom.subject}] is read only!") + } + subject.postValue(chatRoom.subject) val friends = arrayListOf()