refactor: enhance ReflectionUtils and update DevSupportManagerHelpers to use new methods

Author: vadymv-mendix

android/src/main/java/com/facebook/react/devsupport/DevSupportManagerHelpers.kt

@@ -9,7 +9,12 @@ fun setBundleDownloadListener(
   listener: DevBundleDownloadListener
 ) {
   devSupportManager?.apply {
-    ReflectionUtils.setFieldOfSuperclass(this, "mBundleDownloadListener", listener)
+    ReflectionUtils.setFieldOfSuperclass(
+      this,
+      listener,
+      "mBundleDownloadListener",
+      "devBundleDownloadListener"
+    )
   }
 }
 
@@ -18,6 +23,11 @@ fun overrideDevLoadingViewController(
   devLoadingViewController: DefaultDevLoadingViewImplementation
 ) {
   devSupportManager.apply {
-    ReflectionUtils.setFieldOfSuperclass(this, "mDevLoadingViewManager", devLoadingViewController)
+    ReflectionUtils.setFieldOfSuperclass(
+      this,
+      devLoadingViewController,
+      "mDevLoadingViewManager",
+      "devLoadingViewManager"
+    )
   }
 }

android/src/main/java/com/facebook/react/devsupport/MendixShakeDetector.kt

@@ -7,6 +7,7 @@ import com.facebook.react.devsupport.interfaces.DevSupportManager
 import com.mendix.mendixnative.util.ReflectionUtils
 
 const val SHAKE_DETECTECTOR_VAR = "mShakeDetector"
+const val SHAKE_DETECTOR_VAR = "shakeDetector"
 
 fun makeShakeDetector(applicationContext: Context, onShake: () -> Unit): ShakeDetector {
   val shakeDetector = ShakeDetector(onShake)
@@ -18,9 +19,28 @@ fun makeShakeDetector(applicationContext: Context, onShake: () -> Unit): ShakeDe
 fun attachMendixSupportManagerShakeDetector(
   shakeDetector: ShakeDetector,
   devSupportManager: DevSupportManager?
-): Unit = devSupportManager.let { supportManager ->
-  val devShakeDetector =
-    ReflectionUtils.getFieldOfSuperclass<ShakeDetector>(supportManager, SHAKE_DETECTECTOR_VAR)
-  (devShakeDetector != shakeDetector).let { devShakeDetector.stop() }
-  ReflectionUtils.setFieldOfSuperclass(supportManager, SHAKE_DETECTECTOR_VAR, shakeDetector)
+) {
+  val supportManager = devSupportManager ?: return
+
+  try {
+    val devShakeDetector =
+      ReflectionUtils.getFieldOfSuperclass<ShakeDetector>(
+        supportManager,
+        SHAKE_DETECTECTOR_VAR,
+        SHAKE_DETECTOR_VAR
+      )
+
+    if (devShakeDetector !== shakeDetector) {
+      devShakeDetector.stop()
+    }
+
+    ReflectionUtils.setFieldOfSuperclass(
+      supportManager,
+      shakeDetector,
+      SHAKE_DETECTECTOR_VAR,
+      SHAKE_DETECTOR_VAR
+    )
+  } catch (_: RuntimeException) {
+    // React Native internals changed; keep the Mendix detector active without replacing RN's.
+  }
 }

android/src/main/java/com/mendix/mendixnative/util/ReflectionUtils.java

@@ -6,6 +6,20 @@
 import java.lang.reflect.Method;
 
 public class ReflectionUtils {
+    private static Field findDeclaredField(Class<?> objectClass, String... fieldNames) {
+        NoSuchFieldException lastException = null;
+
+        for (String fieldName : fieldNames) {
+            try {
+                return objectClass.getDeclaredField(fieldName);
+            } catch (NoSuchFieldException e) {
+                lastException = e;
+            }
+        }
+
+        throw new RuntimeException(lastException);
+    }
+
     public static ConstructorWrapper findConstructor(String className, Class<?>... parameterTypes) {
         try {
             Constructor constructor = Class.forName(className).getDeclaredConstructor(parameterTypes);
@@ -63,12 +77,12 @@ public void invoke(Object... args) {
     }
 
     public static void setFieldOfSuperclass(Object object, String fieldName, Object value) {
-        try {
-            Field field = object.getClass().getSuperclass().getDeclaredField(fieldName);
-            setField(object, field, value);
-        } catch (NoSuchFieldException e) {
-            throw new RuntimeException(e);
-        }
+        setFieldOfSuperclass(object, value, fieldName);
+    }
+
+    public static void setFieldOfSuperclass(Object object, Object value, String... fieldNames) {
+        Field field = findDeclaredField(object.getClass().getSuperclass(), fieldNames);
+        setField(object, field, value);
     }
 
     public static void setField(Object object, String fieldName, Object value) {
@@ -92,11 +106,15 @@ private static void setField(Object object, Field field, Object value) {
     }
 
     public static <T> T getFieldOfSuperclass(Object object, String fieldName) {
+        return getFieldOfSuperclass(object, new String[] { fieldName });
+    }
+
+    public static <T> T getFieldOfSuperclass(Object object, String... fieldNames) {
         try {
-            Field field = object.getClass().getSuperclass().getDeclaredField(fieldName);
+            Field field = findDeclaredField(object.getClass().getSuperclass(), fieldNames);
             field.setAccessible(true);
             return (T) field.get(object);
-        } catch (NoSuchFieldException | IllegalAccessException | ClassCastException e) {
+        } catch (IllegalAccessException | ClassCastException e) {
             throw new RuntimeException(e);
         }
     }