fix(Android): update not working properly

Author: floydkim

android/app/proguard-rules.pro

@@ -20,11 +20,6 @@
 -keepclassmembers class com.facebook.react.ReactInstanceManager {
     private final ** mBundleLoader;
 }
--keepclassmembers class com.facebook.react.ReactDelegate {
-    private ** mReactHost; # RN < 0.81
-    private ** reactHost; # RN 0.81+
-    public void reload(...); # RN 0.74 and above
-}
 # bridgeless
 -keepclassmembers class com.facebook.react.defaults.DefaultReactHostDelegate {
     private ** jsBundleLoader;

android/app/src/main/java/com/microsoft/codepush/react/CodePushNativeModule.java

@@ -13,6 +13,7 @@
 import com.facebook.react.ReactDelegate;
 import com.facebook.react.ReactHost;
 import com.facebook.react.ReactActivity;
+import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactRootView;
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.JSBundleLoader;
@@ -125,7 +126,9 @@ private void setJSBundle(String latestJSBundleFile) throws IllegalAccessExceptio
 
             ReactHost reactHost = resolveReactHost();
             if (reactHost == null) {
+                CodePushUtils.log("Unable to resolve ReactHost");
                 // Bridge, Old Architecture
+                setJSBundleLoaderBridge(latestJSBundleLoader);
                 return;
             }
 
@@ -137,6 +140,15 @@ private void setJSBundle(String latestJSBundleFile) throws IllegalAccessExceptio
         }
     }
 
+    private void setJSBundleLoaderBridge(JSBundleLoader latestJSBundleLoader) throws NoSuchFieldException, IllegalAccessException {
+        ReactDelegate reactDelegate = resolveReactDelegate();
+        assert reactDelegate != null;
+        ReactInstanceManager instanceManager = reactDelegate.getReactInstanceManager();
+        Field bundleLoaderField = instanceManager.getClass().getDeclaredField("mBundleLoader");
+        bundleLoaderField.setAccessible(true);
+        bundleLoaderField.set(instanceManager, latestJSBundleLoader);
+    }
+
     @OptIn(markerClass = UnstableReactNativeAPI.class)
     private void setJSBundleLoaderBridgeless(ReactHost reactHost, JSBundleLoader latestJSBundleLoader) throws NoSuchFieldException, IllegalAccessException {
         Field reactHostDelegateField;
@@ -222,23 +234,11 @@ private ReactDelegate resolveReactDelegate() {
     private ReactHost resolveReactHost() {
         ReactDelegate reactDelegate = resolveReactDelegate();
         if (reactDelegate == null) {
+            CodePushUtils.log("Unable to resolve ReactDelegate");
             return null;
         }
 
-        try {
-            Field reactHostField;
-            try {
-                // RN < 0.81
-                reactHostField = reactDelegate.getClass().getDeclaredField("mReactHost");
-            } catch (NoSuchFieldException e) {
-                // RN >= 0.81
-                reactHostField = reactDelegate.getClass().getDeclaredField("reactHost");
-            }
-            reactHostField.setAccessible(true);
-            return (ReactHost) reactHostField.get(reactDelegate);
-        } catch (Exception e) {
-            return null;
-        }
+        return reactDelegate.getReactHost();
     }
 
     private void restartAppInternal(boolean onlyIfUpdateIsPending) {