@exodus/react-native-screenshot-detector 1.2.1 → 1.2.3

package/android/src/main/java/com/reactlibrary/RNScreenshotDetectorModule.java

@@ -1,6 +1,7 @@
 
 package com.reactlibrary;
 
+import android.app.Activity;
 import android.view.Window;
 import android.view.WindowManager;
 
@@ -25,25 +26,38 @@ public class RNScreenshotDetectorModule extends ReactContextBaseJavaModule {
 
   @ReactMethod
   public void disableScreenshots() {
-    getCurrentActivity().runOnUiThread(new Runnable() {
-      @Override
-      public void run() {
-        getWindow().setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE);
-      }
-    });
+    Activity currentActivity = getCurrentActivity();
+    if (currentActivity != null) {
+      currentActivity.runOnUiThread(new Runnable() {
+        @Override
+        public void run() {
+          Window window = getWindow();
+          if (window != null) {
+            window.setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE);
+          }
+        }
+      });
+    }
   }
 
   @ReactMethod
   public void enableScreenshots() {
-    getCurrentActivity().runOnUiThread(new Runnable() {
-      @Override
-      public void run() {
-        getWindow().clearFlags(WindowManager.LayoutParams.FLAG_SECURE);
-      }
-    });
+    Activity currentActivity = getCurrentActivity();
+    if (currentActivity != null) {
+      currentActivity.runOnUiThread(new Runnable() {
+        @Override
+        public void run() {
+          Window window = getWindow();
+          if (window != null) {
+            window.clearFlags(WindowManager.LayoutParams.FLAG_SECURE);
+          }
+        }
+      });
+    }
   }
 
   private Window getWindow() {
-    return getCurrentActivity().getWindow();
+    Activity currentActivity = getCurrentActivity();
+    return currentActivity != null ? currentActivity.getWindow() : null;
   }
 }

package/index.ios.js

@@ -2,85 +2,53 @@ import { NativeEventEmitter, NativeModules } from 'react-native'
 
 const { RNScreenshotDetector } = NativeModules
 
-console.log('[TEST] RNScreenshotDetector module loaded:', !!RNScreenshotDetector)
-console.log('[TEST] Available methods:', Object.keys(RNScreenshotDetector || {}))
-
 const eventEmitter = new NativeEventEmitter(RNScreenshotDetector)
 
 const SCREENSHOT_EVENT = 'ScreenshotTaken'
 const SCREEN_RECORDING_EVENT = 'ScreenRecordingChanged'
 
 const subscribe = (cb) => {
-  console.log('[TEST] subscribe called - using NEW explicit method!')
-  
-  // Use the more explicit method name internally
   if (RNScreenshotDetector && RNScreenshotDetector.subscribeToScreenshotAndScreenRecording) {
-    console.log('[TEST] Calling subscribeToScreenshotAndScreenRecording')
     RNScreenshotDetector.subscribeToScreenshotAndScreenRecording()
-    console.log('[TEST] SUCCESS: subscribeToScreenshotAndScreenRecording called')
-  } else {
-    console.log('[TEST] ERROR: subscribeToScreenshotAndScreenRecording not available!')
   }
   
   const sub = eventEmitter.addListener(SCREENSHOT_EVENT, (data) => {
-    console.log('[TEST] ScreenshotTaken event received:', data)
     cb(data)
   })
   return () => {
-    console.log('[TEST] Unsubscribing from screenshot events')
     sub.remove()
     
-    // Use the more explicit method name internally
     if (RNScreenshotDetector && RNScreenshotDetector.unsubscribeFromScreenshotAndScreenRecording) {
-      console.log('[TEST] Calling unsubscribeFromScreenshotAndScreenRecording')
       RNScreenshotDetector.unsubscribeFromScreenshotAndScreenRecording()
-      console.log('[TEST] SUCCESS: unsubscribeFromScreenshotAndScreenRecording called')
-    } else {
-      console.log('[TEST] ERROR: unsubscribeFromScreenshotAndScreenRecording not available!')
     }
   }
 }
 
 const disableScreenshots = () => {
-  console.log('[TEST] disableScreenshots called')
   if (RNScreenshotDetector && RNScreenshotDetector.disableScreenshots) {
-    console.log('[TEST] Calling native disableScreenshots')
     RNScreenshotDetector.disableScreenshots()
-    console.log('[TEST] SUCCESS: disableScreenshots called')
-  } else {
-    console.log('[TEST] ERROR: disableScreenshots not available!')
   }
 }
 
 const enableScreenshots = () => {
-  console.log('[TEST] enableScreenshots called')
   if (RNScreenshotDetector && RNScreenshotDetector.enableScreenshots) {
-    console.log('[TEST] Calling native enableScreenshots')
     RNScreenshotDetector.enableScreenshots()
-    console.log('[TEST] SUCCESS: enableScreenshots called')
-  } else {
-    console.log('[TEST] ERROR: enableScreenshots not available!')
   }
 }
 
 const isScreenRecording = async () => {
-  console.log('[TEST] isScreenRecording called')
   if (RNScreenshotDetector && RNScreenshotDetector.isScreenRecording) {
     try {
       const result = await RNScreenshotDetector.isScreenRecording()
-      console.log('[TEST] isScreenRecording result:', result)
       return result
     } catch (error) {
-      console.log('[TEST] ERROR in isScreenRecording:', error)
       return false
     }
   } else {
-    console.log('[TEST] ERROR: isScreenRecording not available!')
     return false
   }
 }
 
