@bravemobile/react-native-code-push 10.0.0 → 11.0.0

package/README.md

@@ -8,17 +8,9 @@
 
 ### 🚀 New Architecture support
 
-Tested on the React Native template apps
-
-| RN Version | Old Architecture | New Architecture | New Architecture Bridgeless |
-|--------|--------|--------|--------|
-| 0.73.11 | ✅ | ✅ | Unsupported |
-| 0.74.7 | ✅ | ✅ | ✅ |
-| 0.75.5 | ✅ | ✅ | ✅ |
-| 0.76.7 | ✅ | ✅ | ✅ |
-| 0.77.1 | ✅ | ✅ | ✅ | 
-| 0.78.0 | ✅ | ✅ | ✅ | 
+Supports React Native 0.74 ~ 0.80.
 
+(Tested on the React Native CLI template apps)
 
 ## 🚗 Migration Guide
 

package/android/app/proguard-rules.pro

@@ -24,10 +24,6 @@
     private ** mReactHost; # bridgeless
     public void reload(...); # RN 0.74 and above
 }
-# RN 0.74 and above
--keepclassmembers class com.facebook.react.ReactActivity {
-    public ** getReactDelegate(...);
-}
 # bridgeless
 -keepclassmembers class com.facebook.react.defaults.DefaultReactHostDelegate {
     private ** jsBundleLoader;

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

@@ -6,6 +6,7 @@ import android.os.AsyncTask;
 import android.os.Handler;
 import android.os.Looper;
 import android.view.View;
+import android.view.Choreographer;
 
 import androidx.annotation.OptIn;
 
@@ -25,7 +26,6 @@ import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.common.annotations.UnstableReactNativeAPI;
-import com.facebook.react.modules.core.ChoreographerCompat;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.facebook.react.modules.core.ReactChoreographer;
 import com.facebook.react.runtime.ReactHostDelegate;
@@ -99,7 +99,7 @@ public class CodePushNativeModule extends ReactContextBaseJavaModule {
     }
 
     private void loadBundleLegacy() {
-        final Activity currentActivity = getCurrentActivity();
+        final Activity currentActivity = getReactApplicationContext().getCurrentActivity();
         if (currentActivity == null) {
             // The currentActivity can be null if it is backgrounded / destroyed, so we simply
             // no-op to prevent any null pointer exceptions.
@@ -128,7 +128,7 @@ public class CodePushNativeModule extends ReactContextBaseJavaModule {
 
             ReactHost reactHost = resolveReactHost();
             if (reactHost == null) {
-                // Bridge, Old Architecture and RN < 0.74 (we support Bridgeless >= 0.74)
+                // Bridge, Old Architecture
                 setJSBundleLoaderBridge(instanceManager, latestJSBundleLoader);
                 return;
             }
@@ -184,29 +184,14 @@ public class CodePushNativeModule extends ReactContextBaseJavaModule {
             new Handler(Looper.getMainLooper()).post(new Runnable() {
                 @Override
                 public void run() {
-                    try {
-                        // reload method introduced in RN 0.74 (https://github.com/reactwg/react-native-new-architecture/discussions/174)
-                        // so, we need to check if reload method exists and call it
-                        try {
-                            ReactDelegate reactDelegate = resolveReactDelegate();
-                            if (reactDelegate == null) {
-                                throw new NoSuchMethodException("ReactDelegate doesn't have reload method in RN < 0.74");
-                            }
+                    ReactDelegate reactDelegate = resolveReactDelegate();
+                    assert reactDelegate != null;
 
-                            resetReactRootViews(reactDelegate);
+                    resetReactRootViews(reactDelegate);
 
-                            Method reloadMethod = reactDelegate.getClass().getMethod("reload");
-                            reloadMethod.invoke(reactDelegate);
-                        } catch (NoSuchMethodException e) {
-                            // RN < 0.74 calls ReactInstanceManager.recreateReactContextInBackground() directly
-                            instanceManager.recreateReactContextInBackground();
-                        }
-                        mCodePush.initializeUpdateAfterRestart();
-                    } catch (Exception e) {
-                        // The recreation method threw an unknown exception
-                        // so just simply fallback to restarting the Activity (if it exists)
-                        loadBundleLegacy();
-                    }
+                    reactDelegate.reload();
+
+                    mCodePush.initializeUpdateAfterRestart();
                 }
             });
 
@@ -223,7 +208,7 @@ public class CodePushNativeModule extends ReactContextBaseJavaModule {
     //     React Native uses the id field to track react tags and will overwrite this field.
     //     If that is fine, explicitly overwrite the id field to View.NO_ID before calling addRootView."
     private void resetReactRootViews(ReactDelegate reactDelegate) {
-        ReactActivity currentActivity = (ReactActivity) getCurrentActivity();
+        ReactActivity currentActivity = (ReactActivity) getReactApplicationContext().getCurrentActivity();
         if (currentActivity != null) {
             ReactRootView reactRootView = reactDelegate.getReactRootView();
             if (reactRootView != null) {
@@ -242,18 +227,12 @@ public class CodePushNativeModule extends ReactContextBaseJavaModule {
     }
 
     private ReactDelegate resolveReactDelegate() {
-        ReactActivity currentActivity = (ReactActivity) getCurrentActivity();
+        ReactActivity currentActivity = (ReactActivity) getReactApplicationContext().getCurrentActivity();
         if (currentActivity == null) {
             return null;
         }
 
-        try {
-            Method getReactDelegateMethod = currentActivity.getClass().getMethod("getReactDelegate");
-            return (ReactDelegate) getReactDelegateMethod.invoke(currentActivity);
-        } catch (Exception e) {
-            // RN < 0.74 doesn't have getReactDelegate method
-            return null;
-        }
+        return currentActivity.getReactDelegate();
     }
 
     private ReactHost resolveReactHost() {
@@ -278,7 +257,7 @@ public class CodePushNativeModule extends ReactContextBaseJavaModule {
             return instanceManager;
         }
 
-        final Activity currentActivity = getCurrentActivity();
+        final Activity currentActivity = getReactApplicationContext().getCurrentActivity();
         if (currentActivity == null) {
             return null;
         }
@@ -390,7 +369,7 @@ public class CodePushNativeModule extends ReactContextBaseJavaModule {
                             getReactApplicationContext().runOnUiQueueThread(new Runnable() {
                                 @Override
                                 public void run() {
-                                    ReactChoreographer.getInstance().postFrameCallback(ReactChoreographer.CallbackType.TIMERS_EVENTS, new ChoreographerCompat.FrameCallback() {
+                                    ReactChoreographer.getInstance().postFrameCallback(ReactChoreographer.CallbackType.TIMERS_EVENTS, new Choreographer.FrameCallback() {
                                         @Override
                                         public void doFrame(long frameTimeNanos) {
                                             if (!latestDownloadProgress.isCompleted()) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bravemobile/react-native-code-push",
-  "version": "10.0.0",
+  "version": "11.0.0",
   "description": "React Native plugin for the CodePush service",
   "main": "CodePush.js",
   "typings": "typings/react-native-code-push.d.ts",