fix(android): resolve private views through UI manager directly (#1121)

Author: a7medev

CHANGELOG.md

@@ -6,6 +6,10 @@
 
 - Support user identification using ID ([#1115](https://github.com/Instabug/Instabug-React-Native/pull/1115))
 
+### Fixed
+
+- Fix an Android `NullPointerException` crash in private views APIs ([#1121](https://github.com/Instabug/Instabug-React-Native/pull/1121)), closes [#514](https://github.com/Instabug/Instabug-React-Native/issues/514).
+
 ## [12.6.0](https://github.com/Instabug/Instabug-React-Native/compare/v12.5.0...v12.6.0) (January 14, 2024)
 
 ### Changed

android/src/main/java/com/instabug/reactlibrary/RNInstabugReactnativeModule.java

@@ -7,6 +7,8 @@
 import android.net.Uri;
 import android.view.View;
 
+import androidx.annotation.UiThread;
+
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.Promise;
@@ -17,8 +19,6 @@
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.WritableNativeArray;
 import com.facebook.react.bridge.WritableNativeMap;
-import com.facebook.react.uimanager.NativeViewHierarchyManager;
-import com.facebook.react.uimanager.UIBlock;
 import com.facebook.react.uimanager.UIManagerModule;
 import com.instabug.library.Feature;
 import com.instabug.library.Instabug;
@@ -899,24 +899,32 @@ public void networkLog(String jsonObject) throws JSONException {
         networkLog.insert();
     }
 
+    @UiThread
+    @Nullable
+    private View resolveReactView(final int reactTag) {
+        final ReactApplicationContext reactContext = getReactApplicationContext();
+        final UIManagerModule uiManagerModule = reactContext.getNativeModule(UIManagerModule.class);
+
+        if (uiManagerModule == null) {
+            return null;
+        }
+
+        return uiManagerModule.resolveView(reactTag);
+    }
+
 
     @ReactMethod
     public void addPrivateView(final int reactTag) {
         MainThreadHandler.runOnMainThread(new Runnable() {
             @Override
             public void run() {
-                UIManagerModule uiManagerModule = getReactApplicationContext().getNativeModule(UIManagerModule.class);
-                uiManagerModule.prependUIBlock(new UIBlock() {
-                    @Override
-                    public void execute(NativeViewHierarchyManager nativeViewHierarchyManager) {
-                        try {
-                            final View view = nativeViewHierarchyManager.resolveView(reactTag);
-                            Instabug.addPrivateViews(view);
-                        } catch(Exception e) {
-                            e.printStackTrace();
-                        }
-                    }
-                });
+                try {
+                    final View view = resolveReactView(reactTag);
+
+                    Instabug.addPrivateViews(view);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
             }
         });
     }
@@ -926,18 +934,13 @@ public void removePrivateView(final int reactTag) {
         MainThreadHandler.runOnMainThread(new Runnable() {
             @Override
             public void run() {
-                UIManagerModule uiManagerModule = getReactApplicationContext().getNativeModule(UIManagerModule.class);
-                uiManagerModule.prependUIBlock(new UIBlock() {
-                    @Override
-                    public void execute(NativeViewHierarchyManager nativeViewHierarchyManager) {
-                        try {
-                            final View view = nativeViewHierarchyManager.resolveView(reactTag);
-                            Instabug.removePrivateViews(view);
-                        } catch(Exception e) {
-                            e.printStackTrace();
-                        }
-                    }
-                });
+                try {
+                    final View view = resolveReactView(reactTag);
+
+                    Instabug.removePrivateViews(view);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
             }
         });
     }