Merge pull request #33 from gbumps/hotfix/0.3.2

Hotfix version 0.3.2
gbumps · Oct 28, 2023 · 36d8ef1 · 36d8ef1
2 parents 9e160fc + b54136b
commit 36d8ef1
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 13 deletions.
diff --git a/android/src/main/java/com/screenguard/ScreenGuardModule.java b/android/src/main/java/com/screenguard/ScreenGuardModule.java
@@ -70,13 +70,16 @@ public void activateShield(String hexColor) {
             if (mHandlerBlockScreenShot == null) {
                 mHandlerBlockScreenShot = new Handler(Looper.getMainLooper());
             }
-            mHandlerBlockScreenShot.post(() -> Objects.requireNonNull(
-                getReactApplicationContext().getCurrentActivity()
-            ).getWindow().setFlags(
-                    WindowManager.LayoutParams.FLAG_SECURE, 
-                    WindowManager.LayoutParams.FLAG_SECURE
-            ));
-
+            if (
+                getReactApplicationContext().getCurrentActivity() != null
+            ) {
+                mHandlerBlockScreenShot.post(() -> Objects.requireNonNull(
+                    getReactApplicationContext().getCurrentActivity()
+                ).getWindow().setFlags(
+                        WindowManager.LayoutParams.FLAG_SECURE, 
+                        WindowManager.LayoutParams.FLAG_SECURE
+                ));
+            }
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -98,10 +101,14 @@ public void activateWithoutShield() {
     public void deactivateShield() {
         try {
             if (mHandlerBlockScreenShot != null) {
+                if (
+                   getReactApplicationContext().getCurrentActivity() != null
+                ) {
                    mHandlerBlockScreenShot.post(() -> Objects.requireNonNull(
                           getReactApplicationContext().getCurrentActivity()
                      ).getWindow().clearFlags(WindowManager.LayoutParams.FLAG_SECURE));
                     mHandlerBlockScreenShot = null;
+                }
             }
         } catch (Exception e) {
             e.printStackTrace();

diff --git a/ios/ScreenGuard.mm b/ios/ScreenGuard.mm
@@ -1,5 +1,4 @@
 #import "ScreenGuard.h"
-#import <SDWebImage/SDWebImage.h>
 #import <React/RCTRootView.h>
 
 @implementation ScreenGuard
@@ -52,10 +51,6 @@ - (void) initTextField {
 - (void)removeScreenShot {
   UIWindow *window = [UIApplication sharedApplication].keyWindow;
   if (textField != nil) {
-      // if (imageView != nil) {
-      //     [imageView setImage: nil];
-      //     [imageView removeFromSuperview];
-      // }
     [textField setSecureTextEntry: FALSE];
     [textField setBackgroundColor: [UIColor clearColor]];
     [textField setBackground: nil];

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-screenguard",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "private": false,
   "description": "A Native screenshot blocking library for React-Native developer, with background customizable after captured. Screenshot detector are also supported.",
   "main": "index",