Merge pull request #105 from Microsoft/clear-dev-bundle-cache

Clear dev bundle cache

Author: geof90

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

@@ -53,6 +53,8 @@ public class CodePush {
     private final String CODE_PUSH_TAG = "CodePush";
     private final String DOWNLOAD_PROGRESS_EVENT_NAME = "CodePushDownloadProgress";
     private final String RESOURCES_BUNDLE = "resources.arsc";
+    // This needs to be kept in sync with https://github.com/facebook/react-native/blob/master/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManager.java#L78
+    private final String REACT_DEV_BUNDLE_CACHE_FILE_NAME = "ReactNativeDevBundle.js";
 
     private CodePushPackage codePushPackage;
     private CodePushReactPackage codePushReactPackage;
@@ -236,6 +238,8 @@ private void initializeUpdateAfterRestart() {
                     // Therefore, deduce that it is a broken update and rollback.
                     rollbackPackage();
                 } else {
+                    // Clear the React dev bundle cache so that new updates can be loaded.
+                    clearReactDevBundleCache();
                     // Mark that we tried to initialize the new update, so that if it crashes,
                     // we will know that we need to rollback when the app next starts.
                     savePendingUpdate(pendingUpdate.getString(PENDING_UPDATE_HASH_KEY),
@@ -248,20 +252,18 @@ private void initializeUpdateAfterRestart() {
         }
     }
 
+    private void clearReactDevBundleCache() {
+        File cachedDevBundle = new File(this.applicationContext.getFilesDir(), REACT_DEV_BUNDLE_CACHE_FILE_NAME);
+        if (cachedDevBundle.exists()) {
+            cachedDevBundle.delete();
+        }
+    }
+
     private class CodePushNativeModule extends ReactContextBaseJavaModule {
 
         private LifecycleEventListener lifecycleEventListener = null;
-        private static final String JS_BUNDLE_FILE_NAME = "ReactNativeDevBundle.js";
-
-        private void clearReactDevBundleCache() {
-            File cachedDevBundle = new File(getReactApplicationContext().getFilesDir(), JS_BUNDLE_FILE_NAME);
-            if (cachedDevBundle.exists()) {
-                cachedDevBundle.delete();
-            }
-        }
 
         private void loadBundle() {
-            clearReactDevBundleCache();
             Intent intent = mainActivity.getIntent();
             mainActivity.finish();
             mainActivity.startActivity(intent);