@appzung/react-native-code-push 5.7.1 → 6.4.2

package/docs/setup-android.md

@@ -1,10 +1,11 @@
 ## Android Setup
 
-* [Plugin Installation (Android)](#plugin-installation-android)
+* [Plugin Installation and Configuration for React Native 0.60 version and above](#plugin-installation-and-configuration-for-react-native-060-version-and-above-android)
+* [Plugin Installation for React Native lower than 0.60 (Android)](#plugin-installation-for-react-native-lower-than-060-android)
   * [Plugin Installation (Android - RNPM)](#plugin-installation-android---rnpm)
   * [Plugin Installation (Android - Manual)](#plugin-installation-android---manual)
-* [Plugin Configuration (Android)](#plugin-configuration-android)
-  * [For React Native >= v0.29](#for-react-native--v029)
+* [Plugin Configuration for React Native lower than 0.60 (Android)](#plugin-configuration-for-react-native-lower-than-060-android)
+  * [For React Native v0.29 - v0.59](#for-react-native-v029---v059)
     * [For newly created React Native application](#for-newly-created-react-native-application)
     * [For existing native application](#for-existing-native-application)
   * [For React Native v0.19 - v0.28](#for-react-native-v019---v028)
@@ -12,11 +13,72 @@
     * [For React Native >= v0.29 (Background React Instances)](#for-react-native--v029-background-react-instances)
     * [For React Native v0.19 - v0.28 (Background React Instances)](#for-react-native-v019---v028-background-react-instances)
   * [WIX React Native Navigation applications (ver 1.x)](#wix-react-native-navigation-applications)
-  * [Code Signing setup](#code-signing-setup)
+* [Code Signing setup](#code-signing-setup)
 
 In order to integrate CodePush into your Android project, please perform the following steps:
 
-### Plugin Installation (Android)
+### Plugin Installation and Configuration for React Native 0.60 version and above (Android)
+
+1. In your `android/settings.gradle` file, make the following additions at the end of the file:
+
+    ```gradle
+    ...
+    include ':app', ':react-native-code-push'
+    project(':react-native-code-push').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-code-push/android/app')
+    ```
+    
+2. In your `android/app/build.gradle` file, add the `codepush.gradle` file as an additional build task definition underneath `react.gradle`:
+
+    ```gradle
+    ...
+    apply from: "../../node_modules/react-native/react.gradle"
+    apply from: "../../node_modules/react-native-code-push/android/codepush.gradle"
+    ...
+    ```
+
+3. Update the `MainApplication.java` file to use CodePush via the following changes:
+
+    ```java
+    ...
+    // 1. Import the plugin class.
+    import com.microsoft.codepush.react.CodePush;
+
+    public class MainApplication extends Application implements ReactApplication {
+
+        private final ReactNativeHost mReactNativeHost = new ReactNativeHost(this) {
+            ...
+
+            // 2. Override the getJSBundleFile method in order to let
+            // the CodePush runtime determine where to get the JS
+            // bundle location from on each app start
+            @Override
+            protected String getJSBundleFile() {
+                return CodePush.getJSBundleFile();
+            }
+        };
+    }
+    ```
+
+4. Add the Deployment key to `strings.xml`:
+
+   To let the CodePush runtime know which deployment it should query for updates, open your app's `strings.xml` file and add a new string named `CodePushDeploymentKey`, whose value is the key of the deployment you want to configure this app against (like the key for the `Staging` deployment for the `FooBar` app). You can retrieve this value by running `appcenter codepush deployment list -a <ownerName>/<appName> -k` in the CodePush CLI (the `-k` flag is necessary since keys aren't displayed by default) and copying the value of the `Key` column which corresponds to the deployment you want to use (see below). Note that using the deployment's name (like Staging) will not work. The "friendly name" is intended only for authenticated management usage from the CLI, and not for public consumption within your app.
+
+   ![Deployment list](https://cloud.githubusercontent.com/assets/116461/11601733/13011d5e-9a8a-11e5-9ce2-b100498ffb34.png)
+
+   In order to effectively make use of the `Staging` and `Production` deployments that were created along with your CodePush app, refer to the [multi-deployment testing](../README.md#multi-deployment-testing) docs below before actually moving your app's usage of CodePush into production.
+
+   Your `strings.xml` should looks like this:
+
+   ```xml
+    <resources>
+        <string name="app_name">AppName</string>
+        <string moduleConfig="true" name="CodePushDeploymentKey">DeploymentKey</string>
+    </resources>
+    ```
+
+    *Note: If you need to dynamically use a different deployment, you can also override your deployment key in JS code using [Code-Push options](./api-js.md#CodePushOptions)*
+
+### Plugin Installation for React Native lower than 0.60 (Android)
 
 In order to accommodate as many developer preferences as possible, the CodePush plugin supports Android installation via two mechanisms:
 
@@ -40,9 +102,9 @@ In order to accommodate as many developer preferences as possible, the CodePush
 
     *Note: If you don't already have RNPM installed, you can do so by simply running `npm i -g rnpm` and then executing the above command.*
 
-2. If you're using RNPM >=1.6.0, you will be prompted for the deployment key you'd like to use. If you don't already have it, you can retreive this value by running `code-push deployment ls <appName> -k`, or you can choose to ignore it (by simply hitting `<ENTER>`) and add it in later. To get started, we would recommend just using your `Staging` deployment key, so that you can test out the CodePush end-to-end.
+2. If you're using RNPM >=1.6.0, you will be prompted for the deployment key you'd like to use. If you don't already have it, you can retrieve this value by running `appcenter codepush deployment list -a <ownerName>/<appName> -k`, or you can choose to ignore it (by simply hitting `<ENTER>`) and add it in later. To get started, we would recommend just using your `Staging` deployment key, so that you can test out the CodePush end-to-end.
 
-And that's it for installation using RNPM! Continue below to the [Plugin Configuration](#plugin-configuration-android) section to complete the setup.
+And that's it for installation using RNPM! Continue below to the [Plugin Configuration](#plugin-configuration-for-react-native-lower-than-060-android) section to complete the setup.
 
 #### Plugin Installation (Android - Manual)
 
@@ -72,13 +134,13 @@ And that's it for installation using RNPM! Continue below to the [Plugin Configu
     ...
     ```
 
-### Plugin Configuration (Android)
+### Plugin Configuration for React Native lower than 0.60 (Android)
 
 *NOTE: If you used RNPM or `react-native link` to automatically link the plugin, these steps have already been done for you so you may skip this section.*
 
 After installing the plugin and syncing your Android Studio project with Gradle, you need to configure your app to consult CodePush for the location of your JS bundle, since it will "take control" of managing the current and all future versions. To do this:
 
-#### For React Native >= v0.29
+#### For React Native v0.29 - v0.59
 
 ##### For newly created React Native application
 
@@ -107,7 +169,7 @@ public class MainApplication extends Application implements ReactApplication {
         protected List<ReactPackage> getPackages() {
             // 3. Instantiate an instance of the CodePush runtime and add it to the list of
             // existing packages, specifying the right deployment key. If you don't already
-            // have it, you can run "code-push deployment ls <appName> -k" to retrieve your key.
+            // have it, you can run "appcenter codepush deployment list -a <ownerName>/<appName> -k" to retrieve your key.
             return Arrays.<ReactPackage>asList(
                 new MainReactPackage(),
                 new CodePush("deployment-key-here", MainApplication.this, BuildConfig.DEBUG)
@@ -184,7 +246,7 @@ public class MainActivity extends ReactActivity {
     protected List<ReactPackage> getPackages() {
         // 3. Instantiate an instance of the CodePush runtime and add it to the list of
         // existing packages, specifying the right deployment key. If you don't already
-        // have it, you can run "code-push deployment ls <appName> -k" to retrieve your key.
+        // have it, you can run "appcenter codepush deployment list -a <ownerName>/<appName> -k" to retrieve your key.
         return Arrays.<ReactPackage>asList(
             new MainReactPackage(),
             new CodePush("deployment-key-here", this, BuildConfig.DEBUG)
@@ -361,11 +423,11 @@ public class MainApplication extends NavigationApplication {
 }
 ```
 
-#### Code Signing setup
+### Code Signing setup
 
-Starting with CLI version **2.1.0** you can self sign bundles during release and verify its signature before installation of update. For more info about Code Signing please refer to [relevant code-push documentation section](https://github.com/Microsoft/code-push/tree/master/cli#code-signing). In order to use Public Key for Code Signing you need to do following steps:
+Starting with CLI version **2.1.0** you can self sign bundles during release and verify its signature before installation of update. For more info about Code Signing please refer to [relevant code-push documentation section](https://github.com/microsoft/code-push/tree/v3.0.1/cli#code-signing). In order to use Public Key for Code Signing you need to do following steps:
 
- 1. Add `CodePushPublicKey` string item to `/path_to_your_app/android/app/src/main/res/values/strings.xml`. It may looks like this:
+   Add `CodePushPublicKey` string item to `/path_to_your_app/android/app/src/main/res/values/strings.xml`. It may looks like this:
 
  ```xml
  <resources>
@@ -382,9 +444,9 @@ zwIDAQAB
 </resources>
  ```
 
- 2. Configure `CodePush` instance to use this parameter
+#### For React Native <= v0.60 you should configure the `CodePush` instance to use this parameter using one of the following approaches
 
- * using constructor
+##### Using constructor
 
 ```java
 new CodePush(
@@ -394,9 +456,7 @@ new CodePush(
     R.string.CodePushPublicKey)
 ```
 
- or
-
- * using builder
+##### Using builder
 
  ```java
 new CodePushBuilder("deployment-key-here",getApplicationContext())

package/docs/setup-ios.md

@@ -1,8 +1,58 @@
 ## iOS Setup
 
 Once you've acquired the CodePush plugin, you need to integrate it into the Xcode project of your React Native app and configure it correctly. To do this, take the following steps:
+​
+### Plugin Installation and Configuration for React Native 0.60 version and above (iOS)
 
-### Plugin Installation (iOS)
+1. Run `cd ios && pod install && cd ..` to install all the necessary CocoaPods dependencies.
+​
+2. Open up the `AppDelegate.m` file, and add an import statement for the CodePush headers:
+
+   ```objective-c
+   #import <CodePush/CodePush.h>
+   ```
+
+3. Find the following line of code, which sets the source URL for bridge for production releases:
+
+   ```objective-c
+   return [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];
+   ```
+
+4. Replace it with this line:
+   
+   ```objective-c
+   return [CodePush bundleURL];
+   ```
+   This change configures your app to always load the most recent version of your app's JS bundle. On the first launch, this will correspond to the file that was compiled with the app. However, after an update has been pushed via CodePush, this will return the location of the most recently installed update.
+  
+   *NOTE: The `bundleURL` method assumes your app's JS bundle is named `main.jsbundle`. If you have configured your app to use a different file name, simply call the `bundleURLForResource:` method (which assumes you're using the `.jsbundle` extension) or `bundleURLForResource:withExtension:` method instead, in order to overwrite that default behavior*
+
+   Typically, you're only going to want to use CodePush to resolve your JS bundle location within release builds, and therefore, we recommend using the `DEBUG` pre-processor macro to dynamically switch between using the packager server and CodePush, depending on whether you are debugging or not. This will make it much simpler to ensure you get the right behavior you want in production, while still being able to use the Chrome Dev Tools, live reload, etc. at debug-time.
+
+   Your `sourceURLForBridge` method should look like this:
+
+   ```objective-c
+   - (NSURL *)sourceURLForBridge:(RCTBridge *)bridge
+   {
+     #if DEBUG
+       return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index" fallbackResource:nil];
+     #else
+       return [CodePush bundleURL];
+     #endif
+   }
+   ```
+
+5. Add the Deployment key to `Info.plist`:
+
+   To let the CodePush runtime know which deployment it should query for updates against, open your app's `Info.plist` file and add a new entry named `CodePushDeploymentKey`, whose value is the key of the deployment you want to configure this app against (like the key for the `Staging` deployment for the `FooBar` app). You can retrieve this value by running `appcenter codepush deployment list -a <ownerName>/<appName> -k` in the AppCenter CLI (the `-k` flag is necessary since keys aren't displayed by default) and copying the value of the `Key` column which corresponds to the deployment you want to use (see below). Note that using the deployment's name (like Staging) will not work. That "friendly name" is intended only for authenticated management usage from the CLI, and not for public consumption within your app.
+
+   ![Deployment list](https://cloud.githubusercontent.com/assets/116461/11601733/13011d5e-9a8a-11e5-9ce2-b100498ffb34.png)
+
+   In order to effectively make use of the `Staging` and `Production` deployments that were created along with your CodePush app, refer to the [multi-deployment testing](../README.md#multi-deployment-testing) docs below before actually moving your app's usage of CodePush into production.
+
+   *Note: If you need to dynamically use a different deployment, you can also override your deployment key in JS code using [Code-Push options](./api-js.md#CodePushOptions)*
+
+### Plugin Installation for React Native lower than 0.60 (iOS)
 
 In order to accommodate as many developer preferences as possible, the CodePush plugin supports iOS installation via three mechanisms:
 
@@ -26,7 +76,7 @@ In order to accommodate as many developer preferences as possible, the CodePush
 
     *Note: If you don't already have RNPM installed, you can do so by simply running `npm i -g rnpm` and then executing the above command. If you already have RNPM installed, make sure you have v1.9.0+ in order to benefit from this one step install.*
 
-2. You will be prompted for the deployment key you'd like to use. If you don't already have it, you can retrieve this value by running `code-push deployment ls <appName> -k`, or you can choose to ignore it (by simply hitting `<ENTER>`) and add it in later. To get started, we would recommend just using your `Staging` deployment key, so that you can test out the CodePush end-to-end.
+2. You will be prompted for the deployment key you'd like to use. If you don't already have it, you can retrieve this value by running `appcenter codepush deployment list -a <ownerName>/<appName> -k`, or you can choose to ignore it (by simply hitting `<ENTER>`) and add it in later. To get started, we would recommend just using your `Staging` deployment key, so that you can test out the CodePush end-to-end.
 
 And that's it! Isn't RNPM awesome? :)
 
@@ -85,7 +135,7 @@ And that's it! Isn't RNPM awesome? :)
     *Note: Alternatively, if you prefer, you can add the `-lz` flag to the `Other Linker Flags` field in the `Linking` section of the `Build Settings`.*
 
 
-### Plugin Configuration (iOS)
+### Plugin Configuration for React Native lower than 0.60 (iOS)
 
 *NOTE: If you used RNPM or `react-native link` to automatically link the plugin, these steps have already been done for you so you may skip this section.*
 
@@ -97,7 +147,7 @@ Once your Xcode project has been setup to build/link the CodePush plugin, you ne
     #import <CodePush/CodePush.h>
     ```
 
-For React Native 0.59 and above:
+For React Native 0.59 - 0.59.10:
 
 2. Find the following line of code, which sets the source URL for bridge for production releases:
 
@@ -131,7 +181,7 @@ This change configures your app to always load the most recent version of your a
 
 Typically, you're only going to want to use CodePush to resolve your JS bundle location within release builds, and therefore, we recommend using the `DEBUG` pre-processor macro to dynamically switch between using the packager server and CodePush, depending on whether you are debugging or not. This will make it much simpler to ensure you get the right behavior you want in production, while still being able to use the Chrome Dev Tools, live reload, etc. at debug-time.
 
-For React Native 0.59 and above:
+For React Native 0.59 - 0.59.10:
 
 ```objective-c
 - (NSURL *)sourceURLForBridge:(RCTBridge *)bridge
@@ -168,7 +218,7 @@ NSURL *jsCodeLocation;
 #endif
 ```
 
-To let the CodePush runtime know which deployment it should query for updates against, open your app's `Info.plist` file and add a new entry named `CodePushDeploymentKey`, whose value is the key of the deployment you want to configure this app against (like the key for the `Staging` deployment for the `FooBar` app). You can retrieve this value by running `code-push deployment ls <appName> -k` in the CodePush CLI (the `-k` flag is necessary since keys aren't displayed by default) and copying the value of the `Deployment Key` column which corresponds to the deployment you want to use (see below). Note that using the deployment's name (like Staging) will not work. That "friendly name" is intended only for authenticated management usage from the CLI, and not for public consumption within your app.
+To let the CodePush runtime know which deployment it should query for updates against, open your app's `Info.plist` file and add a new entry named `CodePushDeploymentKey`, whose value is the key of the deployment you want to configure this app against (like the key for the `Staging` deployment for the `FooBar` app). You can retrieve this value by running `appcenter codepush deployment list -a <ownerName>/<appName> -k` in the AppCenter CLI (the `-k` flag is necessary since keys aren't displayed by default) and copying the value of the `Key` column which corresponds to the deployment you want to use (see below). Note that using the deployment's name (like Staging) will not work. That "friendly name" is intended only for authenticated management usage from the CLI, and not for public consumption within your app.
 
 ![Deployment list](https://cloud.githubusercontent.com/assets/116461/11601733/13011d5e-9a8a-11e5-9ce2-b100498ffb34.png)
 
@@ -208,7 +258,7 @@ Before doing anything, please [read the docs][ats] first.
 
 ### Code Signing setup
 
-Starting with CLI version **2.1.0** you can self sign bundles during release and verify its signature before installation of update. For more info about Code Signing please refer to [relevant code-push documentation section](https://github.com/Microsoft/code-push/tree/master/cli#code-signing).
+Starting with CLI version **2.1.0** you can self sign bundles during release and verify its signature before installation of update. For more info about Code Signing please refer to [relevant code-push documentation section](https://github.com/microsoft/code-push/tree/v3.0.1/cli#code-signing).
 
 In order to configure Public Key for bundle verification you need to add record in `Info.plist` with name `CodePushPublicKey` and string value of public key content. Example:
 

package/docs/setup-windows.md

@@ -37,7 +37,7 @@ class MainReactNativeHost : ReactNativeHost
     // 3. Update the JavaScriptBundleFile property to initalize the CodePush runtime,
     // specifying the right deployment key, then use it to return the bundle URL from
     // CodePush instead of statically from the binary. If you don't already have your
-    // deployment key, you can run "code-push deployment ls <appName> -k" to retrieve it.
+    // deployment key, you can run "appcenter codepush deployment list -a <ownerName>/<appName> -k" to retrieve it.
     protected override string JavaScriptBundleFile
     {
         get

package/ios/CodePush/CodePush.m

@@ -31,6 +31,10 @@
     long long _latestExpectedContentLength;
     long long _latestReceivedConentLength;
     BOOL _didUpdateProgress;
+    
+    BOOL _allowed;
+    BOOL _restartInProgress;
+    NSMutableArray *_restartQueue;
 }
 
 RCT_EXPORT_MODULE()
@@ -369,8 +373,11 @@ static NSString *const LatestRollbackCountKey = @"count";
 
 - (instancetype)init
 {
+    _allowed = YES;
+    _restartInProgress = NO;
+    _restartQueue = [NSMutableArray arrayWithCapacity:1];
+    
     self = [super init];
-
     if (self) {
         [self initializeUpdateAfterRestart];
     }
@@ -636,25 +643,41 @@ static NSString *const LatestRollbackCountKey = @"count";
     return @[DownloadProgressEvent];
 }
 
+// Determine how long the app was in the background
+- (int)getDurationInBackground
+{
+    int duration = 0;
+    if (_lastResignedDate) {
+        duration = [[NSDate date] timeIntervalSinceDate:_lastResignedDate];
+    }
+
+    return duration;
+}
+
 #pragma mark - Application lifecycle event handlers
 
-// These two handlers will only be registered when there is
+// These three handlers will only be registered when there is
 // a resume-based update still pending installation.
-- (void)applicationWillEnterForeground
+- (void)applicationDidBecomeActive
 {
-    if (_appSuspendTimer) {
-        [_appSuspendTimer invalidate];
-        _appSuspendTimer = nil;
-    }
-    // Determine how long the app was in the background and ensure
-    // that it meets the minimum duration amount of time.
-    int durationInBackground = 0;
-    if (_lastResignedDate) {
-        durationInBackground = [[NSDate date] timeIntervalSinceDate:_lastResignedDate];
+    if (_installMode == CodePushInstallModeOnNextSuspend) {
+        int durationInBackground = [self getDurationInBackground];
+        // We shouldn't use loadBundle in this case, because _appSuspendTimer will call loadBundleOnTick.
+        // We should cancel timer for _appSuspendTimer because otherwise, we would call loadBundle two times.
+        if (durationInBackground < _minimumBackgroundDuration) {
+            [_appSuspendTimer invalidate];
+            _appSuspendTimer = nil;
+        }
     }
+}
 
-    if (durationInBackground >= _minimumBackgroundDuration) {
-        [self loadBundle];
+- (void)applicationWillEnterForeground
+{
+    if (_installMode == CodePushInstallModeOnNextResume) {
+        int durationInBackground = [self getDurationInBackground];
+        if (durationInBackground >= _minimumBackgroundDuration) {
+            [self restartAppInternal:NO];
+        }
     }
 }
 
@@ -674,7 +697,7 @@ static NSString *const LatestRollbackCountKey = @"count";
 }
 
 -(void)loadBundleOnTick:(NSTimer *)timer {
-    [self loadBundle];
+    [self restartAppInternal:NO];
 }
 
 #pragma mark - JavaScript-exported module methods (Public)
@@ -746,6 +769,33 @@ RCT_EXPORT_METHOD(downloadUpdate:(NSDictionary*)updatePackage
         }];
 }
 
+- (void)restartAppInternal:(BOOL)onlyIfUpdateIsPending
+{
+    if (_restartInProgress) {
+        CPLog(@"Restart request queued until the current restart is completed.");
+        [_restartQueue addObject:@(onlyIfUpdateIsPending)];
+        return;
+    } else if (!_allowed) {
+        CPLog(@"Restart request queued until restarts are re-allowed.");
+        [_restartQueue addObject:@(onlyIfUpdateIsPending)];
+        return;
+    }
+
+    _restartInProgress = YES;
+    if (!onlyIfUpdateIsPending || [[self class] isPendingUpdate:nil]) {
+        [self loadBundle];
+        CPLog(@"Restarting app.");
+        return;
+    }
+
+    _restartInProgress = NO;
+    if ([_restartQueue count] > 0) {
+        BOOL buf = [_restartQueue valueForKey: @"@firstObject"];
+        [_restartQueue removeObjectAtIndex:0];
+        [self restartAppInternal:buf];
+    }
+}
+
 /*
  * This is the native side of the CodePush.getConfiguration method. It isn't
  * currently exposed via the "react-native-code-push" module, and is used
@@ -859,6 +909,11 @@ RCT_EXPORT_METHOD(installUpdate:(NSDictionary*)updatePackage
                 // Ensure we do not add the listener twice.
                 // Register for app resume notifications so that we
                 // can check for pending updates which support "restart on resume"
+                [[NSNotificationCenter defaultCenter] addObserver:self
+                                                         selector:@selector(applicationDidBecomeActive)
+                                                             name:UIApplicationDidBecomeActiveNotification
+                                                           object:RCTSharedApplication()];
+                                                           
                 [[NSNotificationCenter defaultCenter] addObserver:self
                                                          selector:@selector(applicationWillEnterForeground)
                                                              name:UIApplicationWillEnterForegroundNotification
@@ -895,6 +950,7 @@ RCT_EXPORT_METHOD(setLatestRollbackInfo:(NSString *)packageHash
                   reject:(RCTPromiseRejectBlock)reject)
 {
     [[self class] setLatestRollbackInfo:packageHash];
+    resolve(nil);
 }
 
 
@@ -932,6 +988,37 @@ RCT_EXPORT_METHOD(notifyApplicationReady:(RCTPromiseResolveBlock)resolve
     resolve(nil);
 }
 
+RCT_EXPORT_METHOD(allow:(RCTPromiseResolveBlock)resolve
+                    rejecter:(RCTPromiseRejectBlock)reject)
+{
+    CPLog(@"Re-allowing restarts.");
+    _allowed = YES;
+
+    if ([_restartQueue count] > 0) {
+        CPLog(@"Executing pending restart.");
+        BOOL buf = [_restartQueue valueForKey: @"@firstObject"];
+        [_restartQueue removeObjectAtIndex:0];
+        [self restartAppInternal:buf];
+    }
+
+    resolve(nil);
+}
+
+RCT_EXPORT_METHOD(clearPendingRestart:(RCTPromiseResolveBlock)resolve
+                    rejecter:(RCTPromiseRejectBlock)reject)
+{
+    [_restartQueue removeAllObjects];
+    resolve(nil);
+}
+
+RCT_EXPORT_METHOD(disallow:(RCTPromiseResolveBlock)resolve
+                    rejecter:(RCTPromiseRejectBlock)reject)
+{
+    CPLog(@"Disallowing restarts.");
+    _allowed = NO;
+    resolve(nil);
+}
+
 /*
  * This method is the native side of the CodePush.restartApp() method.
  */
@@ -939,15 +1026,8 @@ RCT_EXPORT_METHOD(restartApp:(BOOL)onlyIfUpdateIsPending
                      resolve:(RCTPromiseResolveBlock)resolve
                     rejecter:(RCTPromiseRejectBlock)reject)
 {
-    // If this is an unconditional restart request, or there
-    // is current pending update, then reload the app.
-    if (!onlyIfUpdateIsPending || [[self class] isPendingUpdate:nil]) {
-        [self loadBundle];
-        resolve(@(YES));
-        return;
-    }
-
-    resolve(@(NO));
+    [self restartAppInternal:onlyIfUpdateIsPending];
+    resolve(nil);
 }
 
 /*