Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jitsi conference terminated function ends the call correctly #7710

Merged
merged 2 commits into from
Nov 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 15 additions & 16 deletions Riot/Modules/Integrations/Widgets/Jitsi/JitsiViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -321,26 +321,25 @@ - (void)conferenceJoined:(NSDictionary *)data

- (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
Expand Down
1 change: 1 addition & 0 deletions changelog.d/7709.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
If a moderator ends a Jitsi call for everyone the call is now dismissed.
Loading