-// Main API - only expose what's actually used externally
 const ScreenshotDetector = {
   subscribe,
   disableScreenshots,

package/ios/RNScreenshotDetector/RNScreenshotDetector.m

@@ -18,12 +18,10 @@
 RCT_EXPORT_MODULE();
 
 - (NSArray<NSString *> *)supportedEvents {
-    NSLog(@"[TEST] supportedEvents called");
     return @[@"ScreenshotTaken", @"ScreenRecordingChanged"];
 }
 
 - (void)startObserving {
-    NSLog(@"[TEST] startObserving called");
     NSOperationQueue *mainQueue = [NSOperationQueue mainQueue];
     
     if (screenshotObserver == nil) {
@@ -34,9 +32,6 @@ RCT_EXPORT_MODULE();
             usingBlock:^(NSNotification *notification) {
                 [self screenshotDetected:notification];
             }];
-        NSLog(@"[TEST] Screenshot observer registered successfully");
-    } else {
-        NSLog(@"[TEST] Screenshot observer already exists");
     }
     
     if (screenRecordingObserver == nil) {
@@ -47,103 +42,73 @@ RCT_EXPORT_MODULE();
             usingBlock:^(NSNotification *notification) {
                 [self screenRecordingChanged:notification];
             }];
-        NSLog(@"[TEST] Screen recording observer registered successfully");
-    } else {
-        NSLog(@"[TEST] Screen recording observer already exists");
     }
 }
 
 - (void)stopObserving {
-    NSLog(@"[TEST] stopObserving called");
     if (screenshotObserver != nil) {
         [[NSNotificationCenter defaultCenter] removeObserver:screenshotObserver];
         screenshotObserver = nil;
-        NSLog(@"[TEST] Screenshot observer removed successfully");
     }
     
     if (screenRecordingObserver != nil) {
         [[NSNotificationCenter defaultCenter] removeObserver:screenRecordingObserver];
         screenRecordingObserver = nil;
-        NSLog(@"[TEST] Screen recording observer removed successfully");
     }
 }
 
 - (void)screenshotDetected:(NSNotification *)notification {
-    NSLog(@"[TEST] 🚨 SCREENSHOT DETECTED! 🚨");
     if (screenshotObserver != nil) {
-        NSLog(@"[TEST] Sending ScreenshotTaken event to JavaScript");
         [self sendEventWithName:@"ScreenshotTaken" body:@{}];
-        NSLog(@"[TEST] ScreenshotTaken event sent successfully");
-    } else {
-        NSLog(@"[TEST] ERROR: Screenshot observer is nil, not sending event");
     }
 }
 
 - (void)screenRecordingChanged:(NSNotification *)notification {
     BOOL isRecording = [UIScreen mainScreen].isCaptured;
-    NSLog(@"[TEST] Screen recording changed: %@", isRecording ? @"STARTED" : @"STOPPED");
     
     if (screenRecordingObserver != nil) {
-        NSLog(@"[TEST] Sending ScreenRecordingChanged event to JavaScript");
         [self sendEventWithName:@"ScreenRecordingChanged" body:@{@"isRecording": @(isRecording)}];
-        NSLog(@"[TEST] ScreenRecordingChanged event sent successfully");
-    } else {
-        NSLog(@"[TEST] ERROR: Screen recording observer is nil, not sending event");
     }
 }
 
 RCT_EXPORT_METHOD(disableScreenshots) {
-    NSLog(@"[TEST] disableScreenshots called");
     dispatch_async(dispatch_get_main_queue(), ^{
         isProtectionEnabled = YES;
-        NSLog(@"[TEST] Protection enabled, calling enableTrueScreenshotPrevention");
         [self enableTrueScreenshotPrevention];
-        NSLog(@"[TEST] disableScreenshots completed");
     });
 }
 
 RCT_EXPORT_METHOD(enableScreenshots) {
-    NSLog(@"[TEST] enableScreenshots called");
     dispatch_async(dispatch_get_main_queue(), ^{
         isProtectionEnabled = NO;
-        NSLog(@"[TEST] Protection disabled, calling disableTrueScreenshotPrevention");
         [self disableTrueScreenshotPrevention];
-        NSLog(@"[TEST] enableScreenshots completed");
     });
 }
 
 RCT_EXPORT_METHOD(isScreenRecording:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject) {
     BOOL isRecording = [UIScreen mainScreen].isCaptured;
-    NSLog(@"[TEST] isScreenRecording called, result: %@", isRecording ? @"YES" : @"NO");
     resolve(@(isRecording));
 }
 
 // Clear and explicit method names
 RCT_EXPORT_METHOD(subscribeToScreenshotAndScreenRecording) {
-    NSLog(@"[TEST] subscribeToScreenshotAndScreenRecording called - NEW EXPLICIT METHOD!");
     [self startObserving];
-    NSLog(@"[TEST] subscribeToScreenshotAndScreenRecording completed");
 }
 
 RCT_EXPORT_METHOD(unsubscribeFromScreenshotAndScreenRecording) {
-    NSLog(@"[TEST] unsubscribeFromScreenshotAndScreenRecording called");
     [self stopObserving];
-    NSLog(@"[TEST] unsubscribeFromScreenshotAndScreenRecording completed");
 }
 
 // Screenshot Prevention using Secure Text Field
 - (void)enableTrueScreenshotPrevention {
-    NSLog(@"[TEST] enableTrueScreenshotPrevention called");
     if (self.secureTextField == nil) {
-        NSLog(@"[TEST] Creating new secureTextField");
         self.secureTextField = [[UITextField alloc] init];
         self.secureTextField.userInteractionEnabled = NO;
         self.secureTextField.secureTextEntry = YES;
         
         UIWindow *keyWindow = [self getKeyWindow];
         if (keyWindow != nil) {
-            NSLog(@"[TEST] Key window found, setting up secure text field");
             [keyWindow makeKeyAndVisible];
             
             // Make the app window a sublayer of the secure text field
@@ -153,46 +118,30 @@ RCT_EXPORT_METHOD(unsubscribeFromScreenshotAndScreenRecording) {
             NSArray *sublayers = self.secureTextField.layer.sublayers;
             if (sublayers.count > 0) {
                 [sublayers.firstObject addSublayer:keyWindow.layer];
-                NSLog(@"[TEST] ✅ Secure text field configured successfully - Screenshot prevention ACTIVE!");
-            } else {
-                NSLog(@"[TEST] ❌ No sublayers found in secure text field");
             }
-        } else {
-            NSLog(@"[TEST] ❌ Key window not found!");
         }
     } else {
-        NSLog(@"[TEST] Secure text field already exists, enabling secureTextEntry");
         self.secureTextField.secureTextEntry = YES;
-        NSLog(@"[TEST] ✅ Secure text field re-enabled - Screenshot prevention ACTIVE!");
     }
 }
 
 - (void)disableTrueScreenshotPrevention {
-    NSLog(@"[TEST] disableTrueScreenshotPrevention called");
     if (self.secureTextField != nil) {
-        NSLog(@"[TEST] Disabling secureTextEntry");
         self.secureTextField.secureTextEntry = NO;
-        NSLog(@"[TEST] ✅ Screenshot prevention DISABLED");
-    } else {
-        NSLog(@"[TEST] Secure text field is nil");
     }
 }
 
 - (UIWindow *)getKeyWindow {
-    NSLog(@"[TEST] getKeyWindow called");
     UIWindow *keyWindow = nil;
     
     NSSet<UIScene *> *connectedScenes = [UIApplication sharedApplication].connectedScenes;
-    NSLog(@"[TEST] Connected scenes count: %lu", (unsigned long)connectedScenes.count);
     
     for (UIScene *scene in connectedScenes) {
         if ([scene isKindOfClass:[UIWindowScene class]]) {
             UIWindowScene *windowScene = (UIWindowScene *)scene;
-            NSLog(@"[TEST] Found window scene with %lu windows", (unsigned long)windowScene.windows.count);
             for (UIWindow *window in windowScene.windows) {
                 if (window.isKeyWindow) {
                     keyWindow = window;
-                    NSLog(@"[TEST] ✅ Found key window using UIScene method");
                     break;
                 }
             }
@@ -200,15 +149,10 @@ RCT_EXPORT_METHOD(unsubscribeFromScreenshotAndScreenRecording) {
         }
     }
     
-    if (keyWindow == nil) {
-        NSLog(@"[TEST] ❌ Key window not found using UIScene method!");
-    }
-    
     return keyWindow;
 }
 
 - (void)dealloc {
-    NSLog(@"[TEST] dealloc called");
     [self stopObserving];
     [self disableTrueScreenshotPrevention];
 }

package/package.json

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