Skip to content

fix: Fixes SentryScreenFrames use after being converted to Swift #5153

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
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fix: Fixes SentryScreenFrames use after being converted to Swift #5153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
686b6f8
fix: Fixes SentryScreenFrames use after being converted to Swift
itaybre Sep 8, 2025
07104dd
Merge branch 'main' into itay/fix_sentreyscreenframes
itaybre Oct 3, 2025
5a09e8e
Fix build
itaybre Oct 3, 2025
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
16 changes: 5 additions & 11 deletions packages/core/ios/RNSentry.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
#import <Sentry/SentryFormatter.h>
#import <Sentry/SentryOptions.h>
#import <Sentry/SentryOptionsInternal.h>
#import <Sentry/SentryScreenFrames.h>
#import <Sentry/SentryUser.h>

// This guard prevents importing Hermes in JSC apps
Expand Down Expand Up @@ -57,6 +56,7 @@
#import "RNSentryExperimentalOptions.h"
#import "RNSentryVersion.h"
#import "SentrySDKWrapper.h"
#import "SentryScreenFramesWrapper.h"

static bool hasFetchedAppStart;

Expand Down Expand Up @@ -577,21 +577,15 @@ - (void)stopObserving

#if TARGET_OS_IPHONE || TARGET_OS_MACCATALYST
if (PrivateSentrySDKOnly.isFramesTrackingRunning) {
SentryScreenFrames *frames = PrivateSentrySDKOnly.currentScreenFrames;

if (frames == nil) {
if (![SentryScreenFramesWrapper canTrackFrames]) {
resolve(nil);
return;
}

NSNumber *total = [NSNumber numberWithLong:frames.total];
NSNumber *frozen = [NSNumber numberWithLong:frames.frozen];
NSNumber *slow = [NSNumber numberWithLong:frames.slow];

resolve(@ {
@"totalFrames" : total,
@"frozenFrames" : frozen,
@"slowFrames" : slow,
@"totalFrames" : [SentryScreenFramesWrapper totalFrames],
@"frozenFrames" : [SentryScreenFramesWrapper frozenFrames],
@"slowFrames" : [SentryScreenFramesWrapper slowFrames],
});
} else {
resolve(nil);
Expand Down
14 changes: 14 additions & 0 deletions packages/core/ios/SentryScreenFramesWrapper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#import <Foundation/Foundation.h>

#if TARGET_OS_IPHONE || TARGET_OS_MACCATALYST

@interface SentryScreenFramesWrapper : NSObject

+ (BOOL)canTrackFrames;
+ (NSNumber *)totalFrames;
+ (NSNumber *)frozenFrames;
+ (NSNumber *)slowFrames;

@end

#endif // TARGET_OS_IPHONE || TARGET_OS_MACCATALYST
39 changes: 39 additions & 0 deletions packages/core/ios/SentryScreenFramesWrapper.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
#import "SentryScreenFramesWrapper.h"
@import Sentry;

#if TARGET_OS_IPHONE || TARGET_OS_MACCATALYST

@implementation SentryScreenFramesWrapper

+ (BOOL)canTrackFrames
{
return PrivateSentrySDKOnly.currentScreenFrames != nil;
}

+ (NSNumber *)totalFrames
{
if (![self canTrackFrames]) {
return nil;
}
return [NSNumber numberWithLong:PrivateSentrySDKOnly.currentScreenFrames.total];
}

+ (NSNumber *)frozenFrames
{
if (![self canTrackFrames]) {
return nil;
}
return [NSNumber numberWithLong:PrivateSentrySDKOnly.currentScreenFrames.frozen];
}

+ (NSNumber *)slowFrames
{
if (![self canTrackFrames]) {
return nil;
}
return [NSNumber numberWithLong:PrivateSentrySDKOnly.currentScreenFrames.slow];
}

@end

#endif // TARGET_OS_IPHONE || TARGET_OS_MACCATALYST
Loading