Merge pull request #113 from Microsoft/isPending

isPending property on package objects

Author: lostintangent

CodePush.m

@@ -13,9 +13,9 @@ @implementation CodePush {
 
 RCT_EXPORT_MODULE()
 
-static NSTimer *_timer;
 static BOOL usingTestFolder = NO;
 
+// These keys represent the names we use to store data in NSUserDefaults
 static NSString *const FailedUpdatesKey = @"CODE_PUSH_FAILED_UPDATES";
 static NSString *const PendingUpdateKey = @"CODE_PUSH_PENDING_UPDATE";
 
@@ -24,6 +24,11 @@ @implementation CodePush {
 static NSString *const PendingUpdateHashKey = @"hash";
 static NSString *const PendingUpdateIsLoadingKey = @"isLoading";
 
+// These keys are used to inspect/augment the metadata
+// that is associated with an update's package.
+static NSString *const PackageHashKey = @"packageHash";
+static NSString *const PackageIsPendingKey = @"isPending";
+
 @synthesize bridge = _bridge;
 
 // Public Obj-C API (see header for method comments)
@@ -141,6 +146,25 @@ - (BOOL)isFailedHash:(NSString*)packageHash
     return (failedUpdates != nil && [failedUpdates containsObject:packageHash]);
 }
 
+/*
+ * This method checks to see whether a specific package hash
+ * represents a downloaded and installed update, that hasn't
+ * been applied yet via an app restart.
+ */
+- (BOOL)isPendingUpdate:(NSString*)packageHash
+{
+    NSUserDefaults *preferences = [NSUserDefaults standardUserDefaults];
+    NSDictionary *pendingUpdate = [preferences objectForKey:PendingUpdateKey];
+
+    // If there is a pending update, whose hash is equal to the one
+    // specified, and its "state" isn't loading, then we consider it "pending".
+    BOOL updateIsPending = pendingUpdate &&
+                           [pendingUpdate[PendingUpdateIsLoadingKey] boolValue] == NO &&
+                           [pendingUpdate[PendingUpdateHashKey] isEqualToString:packageHash];
+    
+    return updateIsPending;
+}
+
 /*
  * This method updates the React Native bridge's bundle URL
  * to point at the latest CodePush update, and then restarts
@@ -259,7 +283,7 @@ - (void)savePendingUpdate:(NSString *)packageHash
         // The download completed
         doneCallback:^{
             NSError *err;
-            NSDictionary *newPackage = [CodePushPackage getPackage:updatePackage[@"packageHash"] error:&err];
+            NSDictionary *newPackage = [CodePushPackage getPackage:updatePackage[PackageHashKey] error:&err];
 
             if (err) {
                 return reject(err);
@@ -293,12 +317,18 @@ - (void)savePendingUpdate:(NSString *)packageHash
 {
     dispatch_async(dispatch_get_main_queue(), ^{
         NSError *error;
-        NSDictionary *package = [CodePushPackage getCurrentPackage:&error];
+        NSMutableDictionary *package = [[CodePushPackage getCurrentPackage:&error] mutableCopy];
+        
         if (error) {
             reject(error);
-        } else {
-            resolve(package);
         }
+        
+        // Add the "isPending" virtual property to the package at this point, so that
+        // the script-side doesn't need to immediately call back into native to populate it.
+        BOOL isPendingUpdate = [self isPendingUpdate:[package objectForKey:PackageHashKey]];
+        [package setObject:@(isPendingUpdate) forKey:PackageIsPendingKey];
+
+        resolve(package);
     });
 }
 
@@ -318,7 +348,7 @@ - (void)savePendingUpdate:(NSString *)packageHash
         if (error) {
             reject(error);
         } else {
-            [self savePendingUpdate:updatePackage[@"packageHash"]
+            [self savePendingUpdate:updatePackage[PackageHashKey]
                           isLoading:NO];
 
             if (installMode == CodePushInstallModeImmediate) {
@@ -393,4 +423,4 @@ - (void)savePendingUpdate:(NSString *)packageHash
     usingTestFolder = shouldUseTestFolder;
 }
 
-@end
+@end