felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-17 23:18:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mauro
2023-11-14 18:55:47 +01:00
committed by GitHub
parent c1dacb7014 1fa43615b6
commit dde4847b90
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Riot/Modules/Integrations/Widgets/Jitsi/JitsiViewController.m
View File

@@ -321,26 +321,25 @@ static NSString * _Nonnull kJitsiFeatureFlagScreenSharingEnabled = @"ios.screens
- (void)conferenceTerminated:(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) if (data[kJitsiDataErrorKey] != nil)
{ {
MXLogDebug(@"[JitsiViewController] conferenceTerminated - data: %@", data); MXLogDebug(@"[JitsiViewController] conferenceTerminated - data: %@", data);
} }
else
{ dispatch_async(dispatch_get_main_queue(), ^{
dispatch_async(dispatch_get_main_queue(), ^{
// The conference is over. Let the delegate close this view controller.
// The conference is over. Let the delegate close this view controller. if (self.delegate)
if (self.delegate) {
{ [self.delegate jitsiViewController:self dismissViewJitsiController:nil];
[self.delegate jitsiViewController:self dismissViewJitsiController:nil]; }
} else
else {
{ // Do it ourself
// Do it ourself [self dismissViewControllerAnimated:YES completion:nil];
[self dismissViewControllerAnimated:YES completion:nil]; }
} });
});
}
} }
- (void)enterPictureInPicture:(NSDictionary *)data - (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.