Merge pull request #127 from gbumps/release/2.0.1

Release/2.0.1

Author: gbumps

android/src/main/java/com/screenguard/ScreenGuardObserver.java

@@ -24,7 +24,9 @@ public class ScreenGuardObserver extends ContentObserver {
     private int mLimitCount = 0;
     private int mCurrentCount = 0;
     private long mRegistrationTime = 0;
+    private long mLastChangeTime = 0;
     private static final long INITIAL_IGNORE_DURATION_MS = 500;
+    private static final long DEBOUNCE_DURATION_MS = 1000;
 
     public ScreenGuardObserver(
             ReactApplicationContext context,
@@ -64,6 +66,12 @@ public void onChange(boolean selfChange, Uri uri) {
             return;
         }
 
+        long now = System.currentTimeMillis();
+        if (now - mLastChangeTime < DEBOUNCE_DURATION_MS) {
+            return;
+        }
+        mLastChangeTime = now;
+
         mCurrentCount++;
         if (mLimitCount > 0 && mCurrentCount < mLimitCount) {
             return;

android/src/main/java/com/screenguard/ScreenGuardOverlay.java

@@ -46,7 +46,6 @@ public enum OverlayType {
     private boolean isActivated = false;
 
     private static final int COLOR_TRANS = 0x00000000;
-    private static final int OVERLAY_VIEW_ID = View.generateViewId();
 
     private ScreenGuardOverlay() {
         handler = new Handler(Looper.getMainLooper());
@@ -77,15 +76,22 @@ private ViewGroup getDecorView(Activity activity) {
 
     private void createOverlayView(Activity activity) {
         ViewGroup decorView = getDecorView(activity);
-        View existingOverlay = decorView.findViewById(OVERLAY_VIEW_ID);
-        if (existingOverlay != null) {
-            overlayView = (FrameLayout) existingOverlay;
-            imageView = (ImageView) overlayView.getChildAt(0);
+
+        if (overlayView != null && overlayView.getParent() == decorView) {
+            if (imageView != null && imageView.getParent() == overlayView) {
+                return;
+            }
+            overlayView.removeAllViews();
+            imageView = createImageView(activity);
+            overlayView.addView(imageView);
             return;
         }
 
+        if (overlayView != null && overlayView.getParent() != null) {
+            ((ViewGroup) overlayView.getParent()).removeView(overlayView);
+        }
+
         overlayView = new FrameLayout(activity);
-        overlayView.setId(OVERLAY_VIEW_ID);
 
         overlayView.setClickable(false);
         overlayView.setFocusable(false);
@@ -95,14 +101,7 @@ private void createOverlayView(Activity activity) {
                 FrameLayout.LayoutParams.MATCH_PARENT,
                 FrameLayout.LayoutParams.MATCH_PARENT);
 
-        imageView = new ImageView(activity);
-        imageView.setLayoutParams(new FrameLayout.LayoutParams(
-                FrameLayout.LayoutParams.MATCH_PARENT,
-                FrameLayout.LayoutParams.MATCH_PARENT));
-        imageView.setScaleType(ImageView.ScaleType.FIT_CENTER);
-
-        imageView.setClickable(false);
-        imageView.setFocusable(false);
+        imageView = createImageView(activity);
 
         overlayView.addView(imageView);
         overlayView.setBackgroundColor(COLOR_TRANS);
@@ -111,6 +110,17 @@ private void createOverlayView(Activity activity) {
         decorView.addView(overlayView, overlayParams);
     }
 
+    private ImageView createImageView(Activity activity) {
+        ImageView iv = new ImageView(activity);
+        iv.setLayoutParams(new FrameLayout.LayoutParams(
+                FrameLayout.LayoutParams.MATCH_PARENT,
+                FrameLayout.LayoutParams.MATCH_PARENT));
+        iv.setScaleType(ImageView.ScaleType.FIT_CENTER);
+        iv.setClickable(false);
+        iv.setFocusable(false);
+        return iv;
+    }
+
     public void prepareColor(Activity activity, String hexColor, int timeAfterResume) {
         android.util.Log.d("ScreenGuard", "prepareColor called, color=" + hexColor + ", time=" + timeAfterResume);
         this.activityRef = new WeakReference<>(activity);

android/src/main/java/com/screenguard/model/ScreenGuardBlurData.java

@@ -11,25 +11,22 @@ public class ScreenGuardBlurData extends ScreenGuardData implements Parcelable {
 
     public String bitmapPath;
 
-    public ScreenGuardBlurData(int radius, String bitmapPath, int timeAfterResume) {
+    public ScreenGuardBlurData(int radius, String bitmapPath) {
         this.action = ScreenGuardActionEnum.blur;
         this.radius = radius;
         this.bitmapPath = bitmapPath;
-        this.timeAfterResume = timeAfterResume;
     }
 
     protected ScreenGuardBlurData(Parcel in) {
         action = ScreenGuardActionEnum.blur;
         radius = in.readInt();
         bitmapPath = in.readString();
-        timeAfterResume = in.readInt();
     }
 
     @Override
     public void writeToParcel(Parcel dest, int flags) {
         dest.writeInt(radius);
         dest.writeString(bitmapPath);
-        dest.writeInt(timeAfterResume);
     }
 
     @Override
@@ -65,11 +62,4 @@ public void setBitmapPath(String bitmapPath) {
         this.bitmapPath = bitmapPath;
     }
 
-    public int getTimeAfterSync() {
-        return timeAfterResume;
-    }
-
-    public void setTimeAfterSync(int timeAfterSync) {
-        this.timeAfterResume = timeAfterResume;
-    }
 }

android/src/main/java/com/screenguard/model/ScreenGuardColorData.java

@@ -9,15 +9,13 @@
 
 public class ScreenGuardColorData extends ScreenGuardData implements Parcelable {
 
-    public ScreenGuardColorData(String color, int timeAfterResume) {
+    public ScreenGuardColorData(String color) {
        this.backgroundColor = color;
-       this.timeAfterResume = timeAfterResume;
        this.action = ScreenGuardActionEnum.color;
     }
 
     protected ScreenGuardColorData(Parcel in) {
         backgroundColor = in.readString();
-        timeAfterResume = in.readInt();
         action = ScreenGuardActionEnum.color;
     }
 
@@ -41,6 +39,5 @@ public int describeContents() {
     @Override
     public void writeToParcel(@NonNull Parcel parcel, int i) {
         parcel.writeString(backgroundColor);
-        parcel.writeInt(timeAfterResume);
     }
 }

android/src/main/java/com/screenguard/model/ScreenGuardData.java

@@ -4,7 +4,6 @@
 
 abstract class ScreenGuardData {
     public String backgroundColor;
-    public int timeAfterResume;
     public ScreenGuardActionEnum action;
 }
 

android/src/main/java/com/screenguard/model/ScreenGuardImageData.java

@@ -25,15 +25,13 @@ public ScreenGuardImageData(
             String imageUrl,
             double width,
             double height,
-            int alignmentIndex,
-            int timeAfterResume
+            int alignmentIndex
     ) {
         this.width = width;
         this.height = height;
         this.backgroundColor = backgroundColor;
         this.imageUrl = imageUrl;
         this.position = ScreenGuardImagePosition.getEnumFromNumber(alignmentIndex);
-        this.timeAfterResume = timeAfterResume;
         this.action = ScreenGuardActionEnum.image;
     }
 
@@ -43,7 +41,6 @@ protected ScreenGuardImageData(Parcel in) {
         backgroundColor = in.readString();
         imageUrl = in.readString();
         position = ScreenGuardImagePosition.getEnumFromNumber(in.readInt());
-        timeAfterResume = in.readInt();
         action = ScreenGuardActionEnum.image;
     }
 
@@ -78,6 +75,5 @@ public void writeToParcel(@NonNull Parcel parcel, int i) {
         parcel.writeString(backgroundColor);
         parcel.writeString(imageUrl);
         parcel.writeInt(pos);
-        parcel.writeInt(timeAfterResume);
     }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-screenguard",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "A Native screenshot blocking library for React-Native developer, with background customizable after captured. Screenshot detector are also supported.",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",