@bravemobile/react-native-code-push 12.4.0 → 12.4.1

package/README.md

@@ -8,7 +8,7 @@
 
 ### 🚀 New Architecture support
 
-Supports React Native 0.77 ~ 0.84.
+Supports React Native 0.77 ~ 0.86.
 
 > [!NOTE]
 > If you are using React Native 0.76 or lower, please use version `12.0.2` of this library.

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

@@ -341,19 +341,28 @@ public class CodePushNativeModule extends ReactContextBaseJavaModule {
                 try {
                     JSONObject mutableUpdatePackage = CodePushUtils.convertReadableToJsonObject(updatePackage);
                     mUpdateManager.downloadPackage(mutableUpdatePackage, mCodePush.getAssetsBundleFileName(), new DownloadProgressCallback() {
-                        private boolean hasScheduledNextFrame = false;
-                        private DownloadProgress latestDownloadProgress = null;
+                        private volatile boolean hasScheduledNextFrame = false;
+                        private volatile DownloadProgress latestDownloadProgress = null;
+                        private final DownloadProgressEventDispatcher progressEventDispatcher = new DownloadProgressEventDispatcher(
+                                new DownloadProgressEventDispatcher.EventEmitter() {
+                                    @Override
+                                    public void emit(DownloadProgress downloadProgress) {
+                                        getReactApplicationContext()
+                                                .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
+                                                .emit(CodePushConstants.DOWNLOAD_PROGRESS_EVENT_NAME, downloadProgress.createWritableMap());
+                                    }
+                                });
 
                         @Override
                         public void call(DownloadProgress downloadProgress) {
-                            if (!notifyProgress) {
+                            if (!notifyProgress || downloadProgress == null) {
                                 return;
                             }
 
                             latestDownloadProgress = downloadProgress;
                             // If the download is completed, synchronously send the last event.
-                            if (latestDownloadProgress.isCompleted()) {
-                                dispatchDownloadProgressEvent();
+                            if (downloadProgress.isCompleted()) {
+                                progressEventDispatcher.dispatch(downloadProgress);
                                 return;
                             }
 
@@ -368,22 +377,16 @@ public class CodePushNativeModule extends ReactContextBaseJavaModule {
                                     ReactChoreographer.getInstance().postFrameCallback(ReactChoreographer.CallbackType.TIMERS_EVENTS, new Choreographer.FrameCallback() {
                                         @Override
                                         public void doFrame(long frameTimeNanos) {
-                                            if (!latestDownloadProgress.isCompleted()) {
-                                                dispatchDownloadProgressEvent();
+                                            try {
+                                                progressEventDispatcher.dispatch(latestDownloadProgress);
+                                            } finally {
+                                                hasScheduledNextFrame = false;
                                             }
-
-                                            hasScheduledNextFrame = false;
                                         }
                                     });
                                 }
                             });
                         }
-
-                        public void dispatchDownloadProgressEvent() {
-                            getReactApplicationContext()
-                                    .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
-                                    .emit(CodePushConstants.DOWNLOAD_PROGRESS_EVENT_NAME, latestDownloadProgress.createWritableMap());
-                        }
                     });
 
                     JSONObject newPackage = mUpdateManager.getPackage(CodePushUtils.tryGetString(updatePackage, CodePushConstants.PACKAGE_HASH_KEY));

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

@@ -27,4 +27,8 @@ class DownloadProgress {
     public boolean isCompleted() {
         return mTotalBytes == mReceivedBytes;
     }
+
+    long getReceivedBytes() {
+        return mReceivedBytes;
+    }
 }

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

@@ -0,0 +1,23 @@
+package com.microsoft.codepush.react;
+
+class DownloadProgressEventDispatcher {
+    interface EventEmitter {
+        void emit(DownloadProgress downloadProgress);
+    }
+
+    private final EventEmitter mEventEmitter;
+    private long mLastDispatchedBytes = -1;
+
+    DownloadProgressEventDispatcher(EventEmitter eventEmitter) {
+        mEventEmitter = eventEmitter;
+    }
+
+    synchronized void dispatch(DownloadProgress downloadProgress) {
+        if (downloadProgress == null || downloadProgress.getReceivedBytes() <= mLastDispatchedBytes) {
+            return;
+        }
+
+        mEventEmitter.emit(downloadProgress);
+        mLastDispatchedBytes = downloadProgress.getReceivedBytes();
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bravemobile/react-native-code-push",
-  "version": "12.4.0",
+  "version": "12.4.1",
   "description": "React Native plugin for the CodePush service",
   "main": "src/CodePush.js",
   "react-native": "src/CodePush.js",