mirror of
https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git
synced 2026-04-23 18:12:44 +02:00
Merge commit 'd786f7bb4f37b77478a8a55df44a6e87247f96c1' into feature/5433_foss_merge
* commit 'd786f7bb4f37b77478a8a55df44a6e87247f96c1': (36 commits) finish version++ Release notes version++ changelog.d: Upgrade MatrixSDK version ([v0.27.4](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.27.4)). Fix missing placeholder. Translated using Weblate (Catalan) Translated using Weblate (Catalan) Translated using Weblate (Catalan) Translated using Weblate (Arabic) Translated using Weblate (Arabic) Translated using Weblate (Chinese (Simplified)) Translated using Weblate (Vietnamese) Translated using Weblate (Chinese (Simplified)) Translated using Weblate (Chinese (Simplified)) Fix: Remove the “Quote” action from the menu of the selected message. Update RTE to 2.18.0 to fix an issue with Speech-to-Text Code cleanup Dismiss the keyboard and minimise the composer when pasting an image, a video or a file Fix: focus, keyboard visibility, composer height Restore composer tint color ... # Conflicts: # Config/AppVersion.xcconfig # Riot/Modules/Room/RoomViewController.m
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user