fix rollback android

Author: geof90

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

@@ -99,7 +99,7 @@ public CodePush(String deploymentKey, Activity mainActivity, boolean isDebugMode
             appVersion = pInfo.versionName;
             buildVersion = pInfo.versionCode;
         } catch (PackageManager.NameNotFoundException e) {
-            throw new CodePushUnknownException("Unable to get package info for " + applicationContext.getPackageName(), e);
+            CodePushUtils.logException("Unable to get package info for " + applicationContext.getPackageName(), e);
         }
 
         if (currentInstance != null) {
@@ -109,6 +109,7 @@ public CodePush(String deploymentKey, Activity mainActivity, boolean isDebugMode
         currentInstance = this;
 
         clearDebugCacheIfNeeded();
+        initializeUpdateAfterRestart();
     }
 
     private void clearDebugCacheIfNeeded() {
@@ -129,13 +130,14 @@ private long getBinaryResourcesModifiedTime() {
             ZipEntry classesDexEntry = applicationFile.getEntry(RESOURCES_BUNDLE);
             return classesDexEntry.getTime();
         } catch (PackageManager.NameNotFoundException | IOException e) {
-            throw new CodePushUnknownException("Error in getting file information about compiled resources", e);
+            CodePushUtils.logException("Error in getting file information about compiled resources", e);
+            return -1;
         } finally {
             if (applicationFile != null) {
                 try {
                     applicationFile.close();
                 } catch (IOException e) {
-                    throw new CodePushUnknownException("Error in closing application file.", e);
+                    CodePushUtils.logException("Error in closing application file.", e);
                 }
             }
         }
@@ -193,7 +195,8 @@ public String getBundleUrlInternal(String assetsBundleFileName) {
                 return binaryJsBundleUrl;
             }
         } catch (NumberFormatException e) {
-            throw new CodePushUnknownException("Error in reading binary modified date from package metadata", e);
+            CodePushUtils.logException("Error in closing application file.", e);
+            return binaryJsBundleUrl;
         }
     }
 
@@ -251,7 +254,7 @@ private void initializeUpdateAfterRestart() {
                 }
             } catch (JSONException e) {
                 // Should not happen.
-                throw new CodePushUnknownException("Unable to read pending update metadata stored in SharedPreferences", e);
+                CodePushUtils.logException("Unable to read pending update metadata stored in SharedPreferences", e);
             }
         }
     }
@@ -267,7 +270,7 @@ private boolean isFailedHash(String packageHash) {
                         return true;
                     }
                 } catch (JSONException e) {
-                    throw new CodePushUnknownException("Unable to read failedUpdates data stored in SharedPreferences.", e);
+                    CodePushUtils.logException("Unable to read failedUpdates data stored in SharedPreferences.", e);
                 }
             }
         }
@@ -284,7 +287,8 @@ private boolean isPendingUpdate(String packageHash) {
                    (packageHash == null || pendingUpdate.getString(PENDING_UPDATE_HASH_KEY).equals(packageHash));
         }
         catch (JSONException e) {
-            throw new CodePushUnknownException("Unable to read pending update metadata in isPendingUpdate.", e);
+            CodePushUtils.logException("Unable to read pending update metadata in isPendingUpdate.", e);
+            return false;
         }
     }
 
@@ -316,8 +320,9 @@ private void saveFailedUpdate(ReadableMap failedPackage) {
                 failedUpdates = new JSONArray(failedUpdatesString);
             } catch (JSONException e) {
                 // Should not happen.
-                throw new CodePushMalformedDataException("Unable to parse failed updates information " +
+                CodePushUtils.logException("Unable to parse failed updates information " +
                         failedUpdatesString + " stored in SharedPreferences", e);
+                failedUpdates = new JSONArray();
             }
         }
 
@@ -335,7 +340,7 @@ private void savePendingUpdate(String packageHash, boolean isLoading) {
             settings.edit().putString(PENDING_UPDATE_KEY, pendingUpdate.toString()).commit();
         } catch (JSONException e) {
             // Should not happen.
-            throw new CodePushUnknownException("Unable to save pending update.", e);
+            CodePushUtils.logException("Unable to save pending update.", e);
         }
     }
 
@@ -382,11 +387,6 @@ public String getName() {
             return "CodePush";
         }
 
-        @Override
-        public void initialize() {
-            CodePush.this.initializeUpdateAfterRestart();
-        }
-
         private void loadBundleLegacy() {
             Intent intent = mainActivity.getIntent();
             mainActivity.finish();
@@ -418,6 +418,7 @@ private void loadBundle() {
                     public void run() {
                         try {
                             recreateMethod.invoke(instanceManager);
+                            initializeUpdateAfterRestart();
                         }
                         catch (Exception e) {
                             // The recreation method threw an unknown exception
@@ -558,7 +559,7 @@ protected Void doInBackground(Void... params) {
                                     return null;
                                 }
                             } catch (JSONException e) {
-                                throw new CodePushUnknownException("Unable to read failed updates information stored in SharedPreferences.", e);
+                                CodePushUtils.logException("Unable to read failed updates information stored in SharedPreferences.", e);
                             }
                         }
                     } else if (didUpdate) {
@@ -595,7 +596,8 @@ protected Void doInBackground(Void... params) {
 
                     String pendingHash = CodePushUtils.tryGetString(updatePackage, PACKAGE_HASH_KEY);
                     if (pendingHash == null) {
-                        throw new CodePushUnknownException("Update package to be installed has no hash.");
+                        CodePushUtils.log("Update package to be installed has no hash.");
+                        return null;
                     } else {
                         savePendingUpdate(pendingHash, /* isLoading */false);
                     }
@@ -687,7 +689,7 @@ public void downloadAndReplaceCurrentBundle(String remoteBundleUrl) {
                 try {
                     codePushPackage.downloadAndReplaceCurrentBundle(remoteBundleUrl, assetsBundleFileName);
                 } catch (IOException e) {
-                    throw new CodePushUnknownException("Unable to replace current bundle", e);
+                    CodePushUtils.logException("Unable to replace current bundle", e);
                 }
             }
         }

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

@@ -36,8 +36,6 @@ public void onClick(DialogInterface dialog, int which) {
                     case DialogInterface.BUTTON_NEGATIVE:
                         successCallback.invoke(1);
                         break;
-                    default:
-                        throw new CodePushUnknownException("Unknown button ID pressed.");
                 }
             }
         };

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

