Merge pull request #74 from Microsoft/isFirstRunFix

Fixing isFirstRun on iOS after calling restartApp
microsoft · Nov 26, 2015 · f0b334f · f0b334f
2 parents f07fcfb + a7c358e
commit f0b334f
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/CodePush.m b/CodePush.m
@@ -8,11 +8,11 @@
 
 @implementation CodePush {
     BOOL _hasResumeListener;
+    BOOL _isFirstRunAfterUpdate;
 }
 
 RCT_EXPORT_MODULE()
 
-static BOOL didUpdate = NO;
 static NSTimer *_timer;
 static BOOL usingTestFolder = NO;
 
@@ -129,7 +129,7 @@ - (void)initializeUpdateAfterRestart
     NSDictionary *pendingUpdate = [preferences objectForKey:PendingUpdateKey];
 
     if (pendingUpdate) {
-        didUpdate = true;
+        _isFirstRunAfterUpdate = YES;
         int rollbackTimeout = [pendingUpdate[PendingUpdateRollbackTimeoutKey] intValue];
         if (0 != rollbackTimeout) {
             dispatch_async(dispatch_get_main_queue(), ^{
@@ -345,7 +345,7 @@ - (void)startRollbackTimer:(int)rollbackTimeout
                                                              selector:@selector(loadBundle)
                                                                  name:UIApplicationWillEnterForegroundNotification
                                                                object:[UIApplication sharedApplication]];
-                    _hasResumeListener = true;
+                    _hasResumeListener = YES;
                 }
             }
             // Signal to JS that the update has been applied.
@@ -375,7 +375,7 @@ - (void)startRollbackTimer:(int)rollbackTimeout
                     rejecter:(RCTPromiseRejectBlock)reject)
 {
     NSError *error;
-    BOOL isFirstRun = didUpdate
+    BOOL isFirstRun = _isFirstRunAfterUpdate
                         && nil != packageHash
                         && [packageHash length] > 0
                         && [packageHash isEqualToString:[CodePushPackage getCurrentPackageHash:&error]];