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

package/ios/RNScreenshotDetector/RNScreenshotDetector.m

@@ -13,6 +13,8 @@
     id screenshotObserver;
     id screenRecordingObserver;
     BOOL isProtectionEnabled;
+    UIWindow *originalKeyWindow;      
+    CALayer *originalSuperlayer;      
 }
 
 RCT_EXPORT_MODULE();
@@ -91,7 +93,6 @@ RCT_EXPORT_METHOD(isScreenRecording:(RCTPromiseResolveBlock)resolve
     resolve(@(isRecording));
 }
 
-// Clear and explicit method names
 RCT_EXPORT_METHOD(subscribeToScreenshotAndScreenRecording) {
     [self startObserving];
 }
@@ -102,32 +103,90 @@ RCT_EXPORT_METHOD(unsubscribeFromScreenshotAndScreenRecording) {
 
 // Screenshot Prevention using Secure Text Field
 - (void)enableTrueScreenshotPrevention {
-    if (self.secureTextField == nil) {
-        self.secureTextField = [[UITextField alloc] init];
-        self.secureTextField.userInteractionEnabled = NO;
-        self.secureTextField.secureTextEntry = YES;
+    @try {
+        // Check if the protection is already fully active
+        if (isProtectionEnabled && self.secureTextField != nil && 
+            originalKeyWindow != nil && originalSuperlayer != nil) {
+            
+            UIWindow *currentKeyWindow = [self getKeyWindow];
+            
+            // Check if the same keyWindow is already fully protected
+            if (originalKeyWindow == currentKeyWindow && 
+                self.secureTextField.layer.superlayer == originalSuperlayer) {
+                NSLog(@"[RNScreenshotDetector] Screenshot protection fully active, skipping");
+                return;
+            } else {
+                NSLog(@"[RNScreenshotDetector] Protection partially active, need to reset");
+                // If only partially set, reset and set again
+                [self disableTrueScreenshotPrevention];
+            }
+        }
+        
+        if (self.secureTextField == nil) {
+            self.secureTextField = [[UITextField alloc] init];
+            self.secureTextField.userInteractionEnabled = NO;
+            self.secureTextField.secureTextEntry = YES;
+        }
         
         UIWindow *keyWindow = [self getKeyWindow];
         if (keyWindow != nil) {
-            [keyWindow makeKeyAndVisible];
+            originalKeyWindow = keyWindow;
+            originalSuperlayer = keyWindow.layer.superlayer;
             
-            // Make the app window a sublayer of the secure text field
-            [keyWindow.layer.superlayer addSublayer:self.secureTextField.layer];
+            [keyWindow makeKeyAndVisible];
             
-            // Add the window layer as a sublayer of the secure text field's first sublayer
-            NSArray *sublayers = self.secureTextField.layer.sublayers;
-            if (sublayers.count > 0) {
-                [sublayers.firstObject addSublayer:keyWindow.layer];
-            }
+            if (originalSuperlayer != nil) {
+                [originalSuperlayer addSublayer:self.secureTextField.layer];
+                
+                [keyWindow.layer removeFromSuperlayer];
+                
+                NSArray *sublayers = self.secureTextField.layer.sublayers;
+                if (sublayers.count > 0) {
+                    [sublayers.firstObject addSublayer:keyWindow.layer];
+                } else {
+                    [self.secureTextField.layer addSublayer:keyWindow.layer];
+                }
+            }   
+        } else {
+            NSLog(@"[RNScreenshotDetector] No keyWindow found, cannot enable protection");
         }
-    } else {
-        self.secureTextField.secureTextEntry = YES;
+    } @catch (NSException *exception) {
+        NSLog(@"[RNScreenshotDetector] Error in enableTrueScreenshotPrevention: %@", exception);
     }
 }
 
 - (void)disableTrueScreenshotPrevention {
-    if (self.secureTextField != nil) {
-        self.secureTextField.secureTextEntry = NO;
+    @try {
+        if (self.secureTextField != nil) {
+            
+            self.secureTextField.secureTextEntry = NO;
+            
+            // Safe recovery: check if references are valid
+            if (originalKeyWindow != nil && originalSuperlayer != nil) {
+                // Check if keyWindow is still valid
+                if (originalKeyWindow.superview != nil || originalKeyWindow.layer.superlayer != nil) {
+                    [originalKeyWindow.layer removeFromSuperlayer];
+                    [originalSuperlayer addSublayer:originalKeyWindow.layer];
+                }
+                
+                [self.secureTextField.layer removeFromSuperlayer];
+            }
+            
+            // Safe reference cleanup
+            originalKeyWindow = nil;
+            originalSuperlayer = nil;
+            
+            [self.secureTextField removeFromSuperview];
+            self.secureTextField = nil;
+        }
+    } @catch (NSException *exception) {
+        NSLog(@"[RNScreenshotDetector] Error in disableTrueScreenshotPrevention: %@", exception);
+        originalKeyWindow = nil;
+        originalSuperlayer = nil;
+        if (self.secureTextField != nil) {
+            [self.secureTextField removeFromSuperview];
+            self.secureTextField = nil;
+        }
     }
 }
 

package/package.json

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