fix: Race condition in SentryApplication and Swift implementation

Sources/Sentry/SentryANRTrackingIntegration.m

@@ -17,7 +17,6 @@
 #import "SentryThread.h"
 #import "SentryThreadInspector.h"
 #import "SentryThreadWrapper.h"
-#import "SentryUIApplication.h"
 #import <SentryCrashWrapper.h>
 #import <SentryOptions+Private.h>
 
@@ -120,7 +119,7 @@ - (void)anrDetectedWithType:(enum SentryANRType)type
 
     // If the app is not active, the main thread may be blocked or too busy.
     // Since there is no UI for the user to interact, there is no need to report app hang.
-    if (SentryDependencyContainer.sharedInstance.application.applicationState
+    if (SentryDependencyContainer.sharedInstance.threadsafeApplication.applicationState
         != UIApplicationStateActive) {
         return;
     }

Sources/Sentry/SentryClient.m

@@ -42,7 +42,6 @@
 #import "SentryTransport.h"
 #import "SentryTransportAdapter.h"
 #import "SentryTransportFactory.h"
-#import "SentryUIApplication.h"
 #import "SentryUseNSExceptionCallstackWrapper.h"
 #import "SentryUser.h"
 #import "SentryWatchdogTerminationTracker.h"
@@ -785,7 +784,7 @@ - (SentryEvent *_Nullable)prepareEvent:(SentryEvent *)event
             context[@"app"] = app;
 
             UIApplicationState appState =
-                [SentryDependencyContainer sharedInstance].application.applicationState;
+                [SentryDependencyContainer sharedInstance].threadsafeApplication.applicationState;
             BOOL inForeground = appState == UIApplicationStateActive;
             app[@"in_foreground"] = @(inForeground);
             event.context = context;

Sources/Sentry/SentryCrashIntegration.m

@@ -25,7 +25,6 @@
 #import <SentrySDK+Private.h>
 
 #if SENTRY_HAS_UIKIT
-#    import "SentryUIApplication.h"
 #    import <UIKit/UIKit.h>
 #endif
 

Sources/Sentry/SentryCrashWrapper.m

@@ -14,7 +14,6 @@
 #include <mach/mach.h>
 
 #if SENTRY_HAS_UIKIT
-#    import "SentryUIApplication.h"
 #    import <UIKit/UIKit.h>
 #endif
 
@@ -184,7 +183,8 @@ - (void)enrichScope:(SentryScope *)scope
 // The UIWindowScene is unavailable on visionOS
 #if SENTRY_TARGET_REPLAY_SUPPORTED
 
-    NSArray<UIWindow *> *appWindows = SentryDependencyContainer.sharedInstance.application.windows;
+    NSArray<UIWindow *> *appWindows =
+        [SentryDependencyContainer.sharedInstance.application getWindows];
     if ([appWindows count] > 0) {
         UIScreen *appScreen = appWindows.firstObject.screen;
         if (appScreen != nil) {

Sources/Sentry/SentryDependencyContainer.m

@@ -1,6 +1,5 @@
 #import "SentryANRTrackerV1.h"
 
-#import "SentryApplication.h"
 #import "SentryDispatchFactory.h"
 #import "SentryDisplayLinkWrapper.h"
 #import "SentryExtraContextProvider.h"
@@ -38,15 +37,10 @@
 #if SENTRY_HAS_UIKIT
 #    import "SentryANRTrackerV2.h"
 #    import "SentryFramesTracker.h"
-#    import "SentryUIApplication.h"
 #    import <SentryViewHierarchyProvider.h>
 #    import <SentryWatchdogTerminationBreadcrumbProcessor.h>
 #endif // SENTRY_HAS_UIKIT
 
-#if TARGET_OS_OSX
-#    import "SentryNSApplication.h"
-#endif
-
 #if !TARGET_OS_WATCH
 #    import "SentryReachability.h"
 #endif // !TARGET_OS_WATCH
@@ -156,15 +150,16 @@ - (instancetype)init
         _binaryImageCache = [[SentryBinaryImageCache alloc] init];
         _dateProvider = SentryDependencies.dateProvider;
 
-        _notificationCenterWrapper = [NSNotificationCenter defaultCenter];
+        _notificationCenterWrapper = NSNotificationCenter.defaultCenter;
 #if SENTRY_HAS_UIKIT
         _uiDeviceWrapper =
             [[SentryDefaultUIDeviceWrapper alloc] initWithQueueWrapper:_dispatchQueueWrapper];
-        _application = [[SentryUIApplication alloc]
-            initWithNotificationCenterWrapper:_notificationCenterWrapper
-                         dispatchQueueWrapper:_dispatchQueueWrapper];
+        _application = UIApplication.sharedApplication;
+        _threadsafeApplication = [[SentryThreadsafeApplication alloc]
+            initWithInitialState:_application.unsafeApplicationState
+              notificationCenter:_notificationCenterWrapper];
 #elif TARGET_OS_OSX
-        _application = [[SentryNSApplication alloc] init];
+        _application = NSApplication.sharedApplication;
 #endif // SENTRY_HAS_UIKIT
 
         _processInfoWrapper = NSProcessInfo.processInfo;

Sources/Sentry/SentryDependencyContainerSwiftHelper.m

@@ -2,15 +2,14 @@
 #import "SentryDependencyContainer.h"
 #import "SentrySDK+Private.h"
 #import "SentrySwift.h"
-#import "SentryUIApplication.h"
 
 @implementation SentryDependencyContainerSwiftHelper
 
 #if SENTRY_HAS_UIKIT
 
 + (NSArray<UIWindow *> *)windows
 {
-    return SentryDependencyContainer.sharedInstance.application.windows;
+    return [SentryDependencyContainer.sharedInstance.application getWindows];
 }
 
 #endif // SENTRY_HAS_UIKIT

Sources/Sentry/SentrySDKInternal.m

@@ -23,7 +23,6 @@
 #import "SentrySerialization.h"
 #import "SentrySwift.h"
 #import "SentryTransactionContext.h"
-#import "SentryUIApplication.h"
 #import "SentryUseNSExceptionCallstackWrapper.h"
 #import "SentryUserFeedbackIntegration.h"
 

Sources/Sentry/SentrySessionReplayIntegration.m

@@ -22,7 +22,6 @@
 #    import "SentrySessionReplaySyncC.h"
 #    import "SentrySwift.h"
 #    import "SentrySwizzle.h"
-#    import "SentryUIApplication.h"
 #    import <UIKit/UIKit.h>
 
 NS_ASSUME_NONNULL_BEGIN
@@ -212,9 +211,9 @@
     }
 
     SentryId *replayId = jsonObject[@"replayId"]
         ? [[SentryId alloc] initWithUUIDString:jsonObject[@"replayId"]]
         : [[SentryId alloc] init];
     NSURL *lastReplayURL = [dir URLByAppendingPathComponent:jsonObject[@"path"]];
 
     SentryCrashReplay crashInfo = { 0 };
     bool hasCrashInfo = sentrySessionReplaySync_readInfo(&crashInfo,
@@ -238,7 +237,7 @@
     }
 
     SentryOnDemandReplay *resumeReplayMaker =
         [[SentryOnDemandReplay alloc] initWithContentFrom:lastReplayURL.path
                                           processingQueue:_replayProcessingQueue
                                          assetWorkerQueue:_replayAssetWorkerQueue];
     resumeReplayMaker.bitRate = _replayOptions.replayBitRate;
@@ -331,7 +330,7 @@
 
 - (void)runReplayForAvailableWindow
 {
-    if (SentryDependencyContainer.sharedInstance.application.windows.count > 0) {
+    if ([SentryDependencyContainer.sharedInstance.application getWindows].count > 0) {
         SENTRY_LOG_DEBUG(@"[Session Replay] Running replay for available window");
         // If a window its already available start replay right away
         [self startWithOptions:_replayOptions fullSession:_startedAsFullSession];
@@ -379,7 +378,7 @@
     NSString *currentSession = [NSUUID UUID].UUIDString;
     docs = [docs URLByAppendingPathComponent:currentSession];
 
     if (![NSFileManager.defaultManager fileExistsAtPath:docs.path]) {
         SENTRY_LOG_DEBUG(@"[Session Replay] Creating directory at path: %@", docs.path);
         [NSFileManager.defaultManager createDirectoryAtURL:docs
                                withIntermediateDirectories:YES
@@ -388,7 +387,7 @@
     }
 
     SentryOnDemandReplay *replayMaker =
         [[SentryOnDemandReplay alloc] initWithOutputPath:docs.path
                                          processingQueue:_replayProcessingQueue
                                         assetWorkerQueue:_replayAssetWorkerQueue];
     replayMaker.bitRate = replayOptions.replayBitRate;
@@ -414,7 +413,8 @@
                                                          displayLinkWrapper:displayLinkWrapper];
 
     [self.sessionReplay
-        startWithRootView:SentryDependencyContainer.sharedInstance.application.windows.firstObject
+        startWithRootView:[SentryDependencyContainer.sharedInstance.application getWindows]
+                              .firstObject
               fullSession:shouldReplayFullSession];
 
     [_notificationCenter addObserver:self
@@ -427,8 +427,8 @@
                                 name:UIApplicationDidBecomeActiveNotification
                               object:nil];
 
     [self saveCurrentSessionInfo:self.sessionReplay.sessionReplayId
                             path:docs.path
                          options:replayOptions];
 }
 
@@ -478,7 +478,7 @@
     NSURL *last = [path URLByAppendingPathComponent:SENTRY_LAST_REPLAY];
 
     NSError *error;
     if ([fileManager fileExistsAtPath:last.path]) {
         SENTRY_LOG_DEBUG(@"[Session Replay] Removing last replay file at path: %@", last);
         if ([NSFileManager.defaultManager removeItemAtURL:last error:&error] == NO) {
             SENTRY_LOG_ERROR(
@@ -490,7 +490,7 @@
         SENTRY_LOG_DEBUG(@"[Session Replay] No last replay file to remove at path: %@", last);
     }
 
     if ([fileManager fileExistsAtPath:current.path]) {
         SENTRY_LOG_DEBUG(
             @"[Session Replay] Moving current replay file at path: %@ to: %@", current, last);
         if ([fileManager moveItemAtURL:current toURL:last error:&error] == NO) {
@@ -770,7 +770,8 @@
         return;
     }
 
-    UIWindow *window = SentryDependencyContainer.sharedInstance.application.windows.firstObject;
+    UIWindow *window =
+        [SentryDependencyContainer.sharedInstance.application getWindows].firstObject;
     if (window == nil) {
         SENTRY_LOG_WARN(@"[Session Replay] No UIWindow available to display preview");
         return;

Sources/Sentry/SentrySessionTracker.m

@@ -1,5 +1,4 @@
 #import "SentrySessionTracker.h"
-#import "SentryApplication.h"
 #import "SentryClient+Private.h"
 #import "SentryClient.h"
 #import "SentryFileManager.h"
@@ -94,7 +93,7 @@ - (void)start
     // Edge case: When starting the SDK after the app did become active, we need to call
     //            didBecomeActive manually to start the session. This is the case when
     //            closing the SDK and starting it again.
-    if (self.application.isActive) {
+    if (self.application.mainThread_isActive) {
         [self startSession];
     }
 #else

Sources/Sentry/SentryTracer.m

@@ -27,7 +27,6 @@
 #import "SentryTracer+Private.h"
 #import "SentryTransaction.h"
 #import "SentryTransactionContext.h"
-#import "SentryUIApplication.h"
 #import <NSMutableDictionary+Sentry.h>
 
 #if SENTRY_TARGET_PROFILING_SUPPORTED
@@ -176,7 +175,7 @@
 #endif // SENTRY_HAS_UIKIT
 
 #if SENTRY_TARGET_PROFILING_SUPPORTED
     _profilerReferenceID = sentry_startProfilerForTrace(configuration, hub, transactionContext);
     _isProfiling = _profilerReferenceID != nil;
 #endif // SENTRY_TARGET_PROFILING_SUPPORTED
 
@@ -586,7 +585,7 @@
 
 #if SENTRY_TARGET_PROFILING_SUPPORTED
     sentry_stopProfilerDueToFinishedTransaction(
         _hub, _dispatchQueue, transaction, _isProfiling, self.startTimestamp, _startSystemTime
 #    if SENTRY_HAS_UIKIT
         ,
         appStartMeasurement
@@ -645,7 +644,7 @@
     // Prewarming can execute code up to viewDidLoad of a UIViewController, and keep the app in the
     // background. This can lead to auto-generated transactions lasting for minutes or even hours.
     // Therefore, we drop transactions lasting longer than SENTRY_AUTO_TRANSACTION_MAX_DURATION.
     NSTimeInterval transactionDuration = [self.timestamp timeIntervalSinceDate:self.startTimestamp];
     if ([self isAutoGeneratedTransaction]
         && transactionDuration >= SENTRY_AUTO_TRANSACTION_MAX_DURATION) {
         SENTRY_LOG_INFO(@"Auto generated transaction exceeded the max duration of %f seconds. Not "
@@ -704,7 +703,7 @@
 
     @synchronized(_children) {
         for (id<SentrySpan> childSpan in _children) {
             if ([oldest compare:childSpan.timestamp] == NSOrderedAscending) {
                 oldest = childSpan.timestamp;
             }
         }
@@ -825,7 +824,7 @@
     NSDate *appStartEndTimestamp =
         [appStartTimestamp dateByAddingTimeInterval:measurement.duration];
 
     NSTimeInterval difference = [appStartEndTimestamp timeIntervalSinceDate:self.startTimestamp];
 
     // Don't attach app start measurements if too much time elapsed between the end of the app start
     // sequence and the start of the transaction. This makes transactions too long.
@@ -860,7 +859,7 @@
                 ? [NSString stringWithFormat:@"%@.prewarmed", appContextType]
                 : appContextType;
             NSMutableDictionary *context =
                 [[NSMutableDictionary alloc] initWithDictionary:[transaction context]];
             NSDictionary *appContext = @{ @"app" : @ { @"start_type" : appStartType } };
             [SentryDictionary mergeEntriesFromDictionary:appContext intoDictionary:context];
             [transaction setContext:context];