move restartApp to RestartManager

Author: dbasedow

CodePush.js

@@ -214,10 +214,6 @@ async function tryReportStatus(resumeListener) {
   }
 }
 
-function restartApp(onlyIfUpdateIsPending = false) {
-  NativeCodePush.restartApp(onlyIfUpdateIsPending);
-}
-
 var testConfig;
 
 // This function is only used for tests. Replaces the default SDK, configuration and native bridge
@@ -410,7 +406,7 @@ if (NativeCodePush) {
     log,
     notifyAppReady: notifyApplicationReady,
     notifyApplicationReady,
-    restartApp,
+    restartApp: RestartManager.restartApp,
     setUpTestDependencies,
     sync,
     disallowRestart: RestartManager.disallow,
@@ -420,7 +416,6 @@ if (NativeCodePush) {
       IMMEDIATE: NativeCodePush.codePushInstallModeImmediate, // Restart the app immediately
       ON_NEXT_RESTART: NativeCodePush.codePushInstallModeOnNextRestart, // Don't artificially restart the app. Allow the update to be "picked up" on the next app restart
       ON_NEXT_RESUME: NativeCodePush.codePushInstallModeOnNextResume, // Restart the app the next time it is resumed from the background
-      ON_NEXT_RESTART_OPPORTUNITY: NativeCodePush.codePushInstallModeOnNextRestartOpportunity
     },
     SyncStatus: {
       CHECKING_FOR_UPDATE: 0,

RestartManager.js

@@ -2,22 +2,16 @@ let NativeCodePush = require("react-native").NativeModules.CodePush;
 
 const RestartManager = (() => {
     let _allowed = true;
-    let restartPending = false;
 
-    function tryRestart() {
-        if (restartPending && _allowed == true) {
-            NativeCodePush.restartApp(true);
+    function restartApp(onlyIfUpdateIsPending = false) {
+        if (_allowed) {
+            NativeCodePush.restartApp(onlyIfUpdateIsPending);
         }
     }
 
-    function requestRestart() {
-        restartPending = true;
-        tryRestart();
-    }
-
     function allow() {
         _allowed = true;
-        tryRestart();
+        restartApp(true);
     }
 
     function allowed() {
@@ -32,7 +26,7 @@ const RestartManager = (() => {
         allow,
         disallow,
         allowed,
-        requestRestart
+        restartApp,
     };
 })();
 

package-mixins.js

@@ -43,11 +43,8 @@ module.exports = (NativeCodePush) => {
       await NativeCodePush.installUpdate(this, installMode, minimumBackgroundDuration);
       updateInstalledCallback && updateInstalledCallback();
       if (installMode == NativeCodePush.codePushInstallModeImmediate) {
-        NativeCodePush.restartApp(false);
+        RestartManager.restartApp(false);
       } else {
-        if (installMode == NativeCodePush.codePushInstallModeOnNextRestartOpportunity) {
-          RestartManager.requestRestart();
-        }
         localPackage.isPending = true; // Mark the package as pending since it hasn't been applied yet
       }
     },