android add google diff-match-patch

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

@@ -226,6 +226,7 @@ public void downloadPackage(JSONObject updatePackage, String expectedBundleFileN
             if (isDiffUpdate) {
                 String currentPackageFolderPath = getCurrentPackageFolderPath();
                 CodePushUpdateUtils.copyNecessaryFilesFromCurrentPackage(diffManifestFilePath, currentPackageFolderPath, newUpdateFolderPath);
+                CodePushUpdateUtils.diffPatchApplyNecessaryFilesFromCurrentPackage(diffManifestFilePath, currentPackageFolderPath, unzippedFolderPath);
                 File diffManifestFile = new File(diffManifestFilePath);
                 diffManifestFile.delete();
             }

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

@@ -27,8 +27,12 @@
 import java.security.spec.X509EncodedKeySpec;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
 import java.util.Map;
 
+import name.fraser.neil.plaintext.diff_match_patch;
+
 public class CodePushUpdateUtils {
 
     public static final String NEW_LINE = System.getProperty("line.separator");
@@ -113,6 +117,31 @@ public static void copyNecessaryFilesFromCurrentPackage(String diffManifestFileP
         }
     }
 
+    public static void diffPatchApplyNecessaryFilesFromCurrentPackage(String diffManifestFilePath, String currentPackageFolderPath, String unzippedFolderPath) throws IOException {
+        diff_match_patch dmp = new diff_match_patch();
+        JSONObject diffManifest = CodePushUtils.getJsonObjectFromFile(diffManifestFilePath);
+        JSONArray patchedFiles = new JSONArray();
+        try {
+            patchedFiles = diffManifest.getJSONArray("patchedFiles");
+        } catch (JSONException ignored) {
+
+        }
+        try {
+            for (int i = 0; i < patchedFiles.length(); i++) {
+                String fileNameToPatch = patchedFiles.getString(i);
+                File fileToPatch = new File(currentPackageFolderPath, fileNameToPatch);
+                File patchFile = new File(unzippedFolderPath, fileNameToPatch);
+                if (fileToPatch.exists() && patchFile.exists()) {
+                    List<diff_match_patch.Patch> patches = dmp.patch_fromText(FileUtils.readFileToString(patchFile.getAbsolutePath()));
+                    Object[] results = dmp.patch_apply((LinkedList<diff_match_patch.Patch>) patches, FileUtils.readFileToString(fileToPatch.getAbsolutePath()));
+                    FileUtils.writeStringToFile((String) results[0], patchFile.getAbsolutePath());
+                }
+            }
+        } catch (JSONException e) {
+            throw new CodePushUnknownException("Unable to diff-patch-apply files from current package during diff update", e);
+        }
+    }
+
     public static String findJSBundleInUpdateContents(String folderPath, String expectedFileName) {
         File folder = new File(folderPath);
         File[] folderFiles = folder.listFiles();
@@ -264,4 +293,4 @@ public static void verifyUpdateSignature(String folderPath, String packageHash,
 
         CodePushUtils.log("The update contents succeeded the code signing check.");
     }
-}
+}