incubator-callback-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From macdo...@apache.org
Subject android commit: Fixing merge error in FileUtils.notifyDelete
Date Tue, 19 Jun 2012 15:29:21 GMT
Updated Branches:
  refs/heads/master 67d46432e -> 6c594b6f5


Fixing merge error in FileUtils.notifyDelete


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/6c594b6f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/6c594b6f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/6c594b6f

Branch: refs/heads/master
Commit: 6c594b6f5f22a3718b9f59c95854ef4cdd4ad614
Parents: 67d4643
Author: macdonst <simon.macdonald@gmail.com>
Authored: Tue Jun 19 11:29:00 2012 -0400
Committer: macdonst <simon.macdonald@gmail.com>
Committed: Tue Jun 19 11:29:00 2012 -0400

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


http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/6c594b6f/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 32b3c05..1dc6e05 100755
--- a/framework/src/org/apache/cordova/FileUtils.java
+++ b/framework/src/org/apache/cordova/FileUtils.java
@@ -225,7 +225,7 @@ public class FileUtils extends Plugin {
         String newFilePath = stripFileProtocol(filePath);
         int result = this.cordova.getActivity().getContentResolver().delete(MediaStore.Images.Media.EXTERNAL_CONTENT_URI,
             MediaStore.Images.Media.DATA + " = ?",
-            new String[] { filePath });
+            new String[] { newFilePath });
     }
 
     /**


Mime
View raw message