Merge pull request #125 from Microsoft/clear-updates-on-new-binary

Clear updates on new binary

Author: geof90

CodePush.h

@@ -25,7 +25,7 @@
 // The below methods are only used during tests.
 + (BOOL)isUsingTestConfiguration;
 + (void)setUsingTestConfiguration:(BOOL)shouldUseTestConfiguration;
-+ (void)clearTestUpdates;
++ (void)clearUpdates;
 
 @end
 
@@ -84,7 +84,7 @@ failCallback:(void (^)(NSError *err))failCallback;
 
 // The below methods are only used during tests.
 + (void)downloadAndReplaceCurrentBundle:(NSString *)remoteBundleUrl;
-+ (void)clearTestUpdates;
++ (void)clearUpdates;
 
 @end
 

CodePush.m

@@ -61,13 +61,22 @@ + (NSURL *)bundleURLForResource:(NSString *)resourceName
     NSDictionary *appFileAttribs = [[NSFileManager defaultManager] attributesOfItemAtPath:packageFile error:nil];
     NSDate *binaryDate = [binaryFileAttributes objectForKey:NSFileModificationDate];
     NSDate *packageDate = [appFileAttribs objectForKey:NSFileModificationDate];
+    NSString *binaryAppVersion = [[CodePushConfig current] appVersion];
+    NSDictionary *currentPackageMetadata = [CodePushPackage getCurrentPackage:&error];
+    if (error || !currentPackageMetadata) {
+        NSLog(logMessageFormat, binaryJsBundleUrl);
+        return binaryJsBundleUrl;
+    }
+    
+    NSString *packageAppVersion = [currentPackageMetadata objectForKey:@"appVersion"];
 
-    if ([binaryDate compare:packageDate] == NSOrderedAscending) {
+    if ([binaryDate compare:packageDate] == NSOrderedAscending && [binaryAppVersion isEqualToString:packageAppVersion]) {
         // Return package file because it is newer than the app store binary's JS bundle
         NSURL *packageUrl = [[NSURL alloc] initFileURLWithPath:packageFile];
         NSLog(logMessageFormat, packageUrl);
         return packageUrl;
     } else {
+        [CodePush clearUpdates];
         NSLog(logMessageFormat, binaryJsBundleUrl);
         return binaryJsBundleUrl;
     }
@@ -100,16 +109,13 @@ + (void)setUsingTestConfiguration:(BOOL)shouldUseTestConfiguration
 }
 
 /*
- * This is used to clean up all test updates. It can only be used
- * when the testConfigurationFlag is set to YES, otherwise it will
- * simply no-op.
+ * WARNING: This cleans up all downloaded and pending updates.
  */
-+ (void)clearTestUpdates
++ (void)clearUpdates
 {
-    if ([CodePush isUsingTestConfiguration]) {
-        [CodePushPackage clearTestUpdates];
-        [self removePendingUpdate];
-    }
+    [CodePushPackage clearUpdates];
+    [self removePendingUpdate];
+    [self removeFailedUpdates];
 }
 
 
@@ -271,6 +277,17 @@ - (void)saveFailedUpdate:(NSString *)packageHash
     [preferences synchronize];
 }
 
