Merge pull request #443 from Microsoft/fix-not-empty-directory-warning

Fix ENOTEMPTY warning

Author: Richard Hua

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

@@ -54,25 +54,11 @@ public static void copyDirectoryContents(String sourceDirectoryPath, String dest
         }
     }
 
-    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) {
@@ -86,9 +72,7 @@ public static void deleteFileOrFolderSilently(File file) {
                 if (fileEntry.isDirectory()) {
                     deleteFileOrFolderSilently(fileEntry);
                 } else {
-                    if (!file.delete()) {
-                        fileEntry.delete();
-                    }
+                    fileEntry.delete();
                 }
             }
         }
@@ -147,7 +131,7 @@ public static void unzipFile(File zipFile, String destination) throws IOExceptio
 
             File destinationFolder = new File(destination);
             if (destinationFolder.exists()) {
-                deleteDirectory(destinationFolder);
+                deleteFileOrFolderSilently(destinationFolder);
             }
 
             destinationFolder.mkdirs();