mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-04-25 18:48:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix navigation when hanging up conference after editing participants list

Browse source
This commit is contained in:
Christophe Deschamps 2022-12-01 18:03:03 +01:00 • committed by QuentinArguillere
parent 6850282208
commit b78b4a1e6b
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Classes/ChatConversationCreateView.m
View file

@ -209,7 +209,7 @@ static UICompositeViewDescription *compositeDescription = nil;
[_tableController.contactsGroup removeAllObjects]; [_tableController.contactsGroup removeAllObjects];
if (_isForVoipConference) { if (_isForVoipConference) {
if (_isForOngoingVoipConference) { if (_isForOngoingVoipConference) {
[PhoneMainView.instance changeCurrentView:VIEW(ConferenceCallView).compositeViewDescription]; [PhoneMainView.instance popToView:VIEW(ConferenceCallView).compositeViewDescription];
[ControlsViewModelBridge showParticipants]; [ControlsViewModelBridge showParticipants];
} else { } else {
[PhoneMainView.instance popToView:ConferenceSchedulingView.compositeViewDescription]; [PhoneMainView.instance popToView:ConferenceSchedulingView.compositeViewDescription];
@ -225,7 +225,7 @@ static UICompositeViewDescription *compositeDescription = nil;
- (IBAction)onNextClick:(id)sender { - (IBAction)onNextClick:(id)sender {
if (_isForVoipConference) { if (_isForVoipConference) {
if (_isForOngoingVoipConference) { if (_isForOngoingVoipConference) {
[PhoneMainView.instance changeCurrentView:VIEW(ConferenceCallView).compositeViewDescription]; [PhoneMainView.instance popToView:VIEW(ConferenceCallView).compositeViewDescription];
[ConferenceViewModelBridge updateParticipantsListWithAddresses:_tableController.contactsGroup]; [ConferenceViewModelBridge updateParticipantsListWithAddresses:_tableController.contactsGroup];
} else { } else {
[PhoneMainView.instance changeCurrentView:VIEW(ConferenceSchedulingSummaryView).compositeViewDescription]; [PhoneMainView.instance changeCurrentView:VIEW(ConferenceSchedulingSummaryView).compositeViewDescription];

1
Classes/Swift/Voip/Views/Fragments/ParticipantsList/ParticipantsListView.swift
View file

@ -38,6 +38,7 @@ import linphonesw
let edit = CallControlButton(buttonTheme: VoipTheme.voip_edit, onClickAction: { let edit = CallControlButton(buttonTheme: VoipTheme.voip_edit, onClickAction: {
self.removeFromSuperview()
self.gotoParticipantsListSelection() self.gotoParticipantsListSelection()
}) })
super.headerView.addSubview(edit) super.headerView.addSubview(edit)