@revopush/react-native-code-push 2.5.0 → 2.5.1

package/ios/CodePush/CodePushUpdateUtils.m

@@ -197,16 +197,24 @@ NSString * const IgnoreCodePushMetadata = @".codepushrelease";
     return AssetsFolderName;
 }
 
++ (NSString *)cacheKeyForBinaryAtURL:(NSURL *)binaryBundleUrl
+{
+    NSString *bundleModifiedDate = [self modifiedDateStringOfFileAtURL:binaryBundleUrl];
+    return [NSString stringWithFormat:@"%@:%@",
+            [[NSBundle mainBundle] bundlePath],
+            bundleModifiedDate ?: @"unknown"];
+}
+
 + (NSString *)getHashForBinaryContents:(NSURL *)binaryBundleUrl
                                  error:(NSError **)error
 {
     // Get the cached hash from user preferences if it exists.
-    NSString *binaryModifiedDate = [self modifiedDateStringOfFileAtURL:binaryBundleUrl];
+    NSString *binaryCacheKey = [self cacheKeyForBinaryAtURL:binaryBundleUrl];
     NSUserDefaults *preferences = [NSUserDefaults standardUserDefaults];
     NSMutableDictionary *binaryHashDictionary = [preferences objectForKey:BinaryHashKey];
     NSString *binaryHash = nil;
     if (binaryHashDictionary != nil) {
-        binaryHash = [binaryHashDictionary objectForKey:binaryModifiedDate];
+        binaryHash = [binaryHashDictionary objectForKey:binaryCacheKey];
         if (binaryHash == nil) {
             [preferences removeObjectForKey:BinaryHashKey];
             [preferences synchronize];
@@ -237,9 +245,7 @@ NSString * const IgnoreCodePushMetadata = @".codepushrelease";
 
     binaryHash = [self computeFinalHashFromManifest:manifest error:error];
 
-    // Cache the hash in user preferences. This assumes that the modified date for the
-    // JS bundle changes every time a new bundle is generated by the packager.
-    [binaryHashDictionary setObject:binaryHash forKey:binaryModifiedDate];
+    [binaryHashDictionary setObject:binaryHash forKey:binaryCacheKey];
     [preferences setObject:binaryHashDictionary forKey:BinaryHashKey];
     [preferences synchronize];
     return binaryHash;
@@ -255,11 +261,10 @@ NSString * const IgnoreCodePushMetadata = @".codepushrelease";
     NSUserDefaults *preferences = [NSUserDefaults standardUserDefaults];
     NSMutableDictionary *assetsHashDictionary = [preferences objectForKey:BinaryAssetsHashKey];
 
-    NSString *assetsModifiedDate = [self modifiedDateStringOfFileAtURL:
-                                    [NSURL fileURLWithPath:assetsPath isDirectory:YES]];
+    NSString *assetsCacheKey = [self cacheKeyForBinaryAtURL:[CodePush binaryBundleURL]];
 
     if (assetsHashDictionary != nil) {
-        NSString *cached = [assetsHashDictionary objectForKey:assetsModifiedDate];
+        NSString *cached = [assetsHashDictionary objectForKey:assetsCacheKey];
         if (cached != nil) {
             return cached;
         } else {
@@ -285,7 +290,7 @@ NSString * const IgnoreCodePushMetadata = @".codepushrelease";
         return nil;
     }
 
-    [assetsHashDictionary setObject:assetsHash forKey:assetsModifiedDate];
+    [assetsHashDictionary setObject:assetsHash forKey:assetsCacheKey];
     [preferences setObject:assetsHashDictionary forKey:BinaryAssetsHashKey];
     [preferences synchronize];
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@revopush/react-native-code-push",
-  "version": "2.5.0",
+  "version": "2.5.1",
   "description": "React Native plugin for the CodePush service",
   "main": "CodePush.js",
   "typings": "typings/react-native-code-push.d.ts",