react-native-security-suite 0.9.5 → 0.9.7

package/android/src/main/java/com/securitysuite/SecureView.java

@@ -1,9 +1,14 @@
 package com.securitysuite;
 
-import android.content.Context;
+import android.app.Activity;
 import android.graphics.Color;
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
 import android.widget.FrameLayout;
+import android.content.Context;
 
+import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.ReadableType;
 import com.facebook.react.uimanager.ThemedReactContext;
@@ -11,8 +16,11 @@ import com.facebook.react.uimanager.UIManagerModule;
 import com.facebook.react.uimanager.annotations.ReactProp;
 
 public class SecureView extends FrameLayout {
-  public SecureView(Context context) {
+  ReactApplicationContext reactContext;
+
+  public SecureView(Context context, ReactApplicationContext reactContext) {
     super(context);
+    this.reactContext = reactContext;
   }
 
   @Override
@@ -21,6 +29,35 @@ public class SecureView extends FrameLayout {
     post(measureAndLayout);
   }
 
+    @Override
+    protected void onAttachedToWindow() {
+      super.onAttachedToWindow();
+      final Activity activity = reactContext.getCurrentActivity();
+      if (activity != null) {
+        activity.runOnUiThread(() -> {
+          Window window = activity.getWindow();
+          window.addFlags(WindowManager.LayoutParams.FLAG_SECURE);
+        });
+      }
+  }
+
+    @Override
+    protected void onDetachedFromWindow() {
+      super.onDetachedFromWindow();
+      final Activity activity = reactContext.getCurrentActivity();
+      if (activity != null) {
+        activity.runOnUiThread(() -> {
+          Window window = activity.getWindow();
+          window.clearFlags(WindowManager.LayoutParams.FLAG_SECURE);
+        });
+      }
+  }
+
+  @Override
+  public void addView(View child, int index) {
+    super.addView(child, index);
+  }
+
   private final Runnable measureAndLayout = () -> {
     measure(
             MeasureSpec.makeMeasureSpec(getWidth(), MeasureSpec.EXACTLY),

package/android/src/main/java/com/securitysuite/SecureViewFragment.java

@@ -2,7 +2,6 @@ package com.securitysuite;
 
 import android.app.Activity;
 import android.os.Bundle;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -13,11 +12,10 @@ import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
 import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContext;
 
 public class SecureViewFragment extends Fragment {
   SecureView secureView;
-  ReactContext reactContext;
+  ReactApplicationContext reactContext;
 
   public SecureViewFragment(ReactApplicationContext reactContext) {
     this.reactContext = reactContext;
@@ -26,16 +24,14 @@ public class SecureViewFragment extends Fragment {
   @Override
   public View onCreateView(LayoutInflater inflater, ViewGroup parent, Bundle savedInstanceState) {
     super.onCreateView(inflater, parent, savedInstanceState);
-    secureView = new SecureView(this.getContext());
+    secureView = new SecureView(this.getContext(), this.reactContext);
     return secureView;
   }
 
   @Override
   public void onCreate(@Nullable Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
-    Log.d("SecureViewFragment", "onCreate 11111");
-    final Activity activity = reactContext.getCurrentActivity();
-    Log.d("SecureViewFragment", String.valueOf(activity));
+    final Activity activity = getActivity();
     if (activity != null) {
       activity.runOnUiThread(new Runnable() {
         @Override
@@ -50,9 +46,7 @@ public class SecureViewFragment extends Fragment {
   @Override
   public void onDestroy() {
     super.onDestroy();
-    Log.d("SecureViewFragment", "onDestroy 11111");
-
-    final Activity activity = reactContext.getCurrentActivity();
+    final Activity activity = getActivity();
     if (activity != null) {
       activity.runOnUiThread(new Runnable() {
         @Override

package/android/src/main/java/com/securitysuite/SecureViewManager.java

@@ -37,9 +37,10 @@ public class SecureViewManager extends ViewGroupManager<SecureView> {
     return REACT_CLASS;
   }
 
+  @NonNull
   @Override
-  public SecureView createViewInstance(ThemedReactContext reactContext) {
-    return new SecureView(reactContext);
+  protected SecureView createViewInstance(@NonNull ThemedReactContext themedReactContext) {
+    return new SecureView(themedReactContext, reactContext);
   }
 
   @Nullable
@@ -58,6 +59,17 @@ public class SecureViewManager extends ViewGroupManager<SecureView> {
     }
   }
 
+  @Override
+  public boolean needsCustomLayoutForChildren() {
+    return true;
+  }
+
+  @Override
+  public void onAfterUpdateTransaction(@NonNull SecureView view) {
+    super.onAfterUpdateTransaction(view);
+    view.requestLayout();
+  }
+
   public void createFragment(FrameLayout root, int reactNativeViewId) {
     ViewGroup parentView = (ViewGroup) root.findViewById(reactNativeViewId);
     if (parentView == null) {
@@ -66,7 +78,7 @@ public class SecureViewManager extends ViewGroupManager<SecureView> {
     }
     setupLayout(parentView);
 
-    final SecureViewFragment secureViewFragment = new SecureViewFragment();
+    final SecureViewFragment secureViewFragment = new SecureViewFragment(reactContext);
     FragmentActivity activity = (FragmentActivity) reactContext.getCurrentActivity();
     if (activity == null) {
       Log.e("SecureViewManager", "Activity is null");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-security-suite",
-  "version": "0.9.5",
+  "version": "0.9.7",
   "description": "Security solution for React Native",
   "source": "./src/index.tsx",
   "main": "./lib/commonjs/index.js",