diff --git a/CHANGELOG.md b/CHANGELOG.md index 88f8f59ae7..e341f47022 100644 --- 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 index 0c680c7ad6..73dc1f4ad8 100644 --- 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 index a95cfc9e44..8985bc0b10 100644 --- 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 index ed017fcfc6..908af8c5d0 100644 --- 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) {