Merge pull request #7710 from vector-im/mauroromito/fix_for_confernce_terminated

This commit is contained in:
Mauro
2023-11-14 18:55:47 +01:00
committed by GitHub
2 changed files with 16 additions and 16 deletions

View File

@@ -321,26 +321,25 @@ static NSString * _Nonnull kJitsiFeatureFlagScreenSharingEnabled = @"ios.screens
- (void)conferenceTerminated:(NSDictionary *)data
{
// 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);
}
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

1
changelog.d/7709.bugfix Normal file
View File

@@ -0,0 +1 @@
If a moderator ends a Jitsi call for everyone the call is now dismissed.