@exodus/react-native-screenshot-detector 1.2.0 → 1.2.2

package/index.ios.js

@@ -1,51 +1,49 @@
 import { NativeEventEmitter, NativeModules } from 'react-native'
 
 const { RNScreenshotDetector } = NativeModules
+
 const eventEmitter = new NativeEventEmitter(RNScreenshotDetector)
 
 const SCREENSHOT_EVENT = 'ScreenshotTaken'
 const SCREEN_RECORDING_EVENT = 'ScreenRecordingChanged'
 
 const subscribe = (cb) => {
-  const sub = eventEmitter.addListener(SCREENSHOT_EVENT, (data) => {
-    cb(data)
-  })
-  return () => {
-    sub.remove()
-  }
-}
-
-const subscribeToScreenRecording = (cb) => {
-  if (RNScreenshotDetector.subscribeToScreenRecording) {
-    RNScreenshotDetector.subscribeToScreenRecording()
+  if (RNScreenshotDetector && RNScreenshotDetector.subscribeToScreenshotAndScreenRecording) {
+    RNScreenshotDetector.subscribeToScreenshotAndScreenRecording()
   }
   
-  const sub = eventEmitter.addListener(SCREEN_RECORDING_EVENT, (data) => {
+  const sub = eventEmitter.addListener(SCREENSHOT_EVENT, (data) => {
     cb(data)
   })
   return () => {
     sub.remove()
-    if (RNScreenshotDetector.unsubscribeFromScreenRecording) {
-      RNScreenshotDetector.unsubscribeFromScreenRecording()
+    
+    if (RNScreenshotDetector && RNScreenshotDetector.unsubscribeFromScreenshotAndScreenRecording) {
+      RNScreenshotDetector.unsubscribeFromScreenshotAndScreenRecording()
     }
   }
 }
 
 const disableScreenshots = () => {
-  if (RNScreenshotDetector.disableScreenshots) {
+  if (RNScreenshotDetector && RNScreenshotDetector.disableScreenshots) {
     RNScreenshotDetector.disableScreenshots()
   }
 }
 
 const enableScreenshots = () => {
-  if (RNScreenshotDetector.enableScreenshots) {
+  if (RNScreenshotDetector && RNScreenshotDetector.enableScreenshots) {
     RNScreenshotDetector.enableScreenshots()
   }
 }
 
 const isScreenRecording = async () => {
-  if (RNScreenshotDetector.isScreenRecording) {
-    return RNScreenshotDetector.isScreenRecording()
+  if (RNScreenshotDetector && RNScreenshotDetector.isScreenRecording) {
+    try {
+      const result = await RNScreenshotDetector.isScreenRecording()
+      return result
+    } catch (error) {
+      return false
+    }
   } else {
     return false
   }
@@ -53,7 +51,6 @@ const isScreenRecording = async () => {
 
 const ScreenshotDetector = {
   subscribe,
-  subscribeToScreenRecording,
   disableScreenshots,
   enableScreenshots,
   isScreenRecording,

package/ios/RNScreenshotDetector/RNScreenshotDetector.m

@@ -12,7 +12,6 @@
 {
     id screenshotObserver;
     id screenRecordingObserver;
-    UIView *securityOverlay;
     BOOL isProtectionEnabled;
 }
 
@@ -24,21 +23,26 @@ RCT_EXPORT_MODULE();
 
 - (void)startObserving {
     NSOperationQueue *mainQueue = [NSOperationQueue mainQueue];
-    screenshotObserver = [[NSNotificationCenter defaultCenter] 
-        addObserverForName:UIApplicationUserDidTakeScreenshotNotification
-        object:nil
-        queue:mainQueue
-        usingBlock:^(NSNotification *notification) {
-            [self screenshotDetected:notification];
-        }];
     
-    screenRecordingObserver = [[NSNotificationCenter defaultCenter]
-        addObserverForName:UIScreenCapturedDidChangeNotification
-        object:nil
-        queue:mainQueue
-        usingBlock:^(NSNotification *notification) {
-            [self screenRecordingChanged:notification];
-        }];
+    if (screenshotObserver == nil) {
+        screenshotObserver = [[NSNotificationCenter defaultCenter] 
+            addObserverForName:UIApplicationUserDidTakeScreenshotNotification
+            object:nil
+            queue:mainQueue
+            usingBlock:^(NSNotification *notification) {
+                [self screenshotDetected:notification];
+            }];
+    }
+    
+    if (screenRecordingObserver == nil) {
+        screenRecordingObserver = [[NSNotificationCenter defaultCenter]
+            addObserverForName:UIScreenCapturedDidChangeNotification
+            object:nil
+            queue:mainQueue
+            usingBlock:^(NSNotification *notification) {
+                [self screenRecordingChanged:notification];
+            }];
+    }
 }
 
 - (void)stopObserving {
@@ -60,9 +64,9 @@ RCT_EXPORT_MODULE();
 }
 
 - (void)screenRecordingChanged:(NSNotification *)notification {
+    BOOL isRecording = [UIScreen mainScreen].isCaptured;
+    
     if (screenRecordingObserver != nil) {
-        BOOL isRecording = [UIScreen mainScreen].isCaptured;
-        
         [self sendEventWithName:@"ScreenRecordingChanged" body:@{@"isRecording": @(isRecording)}];
     }
 }
@@ -87,11 +91,12 @@ RCT_EXPORT_METHOD(isScreenRecording:(RCTPromiseResolveBlock)resolve
     resolve(@(isRecording));
 }
 
-RCT_EXPORT_METHOD(subscribeToScreenRecording) {
+// Clear and explicit method names
+RCT_EXPORT_METHOD(subscribeToScreenshotAndScreenRecording) {
     [self startObserving];
 }
 
-RCT_EXPORT_METHOD(unsubscribeFromScreenRecording) {
+RCT_EXPORT_METHOD(unsubscribeFromScreenshotAndScreenRecording) {
     [self stopObserving];
 }
 
@@ -130,6 +135,7 @@ RCT_EXPORT_METHOD(unsubscribeFromScreenRecording) {
     UIWindow *keyWindow = nil;
     
     NSSet<UIScene *> *connectedScenes = [UIApplication sharedApplication].connectedScenes;
+    
     for (UIScene *scene in connectedScenes) {
         if ([scene isKindOfClass:[UIWindowScene class]]) {
             UIWindowScene *windowScene = (UIWindowScene *)scene;
@@ -143,18 +149,6 @@ RCT_EXPORT_METHOD(unsubscribeFromScreenRecording) {
         }
     }
     
-    if (keyWindow == nil) {
-        keyWindow = [UIApplication sharedApplication].keyWindow;
-        if (keyWindow == nil) {
-            for (UIWindow *window in [UIApplication sharedApplication].windows) {
-                if (window.isKeyWindow) {
-                    keyWindow = window;
-                    break;
-                }
-            }
-        }
-    }
-    
     return keyWindow;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/react-native-screenshot-detector",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "description": "detect when the user takes a screenshot",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"