Skip to content

fix: Move file manager URL constructing to Swift #6899

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
noahsmartin wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −4
Open

fix: Move file manager URL constructing to Swift #6899

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions Sources/Sentry/SentryFileManagerHelper.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Sources/Sentry/include/SentryFileManagerHelper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion Sources/Swift/Helper/SentryFileManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
}

@objc public func getSentryPathAsURL() -> URL {
Copy link
Member

@philprime philprime Dec 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

m: Please add a test

helper.getSentryPathAsURL()
URL(fileURLWithPath: helper.getSentryPath())
}

@objc public func moveState(_ stateFilePath: String, toPreviousState previousStateFilePath: String) {
Expand Down
Loading