From b20d56f8f2f8e5559a7b0ec731a8bf474813610b Mon Sep 17 00:00:00 2001
From: Richard Hua <rihua@microsoft.com>
Date: Fri, 29 Jul 2016 18:07:11 -0700
Subject: [PATCH 1/2] Do not attempt to remove a directory before its children
 have been deleted

---
 .../src/main/java/com/microsoft/codepush/react/FileUtils.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/android/app/src/main/java/com/microsoft/codepush/react/FileUtils.java b/android/app/src/main/java/com/microsoft/codepush/react/FileUtils.java
index fcc8cf5..c35a44c 100644
--- a/android/app/src/main/java/com/microsoft/codepush/react/FileUtils.java
+++ b/android/app/src/main/java/com/microsoft/codepush/react/FileUtils.java
@@ -86,9 +86,7 @@ public class FileUtils {
                 if (fileEntry.isDirectory()) {
                     deleteFileOrFolderSilently(fileEntry);
                 } else {
-                    if (!file.delete()) {
-                        fileEntry.delete();
-                    }
+                    fileEntry.delete();
                 }
             }
         }

From 9299748f2ed1d2015d2572b7355d9446a3c1e71d Mon Sep 17 00:00:00 2001
From: Richard Hua <rihua@microsoft.com>
Date: Fri, 29 Jul 2016 18:28:00 -0700
Subject: [PATCH 2/2] Refactoring - remove deleteDirectory() function

---
 .../microsoft/codepush/react/FileUtils.java   | 24 ++++---------------
 1 file changed, 5 insertions(+), 19 deletions(-)

diff --git a/android/app/src/main/java/com/microsoft/codepush/react/FileUtils.java b/android/app/src/main/java/com/microsoft/codepush/react/FileUtils.java
index c35a44c..f4d9974 100644
--- a/android/app/src/main/java/com/microsoft/codepush/react/FileUtils.java
+++ b/android/app/src/main/java/com/microsoft/codepush/react/FileUtils.java
@@ -54,25 +54,11 @@ public class FileUtils {
         }
     }
 
-    public static void deleteDirectory(File directory) {
-        if (directory.exists()) {
-            File[] files = directory.listFiles();
-            if (files != null) {
-                for (File file : files) {
-                    if(file.isDirectory()) {
-                        deleteDirectory(file);
-                    }
-                    else {
-                        file.delete();
-                    }
-                }
-            }
-        }
-        directory.delete();
-    }
-
     public static void deleteDirectoryAtPath(String directoryPath) {
-        deleteDirectory(new File(directoryPath));
+        File file = new File(directoryPath);
+        if (file.exists()) {
+            deleteFileOrFolderSilently(file);
+        }
     }
 
     public static void deleteFileAtPathSilently(String path) {
@@ -145,7 +131,7 @@ public class FileUtils {
 
             File destinationFolder = new File(destination);
             if (destinationFolder.exists()) {
-                deleteDirectory(destinationFolder);
+                deleteFileOrFolderSilently(destinationFolder);
             }
             
             destinationFolder.mkdirs();