@revopush/react-native-code-push 1.5.0 → 2.5.0-rc.1

package/CodePush.js

@@ -1,4 +1,4 @@
-import { AcquisitionManager as Sdk } from "code-push/script/acquisition-sdk";
+import { AcquisitionManager as Sdk } from "@revopush/code-push/script/acquisition-sdk";
 import { Alert } from "./AlertAdapter";
 import requestFetchAdapter from "./request-fetch-adapter";
 import { AppState, Platform } from "react-native";
@@ -45,8 +45,11 @@ async function checkForUpdate(deploymentKey = null, handleBinaryVersionMismatchC
     queryPackage = localPackage;
   } else {
     queryPackage = { appVersion: config.appVersion };
-    if (Platform.OS === "ios" && config.packageHash) {
-      queryPackage.packageHash = config.packageHash;
+    if (config.packageHash) {
+        queryPackage.packageHash = config.packageHash;
+    }
+    if (config.assetHash) {
+        queryPackage.assetHash = config.assetHash;
     }
   }
 
@@ -479,8 +482,8 @@ async function syncInternal(options = {}, syncStatusChangeCallback, downloadProg
             }
           });
         }
-        
-        // Since the install button should be placed to the 
+
+        // Since the install button should be placed to the
         // right of any other button, add it last
         dialogButtons.push({
           text: installButtonText,

package/CodePush.podspec

@@ -18,6 +18,15 @@ Pod::Spec.new do |s|
   s.public_header_files = ['ios/CodePush/CodePush.h']
   s.pod_target_xcconfig = { "DEFINES_MODULE" => "YES" }
 
+  s.user_target_xcconfig = {
+    'SOURCEMAP_FILE' => '$(DERIVED_FILE_DIR)/main.jsbundle.map'
+  }
+
+  s.vendored_frameworks = 'ios/Frameworks/DiffUpdates.xcframework'
+  s.preserve_paths      = 'ios/Frameworks/DiffUpdates.xcframework'
+
+
+
   # 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
   # linked properly at a parent workspace level.

package/android/build.gradle

@@ -1,61 +1,74 @@
-buildscript {
-    repositories {
-        google()
-        mavenCentral()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:1.3.0'
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
-    }
-}
-
-apply plugin: "com.android.library"
+plugins {
+    id("com.android.library")
 
-def isNewArchitectureEnabled() {
-    // To opt-in for the New Architecture, you can either:
-    // - Set `newArchEnabled` to true inside the `gradle.properties` file
-    // - Invoke gradle with `-newArchEnabled=true`
-    // - Set an environment variable `ORG_GRADLE_PROJECT_newArchEnabled=true`
-    return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true"
+    id "com.facebook.react" apply false
 }
 
-def IS_NEW_ARCHITECTURE_ENABLED = isNewArchitectureEnabled()
-
-if (IS_NEW_ARCHITECTURE_ENABLED) {
+if (isNewArchitectureEnabled()) {
     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
-def DEFAULT_MIN_SDK_VERSION = 16
+repositories {
+    mavenCentral()
+    google()
+}
 
 android {
     namespace "com.microsoft.codepush.react"
 
-    compileSdkVersion rootProject.hasProperty('compileSdkVersion') ? rootProject.compileSdkVersion : DEFAULT_COMPILE_SDK_VERSION
-    buildToolsVersion rootProject.hasProperty('buildToolsVersion') ? rootProject.buildToolsVersion : DEFAULT_BUILD_TOOLS_VERSION
+    // TODO check if needed. RN gradle plugin set these
+    compileSdk = getExtOrIntegerDefault('compileSdkVersion', 34)
 
     defaultConfig {
-        minSdkVersion rootProject.hasProperty('minSdkVersion') ? rootProject.minSdkVersion : DEFAULT_MIN_SDK_VERSION
-        targetSdkVersion rootProject.hasProperty('targetSdkVersion') ? rootProject.targetSdkVersion : DEFAULT_TARGET_SDK_VERSION
-        versionCode 1
-        versionName "1.0"
-        buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", IS_NEW_ARCHITECTURE_ENABLED.toString()
+        // TODO check if needed. RN gradle plugin set these
+        minSdk = getExtOrIntegerDefault('minSdkVersion', 21)
+        // TODO check if needed. RN gradle plugin set these
+        targetSdk = getExtOrIntegerDefault('targetSdkVersion', 34)
+        // TODO check if needed. RN gradle plugin set these
+        buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
+        consumerProguardFiles 'proguard-rules.pro'
     }
 
-    lintOptions {
-        abortOnError false
+    sourceSets {
+        main {
+            jniLibs.srcDirs = ['src/main/jniLibs']
+        }
     }
 
-    defaultConfig {
-        consumerProguardFiles 'proguard-rules.pro'
+    // TODO check if needed. RN gradle plugin set these
+    buildFeatures {
+        buildConfig = true
+    }
+
+    lint {
+        abortOnError = false
     }
 }
 
 dependencies {
-    implementation "com.facebook.react:react-native:+"
-    implementation 'com.nimbusds:nimbus-jose-jwt:9.37.3'
+    if (boolProp("REACT_NATIVE_REVOPUSH_DEV_MODE", false)) {
+        // for local dev only
+        implementation("org.revopush:revopush-diff")
+        implementation 'com.facebook.react:react-android:0.79.6'
+        // end of local dev only
+    } else {
+        // For < 0.71, this will be from the local maven repo
+        // For > 0.71, this will be replaced by `com.facebook.react:react-android:$version` by react gradle plugin
+        //noinspection GradleDynamicVersion
+
+        implementation "org.revopush:revopush-diff:0.0.1"
+        implementation "com.facebook.react:react-native:+"
+    }
+}
+
+def getExtOrIntegerDefault(name, defaultValue) {
+    return rootProject.ext.has(name) ? rootProject.ext.get(name) : defaultValue.toInteger()
+}
+
+def isNewArchitectureEnabled() {
+    return rootProject.hasProperty("newArchEnabled") && rootProject.getProperty("newArchEnabled") == "true"
+}
+
+def boolProp(name, defaultVal){
+   return  (project.findProperty(name) ?: System.getenv(name.toUpperCase()) ?: defaultVal.toString()).toString().toBoolean()
 }

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

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip

package/android/gradle.properties

@@ -17,4 +17,4 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
-android.useDeprecatedNdk=true
+#android.useDeprecatedNdk=true

package/android/settings.gradle

@@ -0,0 +1,31 @@
+pluginManagement {
+    repositories {
+        mavenCentral()
+        google()
+        gradlePluginPortal()
+    }
+
+    plugins {
+        // to satisfy plugin id("com.android.library")
+        id("com.android.library") version "8.8.2" apply false
+    }
+
+    // to satisfy apply plugin: "com.facebook.react" as a part of monorepo
+    def gradlePluginPath = getProperty("REACT_NATIVE_GRADLE_PLUGIN_PATH")
+    if (gradlePluginPath != null) {
+        includeBuild(gradlePluginPath)
+    }
+}
+
+def diffPath = getProperty("REACT_NATIVE_REVOPUSH_DIFF_PATH")
+if (diffPath != null) {
+    includeBuild(diffPath) {
+        dependencySubstitution {
+            substitute(module("org.revopush:revopush-diff")).using(project(":revopush-diff"))
+        }
+    }
+}
+
+def getProperty(propName) {
+    return settings[propName] ?: System.getenv(propName)
+}

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

@@ -15,6 +15,7 @@ import com.facebook.react.uimanager.ViewManager;
 
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.revopush.ota.NativeBundleManager;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -23,6 +24,7 @@ import java.util.List;
 public class CodePush implements ReactPackage {
     private static final Object LOCK = new Object();
     private static volatile CodePush mCurrentInstance;
+
     public static CodePush getInstance(String deploymentKey, Context context, boolean isDebugMode) {
         if (mCurrentInstance == null) {
             synchronized (LOCK) {
@@ -47,6 +49,7 @@ public class CodePush implements ReactPackage {
     private CodePushUpdateManager mUpdateManager;
     private CodePushTelemetryManager mTelemetryManager;
     private SettingsManager mSettingsManager;
+    private NativeBundleManager bundleMetadataManager;
 
     // Config properties.
     private String mDeploymentKey;
@@ -72,11 +75,12 @@ public class CodePush implements ReactPackage {
     private CodePush(String deploymentKey, Context context, boolean isDebugMode) {
         mContext = context.getApplicationContext();
 
-        mUpdateManager = new CodePushUpdateManager(context.getFilesDir().getAbsolutePath());
+        mUpdateManager = new CodePushUpdateManager(context, isDebugMode);
         mTelemetryManager = new CodePushTelemetryManager(mContext);
         mDeploymentKey = deploymentKey;
         mIsDebugMode = isDebugMode;
         mSettingsManager = new SettingsManager(mContext);
+        bundleMetadataManager = new NativeBundleManager(mContext);
 
         if (sAppVersion == null) {
             try {
@@ -121,7 +125,7 @@ public class CodePush implements ReactPackage {
         mServerUrl = serverUrl;
     }
 
-    private String getPublicKeyByResourceDescriptor(int publicKeyResourceDescriptor){
+    private String getPublicKeyByResourceDescriptor(int publicKeyResourceDescriptor) {
         String publicKey;
         try {
             publicKey = mContext.getString(publicKeyResourceDescriptor);
@@ -192,7 +196,7 @@ public class CodePush implements ReactPackage {
             int codePushApkBuildTimeId = this.mContext.getResources().getIdentifier(CodePushConstants.CODE_PUSH_APK_BUILD_TIME_KEY, "string", packageName);
             // replace double quotes needed for correct restoration of long value from strings.xml
             // https://github.com/microsoft/cordova-plugin-code-push/issues/264
-            String codePushApkBuildTime = this.mContext.getResources().getString(codePushApkBuildTimeId).replaceAll("\"","");
+            String codePushApkBuildTime = this.mContext.getResources().getString(codePushApkBuildTimeId).replaceAll("\"", "");
             return Long.parseLong(codePushApkBuildTime);
         } catch (Exception e) {
             throw new CodePushUnknownException("Error in getting binary resources modified time", e);
@@ -423,7 +427,7 @@ public class CodePush implements ReactPackage {
 
     @Override
     public List<NativeModule> createNativeModules(ReactApplicationContext reactApplicationContext) {
-        CodePushNativeModule codePushModule = new CodePushNativeModule(reactApplicationContext, this, mUpdateManager, mTelemetryManager, mSettingsManager);
+        CodePushNativeModule codePushModule = new CodePushNativeModule(reactApplicationContext, this, mUpdateManager, mTelemetryManager, mSettingsManager, bundleMetadataManager);
         CodePushDialog dialogModule = new CodePushDialog(reactApplicationContext);
 
         List<NativeModule> nativeModules = new ArrayList<>();

package/android/src/main/java/com/microsoft/codepush/react/CodePushConstants.java

@@ -1,21 +1,26 @@
 package com.microsoft.codepush.react;
 
+import org.revopush.ota.BundleManager;
+
 public class CodePushConstants {
     public static final String ASSETS_BUNDLE_PREFIX = "assets://";
     public static final String BINARY_MODIFIED_TIME_KEY = "binaryModifiedTime";
-    public static final String CODE_PUSH_FOLDER_PREFIX = "CodePush";
-    public static final String CODE_PUSH_HASH_FILE_NAME = "CodePushHash";
-    public static final String CODE_PUSH_OLD_HASH_FILE_NAME = "CodePushHash.json";
+    public static final String CODE_PUSH_FOLDER_PREFIX = BundleManager.CODE_PUSH_FOLDER_PREFIX;
+    public static final String CODE_PUSH_PACKAGE_HASH = "packageHash";
+    public static final String CODE_PUSH_BUNDLE_HASH = "bundleHash";
+    public static final String CODE_PUSH_ASSET_HASH = BundleManager.CODE_PUSH_ASSET_HASH;
     public static final String CODE_PUSH_PREFERENCES = "CodePush";
     public static final String CURRENT_PACKAGE_KEY = "currentPackage";
     public static final String DEFAULT_JS_BUNDLE_NAME = "index.android.bundle";
-    public static final String DIFF_MANIFEST_FILE_NAME = "hotcodepush.json";
     public static final int DOWNLOAD_BUFFER_SIZE = 1024 * 256;
-    public static final String DOWNLOAD_FILE_NAME = "download.zip";
     public static final String DOWNLOAD_PROGRESS_EVENT_NAME = "CodePushDownloadProgress";
     public static final String DOWNLOAD_URL_KEY = "downloadUrl";
+    public static final String ASSET_DOWNLOAD_URL_KEY = "assetDownloadUrl";
+    public static final String BUNDLE_DOWNLOAD_URL_KEY = "bundleBlobUrl";
+    public static final String BUNDLE_DIFF_DOWNLOAD_URL_KEY = "bundleDiffBlobUrl";
+
     public static final String FAILED_UPDATES_KEY = "CODE_PUSH_FAILED_UPDATES";
-    public static final String PACKAGE_FILE_NAME = "app.json";
+    public static final String PACKAGE_FILE_NAME = BundleManager.PACKAGE_FILE_NAME;
     public static final String PACKAGE_HASH_KEY = "packageHash";
     public static final String PENDING_UPDATE_HASH_KEY = "hash";
     public static final String PENDING_UPDATE_IS_LOADING_KEY = "isLoading";
@@ -26,7 +31,6 @@ public class CodePushConstants {
     public static final String STATUS_FILE = "codepush.json";
     public static final String UNZIPPED_FOLDER_NAME = "unzipped";
     public static final String CODE_PUSH_APK_BUILD_TIME_KEY = "CODE_PUSH_APK_BUILD_TIME";
-    public static final String BUNDLE_JWT_FILE = ".codepushrelease";
     public static final String LATEST_ROLLBACK_INFO_KEY = "LATEST_ROLLBACK_INFO";
     public static final String LATEST_ROLLBACK_PACKAGE_HASH_KEY = "packageHash";
     public static final String LATEST_ROLLBACK_TIME_KEY = "time";

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

@@ -34,6 +34,8 @@ import com.facebook.react.runtime.ReactHostImpl;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.revopush.ota.NativeBundleManager;
+import org.revopush.ota.NativeBundleManager.NativeBundleHash;
 
 import java.io.IOException;
 import java.lang.reflect.Field;
@@ -47,7 +49,7 @@ import java.util.UUID;
 
 @OptIn(markerClass = UnstableReactNativeAPI.class)
 public class CodePushNativeModule extends BaseJavaModule {
-    private String mBinaryContentsHash = null;
+    private NativeBundleHash mNativeBundleHash = null;
     private String mClientUniqueId = null;
     private LifecycleEventListener mLifecycleEventListener = null;
     private int mMinimumBackgroundDuration = 0;
@@ -57,21 +59,20 @@ public class CodePushNativeModule extends BaseJavaModule {
     private CodePushTelemetryManager mTelemetryManager;
     private CodePushUpdateManager mUpdateManager;
 
-    private  boolean _allowed = true;
-    private  boolean _restartInProgress = false;
-    private  ArrayList<Boolean> _restartQueue = new ArrayList<>();
+    private boolean _allowed = true;
+    private boolean _restartInProgress = false;
+    private ArrayList<Boolean> _restartQueue = new ArrayList<>();
 
-    public CodePushNativeModule(ReactApplicationContext reactContext, CodePush codePush, CodePushUpdateManager codePushUpdateManager, CodePushTelemetryManager codePushTelemetryManager, SettingsManager settingsManager) {
+    public CodePushNativeModule(ReactApplicationContext reactContext, CodePush codePush, CodePushUpdateManager codePushUpdateManager, CodePushTelemetryManager codePushTelemetryManager, SettingsManager settingsManager, NativeBundleManager bundleMetadataManager) {
         super(reactContext);
 
         mCodePush = codePush;
         mSettingsManager = settingsManager;
         mTelemetryManager = codePushTelemetryManager;
         mUpdateManager = codePushUpdateManager;
-
         // Initialize module state while we have a reference to the current context.
-        mBinaryContentsHash = CodePushUpdateUtils.getHashForBinaryContents(reactContext, mCodePush.isDebugMode());
 
+        mNativeBundleHash = bundleMetadataManager.getNativeBundleHash();
         SharedPreferences preferences = codePush.getContext().getSharedPreferences(CodePushConstants.CODE_PUSH_PREFERENCES, 0);
         mClientUniqueId = preferences.getString(CodePushConstants.CLIENT_UNIQUE_ID_KEY, null);
         if (mClientUniqueId == null) {
@@ -152,11 +153,9 @@ public class CodePushNativeModule extends BaseJavaModule {
             Field bundleLoaderField = reactHostDelegate.getClass().getDeclaredField("jsBundleLoader");
             bundleLoaderField.setAccessible(true);
             bundleLoaderField.set(reactHostDelegate, latestJSBundleLoader);
-        }
-        catch (NoSuchFieldException noSuchFileFound) {
+        } catch (NoSuchFieldException noSuchFileFound) {
             // Ignore this error for Expo
-        }
-        catch (Exception e) {
+        } 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");
         }
@@ -169,14 +168,14 @@ public class CodePushNativeModule extends BaseJavaModule {
         if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
             try {
                 DevSupportManager devSupportManager = null;
-                    ReactHost reactHost = resolveReactHost();
-                    if (reactHost != null) {
-                        devSupportManager = reactHost.getDevSupportManager();
-                    }
+                ReactHost reactHost = resolveReactHost();
+                if (reactHost != null) {
+                    devSupportManager = reactHost.getDevSupportManager();
+                }
                 boolean isLiveReloadEnabled = isLiveReloadEnabled(devSupportManager);
 
                 mCodePush.clearDebugCacheIfNeeded(isLiveReloadEnabled);
-            } catch(Exception e) {
+            } catch (Exception e) {
                 // If we got error in out reflection we should clear debug cache anyway.
                 mCodePush.clearDebugCacheIfNeeded(false);
             }
@@ -232,7 +231,7 @@ public class CodePushNativeModule extends BaseJavaModule {
                 boolean isLiveReloadEnabled = isLiveReloadEnabled(devSupportManager);
 
                 mCodePush.clearDebugCacheIfNeeded(isLiveReloadEnabled);
-            } catch(Exception e) {
+            } catch (Exception e) {
                 // If we got error in out reflection we should clear debug cache anyway.
                 mCodePush.clearDebugCacheIfNeeded(false);
             }
@@ -304,7 +303,7 @@ public class CodePushNativeModule extends BaseJavaModule {
     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);
+        List<ReactRootView> mAttachedRootViews = (List<ReactRootView>) mAttachedRootViewsField.get(instanceManager);
         for (ReactRootView reactRootView : mAttachedRootViews) {
             reactRootView.removeAllViews();
             reactRootView.setId(View.NO_ID);
@@ -415,7 +414,7 @@ public class CodePushNativeModule extends BaseJavaModule {
         try {
             restartAppInternal(onlyIfUpdateIsPending);
             promise.resolve(null);
-        } catch(CodePushUnknownException e) {
+        } catch (CodePushUnknownException e) {
             CodePushUtils.log(e);
             promise.reject(e);
         }
@@ -477,11 +476,13 @@ public class CodePushNativeModule extends BaseJavaModule {
 
                     JSONObject newPackage = mUpdateManager.getPackage(CodePushUtils.tryGetString(updatePackage, CodePushConstants.PACKAGE_HASH_KEY));
                     promise.resolve(CodePushUtils.convertJsonObjectToWritable(newPackage));
-                } catch (CodePushInvalidUpdateException e) {
+                } catch (CodePushInvalidUpdateException |
+                         org.revopush.ota.exceptions.CodePushInvalidUpdateException e) {
                     CodePushUtils.log(e);
                     mSettingsManager.saveFailedUpdate(CodePushUtils.convertReadableToJsonObject(updatePackage));
                     promise.reject(e);
-                } catch (IOException | CodePushUnknownException e) {
+                } catch (IOException | CodePushUnknownException |
+                         org.revopush.ota.exceptions.CodePushUnknownException e) {
                     CodePushUtils.log(e);
                     promise.reject(e);
                 }
@@ -496,19 +497,18 @@ public class CodePushNativeModule extends BaseJavaModule {
     @ReactMethod
     public void getConfiguration(Promise promise) {
         try {
-            WritableMap configMap =  Arguments.createMap();
+            WritableMap configMap = Arguments.createMap();
             configMap.putString("appVersion", mCodePush.getAppVersion());
             configMap.putString("clientUniqueId", mClientUniqueId);
             configMap.putString("deploymentKey", mCodePush.getDeploymentKey());
             configMap.putString("serverUrl", mCodePush.getServerUrl());
 
-            // The binary hash may be null in debug builds
-            if (mBinaryContentsHash != null) {
-                configMap.putString(CodePushConstants.PACKAGE_HASH_KEY, mBinaryContentsHash);
-            }
+            configMap.putString(CodePushConstants.PACKAGE_HASH_KEY, mNativeBundleHash.getPackageHash());
+            configMap.putString(CodePushConstants.CODE_PUSH_ASSET_HASH, mNativeBundleHash.getAssetHash());
+            configMap.putString(CodePushConstants.CODE_PUSH_BUNDLE_HASH, mNativeBundleHash.getBundleHash());
 
             promise.resolve(configMap);
-        } catch(CodePushUnknownException e) {
+        } catch (CodePushUnknownException e) {
             CodePushUtils.log(e);
             promise.reject(e);
         }
@@ -570,7 +570,7 @@ public class CodePushNativeModule extends BaseJavaModule {
                     CodePushUtils.log(e.getMessage());
                     clearUpdates();
                     promise.resolve(null);
-                } catch(CodePushUnknownException e) {
+                } catch (CodePushUnknownException e) {
                     CodePushUtils.log(e);
                     promise.reject(e);
                 }
@@ -628,7 +628,7 @@ public class CodePushNativeModule extends BaseJavaModule {
                     }
 
                     promise.resolve("");
-                } catch(CodePushUnknownException e) {
+                } catch (CodePushUnknownException e) {
                     CodePushUtils.log(e);
                     promise.reject(e);
                 }
@@ -655,11 +655,11 @@ public class CodePushNativeModule extends BaseJavaModule {
                     }
 
                     if (installMode == CodePushInstallMode.ON_NEXT_RESUME.getValue() ||
-                        // We also add the resume listener if the installMode is IMMEDIATE, because
-                        // if the current activity is backgrounded, we want to reload the bundle when
-                        // it comes back into the foreground.
-                        installMode == CodePushInstallMode.IMMEDIATE.getValue() ||
-                        installMode == CodePushInstallMode.ON_NEXT_SUSPEND.getValue()) {
+                            // We also add the resume listener if the installMode is IMMEDIATE, because
+                            // if the current activity is backgrounded, we want to reload the bundle when
+                            // it comes back into the foreground.
+                            installMode == CodePushInstallMode.IMMEDIATE.getValue() ||
+                            installMode == CodePushInstallMode.ON_NEXT_SUSPEND.getValue()) {
 
                         // Store the minimum duration on the native module as an instance
                         // variable instead of relying on a closure below, so that any
@@ -715,7 +715,7 @@ public class CodePushNativeModule extends BaseJavaModule {
                     }
 
                     promise.resolve("");
-                } catch(CodePushUnknownException e) {
+                } catch (CodePushUnknownException e) {
                     CodePushUtils.log(e);
                     promise.reject(e);
                 }
@@ -771,7 +771,7 @@ public class CodePushNativeModule extends BaseJavaModule {
                     && packageHash.length() > 0
                     && packageHash.equals(mUpdateManager.getCurrentPackageHash());
             promise.resolve(isFirstRun);
-        } catch(CodePushUnknownException e) {
+        } catch (CodePushUnknownException e) {
             CodePushUtils.log(e);
             promise.reject(e);
         }
@@ -782,7 +782,7 @@ public class CodePushNativeModule extends BaseJavaModule {
         try {
             mSettingsManager.removePendingUpdate();
             promise.resolve("");
-        } catch(CodePushUnknownException e) {
+        } catch (CodePushUnknownException e) {
             CodePushUtils.log(e);
             promise.reject(e);
         }
@@ -792,7 +792,7 @@ public class CodePushNativeModule extends BaseJavaModule {
     public void recordStatusReported(ReadableMap statusReport) {
         try {
             mTelemetryManager.recordStatusReported(statusReport);
-        } catch(CodePushUnknownException e) {
+        } catch (CodePushUnknownException e) {
             CodePushUtils.log(e);
         }
     }
@@ -801,7 +801,7 @@ public class CodePushNativeModule extends BaseJavaModule {
     public void saveStatusReportForRetry(ReadableMap statusReport) {
         try {
             mTelemetryManager.saveStatusReportForRetry(statusReport);
-        } catch(CodePushUnknownException e) {
+        } catch (CodePushUnknownException e) {
             CodePushUtils.log(e);
         }
     }
@@ -818,7 +818,7 @@ public class CodePushNativeModule extends BaseJavaModule {
                     throw new CodePushUnknownException("Unable to replace current bundle", e);
                 }
             }
-        } catch(CodePushUnknownException | CodePushMalformedDataException e) {
+        } catch (CodePushUnknownException | CodePushMalformedDataException e) {
             CodePushUtils.log(e);
         }
     }
@@ -849,7 +849,14 @@ public class CodePushNativeModule extends BaseJavaModule {
     public ReactHostDelegate getReactHostDelegate(ReactHostImpl reactHostImpl) {
         try {
             Class<?> clazz = reactHostImpl.getClass();
-            Field field = clazz.getDeclaredField("reactHostDelegate");
+            Field field;
+            try {
+                // RN < 0.81
+                field = clazz.getDeclaredField("mReactHostDelegate");
+            } catch (NoSuchFieldException e) {
+                // RN >= 0.81
+                field = clazz.getDeclaredField("reactHostDelegate");
+            }
             field.setAccessible(true);
 
             // Get the value of the field for the provided instance