Merge 686b6f8 into 2b89ce9

Author: itaybre

packages/core/ios/RNSentry.mm

@@ -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
@@ -57,6 +56,7 @@
 #import "RNSentryExperimentalOptions.h"
 #import "RNSentryVersion.h"
 #import "SentrySDKWrapper.h"
+#import "SentryScreenFramesWrapper.h"
 
 static bool hasFetchedAppStart;
 
@@ -580,21 +580,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);

packages/core/ios/SentryScreenFramesWrapper.h

@@ -0,0 +1,10 @@
+#import <Foundation/Foundation.h>
+
+@interface SentryScreenFramesWrapper : NSObject
+
++ (BOOL)canTrackFrames;
++ (NSNumber *)totalFrames;
++ (NSNumber *)frozenFrames;
++ (NSNumber *)slowFrames;
+
+@end

packages/core/ios/SentryScreenFramesWrapper.m

@@ -0,0 +1,35 @@
+#import "SentryScreenFramesWrapper.h"
+@import Sentry;
+
+@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