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

Fixed additional merge issues

Browse Source
This commit is contained in:
Arnfried Griesert
2023-06-12 06:08:33 +02:00
parent 51e98cfe61
commit 4fc5e366e3
7 changed files with 42 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Application/LegacyAppDelegate.m
+8 -11
View File
@@ -2562,6 +2562,7 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
{
MXLogDebug(@"[AppDelegate] showLaunchAnimation");
/* bwi: 4782 removed by nv
UIView *launchLoadingView;
if (MXSDKOptions.sharedInstance.enableStartupProgress)
{
@@ -2569,15 +2570,8 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
{
launchLoadingView = [BUMLaunchLoadingViewController makeView];
} else {
if (MXSDKOptions.sharedInstance.enableStartupProgress)
{
MXSession *mainSession = self.mxSessions.firstObject;
launchLoadingView = [LaunchLoadingView instantiateWithStartupProgress:mainSession.startupProgress];
}
else
{
launchLoadingView = [LaunchLoadingView instantiateWithStartupProgress:nil];
}
MXSession *mainSession = self.mxSessions.firstObject;
launchLoadingView = [LaunchLoadingView instantiateWithStartupProgress:mainSession.startupProgress];
[(LaunchLoadingView *) launchLoadingView updateWithTheme:ThemeService.shared.theme];
}
@@ -2586,7 +2580,9 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
[window addSubview:launchLoadingView];
}
*/
/* bwi: 4782 - new code from nv
MXSession *mainSession = self.mxSessions.firstObject;
LaunchLoadingView *launchLoadingView = [LaunchLoadingView instantiateWithStartupProgress:mainSession.startupProgress];
@@ -2596,8 +2592,9 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
[window addSubview:launchLoadingView];
launchAnimationContainerView = launchLoadingView;
launchAnimationContainerView = launchLoadingView;
*/
[MXSDKOptions.sharedInstance.profiler startMeasuringTaskWithName:MXTaskProfileNameStartupLaunchScreen];
}
}