From 5551cdef8ff03d90152dc4ff05cea5e4e1ee7908 Mon Sep 17 00:00:00 2001
From: Geoffrey Goh <kg422@cornell.edu>
Date: Wed, 4 Nov 2015 11:30:35 -0800
Subject: [PATCH] fix getPackageHash

---
 CodePush.m        | 7 ++++---
 CodePushPackage.m | 8 ++++++++
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/CodePush.m b/CodePush.m
index feb3a82..3ddda58 100644
--- a/CodePush.m
+++ b/CodePush.m
@@ -184,10 +184,11 @@ RCT_EXPORT_METHOD(isFirstRun:(NSString *)packageHash
                   rejecter:(RCTPromiseRejectBlock)reject)
 {
     NSError *error;
-    BOOL isFirstRun = (nil != packageHash
+    BOOL isFirstRun = didUpdate
+                  && nil != packageHash
                   && [packageHash length] > 0
-                  && [packageHash isEqualToString:[CodePushPackage getCurrentPackageHash:&error]]
-                  && didUpdate);
+                  && [packageHash isEqualToString:[CodePushPackage getCurrentPackageHash:&error]];
+                  
     resolve(@(isFirstRun));
 }
 
diff --git a/CodePushPackage.m b/CodePushPackage.m
index afd7062..5522a27 100644
--- a/CodePushPackage.m
+++ b/CodePushPackage.m
@@ -75,12 +75,20 @@ NSString * const StatusFile = @"codepush.json";
 + (NSString *)getCurrentPackageHash:(NSError **)error
 {
     NSDictionary *info = [self getCurrentPackageInfo:error];
+    if (*error) {
+        return NULL;
+    }
+    
     return info[@"currentPackage"];
 }
 
 + (NSString *)getPreviousPackageHash:(NSError **)error
 {
     NSDictionary *info = [self getCurrentPackageInfo:error];
+    if (*error) {
+        return NULL;
+    }
+    
     return info[@"previousPackage"];
 }