fix: Race condition in SentryApplication and Swift implementation

Author: noahsmartin

Sentry.xcodeproj/project.pbxproj

@@ -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/SentryANRTrackingIntegration.m

@@ -46,7 +46,6 @@
 #import "SentryTransport.h"
 #import "SentryTransportAdapter.h"
 #import "SentryTransportFactory.h"
-#import "SentryUIApplication.h"
 #import "SentryUseNSExceptionCallstackWrapper.h"
 #import "SentryUser.h"
 #import "SentryWatchdogTerminationTracker.h"
@@ -770,7 +769,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/SentryClient.m

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

Sources/Sentry/SentryCrashIntegration.m

@@ -7,6 +7,7 @@
 #import "SentryNSProcessInfoWrapper.h"
 #import "SentryScope+PrivateSwift.h"
 #import "SentryScope.h"
+#import "SentrySwift.h"
 #import "SentryUIDeviceWrapper.h"
 #import <SentryCrashCachedData.h>
 #import <SentryCrashDebug.h>
@@ -15,7 +16,6 @@
 #include <mach/mach.h>
 
 #if SENTRY_HAS_UIKIT
-#    import "SentryUIApplication.h"
 #    import <UIKit/UIKit.h>
 #endif
 
@@ -185,7 +185,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/SentryCrashWrapper.m

@@ -1,6 +1,5 @@
 #import "SentryANRTrackerV1.h"
 
-#import "SentryApplication.h"
 #import "SentryBinaryImageCache.h"
 #import "SentryDefaultObjCRuntimeWrapper.h"
 #import "SentryDispatchFactory.h"
@@ -44,7 +43,6 @@
 #if SENTRY_HAS_UIKIT
 #    import "SentryANRTrackerV2.h"
 #    import "SentryFramesTracker.h"
-#    import "SentryUIApplication.h"
 #    import <SentryViewHierarchyProvider.h>
 #    import <SentryWatchdogTerminationBreadcrumbProcessor.h>
 #endif // SENTRY_HAS_UIKIT
@@ -53,10 +51,6 @@
 #    import "SentryUIDeviceWrapper.h"
 #endif // TARGET_OS_IOS
 
-#if TARGET_OS_OSX
-#    import "SentryNSApplication.h"
-#endif
-
 #if !TARGET_OS_WATCH
 #    import "SentryReachability.h"
 #endif // !TARGET_OS_WATCH
@@ -166,14 +160,15 @@ - (instancetype)init
         _binaryImageCache = [[SentryBinaryImageCache alloc] init];
         _dateProvider = SentryDependencies.dateProvider;
 
-        _notificationCenterWrapper = [NSNotificationCenter defaultCenter];
+        _notificationCenterWrapper = NSNotificationCenter.defaultCenter;
 #if SENTRY_HAS_UIKIT
         _uiDeviceWrapper = [[SentryUIDeviceWrapper alloc] init];
-        _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 = [[SentryNSProcessInfoWrapper alloc] init];

Sources/Sentry/SentryDependencyContainer.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/SentryDependencyContainerSwiftHelper.m

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

Sources/Sentry/SentryNSApplication.m

@@ -23,7 +23,6 @@
 #    import "SentrySessionReplaySyncC.h"
 #    import "SentrySwift.h"
 #    import "SentrySwizzle.h"
-#    import "SentryUIApplication.h"
 #    import <UIKit/UIKit.h>
 
 NS_ASSUME_NONNULL_BEGIN
@@ -332,7 +331,7 @@ - (void)startSession
 
 - (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];
@@ -415,7 +414,8 @@ - (void)startWithOptions:(SentryReplayOptions *)replayOptions
                                                          displayLinkWrapper:displayLinkWrapper];
 
     [self.sessionReplay
-        startWithRootView:SentryDependencyContainer.sharedInstance.application.windows.firstObject
+        startWithRootView:[SentryDependencyContainer.sharedInstance.application getWindows]
+                              .firstObject
               fullSession:shouldReplayFullSession];
 
     [_notificationCenter addObserver:self
@@ -771,7 +771,8 @@ - (void)showMaskPreview:(CGFloat)opacity
         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;