fix: Incorrect nullability in some dependencies (#6448)

noahsmartin · web-flow · commit aa643c56bce6 · 2025-10-17T13:45:42.000-04:00
diff --git a/Sources/Sentry/Processors/SentryWatchdogTerminationBreadcrumbProcessor.m b/Sources/Sentry/Processors/SentryWatchdogTerminationBreadcrumbProcessor.m
@@ -18,7 +18,7 @@ @interface SentryWatchdogTerminationBreadcrumbProcessor ()
 @implementation SentryWatchdogTerminationBreadcrumbProcessor
 
 - (instancetype)initWithMaxBreadcrumbs:(NSInteger)maxBreadcrumbs
-                           fileManager:(SentryFileManager *)fileManager
+                           fileManager:(SentryFileManager *_Nullable)fileManager
 {
     if (self = [super init]) {
         self.fileManager = fileManager;
diff --git a/Sources/Sentry/SentryDefaultAppStateManager.m b/Sources/Sentry/SentryDefaultAppStateManager.m
@@ -23,9 +23,9 @@ @interface SentryDefaultAppStateManager ()
 
 @implementation SentryDefaultAppStateManager
 
-- (instancetype)initWithOptions:(SentryOptions *)options
+- (instancetype)initWithOptions:(SentryOptions *_Nullable)options
                    crashWrapper:(SentryCrashWrapper *)crashWrapper
-                    fileManager:(SentryFileManager *)fileManager
+                    fileManager:(SentryFileManager *_Nullable)fileManager
            dispatchQueueWrapper:(SentryDispatchQueueWrapper *)dispatchQueueWrapper
       notificationCenterWrapper:(id<SentryNSNotificationCenterWrapper>)notificationCenterWrapper
 {
diff --git a/Sources/Sentry/SentryDependencyContainer.m b/Sources/Sentry/SentryDependencyContainer.m
@@ -387,7 +387,8 @@ - (SentryMXManager *)metricKitManager SENTRY_THREAD_SANITIZER_DOUBLE_CHECKED_LOC
 
 #endif // SENTRY_HAS_METRIC_KIT
 
-- (SentryScopePersistentStore *)scopePersistentStore SENTRY_THREAD_SANITIZER_DOUBLE_CHECKED_LOCK
+- (SentryScopePersistentStore *_Nullable)
+    scopePersistentStore SENTRY_THREAD_SANITIZER_DOUBLE_CHECKED_LOCK
 {
     SENTRY_LAZY_INIT(_scopePersistentStore,
         [[SentryScopePersistentStore alloc] initWithFileManager:self.fileManager]);
diff --git a/Sources/Sentry/SentryFileManagerHelper.m b/Sources/Sentry/SentryFileManagerHelper.m
@@ -103,7 +103,7 @@ @interface SentryFileManagerHelper ()
 
 @implementation SentryFileManagerHelper
 
-- (nullable instancetype)initWithOptions:(SentryOptions *)options error:(NSError **)error
+- (nullable instancetype)initWithOptions:(SentryOptions *_Nullable)options error:(NSError **)error
 {
     if (self = [super init]) {
         [self createPathsWithOptions:options];
@@ -128,7 +128,7 @@ - (nullable instancetype)initWithOptions:(SentryOptions *)options error:(NSError
     return self;
 }
 
-- (void)createPathsWithOptions:(SentryOptions *)options
+- (void)createPathsWithOptions:(SentryOptions *_Nullable)options
 {
     NSString *cachePath = options.cacheDirectoryPath;
 
diff --git a/Sources/Sentry/include/HybridPublic/SentryDependencyContainer.h b/Sources/Sentry/include/HybridPublic/SentryDependencyContainer.h
@@ -103,7 +103,7 @@ SENTRY_NO_INIT
 @property (nonatomic, strong, readonly) SentryThreadInspector *threadInspector;
 @property (nonatomic, strong, readonly) SentryFileIOTracker *fileIOTracker;
 @property (nonatomic, strong) SentryCrashSwift *crashReporter;
-@property (nonatomic, strong) SentryScopePersistentStore *scopePersistentStore;
+@property (nonatomic, strong, nullable) SentryScopePersistentStore *scopePersistentStore;
 @property (nonatomic, strong) SentryDebugImageProvider *debugImageProvider;
 
 - (id<SentryANRTracker>)getANRTracker:(NSTimeInterval)timeout;
diff --git a/Sources/Sentry/include/SentryDefaultAppStateManager.h b/Sources/Sentry/include/SentryDefaultAppStateManager.h
@@ -15,9 +15,9 @@ SENTRY_NO_INIT
 
 @property (nonatomic, readonly) NSInteger startCount;
 
-- (instancetype)initWithOptions:(SentryOptions *)options
+- (instancetype)initWithOptions:(SentryOptions *_Nullable)options
                    crashWrapper:(SentryCrashWrapper *)crashWrapper
-                    fileManager:(SentryFileManager *)fileManager
+                    fileManager:(SentryFileManager *_Nullable)fileManager
            dispatchQueueWrapper:(SentryDispatchQueueWrapper *)dispatchQueueWrapper
       notificationCenterWrapper:(id<SentryNSNotificationCenterWrapper>)notificationCenterWrapper;
 
diff --git a/Sources/Sentry/include/SentryFileManagerHelper.h b/Sources/Sentry/include/SentryFileManagerHelper.h
@@ -33,7 +33,7 @@ SENTRY_NO_INIT
 
 @property (nonatomic, copy, nullable) void (^handleEnvelopesLimit)(void);
 
-- (nullable instancetype)initWithOptions:(SentryOptions *)options
+- (nullable instancetype)initWithOptions:(SentryOptions *_Nullable)options
                                    error:(NSError **)error NS_DESIGNATED_INITIALIZER;
 
 #pragma mark - Envelope
diff --git a/Sources/Sentry/include/SentryWatchdogTerminationBreadcrumbProcessor.h b/Sources/Sentry/include/SentryWatchdogTerminationBreadcrumbProcessor.h
@@ -7,7 +7,7 @@ NS_ASSUME_NONNULL_BEGIN
 @interface SentryWatchdogTerminationBreadcrumbProcessor : NSObject
 
 - (instancetype)initWithMaxBreadcrumbs:(NSInteger)maxBreadcrumbs
-                           fileManager:(SentryFileManager *)fileManager;
+                           fileManager:(SentryFileManager *_Nullable)fileManager;
 
 - (void)addSerializedBreadcrumb:(NSDictionary *)crumb;
 
diff --git a/Sources/Swift/Helper/SentryFileManager.swift b/Sources/Swift/Helper/SentryFileManager.swift
@@ -26,7 +26,7 @@
         helper.previousBreadcrumbsFilePathTwo
     }
 
-    @objc public init(options: Options, dateProvider: SentryCurrentDateProvider, dispatchQueueWrapper: SentryDispatchQueueWrapper) throws {
+    @objc public init(options: Options?, dateProvider: SentryCurrentDateProvider, dispatchQueueWrapper: SentryDispatchQueueWrapper) throws {
         dispatchQueue = dispatchQueueWrapper
         self.dateProvider = dateProvider
         helper = try SentryFileManagerHelper(options: options)
diff --git a/Sources/Swift/Integrations/WatchdogTerminations/Processors/SentryWatchdogTerminationAttributesProcessor.swift b/Sources/Swift/Integrations/WatchdogTerminations/Processors/SentryWatchdogTerminationAttributesProcessor.swift
@@ -5,11 +5,11 @@ import Foundation
 @_spi(Private) public class SentryWatchdogTerminationAttributesProcessor: NSObject {
 
     private let dispatchQueueWrapper: SentryDispatchQueueWrapper
-    private let scopePersistentStore: SentryScopePersistentStore
+    private let scopePersistentStore: SentryScopePersistentStore?
 
     public init(
         withDispatchQueueWrapper dispatchQueueWrapper: SentryDispatchQueueWrapper,
-        scopePersistentStore: SentryScopePersistentStore
+        scopePersistentStore: SentryScopePersistentStore?
     ) {
         self.dispatchQueueWrapper = dispatchQueueWrapper
         self.scopePersistentStore = scopePersistentStore
@@ -21,48 +21,48 @@ import Foundation
     
     public func clear() {
         SentrySDKLog.debug("Deleting all stored data in in persistent store")
-        scopePersistentStore.deleteAllCurrentState()
+        scopePersistentStore?.deleteAllCurrentState()
     }
 
     public func setContext(_ context: [String: [String: Any]]?) {
         setData(data: context, field: .context) { [weak self] data in
-            self?.scopePersistentStore.writeContextToDisk(context: data)
+            self?.scopePersistentStore?.writeContextToDisk(context: data)
         }
     }
     
     public func setUser(_ user: User?) {
         setData(data: user, field: .user) { [weak self] data in
-            self?.scopePersistentStore.writeUserToDisk(user: data)
+            self?.scopePersistentStore?.writeUserToDisk(user: data)
         }
     }
     
     public func setDist(_ dist: String?) {
         setData(data: dist, field: .dist) { [weak self] data in
-            self?.scopePersistentStore.writeDistToDisk(dist: data)
+            self?.scopePersistentStore?.writeDistToDisk(dist: data)
         }
     }
     
     public func setEnvironment(_ environment: String?) {
         setData(data: environment, field: .environment) { [weak self] data in
-            self?.scopePersistentStore.writeEnvironmentToDisk(environment: data)
+            self?.scopePersistentStore?.writeEnvironmentToDisk(environment: data)
         }
     }
     
     public func setTags(_ tags: [String: String]?) {
         setData(data: tags, field: .tags) { [weak self] data in
-            self?.scopePersistentStore.writeTagsToDisk(tags: data)
+            self?.scopePersistentStore?.writeTagsToDisk(tags: data)
         }
     }
     
     public func setExtras(_ extras: [String: Any]?) {
         setData(data: extras, field: .extras) { [weak self] data in
-            self?.scopePersistentStore.writeExtrasToDisk(extras: data)
+            self?.scopePersistentStore?.writeExtrasToDisk(extras: data)
         }
     }
     
     public func setFingerprint(_ fingerprint: [String]?) {
         setData(data: fingerprint, field: .fingerprint) { [weak self] data in
-            self?.scopePersistentStore.writeFingerprintToDisk(fingerprint: data)
+            self?.scopePersistentStore?.writeFingerprintToDisk(fingerprint: data)
         }
     }
     
@@ -76,7 +76,7 @@ import Foundation
             }
             guard let data = data else {
                 SentrySDKLog.debug("Data for \(field.name) is nil, deleting active file.")
-                strongSelf.scopePersistentStore.deleteCurrentFieldOnDisk(field: field)
+                strongSelf.scopePersistentStore?.deleteCurrentFieldOnDisk(field: field)
                 return
             }
             save(data)

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ @interface SentryWatchdogTerminationBreadcrumbProcessor ()`
`18`	`18`	`@implementation SentryWatchdogTerminationBreadcrumbProcessor`
`19`	`19`
`20`	`20`	`- (instancetype)initWithMaxBreadcrumbs:(NSInteger)maxBreadcrumbs`
`21`		`- fileManager:(SentryFileManager *)fileManager`
	`21`	`+ fileManager:(SentryFileManager *_Nullable)fileManager`
`22`	`22`	`{`
`23`	`23`	`if (self = [super init]) {`
`24`	`24`	`self.fileManager = fileManager;`
Original file line number	Diff line number	Diff line change
`@@ -387,7 +387,8 @@ - (SentryMXManager *)metricKitManager SENTRY_THREAD_SANITIZER_DOUBLE_CHECKED_LOC`
`387`	`387`
`388`	`388`	`#endif // SENTRY_HAS_METRIC_KIT`
`389`	`389`
`390`		`-- (SentryScopePersistentStore *)scopePersistentStore SENTRY_THREAD_SANITIZER_DOUBLE_CHECKED_LOCK`
	`390`	`+- (SentryScopePersistentStore *_Nullable)`
	`391`	`+ scopePersistentStore SENTRY_THREAD_SANITIZER_DOUBLE_CHECKED_LOCK`
`391`	`392`	`{`
`392`	`393`	`SENTRY_LAZY_INIT(_scopePersistentStore,`
`393`	`394`	`[[SentryScopePersistentStore alloc] initWithFileManager:self.fileManager]);`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ @interface SentryFileManagerHelper ()`
`103`	`103`
`104`	`104`	`@implementation SentryFileManagerHelper`
`105`	`105`
`106`		`-- (nullable instancetype)initWithOptions:(SentryOptions )options error:(NSError *)error`
	`106`	`+- (nullable instancetype)initWithOptions:(SentryOptions _Nullable)options error:(NSError *)error`
`107`	`107`	`{`
`108`	`108`	`if (self = [super init]) {`
`109`	`109`	`[self createPathsWithOptions:options];`
`@@ -128,7 +128,7 @@ - (nullable instancetype)initWithOptions:(SentryOptions *)options error:(NSError`
`128`	`128`	`return self;`
`129`	`129`	`}`
`130`	`130`
`131`		`-- (void)createPathsWithOptions:(SentryOptions *)options`
	`131`	`+- (void)createPathsWithOptions:(SentryOptions *_Nullable)options`
`132`	`132`	`{`
`133`	`133`	`NSString *cachePath = options.cacheDirectoryPath;`
`134`	`134`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`helper.previousBreadcrumbsFilePathTwo`
`27`	`27`	`}`
`28`	`28`
`29`		`- @objc public init(options: Options, dateProvider: SentryCurrentDateProvider, dispatchQueueWrapper: SentryDispatchQueueWrapper) throws {`
	`29`	`+ @objc public init(options: Options?, dateProvider: SentryCurrentDateProvider, dispatchQueueWrapper: SentryDispatchQueueWrapper) throws {`
`30`	`30`	`dispatchQueue = dispatchQueueWrapper`
`31`	`31`	`self.dateProvider = dateProvider`
`32`	`32`	`helper = try SentryFileManagerHelper(options: options)`
Original file line number	Diff line number	Diff line change
`@@ -5,11 +5,11 @@ import Foundation`
`5`	`5`	`@_spi(Private) public class SentryWatchdogTerminationAttributesProcessor: NSObject {`
`6`	`6`
`7`	`7`	`private let dispatchQueueWrapper: SentryDispatchQueueWrapper`
`8`		`- private let scopePersistentStore: SentryScopePersistentStore`
	`8`	`+ private let scopePersistentStore: SentryScopePersistentStore?`
`9`	`9`
`10`	`10`	`public init(`
`11`	`11`	`withDispatchQueueWrapper dispatchQueueWrapper: SentryDispatchQueueWrapper,`
`12`		`- scopePersistentStore: SentryScopePersistentStore`
	`12`	`+ scopePersistentStore: SentryScopePersistentStore?`
`13`	`13`	`) {`
`14`	`14`	`self.dispatchQueueWrapper = dispatchQueueWrapper`
`15`	`15`	`self.scopePersistentStore = scopePersistentStore`
`@@ -21,48 +21,48 @@ import Foundation`
`21`	`21`
`22`	`22`	`public func clear() {`
`23`	`23`	`SentrySDKLog.debug("Deleting all stored data in in persistent store")`
`24`		`- scopePersistentStore.deleteAllCurrentState()`
	`24`	`+ scopePersistentStore?.deleteAllCurrentState()`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`public func setContext(_ context: [String: [String: Any]]?) {`
`28`	`28`	`setData(data: context, field: .context) { [weak self] data in`
`29`		`- self?.scopePersistentStore.writeContextToDisk(context: data)`
	`29`	`+ self?.scopePersistentStore?.writeContextToDisk(context: data)`
`30`	`30`	`}`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`public func setUser(_ user: User?) {`
`34`	`34`	`setData(data: user, field: .user) { [weak self] data in`
`35`		`- self?.scopePersistentStore.writeUserToDisk(user: data)`
	`35`	`+ self?.scopePersistentStore?.writeUserToDisk(user: data)`
`36`	`36`	`}`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`public func setDist(_ dist: String?) {`
`40`	`40`	`setData(data: dist, field: .dist) { [weak self] data in`
`41`		`- self?.scopePersistentStore.writeDistToDisk(dist: data)`
	`41`	`+ self?.scopePersistentStore?.writeDistToDisk(dist: data)`
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`public func setEnvironment(_ environment: String?) {`
`46`	`46`	`setData(data: environment, field: .environment) { [weak self] data in`
`47`		`- self?.scopePersistentStore.writeEnvironmentToDisk(environment: data)`
	`47`	`+ self?.scopePersistentStore?.writeEnvironmentToDisk(environment: data)`
`48`	`48`	`}`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`public func setTags(_ tags: [String: String]?) {`
`52`	`52`	`setData(data: tags, field: .tags) { [weak self] data in`
`53`		`- self?.scopePersistentStore.writeTagsToDisk(tags: data)`
	`53`	`+ self?.scopePersistentStore?.writeTagsToDisk(tags: data)`
`54`	`54`	`}`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`public func setExtras(_ extras: [String: Any]?) {`
`58`	`58`	`setData(data: extras, field: .extras) { [weak self] data in`
`59`		`- self?.scopePersistentStore.writeExtrasToDisk(extras: data)`
	`59`	`+ self?.scopePersistentStore?.writeExtrasToDisk(extras: data)`
`60`	`60`	`}`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`public func setFingerprint(_ fingerprint: [String]?) {`
`64`	`64`	`setData(data: fingerprint, field: .fingerprint) { [weak self] data in`
`65`		`- self?.scopePersistentStore.writeFingerprintToDisk(fingerprint: data)`
	`65`	`+ self?.scopePersistentStore?.writeFingerprintToDisk(fingerprint: data)`
`66`	`66`	`}`
`67`	`67`	`}`
`68`	`68`
`@@ -76,7 +76,7 @@ import Foundation`
`76`	`76`	`}`
`77`	`77`	`guard let data = data else {`
`78`	`78`	`SentrySDKLog.debug("Data for \(field.name) is nil, deleting active file.")`
`79`		`- strongSelf.scopePersistentStore.deleteCurrentFieldOnDisk(field: field)`
	`79`	`+ strongSelf.scopePersistentStore?.deleteCurrentFieldOnDisk(field: field)`
`80`	`80`	`return`
`81`	`81`	`}`
`82`	`82`	`save(data)`