fix(macos): Only include screenshots and view hierarchy for iOS and M…

…ac Catalyst builds
getsentry · Apr 25, 2023 · 39f7fe7 · 39f7fe7
1 parent 437ade1
commit 39f7fe7
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@
 
 - Allow disabling native on RNNA ([#2978](https://github.com/getsentry/sentry-react-native/pull/2978))
 - iOS Autolinking for RN 0.68 and older ([#2980](https://github.com/getsentry/sentry-react-native/pull/2980))
+- Only include Screenshots and View Hierarchy for iOS and Mac Catalyst builds
 
 ### Dependencies
 

diff --git a/ios/RNSentry.mm b/ios/RNSentry.mm
@@ -330,6 +330,7 @@ - (void)setEventEnvironmentTag:(SentryEvent *)event
 RCT_EXPORT_METHOD(captureScreenshot: (RCTPromiseResolveBlock)resolve
                   rejecter: (RCTPromiseRejectBlock)reject)
 {
+#if TARGET_OS_IPHONE || TARGET_OS_MACCATALYST
     NSArray<NSData *>* rawScreenshots = [PrivateSentrySDKOnly captureScreenshots];
     NSMutableArray *screenshotsArray = [NSMutableArray arrayWithCapacity:[rawScreenshots count]];
 
@@ -354,11 +355,15 @@ - (void)setEventEnvironmentTag:(SentryEvent *)event
     }
 
     resolve(screenshotsArray);
+#else
+    resolve(nil);
+#endif
 }
 
 RCT_EXPORT_METHOD(fetchViewHierarchy: (RCTPromiseResolveBlock)resolve
                   rejecter: (RCTPromiseRejectBlock)reject)
 {
+#if TARGET_OS_IPHONE || TARGET_OS_MACCATALYST
     NSData * rawViewHierarchy = [PrivateSentrySDKOnly captureViewHierarchy];
 
     NSMutableArray *viewHierarchy = [NSMutableArray arrayWithCapacity:rawViewHierarchy.length];
@@ -368,8 +373,12 @@ - (void)setEventEnvironmentTag:(SentryEvent *)event
     }
 
     resolve(viewHierarchy);
+#else
+    resolve(nil);
+#endif
 }
 
+
 RCT_EXPORT_METHOD(setUser:(NSDictionary *)userKeys
                   otherUserKeys:(NSDictionary *)userDataKeys
 )

diff --git a/src/js/NativeRNSentry.ts b/src/js/NativeRNSentry.ts
@@ -13,7 +13,7 @@ export interface Spec extends TurboModule {
       store: boolean;
     },
   ): Promise<boolean>;
-  captureScreenshot(): Promise<NativeScreenshot[]>;
+  captureScreenshot(): Promise<NativeScreenshot[] | undefined | null>;
   clearBreadcrumbs(): void;
   crash(): void;
   closeNativeSdk(): Promise<void>;

diff --git a/src/js/wrapper.ts b/src/js/wrapper.ts
@@ -467,14 +467,19 @@ export const NATIVE: SentryNativeWrapper = {
       return null;
     }
 
+    let raw: NativeScreenshot[] | null | undefined;
     try {
-      const raw = await RNSentry.captureScreenshot();
+      raw = await RNSentry.captureScreenshot();
+    } catch (e) {
+      logger.warn('Failed to capture screenshot', e);
+    }
+
+    if (raw) {
       return raw.map((item: NativeScreenshot) => ({
         ...item,
         data: new Uint8Array(item.data),
       }));
-    } catch (e) {
-      logger.warn('Failed to capture screenshot', e);
+    } else {
       return null;
     }
   },