From 3b66fccc9851974ea37ebc072c9ad1d3271c6ddf Mon Sep 17 00:00:00 2001 From: Mauro Romito Date: Tue, 14 Nov 2023 18:47:16 +0100 Subject: [PATCH 1/2] fix --- .../Widgets/Jitsi/JitsiViewController.m | 31 +++++++++---------- changelog.d/7709.bugfix | 1 + 2 files changed, 16 insertions(+), 16 deletions(-) create mode 100644 changelog.d/7709.bugfix diff --git a/Riot/Modules/Integrations/Widgets/Jitsi/JitsiViewController.m b/Riot/Modules/Integrations/Widgets/Jitsi/JitsiViewController.m index 71d5283318..562db0fa49 100644 --- a/Riot/Modules/Integrations/Widgets/Jitsi/JitsiViewController.m +++ b/Riot/Modules/Integrations/Widgets/Jitsi/JitsiViewController.m @@ -321,26 +321,25 @@ - (void)conferenceJoined:(NSDictionary *)data - (void)conferenceTerminated:(NSDictionary *)data { + // If the call if terminated by a moderator the error key contains the "conference.destroyed" value if (data[kJitsiDataErrorKey] != nil) { MXLogDebug(@"[JitsiViewController] conferenceTerminated - data: %@", data); } - else - { - dispatch_async(dispatch_get_main_queue(), ^{ - - // The conference is over. Let the delegate close this view controller. - if (self.delegate) - { - [self.delegate jitsiViewController:self dismissViewJitsiController:nil]; - } - else - { - // Do it ourself - [self dismissViewControllerAnimated:YES completion:nil]; - } - }); - } + + dispatch_async(dispatch_get_main_queue(), ^{ + + // The conference is over. Let the delegate close this view controller. + if (self.delegate) + { + [self.delegate jitsiViewController:self dismissViewJitsiController:nil]; + } + else + { + // Do it ourself + [self dismissViewControllerAnimated:YES completion:nil]; + } + }); } - (void)enterPictureInPicture:(NSDictionary *)data diff --git a/changelog.d/7709.bugfix b/changelog.d/7709.bugfix new file mode 100644 index 0000000000..0a77faa72d --- /dev/null +++ b/changelog.d/7709.bugfix @@ -0,0 +1 @@ +If a moderator ends a Jitsi call for everyone the call is now dismissed. \ No newline at end of file From 925e3cfb5bcb3482b938e82c95e9bd16124c8be8 Mon Sep 17 00:00:00 2001 From: Mauro <34335419+Velin92@users.noreply.github.com> Date: Tue, 14 Nov 2023 18:55:31 +0100 Subject: [PATCH 2/2] Update Riot/Modules/Integrations/Widgets/Jitsi/JitsiViewController.m Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com> --- Riot/Modules/Integrations/Widgets/Jitsi/JitsiViewController.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Riot/Modules/Integrations/Widgets/Jitsi/JitsiViewController.m b/Riot/Modules/Integrations/Widgets/Jitsi/JitsiViewController.m index 562db0fa49..baa8907d46 100644 --- a/Riot/Modules/Integrations/Widgets/Jitsi/JitsiViewController.m +++ b/Riot/Modules/Integrations/Widgets/Jitsi/JitsiViewController.m @@ -321,7 +321,7 @@ - (void)conferenceJoined:(NSDictionary *)data - (void)conferenceTerminated:(NSDictionary *)data { - // If the call if terminated by a moderator the error key contains the "conference.destroyed" value + // If the call is terminated by a moderator the error key contains the "conference.destroyed" value if (data[kJitsiDataErrorKey] != nil) { MXLogDebug(@"[JitsiViewController] conferenceTerminated - data: %@", data);