@appcircle/react-native-code-push 0.0.4 → 0.1.0-beta.1

package/CodePush.podspec

@@ -16,6 +16,7 @@ Pod::Spec.new do |s|
   s.library        = 'z'
   s.source_files = 'ios/CodePush/*.{h,m}'
   s.public_header_files = ['ios/CodePush/CodePush.h']
+  s.pod_target_xcconfig = { "DEFINES_MODULE" => "YES" }
 
   # Note: Even though there are copy/pasted versions of some of these dependencies in the repo, 
   # we explicitly let CocoaPods pull in the versions below so all dependencies are resolved and 

package/README.md

@@ -37,6 +37,16 @@ Run the following command to add the Appcircle CodePush SDK to your project.
 npm install @appcircle/react-native-code-push
 ```
 
+## Supported Versions
+
+| React Native version(s) | Supporting CodePush version(s) |
+| --- | --- |
+| `<v0.76` | Consider `microsoft/code-push-react-native` |
+| `v0.76`, `v0.77`, `v0.78`, `v0.79` | `v0.0.3+` (Available for Old/New Architecture) |
+| `v0.80` | `v0.0.4+` (Available for Old/New Architecture) |
+| `v0.81+` | `v0.1.0+` (Available for Old/New Architecture) |
+| `v0.82+` | `v0.1.0+` (Available for New Architecture) |
+
 ## Platform Setup
 
 ### iOS Setup

package/android/app/build.gradle

@@ -10,10 +10,6 @@ def isNewArchitectureEnabled() {
 
 def IS_NEW_ARCHITECTURE_ENABLED = isNewArchitectureEnabled()
 
-if (IS_NEW_ARCHITECTURE_ENABLED) {
-    apply plugin: "com.facebook.react"
-}
-
 def DEFAULT_COMPILE_SDK_VERSION = 26
 def DEFAULT_BUILD_TOOLS_VERSION = "26.0.3"
 def DEFAULT_TARGET_SDK_VERSION = 26
@@ -40,9 +36,13 @@ android {
     defaultConfig {
         consumerProguardFiles 'proguard-rules.pro'
     }
+
+    buildFeatures {
+        buildConfig true
+    }
 }
 
 dependencies {
-    implementation "com.facebook.react:react-native:+"
+    implementation 'com.facebook.react:react-android:0.82.1'
     implementation 'com.nimbusds:nimbus-jose-jwt:9.37.3'
 }

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

@@ -141,10 +141,10 @@ public class CodePush implements ReactPackage {
 
     private String getCustomPropertyFromStringsIfExist(String propertyName) {
         String property;
-
+      
         String packageName = mContext.getPackageName();
         int resId = mContext.getResources().getIdentifier("CodePush" + propertyName, "string", packageName);
-
+        
         if (resId != 0) {
             property = mContext.getString(resId);
 
@@ -152,7 +152,7 @@ public class CodePush implements ReactPackage {
                 return property;
             } else {
                 CodePushUtils.log("Specified " + propertyName + " is empty");
-            }
+            } 
         }
 
         return null;
@@ -402,10 +402,6 @@ public class CodePush implements ReactPackage {
         mReactInstanceHolder = reactInstanceHolder;
     }
 
-    public static void setReactHost(ReactHostHolder reactHostHolder) {
-        mReactHostHolder = reactHostHolder;
-    }
-
     static ReactInstanceManager getReactInstanceManager() {
         if (mReactInstanceHolder == null) {
             return null;
@@ -413,6 +409,10 @@ public class CodePush implements ReactPackage {
         return mReactInstanceHolder.getReactInstanceManager();
     }
 
+    public static void setReactHost(ReactHostHolder reactHostHolder) {
+        mReactHostHolder = reactHostHolder;
+    }
+
     static ReactHost getReactHost() {
         if (mReactHostHolder == null) {
             return null;
@@ -432,13 +432,8 @@ public class CodePush implements ReactPackage {
         return nativeModules;
     }
 
-    // Deprecated in RN v0.47.
-    public List<Class<? extends JavaScriptModule>> createJSModules() {
-        return new ArrayList<>();
-    }
-
     @Override
     public List<ViewManager> createViewManagers(ReactApplicationContext reactApplicationContext) {
         return new ArrayList<>();
     }
-}
+}

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

@@ -118,6 +118,25 @@ public class CodePushNativeModule extends BaseJavaModule {
         });
     }
 
+    private Field findBundleLoaderField(Class<?> delegateClass) {
+        Class<?> currentClass = delegateClass;
+        while (currentClass != null) {
+            try {
+                return currentClass.getDeclaredField("jsBundleLoader");
+            } catch (NoSuchFieldException ignored) {
+                // Continue searching the class hierarchy and alternate field names.
+            }
+
+            try {
+                return currentClass.getDeclaredField("_jsBundleLoader");
+            } catch (NoSuchFieldException ignored) {
+                currentClass = currentClass.getSuperclass();
+            }
+        }
+
+        return null;
+    }
+
     // Use reflection to find and set the appropriate fields on ReactInstanceManager. See #556 for a proposal for a less brittle way
     // to approach this.
     private void setJSBundle(ReactInstanceManager instanceManager, String latestJSBundleFile) throws IllegalAccessException {
@@ -149,10 +168,17 @@ public class CodePushNativeModule extends BaseJavaModule {
                 latestJSBundleLoader = JSBundleLoader.createFileLoader(latestJSBundleFile);
             }
 
-            Field bundleLoaderField = reactHostDelegate.getClass().getDeclaredField("jsBundleLoader");
+            Field bundleLoaderField = findBundleLoaderField(reactHostDelegate.getClass());
+            if (bundleLoaderField == null) {
+                throw new NoSuchFieldException("jsBundleLoader");
+            }
             bundleLoaderField.setAccessible(true);
             bundleLoaderField.set(reactHostDelegate, latestJSBundleLoader);
-        } catch (Exception e) {
+
+        } catch (NoSuchFieldException nsfe) {
+            CodePushUtils.log("Field 'jsBundleLoader' NOT FOUND on " + (reactHostDelegate != null ? reactHostDelegate.getClass().getName() : "null") + ". This is an EXPECTED and IGNORED failure with ExpoReactHostDelegate. Will rely on reactHost.reload(). Original log: Unable to set JSBundle of ReactHostDelegate - CodePush may not support this version of React Native");
+            // DO NOT THROW for NoSuchFieldException.
+        }catch (Exception e) {
             CodePushUtils.log("Unable to set JSBundle of ReactHostDelegate - CodePush may not support this version of React Native");
             throw new IllegalAccessException("Could not setJSBundle");
         }
@@ -177,18 +203,38 @@ public class CodePushNativeModule extends BaseJavaModule {
                 mCodePush.clearDebugCacheIfNeeded(false);
             }
 
+
             try {
                 // #1) Get the ReactHost instance, which is what includes the
                 //     logic to reload the current React context.
                 final ReactHost reactHost = resolveReactHost();
                 if (reactHost == null) {
+                    loadBundleLegacy(); // Fallback if reactHost can't be resolved
                     return;
                 }
 
                 String latestJSBundleFile = mCodePush.getJSBundleFileInternal(mCodePush.getAssetsBundleFileName());
+                CodePushUtils.log("[MyDebug] Latest JS bundle for New Arch: " + latestJSBundleFile);
 
-                // #2) Update the locally stored JS bundle file path
-                setJSBundle(getReactHostDelegate((ReactHostImpl) reactHost), latestJSBundleFile);
+
+                try {
+                    if (reactHost instanceof ReactHostImpl) {
+                        ReactHostDelegate delegate = getReactHostDelegate((ReactHostImpl) reactHost);
+                        if (delegate != null) {
+                            // #2) Update the locally stored JS bundle file path
+                            setJSBundle(delegate, latestJSBundleFile);
+                        } else {
+                            CodePushUtils.log("Could not get ReactHostDelegate from ReactHostImpl.");
+                        }
+                    } else {
+                        CodePushUtils.log("ReactHost is not a direct ReactHostImpl instance (" + reactHost.getClass().getName() + "), skipping direct setJSBundle reflection attempt. This is expected with Expo.");
+                    }
+                } catch (ClassCastException cce) {
+                    CodePushUtils.log(new Exception("ClassCastException trying to get/use ReactHostDelegate. Skipping reflection call to setJSBundle. This is expected for Expo.", cce));
+                }catch (Exception e) {
+                    // Catch any unexpected errors from the attempt to call setJSBundle, e.g., if getReactHostDelegate itself fails
+                    CodePushUtils.log("Exception during the reflective setJSBundle block: " + e.getMessage());
+                }
 
                 // #3) Get the context creation method
                 try {
@@ -201,8 +247,7 @@ public class CodePushNativeModule extends BaseJavaModule {
                 }
 
             } catch (Exception e) {
-                // Our reflection logic failed somewhere
-                // so fall back to restarting the Activity (if it exists)
+                // reflection logic failed somewhere so fall back to restarting the Activity (if it exists)
                 CodePushUtils.log("Failed to load the bundle, falling back to restarting the Activity (if it exists). " + e.getMessage());
                 loadBundleLegacy();
             }
@@ -241,11 +286,6 @@ public class CodePushNativeModule extends BaseJavaModule {
                     @Override
                     public void run() {
                         try {
-                            // We don't need to resetReactRootViews anymore
-                            // due the issue https://github.com/facebook/react-native/issues/14533
-                            // has been fixed in RN 0.46.0
-                            //resetReactRootViews(instanceManager);
-
                             instanceManager.recreateReactContextInBackground();
                             mCodePush.initializeUpdateAfterRestart();
                         } catch (Exception e) {
@@ -284,20 +324,6 @@ public class CodePushNativeModule extends BaseJavaModule {
         return false;
     }
 
-    // This workaround has been implemented in order to fix https://github.com/facebook/react-native/issues/14533
-    // resetReactRootViews allows to call recreateReactContextInBackground without any exceptions
-    // This fix also relates to https://github.com/microsoft/react-native-code-push/issues/878
-    private void resetReactRootViews(ReactInstanceManager instanceManager) throws NoSuchFieldException, IllegalAccessException {
-        Field mAttachedRootViewsField = instanceManager.getClass().getDeclaredField("mAttachedRootViews");
-        mAttachedRootViewsField.setAccessible(true);
-        List<ReactRootView> mAttachedRootViews = (List<ReactRootView>)mAttachedRootViewsField.get(instanceManager);
-        for (ReactRootView reactRootView : mAttachedRootViews) {
-            reactRootView.removeAllViews();
-            reactRootView.setId(View.NO_ID);
-        }
-        mAttachedRootViewsField.set(instanceManager, mAttachedRootViews);
-    }
-
     private void clearLifecycleEventListener() {
         // Remove LifecycleEventListener to prevent infinite restart loop
         if (mLifecycleEventListener != null) {
@@ -833,16 +859,29 @@ public class CodePushNativeModule extends BaseJavaModule {
     }
 
     public ReactHostDelegate getReactHostDelegate(ReactHostImpl reactHostImpl) {
-        try {
-            Class<?> clazz = reactHostImpl.getClass();
-            Field field = clazz.getDeclaredField("mReactHostDelegate");
-            field.setAccessible(true);
-
-            // Get the value of the field for the provided instance
-            return (ReactHostDelegate) field.get(reactHostImpl);
-        } catch (NoSuchFieldException | IllegalAccessException e) {
-            e.printStackTrace();
-            return null;
+        Class<?> currentClass = reactHostImpl.getClass();
+
+        // Traverse up the class hierarchy in case the delegate field is declared in a parent.
+        while (currentClass != null) {
+            Field[] fields = currentClass.getDeclaredFields();
+
+            for (Field field : fields) {
+                try {
+                    field.setAccessible(true);
+                    Object value = field.get(reactHostImpl);
+
+                    if (value instanceof ReactHostDelegate) {
+                        return (ReactHostDelegate) value;
+                    }
+                } catch (Exception ignored) {
+                    // Keep scanning fields.
+                }
+            }
+
+            currentClass = currentClass.getSuperclass();
         }
+
+        CodePushUtils.log("Reflection failed: Could not find any field of type ReactHostDelegate in ReactHostImpl.");
+        return null;
     }
 }

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

@@ -157,6 +157,9 @@ public class CodePushUpdateManager {
 
         String downloadUrlString = updatePackage.optString(CodePushConstants.DOWNLOAD_URL_KEY, null);
         HttpURLConnection connection = null;
+        BufferedInputStream bin = null;
+        FileOutputStream fos = null;
+        BufferedOutputStream bout = null;
         File downloadFile = null;
         boolean isZip = false;
 
@@ -175,51 +178,52 @@ public class CodePushUpdateManager {
             }
 
             connection.setRequestProperty("Accept-Encoding", "identity");
+            bin = new BufferedInputStream(connection.getInputStream());
 
             long totalBytes = connection.getContentLength();
             long receivedBytes = 0;
 
             File downloadFolder = new File(getCodePushPath());
             downloadFolder.mkdirs();
-            
             downloadFile = new File(downloadFolder, CodePushConstants.DOWNLOAD_FILE_NAME);
+            fos = new FileOutputStream(downloadFile);
+            bout = new BufferedOutputStream(fos, CodePushConstants.DOWNLOAD_BUFFER_SIZE);
             byte[] data = new byte[CodePushConstants.DOWNLOAD_BUFFER_SIZE];
             byte[] header = new byte[4];
 
-            try (
-                BufferedInputStream bin = new BufferedInputStream(connection.getInputStream());
-                FileOutputStream fos = new FileOutputStream(downloadFile);
-                BufferedOutputStream bout = new BufferedOutputStream(fos, CodePushConstants.DOWNLOAD_BUFFER_SIZE)
-            ) {
-                int numBytesRead = 0;
-                while ((numBytesRead = bin.read(data, 0, CodePushConstants.DOWNLOAD_BUFFER_SIZE)) >= 0) {
-                    if (receivedBytes < 4) {
-                        for (int i = 0; i < numBytesRead; i++) {
-                            int headerOffset = (int) (receivedBytes) + i;
-                            if (headerOffset >= 4) {
-                                break;
-                            }
-
-                            header[headerOffset] = data[i];
+            int numBytesRead = 0;
+            while ((numBytesRead = bin.read(data, 0, CodePushConstants.DOWNLOAD_BUFFER_SIZE)) >= 0) {
+                if (receivedBytes < 4) {
+                    for (int i = 0; i < numBytesRead; i++) {
+                        int headerOffset = (int) (receivedBytes) + i;
+                        if (headerOffset >= 4) {
+                            break;
                         }
-                    }
 
-                    receivedBytes += numBytesRead;
-                    bout.write(data, 0, numBytesRead);
-                    progressCallback.call(new DownloadProgress(totalBytes, receivedBytes));
+                        header[headerOffset] = data[i];
+                    }
                 }
 
-                if (totalBytes != receivedBytes) {
-                    throw new CodePushUnknownException("Received " + receivedBytes + " bytes, expected " + totalBytes);
-                }
+                receivedBytes += numBytesRead;
+                bout.write(data, 0, numBytesRead);
+                progressCallback.call(new DownloadProgress(totalBytes, receivedBytes));
+            }
 
-                isZip = ByteBuffer.wrap(header).getInt() == 0x504b0304;
+            if (totalBytes != receivedBytes) {
+                throw new CodePushUnknownException("Received " + receivedBytes + " bytes, expected " + totalBytes);
             }
+
+            isZip = ByteBuffer.wrap(header).getInt() == 0x504b0304;
         } catch (MalformedURLException e) {
             throw new CodePushMalformedDataException(downloadUrlString, e);
         } finally {
-            if (connection != null) {
-                connection.disconnect();
+            try {
+                if (bout != null) bout.close();
+                if (fos != null) fos.close();
+                if (bin != null) bin.close();
+                if (connection != null) connection.disconnect();
+            } catch (IOException e) {
+                throw new CodePushUnknownException("Error closing IO resources.", e);
             }
         }
 
@@ -343,35 +347,32 @@ public class CodePushUpdateManager {
     public void downloadAndReplaceCurrentBundle(String remoteBundleUrl, String bundleFileName) throws IOException {
         URL downloadUrl;
         HttpURLConnection connection = null;
-
+        BufferedInputStream bin = null;
+        FileOutputStream fos = null;
+        BufferedOutputStream bout = null;
         try {
             downloadUrl = new URL(remoteBundleUrl);
             connection = (HttpURLConnection) (downloadUrl.openConnection());
-
+            bin = new BufferedInputStream(connection.getInputStream());
             File downloadFile = new File(getCurrentPackageBundlePath(bundleFileName));
-            if (downloadFile.exists() && !downloadFile.delete()) {
-                // Silent failure, but execution continues
-            }
-
-            try (
-                BufferedInputStream bin = new BufferedInputStream(connection.getInputStream());
-                FileOutputStream fos = new FileOutputStream(downloadFile);
-                BufferedOutputStream bout = new BufferedOutputStream(fos, CodePushConstants.DOWNLOAD_BUFFER_SIZE)
-            ) {
-                byte[] data = new byte[CodePushConstants.DOWNLOAD_BUFFER_SIZE];
-                int numBytesRead;
-                while ((numBytesRead = bin.read(data, 0, CodePushConstants.DOWNLOAD_BUFFER_SIZE)) >= 0) {
-                    bout.write(data, 0, numBytesRead);
-                }
+            downloadFile.delete();
+            fos = new FileOutputStream(downloadFile);
+            bout = new BufferedOutputStream(fos, CodePushConstants.DOWNLOAD_BUFFER_SIZE);
+            byte[] data = new byte[CodePushConstants.DOWNLOAD_BUFFER_SIZE];
+            int numBytesRead = 0;
+            while ((numBytesRead = bin.read(data, 0, CodePushConstants.DOWNLOAD_BUFFER_SIZE)) >= 0) {
+                bout.write(data, 0, numBytesRead);
             }
-
         } catch (MalformedURLException e) {
             throw new CodePushMalformedDataException(remoteBundleUrl, e);
-        } catch (IOException e) {
-            throw new CodePushUnknownException("Error handling IO streams.", e);
         } finally {
-            if (connection != null) {
-                connection.disconnect();
+            try {
+                if (bout != null) bout.close();
+                if (fos != null) fos.close();
+                if (bin != null) bin.close();
+                if (connection != null) connection.disconnect();
+            } catch (IOException e) {
+                throw new CodePushUnknownException("Error closing IO resources.", e);
             }
         }
     }
@@ -379,4 +380,4 @@ public class CodePushUpdateManager {
     public void clearUpdates() {
         FileUtils.deleteDirectoryAtPath(getCodePushPath());
     }
-}
+}

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

@@ -62,14 +62,11 @@ public class CodePushUpdateUtils {
             if (file.isDirectory()) {
                 addContentsOfFolderToManifest(fullFilePath, relativePath, manifest);
             } else {
-                try (FileInputStream fis = new FileInputStream(file)) {
-                    manifest.add(relativePath + ":" + computeHash(fis));
+                try {
+                    manifest.add(relativePath + ":" + computeHash(new FileInputStream(file)));
                 } catch (FileNotFoundException e) {
                     // Should not happen.
                     throw new CodePushUnknownException("Unable to compute hash of update contents.", e);
-                } catch (IOException e) {
-                    // Should not happen.
-                    throw new CodePushUnknownException("Error occurred while reading file for hashing.", e);
                 }
             }
         }
@@ -275,4 +272,4 @@ public class CodePushUpdateUtils {
 
         CodePushUtils.log("The update contents succeeded the code signing check.");
     }
-}
+}

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

@@ -29,19 +29,26 @@ public class FileUtils {
                         CodePushUtils.appendPathComponent(destinationDirectoryPath, sourceFile.getName()));
             } else {
                 File destFile = new File(destDir, sourceFile.getName());
+                FileInputStream fromFileStream = null;
+                BufferedInputStream fromBufferedStream = null;
+                FileOutputStream destStream = null;
                 byte[] buffer = new byte[WRITE_BUFFER_SIZE];
-                try (
-                    FileInputStream fromFileStream = new FileInputStream(sourceFile);
-                    BufferedInputStream fromBufferedStream = new BufferedInputStream(fromFileStream);
-                    FileOutputStream destStream = new FileOutputStream(destFile)
-                )
-                {
+                try {
+                    fromFileStream = new FileInputStream(sourceFile);
+                    fromBufferedStream = new BufferedInputStream(fromFileStream);
+                    destStream = new FileOutputStream(destFile);
                     int bytesRead;
                     while ((bytesRead = fromBufferedStream.read(buffer)) > 0) {
                         destStream.write(buffer, 0, bytesRead);
                     }
-                } catch (IOException e) {
-                    throw new CodePushUnknownException("Error closing IO resources.", e);
+                } finally {
+                    try {
+                        if (fromFileStream != null) fromFileStream.close();
+                        if (fromBufferedStream != null) fromBufferedStream.close();
+                        if (destStream != null) destStream.close();
+                    } catch (IOException e) {
+                        throw new CodePushUnknownException("Error closing IO resources.", e);
+                    }
                 }
             }
         }
@@ -193,4 +200,4 @@ public class FileUtils {
             if (out != null) out.close();
         }
     }
-}
+}

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

@@ -14,7 +14,4 @@ public interface ReactInstanceHolder {
    * Get the current {@link ReactInstanceManager} instance. May return null.
    */
   ReactInstanceManager getReactInstanceManager();
-
-
-
 }

package/android/build.gradle

@@ -6,7 +6,8 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.3.0'
+        classpath("com.android.tools.build:gradle:8.12.0")
+        classpath("com.facebook.react:react-native-gradle-plugin")
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -14,10 +15,8 @@ buildscript {
 }
 
 allprojects {
-    android {
-        namespace "com.microsoft.codepush.react"
-    }
     repositories {
+        google()
         mavenLocal()
         mavenCentral()
     }

package/android/gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip

package/android/gradle.properties

@@ -16,5 +16,3 @@
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-
-android.useDeprecatedNdk=true

package/android/settings.gradle

@@ -1 +1,2 @@
-include ':app'
+include ':app'
+includeBuild('../node_modules/@react-native/gradle-plugin')

package/ios/CodePush/CodePush.m

@@ -32,7 +32,7 @@
     long long _latestExpectedContentLength;
     long long _latestReceivedConentLength;
     BOOL _didUpdateProgress;
-
+    
     BOOL _allowed;
     BOOL _restartInProgress;
     NSMutableArray *_restartQueue;
@@ -377,7 +377,7 @@ static NSString *const LatestRollbackCountKey = @"count";
     _allowed = YES;
     _restartInProgress = NO;
     _restartQueue = [NSMutableArray arrayWithCapacity:1];
-
+    
     self = [super init];
     if (self) {
         [self initializeUpdateAfterRestart];
@@ -538,10 +538,19 @@ static NSString *const LatestRollbackCountKey = @"count";
         // file (since Chrome wouldn't support it). Otherwise, update
         // the current bundle URL to point at the latest update
         if ([CodePush isUsingTestConfiguration] || ![super.bridge.bundleURL.scheme hasPrefix:@"http"]) {
-            [super.bridge setValue:[CodePush bundleURL] forKey:@"bundleURL"];
+            RCTReloadCommandSetBundleURL([CodePush bundleURL]);
+            // [super.bridge setValue:[CodePush bundleURL] forKey:@"bundleURL"];
         }
 
-        RCTTriggerReloadCommandListeners(@"react-native-code-push: Restart");
+        // Add a small delay to ensure Fabric surface initialization is complete
+        // before triggering reload. This fixes a race condition in React Native 0.82+
+        // with New Architecture where RCTInstance invalidate and RCTFabricSurface start
+        // can run concurrently, causing a crash when MountingCoordinator's mutex is accessed
+        // after being destroyed.
+        // 
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.3 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+            RCTTriggerReloadCommandListeners(@"react-native-code-push: Restart");
+        });
     });
 }
 
@@ -744,8 +753,8 @@ RCT_EXPORT_METHOD(downloadUpdate:(NSDictionary*)updatePackage
             if (expectedContentLength == receivedContentLength) {
                 _didUpdateProgress = NO;
                 self.paused = YES;
-                [self dispatchDownloadProgressEvent];
             }
+            [self dispatchDownloadProgressEvent];
         }
         // The download completed
         doneCallback:^{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appcircle/react-native-code-push",
-  "version": "0.0.4",
+  "version": "0.1.0-beta.1",
   "description": "React Native plugin for the CodePush service",
   "main": "CodePush.js",
   "typings": "typings/react-native-code-push.d.ts",
@@ -53,6 +53,7 @@
     "xcode": "3.0.1"
   },
   "devDependencies": {
+    "react-native": "0.82.1",
     "@types/assert": "^1.5.2",
     "@types/mkdirp": "^1.0.1",
     "@types/mocha": "^9.0.0",
@@ -83,8 +84,8 @@
       ]
     },
     "commands": {
-      "postlink": "node node_modules/react-native-code-push/scripts/postlink/run",
-      "postunlink": "node node_modules/react-native-code-push/scripts/postunlink/run"
+      "postlink": "node node_modules/@appcircle/react-native-code-push/scripts/postlink/run",
+      "postunlink": "node node_modules/@appcircle/react-native-code-push/scripts/postunlink/run"
     }
   }
 }

package/react-native.config.js

@@ -8,4 +8,4 @@ module.exports = {
             }
         }
     }
-};
+};

package/scripts/tools/linkToolsAndroid.js

@@ -13,7 +13,7 @@ exports.getJSBundleFileOverride = `
 `;
 exports.reactNativeHostInstantiation = "new ReactNativeHost(this) {";
 exports.mainActivityClassDeclaration = "public class MainActivity extends ReactActivity {";
-exports.codePushGradleLink = `\napply from: "../../node_modules/react-native-code-push/android/codepush.gradle"`;
+exports.codePushGradleLink = `\napply from: "../../node_modules/@appcircle/react-native-code-push/android/codepush.gradle"`;
 exports.deploymentKeyName = "CodePushDeploymentKey";
 
 exports.getMainApplicationLocation = function () {