@@ -71,15 +71,18 @@ public WritableMap getCurrentPackageInfo() {
         try {
             return CodePushUtils.getWritableMapFromFile(statusFilePath);
         } catch (IOException e) {
-            throw new CodePushUnknownException("Error getting current package info" , e);
+            // Should not happen.
+            CodePushUtils.logException("Error getting current package info" , e);
+            return new WritableNativeMap();
         }
     }
 
     public void updateCurrentPackageInfo(ReadableMap packageInfo) {
         try {
             CodePushUtils.writeReadableMapToFile(packageInfo, getStatusFilePath());
         } catch (IOException e) {
-            throw new CodePushUnknownException("Error updating current package info" , e);
+            // Should not happen.
+            CodePushUtils.logException("Error updating current package info" , e);
         }
     }
 
@@ -100,6 +103,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);
@@ -205,20 +212,18 @@ public void downloadPackage(ReadableMap updatePackage, String expectedBundleFile
             }
 
             if (totalBytes != receivedBytes) {
-                throw new CodePushUnknownException("Received " + receivedBytes + " bytes, expected " + totalBytes);
+                CodePushUtils.log("Received " + receivedBytes + " bytes, expected " + totalBytes);
             }
 
             isZip = ByteBuffer.wrap(header).getInt() == 0x504b0304;
-        } catch (MalformedURLException e) {
-            throw new CodePushMalformedDataException(downloadUrlString, e);
         } finally {
             try {
                 if (bout != null) bout.close();
                 if (fos != null) fos.close();
                 if (bin != null) bin.close();
                 if (connection != null) connection.disconnect();
             } catch (IOException e) {
-                throw new CodePushUnknownException("Error closing IO resources.", e);
+                CodePushUtils.logException("Error closing IO resources.", e);
             }
         }
 
@@ -262,9 +267,8 @@ public void downloadPackage(ReadableMap updatePackage, String expectedBundleFile
                 try {
                     updatePackageJSON.put(RELATIVE_BUNDLE_PATH_KEY, relativeBundlePath);
                 } catch (JSONException e) {
-                    throw new CodePushUnknownException("Unable to set key " +
-                            RELATIVE_BUNDLE_PATH_KEY + " to value " + relativeBundlePath +
-                            " in update package.", e);
+                    CodePushUtils.logException("Unable to set key " + RELATIVE_BUNDLE_PATH_KEY +
+                            " to value " + relativeBundlePath + " in update package.", e);
                 }
 
                 updatePackage = CodePushUtils.convertJsonObjectToWritable(updatePackageJSON);
@@ -327,16 +331,14 @@ public void downloadAndReplaceCurrentBundle(String remoteBundleUrl, String bundl
             while ((numBytesRead = bin.read(data, 0, DOWNLOAD_BUFFER_SIZE)) >= 0) {
                 bout.write(data, 0, numBytesRead);
             }
-        } catch (MalformedURLException e) {
-            throw new CodePushMalformedDataException(remoteBundleUrl, e);
         } finally {
             try {
                 if (bout != null) bout.close();
                 if (fos != null) fos.close();
                 if (bin != null) bin.close();
                 if (connection != null) connection.disconnect();
             } catch (IOException e) {
-                throw new CodePushUnknownException("Error closing IO resources.", e);
+                CodePushUtils.logException("Error closing IO resources.", e);
             }
         }
     }

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

@@ -36,7 +36,7 @@ private static void addContentsOfFolderToManifest(String folderPath, String path
                     manifest.add(relativePath + ":" + computeHash(new FileInputStream(file)));
                 } catch (FileNotFoundException e) {
                     // Should not happen.
-                    throw new CodePushUnknownException("Unable to compute hash of update contents.", e);
+                    CodePushUtils.logException("Unable to compute hash of update contents.", e);
                 }
             }
         }
@@ -52,7 +52,7 @@ private static String computeHash(InputStream dataStream) {
             while (digestInputStream.read(byteBuffer) != -1);
         } catch (NoSuchAlgorithmException | IOException e) {
             // Should not happen.
-            throw new CodePushUnknownException("Unable to compute hash of update contents.", e);
+            CodePushUtils.logException("Unable to compute hash of update contents.", e);
         } finally {
             try {
                 if (digestInputStream != null) digestInputStream.close();