react-native-update 10.40.0 → 10.40.2

package/android/src/main/java/cn/reactnative/modules/update/ReactReloadManager.java

@@ -31,7 +31,8 @@ final class ReactReloadManager {
         Activity currentActivity = reactContext.getCurrentActivity();
         String updateBundlePath = updateContext.getBundleUrl();
 
-        Object reactHost = getReactHost(currentActivity, application);
+        boolean newArchitectureEnabled = isNewArchitectureEnabled(application);
+        Object reactHost = newArchitectureEnabled ? getReactHost(currentActivity, application) : null;
         if (reactHost != null) {
             try {
                 reloadReactHost(reactHost, createBundleLoader(application, updateBundlePath, true));
@@ -63,6 +64,9 @@ final class ReactReloadManager {
             }
 
             try {
+                if (!newArchitectureEnabled) {
+                    throw err;
+                }
                 Object currentReactHost = getReactHost(currentActivity, application);
                 if (currentReactHost == null) {
                     throw err;
@@ -180,6 +184,51 @@ final class ReactReloadManager {
         return null;
     }
 
+    private static boolean isNewArchitectureEnabled(Context application) {
+        if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
+            return true;
+        }
+
+        try {
+            Class<?> buildConfigClass = Class.forName(application.getPackageName() + ".BuildConfig");
+            Field newArchitectureField = buildConfigClass.getField("IS_NEW_ARCHITECTURE_ENABLED");
+            if (newArchitectureField.getBoolean(null)) {
+                return true;
+            }
+        } catch (Throwable ignored) {
+        }
+
+        if (application instanceof ReactApplication) {
+            try {
+                ReactNativeHost reactNativeHost = ((ReactApplication) application).getReactNativeHost();
+                Method isNewArchEnabledMethod = getDeclaredMethodInHierarchy(
+                    reactNativeHost.getClass(),
+                    "isNewArchEnabled"
+                );
+                isNewArchEnabledMethod.setAccessible(true);
+                Object result = isNewArchEnabledMethod.invoke(reactNativeHost);
+                return result instanceof Boolean && (Boolean) result;
+            } catch (Throwable ignored) {
+            }
+        }
+
+        return false;
+    }
+
+    private static Method getDeclaredMethodInHierarchy(Class<?> clazz, String methodName)
+        throws NoSuchMethodException {
+        Class<?> current = clazz;
+        while (current != null) {
+            try {
+                return current.getDeclaredMethod(methodName);
+            } catch (NoSuchMethodException ignored) {
+                current = current.getSuperclass();
+            }
+        }
+
+        throw new NoSuchMethodException(methodName);
+    }
+
     private static void reloadReactHost(Object reactHost, JSBundleLoader loader) throws Throwable {
         try {
             Field devSupportField = getCompatibleField(reactHost.getClass(), "useDevSupport");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-update",
-  "version": "10.40.0",
+  "version": "10.40.2",
   "description": "react-native hot update",
   "main": "src/index",
   "scripts": {