From b78b4a1e6b3203c2fc30261bb3b5c9dd4e1ac85e Mon Sep 17 00:00:00 2001 From: Christophe Deschamps Date: Thu, 1 Dec 2022 18:03:03 +0100 Subject: [PATCH] Fix navigation when hanging up conference after editing participants list --- Classes/ChatConversationCreateView.m | 4 ++-- .../Fragments/ParticipantsList/ParticipantsListView.swift | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Classes/ChatConversationCreateView.m b/Classes/ChatConversationCreateView.m index 4a9ea2617..aac3b4eaa 100644 --- a/Classes/ChatConversationCreateView.m +++ b/Classes/ChatConversationCreateView.m @@ -209,7 +209,7 @@ static UICompositeViewDescription *compositeDescription = nil; [_tableController.contactsGroup removeAllObjects]; if (_isForVoipConference) { if (_isForOngoingVoipConference) { - [PhoneMainView.instance changeCurrentView:VIEW(ConferenceCallView).compositeViewDescription]; + [PhoneMainView.instance popToView:VIEW(ConferenceCallView).compositeViewDescription]; [ControlsViewModelBridge showParticipants]; } else { [PhoneMainView.instance popToView:ConferenceSchedulingView.compositeViewDescription]; @@ -225,7 +225,7 @@ static UICompositeViewDescription *compositeDescription = nil; - (IBAction)onNextClick:(id)sender { if (_isForVoipConference) { if (_isForOngoingVoipConference) { - [PhoneMainView.instance changeCurrentView:VIEW(ConferenceCallView).compositeViewDescription]; + [PhoneMainView.instance popToView:VIEW(ConferenceCallView).compositeViewDescription]; [ConferenceViewModelBridge updateParticipantsListWithAddresses:_tableController.contactsGroup]; } else { [PhoneMainView.instance changeCurrentView:VIEW(ConferenceSchedulingSummaryView).compositeViewDescription]; diff --git a/Classes/Swift/Voip/Views/Fragments/ParticipantsList/ParticipantsListView.swift b/Classes/Swift/Voip/Views/Fragments/ParticipantsList/ParticipantsListView.swift index e58a6109f..fabc1dc4a 100644 --- a/Classes/Swift/Voip/Views/Fragments/ParticipantsList/ParticipantsListView.swift +++ b/Classes/Swift/Voip/Views/Fragments/ParticipantsList/ParticipantsListView.swift @@ -38,6 +38,7 @@ import linphonesw let edit = CallControlButton(buttonTheme: VoipTheme.voip_edit, onClickAction: { + self.removeFromSuperview() self.gotoParticipantsListSelection() }) super.headerView.addSubview(edit)