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

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/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,58 @@ 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 {
+        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];
-            }
-        }
-    } else {
-        self.secureTextField.secureTextEntry = YES;
+            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];
+                }
+            }   
+        } 
+    } @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;
+            
+            if (originalKeyWindow != nil && originalSuperlayer != nil) {
+                [originalKeyWindow.layer removeFromSuperlayer];
+                [originalSuperlayer addSublayer:originalKeyWindow.layer];
+                
+                [self.secureTextField.layer removeFromSuperlayer];
+            }
+            
+            originalKeyWindow = nil;
+            originalSuperlayer = nil;
+            
+            [self.secureTextField removeFromSuperview];
+            self.secureTextField = nil;
+        }
+    } @catch (NSException *exception) {
+        NSLog(@"[RNScreenshotDetector] Error in disableTrueScreenshotPrevention: %@", exception);
     }
 }
 

package/package.json

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