incubator-callback-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bows...@apache.org
Subject [9/21] android commit: remove file:// protocol from various fileutils remove methods
Date Mon, 20 Feb 2012 21:01:00 GMT
remove file:// protocol from various fileutils remove methods


Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/commit/c099c653
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/c099c653
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/c099c653

Branch: refs/heads/master
Commit: c099c653658f63fff1e3db6cd25898bdc347e81f
Parents: 79ba28d
Author: Fil Maj <filip.maj@nitobi.com>
Authored: Thu Feb 16 17:31:07 2012 -0800
Committer: Joe Bowser <bowserj@apache.org>
Committed: Mon Feb 20 11:04:36 2012 -0800

----------------------------------------------------------------------
 framework/src/org/apache/cordova/FileUtils.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/c099c653/framework/src/org/apache/cordova/FileUtils.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/FileUtils.java b/framework/src/org/apache/cordova/FileUtils.java
index 3646be6..87be54f 100755
--- a/framework/src/org/apache/cordova/FileUtils.java
+++ b/framework/src/org/apache/cordova/FileUtils.java
@@ -555,6 +555,10 @@ public class FileUtils extends Plugin {
      * @throws FileExistsException
      */
     private boolean removeRecursively(String filePath) throws FileExistsException {
+        if (filePath.startsWith("file://")) {
+            filePath = filePath.substring(7);
+        }
+
         File fp = new File(filePath);
 
         // You can't delete the root directory.
@@ -596,6 +600,10 @@ public class FileUtils extends Plugin {
      * @throws InvalidModificationException
      */
     private boolean remove(String filePath) throws NoModificationAllowedException, InvalidModificationException
{
+        if (filePath.startsWith("file://")) {
+            filePath = filePath.substring(7);
+        }
+
         File fp = new File(filePath);
 
         // You can't delete the root directory.


Mime
View raw message