mirror of
https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git
synced 2026-04-20 16:42:44 +02:00
Merge branch 'ismail/5068_design_tweaks' into ismail/5096_thread_notifications
This commit is contained in:
@@ -22,7 +22,6 @@
|
||||
#import "JitsiViewController.h"
|
||||
|
||||
#import "RageShakeManager.h"
|
||||
#import "Analytics.h"
|
||||
|
||||
#import "ThemeService.h"
|
||||
#import "UniversalLink.h"
|
||||
|
||||
@@ -433,16 +433,16 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
|
||||
_isAppForeground = NO;
|
||||
_handleSelfVerificationRequest = YES;
|
||||
|
||||
// Configure our analytics. It will indeed start if the option is enabled
|
||||
Analytics *analytics = [Analytics sharedInstance];
|
||||
// Configure our analytics. It will start if the option is enabled
|
||||
Analytics *analytics = Analytics.shared;
|
||||
[MXSDKOptions sharedInstance].analyticsDelegate = analytics;
|
||||
[DecryptionFailureTracker sharedInstance].delegate = [Analytics sharedInstance];
|
||||
[DecryptionFailureTracker sharedInstance].delegate = analytics;
|
||||
|
||||
MXBaseProfiler *profiler = [MXBaseProfiler new];
|
||||
profiler.analytics = analytics;
|
||||
[MXSDKOptions sharedInstance].profiler = profiler;
|
||||
|
||||
[analytics start];
|
||||
[analytics startIfEnabled];
|
||||
|
||||
self.localAuthenticationService = [[LocalAuthenticationService alloc] initWithPinCodePreferences:[PinCodePreferences shared]];
|
||||
|
||||
@@ -587,7 +587,7 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
|
||||
|
||||
// Analytics: Force to send the pending actions
|
||||
[[DecryptionFailureTracker sharedInstance] dispatch];
|
||||
[[Analytics sharedInstance] dispatch];
|
||||
[Analytics.shared forceUpload];
|
||||
}
|
||||
|
||||
- (void)applicationWillEnterForeground:(UIApplication *)application
|
||||
@@ -648,9 +648,13 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
|
||||
MXLogDebug(@"[AppDelegate] afterAppUnlockedByPin");
|
||||
|
||||
// Check if there is crash log to send
|
||||
if (RiotSettings.shared.enableCrashReport)
|
||||
if (RiotSettings.shared.enableAnalytics)
|
||||
{
|
||||
#if DEBUG
|
||||
// Don't show alerts for crashes during development.
|
||||
#else
|
||||
[self checkExceptionToReport];
|
||||
#endif
|
||||
}
|
||||
|
||||
// Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
|
||||
@@ -1933,6 +1937,11 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
|
||||
|
||||
[self.pushNotificationService checkPushKitPushersInSession:mxSession];
|
||||
}
|
||||
else if (mxSession.state == MXSessionStateRunning)
|
||||
{
|
||||
// Configure analytics from the session if necessary
|
||||
[Analytics.shared useAnalyticsSettingsFrom:mxSession];
|
||||
}
|
||||
else if (mxSession.state == MXSessionStateClosed)
|
||||
{
|
||||
[self removeMatrixSession:mxSession];
|
||||
@@ -2278,6 +2287,9 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
|
||||
// Reset push notification store
|
||||
[self.pushNotificationStore reset];
|
||||
|
||||
// Reset analytics
|
||||
[Analytics.shared reset];
|
||||
|
||||
#ifdef MX_CALL_STACK_ENDPOINT
|
||||
// Erase all created certificates and private keys by MXEndpointCallStack
|
||||
for (MXKAccount *account in MXKAccountManager.sharedManager.accounts)
|
||||
@@ -2443,8 +2455,7 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
|
||||
|
||||
launchAnimationContainerView = launchLoadingView;
|
||||
|
||||
[MXSDKOptions.sharedInstance.profiler startMeasuringTaskWithName:kMXAnalyticsStartupLaunchScreen
|
||||
category:kMXAnalyticsStartupCategory];
|
||||
[MXSDKOptions.sharedInstance.profiler startMeasuringTaskWithName:MXTaskProfileNameStartupLaunchScreen];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2453,7 +2464,7 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
|
||||
if (launchAnimationContainerView)
|
||||
{
|
||||
id<MXProfiler> profiler = MXSDKOptions.sharedInstance.profiler;
|
||||
MXTaskProfile *launchTaskProfile = [profiler taskProfileWithName:kMXAnalyticsStartupLaunchScreen category:kMXAnalyticsStartupCategory];
|
||||
MXTaskProfile *launchTaskProfile = [profiler taskProfileWithName:MXTaskProfileNameStartupLaunchScreen];
|
||||
if (launchTaskProfile)
|
||||
{
|
||||
[profiler stopMeasuringTaskWithProfile:launchTaskProfile];
|
||||
|
||||
Reference in New Issue
Block a user