+/*
+ * This method is used to clear away failed updates in the event that
+ * a new app store binary is installed.
+ */
++ (void)removeFailedUpdates
+{
+    NSUserDefaults *preferences = [NSUserDefaults standardUserDefaults];
+    [preferences removeObjectForKey:FailedUpdatesKey];
+    [preferences synchronize];
+}
+
 /*
  * This method is used to register the fact that a pending
  * update succeeded and therefore can be removed.

CodePushPackage.m

@@ -505,12 +505,10 @@ + (void)downloadAndReplaceCurrentBundle:(NSString *)remoteBundleUrl
     }
 }
 
-+ (void)clearTestUpdates
++ (void)clearUpdates
 {
-    if ([CodePush isUsingTestConfiguration]) {
-        [[NSFileManager defaultManager] removeItemAtPath:[self getCodePushPath] error:nil];
-        [[NSFileManager defaultManager] removeItemAtPath:[self getStatusFilePath] error:nil];
-    }
+    [[NSFileManager defaultManager] removeItemAtPath:[self getCodePushPath] error:nil];
+    [[NSFileManager defaultManager] removeItemAtPath:[self getStatusFilePath] error:nil];
 }
 
 @end

Examples/CodePushDemoApp/CodePushDemoAppTests/CheckForUpdateTests.m

@@ -25,7 +25,7 @@ - (void)setUp
     NSOperatingSystemVersion version = [[NSProcessInfo processInfo] operatingSystemVersion];
     RCTAssert(version.majorVersion == 8 || version.minorVersion == 3, @"Tests should be run on iOS 8.3, found %zd.%zd.%zd", version.majorVersion, version.minorVersion, version.patchVersion);
     [CodePush setUsingTestConfiguration:YES];
-    [CodePush clearTestUpdates];
+    [CodePush clearUpdates];
     _runner = RCTInitRunnerForApp(@"CodePushDemoAppTests/CheckForUpdateTests/CheckForUpdateTestApp", nil);
 }
 

Examples/CodePushDemoApp/CodePushDemoAppTests/DownloadProgressTests.m

@@ -25,7 +25,7 @@ - (void)setUp
     NSOperatingSystemVersion version = [[NSProcessInfo processInfo] operatingSystemVersion];
     RCTAssert(version.majorVersion == 8 || version.minorVersion == 3, @"Tests should be run on iOS 8.3, found %zd.%zd.%zd", version.majorVersion, version.minorVersion, version.patchVersion);
     [CodePush setUsingTestConfiguration:YES];
-    [CodePush clearTestUpdates];
+    [CodePush clearUpdates];
     _runner = RCTInitRunnerForApp(@"CodePushDemoAppTests/DownloadProgressTests/DownloadProgressTestApp", nil);
 }
 

Examples/CodePushDemoApp/CodePushDemoAppTests/InstallUpdateTests.m

@@ -72,7 +72,7 @@ - (void)testIsPending
 
 - (void)runTest:(NSString *)testName
 {
-    [CodePush clearTestUpdates];
+    [CodePush clearUpdates];
     RCTRootView *rootView = [[RCTRootView alloc] initWithBundleURL:[NSURL URLWithString:[NSString stringWithFormat:@"http://localhost:8081/CodePushDemoAppTests/InstallUpdateTests/testcases/%@.bundle?platform=ios&dev=true", testName]]
                                                         moduleName:testName
                                                  initialProperties:nil

Examples/CodePushDemoApp/android/app/src/main/java/com/microsoft/codepushdemoapp/MainActivity.java

@@ -14,7 +14,6 @@
 
 public class MainActivity extends FragmentActivity implements DefaultHardwareBackBtnHandler {
 
-    private final String TEST_FOLDER_PREFIX = "CodePushDemoAppTests/";
     private ReactInstanceManager mReactInstanceManager;
     private ReactRootView mReactRootView;
 
@@ -25,7 +24,7 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         mReactRootView = new ReactRootView(this);
 
-        codePush = new CodePush("DEPLOYMENT_KEY_HERE", this);
+        codePush = new CodePush("DEPLOYMENT_KEY_HERE", this, BuildConfig.DEBUG);
 
         ReactInstanceManager.Builder builder = ReactInstanceManager.builder()
                 .setApplication(getApplication())

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

@@ -67,14 +67,20 @@ public class CodePush {
 
     private Activity mainActivity;
     private Context applicationContext;
+    private final boolean isDebugMode;
 
     public CodePush(String deploymentKey, Activity mainActivity) {
+        this(deploymentKey, mainActivity, false);
+    }
+
+    public CodePush(String deploymentKey, Activity mainActivity, boolean isDebugMode) {
         SoLoader.init(mainActivity, false);
         this.deploymentKey = deploymentKey;
         this.codePushPackage = new CodePushPackage(mainActivity.getFilesDir().getAbsolutePath());
         this.mainActivity = mainActivity;
         this.applicationContext = mainActivity.getApplicationContext();
         this.deploymentKey = deploymentKey;
+        this.isDebugMode = isDebugMode;
 
         PackageInfo pInfo = null;
         try {
@@ -130,13 +136,25 @@ public String getBundleUrl(String assetsBundleFileName) {
             }
 
             ReadableMap packageMetadata = codePushPackage.getCurrentPackage();
-            // May throw NumberFormatException.
-            Long binaryModifiedDateDuringPackageInstall = Long.parseLong(CodePushUtils.tryGetString(packageMetadata, BINARY_MODIFIED_TIME_KEY));
-            if (binaryModifiedDateDuringPackageInstall == binaryResourcesModifiedTime) {
+            Long binaryModifiedDateDuringPackageInstall = null;
+            String binaryModifiedDateDuringPackageInstallString = CodePushUtils.tryGetString(packageMetadata, BINARY_MODIFIED_TIME_KEY);
+            if (binaryModifiedDateDuringPackageInstallString != null) {
+                binaryModifiedDateDuringPackageInstall = Long.parseLong(binaryModifiedDateDuringPackageInstallString);
+            }
+
+            String pacakgeAppVersion = CodePushUtils.tryGetString(packageMetadata, "appVersion");
+            if (binaryModifiedDateDuringPackageInstall != null &&
+                    binaryModifiedDateDuringPackageInstall == binaryResourcesModifiedTime &&
+                    this.appVersion.equals(pacakgeAppVersion)) {
                 CodePushUtils.logBundleUrl(packageFilePath);
                 return packageFilePath;
             } else {
                 // The binary version is newer.
+                didUpdate = false;
+                if (!this.isDebugMode) {
+                    this.clearUpdates();
+                }
+
                 CodePushUtils.logBundleUrl(binaryJsBundleUrl);
                 return binaryJsBundleUrl;
             }
@@ -185,7 +203,9 @@ private void initializeUpdateAfterRestart() {
                     rollbackPackage();
                 } else {
                     // Clear the React dev bundle cache so that new updates can be loaded.
-                    clearReactDevBundleCache();
+                    if (this.isDebugMode) {
+                        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),
@@ -222,14 +242,18 @@ private boolean isPendingUpdate(String packageHash) {
             boolean updateIsPending = pendingUpdate != null &&
                                       pendingUpdate.getBoolean(PENDING_UPDATE_IS_LOADING_KEY) == false &&
                                       pendingUpdate.getString(PENDING_UPDATE_HASH_KEY).equals(packageHash);
-                                 
             return updateIsPending;
         }
         catch (JSONException e) {
             throw new CodePushUnknownException("Unable to read pending update metadata in isPendingUpdate.", e);
         }
     }
 
+    private void removeFailedUpdates() {
+        SharedPreferences settings = applicationContext.getSharedPreferences(CODE_PUSH_PREFERENCES, 0);
+        settings.edit().remove(FAILED_UPDATES_KEY).commit();
+    }
+
     private void removePendingUpdate() {
         SharedPreferences settings = applicationContext.getSharedPreferences(CODE_PUSH_PREFERENCES, 0);
         settings.edit().remove(PENDING_UPDATE_KEY).commit();
@@ -299,11 +323,10 @@ public static void setUsingTestConfiguration(boolean shouldUseTestConfiguration)
         testConfigurationFlag = shouldUseTestConfiguration;
     }
 
-    public void clearTestUpdates() {
-        if (isUsingTestConfiguration()) {
-            codePushPackage.clearTestUpdates();
-            removePendingUpdate();
-        }
+    public void clearUpdates() {
+        codePushPackage.clearUpdates();
+        removePendingUpdate();
+        removeFailedUpdates();
     }
 
     private class CodePushNativeModule extends ReactContextBaseJavaModule {

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

@@ -225,11 +225,9 @@ public void downloadAndReplaceCurrentBundle(String remoteBundleUrl) throws IOExc
         }
     }
 
-    public void clearTestUpdates() {
-        if (CodePush.isUsingTestConfiguration()) {
-            File statusFile = new File(getStatusFilePath());
-            statusFile.delete();
-            CodePushUtils.deleteDirectoryAtPath(getCodePushPath());
-        }
+    public void clearUpdates() {
+        File statusFile = new File(getStatusFilePath());
+        statusFile.delete();
+        CodePushUtils.deleteDirectoryAtPath(getCodePushPath());
     }
 }