fix: Move file manager URL constructing to Swift

noahsmartin · noahsmartin · commit d27ad647e991 · 2025-11-25T11:07:09.000-05:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## Unreleased
+
+### Fixes
+
+- Fixes a possible crash from ObjC to Swift nullability conversion in SentryFileManager (#6899)
+
 ## 9.0.0-rc.1
 
 ### Breaking Changes
diff --git a/Sources/Sentry/SentryFileManagerHelper.m b/Sources/Sentry/SentryFileManagerHelper.m
@@ -191,9 +191,9 @@ - (void)createPathsWithOptions:(SentryOptions *_Nullable)options
 
 #pragma mark - Convenience Accessors
 
-- (NSURL *)getSentryPathAsURL
+- (NSString *)getSentryPath
 {
-    return [NSURL fileURLWithPath:self.sentryPath];
+    return self.sentryPath;
 }
 
 #pragma mark - Envelope
diff --git a/Sources/Sentry/include/SentryFileManagerHelper.h b/Sources/Sentry/include/SentryFileManagerHelper.h
@@ -58,7 +58,7 @@ SENTRY_NO_INIT
 - (void)deleteAllEnvelopes;
 
 #pragma mark - Convenience Accessors
-- (NSURL *)getSentryPathAsURL;
+- (NSString *)getSentryPath;
 
 #pragma mark - State
 - (void)moveState:(NSString *)stateFilePath toPreviousState:(NSString *)previousStateFilePath;
diff --git a/Sources/Swift/Helper/SentryFileManager.swift b/Sources/Swift/Helper/SentryFileManager.swift
@@ -88,7 +88,7 @@
     }
     
     @objc public func getSentryPathAsURL() -> URL {
-        helper.getSentryPathAsURL()
+        URL(fileURLWithPath: helper.getSentryPath())
     }
 
     @objc public func moveState(_ stateFilePath: String, toPreviousState previousStateFilePath: String) {

Original file line number	Diff line number	Diff line change
`@@ -191,9 +191,9 @@ - (void)createPathsWithOptions:(SentryOptions *_Nullable)options`
`191`	`191`
`192`	`192`	`#pragma mark - Convenience Accessors`
`193`	`193`
`194`		`-- (NSURL *)getSentryPathAsURL`
	`194`	`+- (NSString *)getSentryPath`
`195`	`195`	`{`
`196`		`- return [NSURL fileURLWithPath:self.sentryPath];`
	`196`	`+ return self.sentryPath;`
`197`	`197`	`}`
`198`	`198`
`199`	`199`	`#pragma mark - Envelope`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`@objc public func getSentryPathAsURL() -> URL {`
`91`		`- helper.getSentryPathAsURL()`
	`91`	`+ URL(fileURLWithPath: helper.getSentryPath())`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`@objc public func moveState(_ stateFilePath: String, toPreviousState previousStateFilePath: String) {`