fix android install to overwrite pending

Author: geof90

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

@@ -481,7 +481,7 @@ public void installUpdate(final ReadableMap updatePackage, final int installMode
                 @Override
                 protected Void doInBackground(Object... params) {
                     try {
-                        codePushPackage.installPackage(updatePackage);
+                        codePushPackage.installPackage(updatePackage, isPendingUpdate(null));
 
                         String pendingHash = CodePushUtils.tryGetString(updatePackage, codePushPackage.PACKAGE_HASH_KEY);
                         if (pendingHash == null) {

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

@@ -259,15 +259,23 @@ public void downloadPackage(Context applicationContext, ReadableMap updatePackag
         CodePushUtils.writeReadableMapToFile(updatePackage, bundlePath);
     }
 
-    public void installPackage(ReadableMap updatePackage) throws IOException {
+    public void installPackage(ReadableMap updatePackage, boolean removePendingUpdate) throws IOException {
         String packageHash = CodePushUtils.tryGetString(updatePackage, PACKAGE_HASH_KEY);
         WritableMap info = getCurrentPackageInfo();
-        String previousPackageHash = getPreviousPackageHash();
-        if (previousPackageHash != null && !previousPackageHash.equals(packageHash)) {
-            FileUtils.deleteDirectoryAtPath(getPackageFolderPath(previousPackageHash));
+        if (removePendingUpdate) {
+            String currentPackageFolderPath = getCurrentPackageFolderPath();
+            if (currentPackageFolderPath != null) {
+                FileUtils.deleteDirectoryAtPath(currentPackageFolderPath);
+            }
+        } else {
+            String previousPackageHash = getPreviousPackageHash();
+            if (previousPackageHash != null && !previousPackageHash.equals(packageHash)) {
+                FileUtils.deleteDirectoryAtPath(getPackageFolderPath(previousPackageHash));
+            }
+
+            info.putString(PREVIOUS_PACKAGE_KEY, CodePushUtils.tryGetString(info, CURRENT_PACKAGE_KEY));
         }
 
-        info.putString(PREVIOUS_PACKAGE_KEY, CodePushUtils.tryGetString(info, CURRENT_PACKAGE_KEY));
         info.putString(CURRENT_PACKAGE_KEY, packageHash);
         updateCurrentPackageInfo(info);
     }