Merge pull request #311 from Microsoft/fix-rollback-android

Fix rollback android

Author: lostintangent

Examples/CodePushDemoApp/crossplatformdemo.js

@@ -18,13 +18,13 @@ let CodePushDemoApp = React.createClass({
     let self = this;
     try {
       return await CodePush.sync(
-        { 
+        {
           updateDialog: true,
           installMode: CodePush.InstallMode.ON_NEXT_RESUME
-        }, 
+        },
         (syncStatus) => {
           switch(syncStatus) {
-            case CodePush.SyncStatus.CHECKING_FOR_UPDATE: 
+            case CodePush.SyncStatus.CHECKING_FOR_UPDATE:
               self.setState({
                 syncMessage: "Checking for update."
               });
@@ -80,36 +80,36 @@ let CodePushDemoApp = React.createClass({
       CodePush.log(error);
     }
   },
-  
+
   componentDidMount() {
       CodePush.notifyApplicationReady();
   },
-  
+
   getInitialState() {
     return { };
   },
-  
+
   render() {
     let syncView, syncButton, progressView;
-    
+
     if (this.state.syncMessage) {
       syncView = (
         <Text style={styles.messages}>{this.state.syncMessage}</Text>
       );
     } else {
-      syncButton = ( 
+      syncButton = (
         <Button style={{color: 'green'}} onPress={this.sync}>
           Start Sync!
         </Button>
       );
     }
-    
+
     if (this.state.progress) {
       progressView = (
         <Text style={styles.messages}>{this.state.progress.receivedBytes} of {this.state.progress.totalBytes} bytes received</Text>
       );
     }
-    
+
     return (
       <View style={styles.container}>
         <Text style={styles.welcome}>

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

@@ -109,6 +109,7 @@ public CodePush(String deploymentKey, Activity mainActivity, boolean isDebugMode
         currentInstance = this;
 
         clearDebugCacheIfNeeded();
+        initializeUpdateAfterRestart();
     }
 
     private void clearDebugCacheIfNeeded() {
@@ -382,11 +383,6 @@ public String getName() {
             return "CodePush";
         }
 
-        @Override
-        public void initialize() {
-            CodePush.this.initializeUpdateAfterRestart();
-        }
-
         private void loadBundleLegacy() {
             Intent intent = mainActivity.getIntent();
             mainActivity.finish();
@@ -418,6 +414,7 @@ private void loadBundle() {
                     public void run() {
                         try {
                             recreateMethod.invoke(instanceManager);
+                            initializeUpdateAfterRestart();
                         }
                         catch (Exception e) {
                             // The recreation method threw an unknown exception

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

@@ -9,4 +9,4 @@ public CodePushMalformedDataException(String path, Throwable cause) {
     public CodePushMalformedDataException(String url, MalformedURLException cause) {
         super("The package has an invalid downloadUrl: " + url, cause);
     }
-}
+}

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

@@ -71,6 +71,7 @@ public WritableMap getCurrentPackageInfo() {
         try {
             return CodePushUtils.getWritableMapFromFile(statusFilePath);
         } catch (IOException e) {
+            // Should not happen.
             throw new CodePushUnknownException("Error getting current package info" , e);
         }
     }
@@ -79,6 +80,7 @@ public void updateCurrentPackageInfo(ReadableMap packageInfo) {
         try {
             CodePushUtils.writeReadableMapToFile(packageInfo, getStatusFilePath());
         } catch (IOException e) {
+            // Should not happen.
             throw new CodePushUnknownException("Error updating current package info" , e);
         }
     }
@@ -100,6 +102,10 @@ public String getCurrentPackageBundlePath(String bundleFileName) {
         }
 
         WritableMap currentPackage = getCurrentPackage();
+        if (currentPackage == null) {
+            return null;
+        }
+
         String relativeBundlePath = CodePushUtils.tryGetString(currentPackage, RELATIVE_BUNDLE_PATH_KEY);
         if (relativeBundlePath == null) {
             return CodePushUtils.appendPathComponent(packageFolder, bundleFileName);

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

@@ -202,6 +202,7 @@ public static WritableMap getWritableMapFromFile(String filePath) throws IOExcep
             JSONObject json = new JSONObject(content);
             return convertJsonObjectToWritable(json);
         } catch (JSONException jsonException) {
+            // Should not happen
             throw new CodePushMalformedDataException(filePath, jsonException);
         }
     }

ios/CodePush/CodePushConfig.m

@@ -27,32 +27,32 @@ - (instancetype)init
 {
     self = [super init];
     NSDictionary *infoDictionary = [[NSBundle mainBundle] infoDictionary];
-    
+
     NSString *appVersion = [infoDictionary objectForKey:@"CFBundleShortVersionString"];
     NSString *buildVersion = [infoDictionary objectForKey:(NSString *)kCFBundleVersionKey];
     NSString *deploymentKey = [infoDictionary objectForKey:@"CodePushDeploymentKey"];
     NSString *serverURL = [infoDictionary objectForKey:@"CodePushServerURL"];
-    
+
     NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];
     NSString *clientUniqueId = [userDefaults stringForKey:ClientUniqueIDConfigKey];
     if (clientUniqueId == nil) {
         clientUniqueId = [[[UIDevice currentDevice] identifierForVendor] UUIDString];
         [userDefaults setObject:clientUniqueId forKey:ClientUniqueIDConfigKey];
         [userDefaults synchronize];
     }
-    
+
     if (!serverURL) {
         serverURL = @"https://codepush.azurewebsites.net/";
     }
-    
+
     _configDictionary = [[NSMutableDictionary alloc] initWithObjectsAndKeys:
                             appVersion,AppVersionConfigKey,
                             buildVersion,BuildVdersionConfigKey,
                             serverURL,ServerURLConfigKey,
                             clientUniqueId,ClientUniqueIDConfigKey,
                             deploymentKey,DeploymentKeyConfigKey,
                             nil];
-    
+
     return self;
 }
 

request-fetch-adapter.js

@@ -21,7 +21,7 @@ module.exports = {
         headers: headers,
         body: requestBody
       });
-        
+
       const statusCode = response.status;
       const body = await response.text();
       callback(null, { statusCode, body });