You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by bo...@apache.org on 2012/06/07 22:20:55 UTC

[40/50] [abbrv] android commit: Fixing FileUtils change. We are using contexts now, not CordovaInterfaces. CordovaInterface is a SHOULD, not a MUST

Fixing FileUtils change.  We are using contexts now, not CordovaInterfaces.  CordovaInterface is a SHOULD, not a MUST


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

Branch: refs/heads/master
Commit: 79048a5a84f82d3ec52327b65f5e3e77b766cce9
Parents: aede223 d683bd3
Author: Joe Bowser <bo...@apache.org>
Authored: Tue May 15 08:55:42 2012 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Tue May 15 08:55:42 2012 -0700

----------------------------------------------------------------------
 framework/src/com/phonegap/api/PluginManager.java  |    3 +-
 .../src/org/apache/cordova/AccelListener.java      |  332 +-
 framework/src/org/apache/cordova/App.java          |  215 +-
 framework/src/org/apache/cordova/AudioHandler.java |  408 +-
 framework/src/org/apache/cordova/AudioPlayer.java  |  752 ++--
 .../src/org/apache/cordova/BatteryListener.java    |   49 +-
 .../src/org/apache/cordova/CallbackServer.java     |  591 ++--
 .../src/org/apache/cordova/CameraLauncher.java     |  222 +-
 framework/src/org/apache/cordova/Capture.java      |  116 +-
 .../src/org/apache/cordova/CompassListener.java    |   43 +-
 .../src/org/apache/cordova/ContactAccessor.java    |  211 +-
 .../org/apache/cordova/ContactAccessorSdk5.java    | 3125 +++++++--------
 .../org/apache/cordova/CordovaChromeClient.java    |  188 +-
 .../src/org/apache/cordova/CordovaException.java   |    4 +
 .../src/org/apache/cordova/CordovaWebView.java     | 1039 +++---
 .../org/apache/cordova/CordovaWebViewClient.java   |  284 +-
 framework/src/org/apache/cordova/Device.java       |   57 +-
 .../src/org/apache/cordova/DirectoryManager.java   |  199 +-
 framework/src/org/apache/cordova/DroidGap.java     |  856 ++---
 framework/src/org/apache/cordova/FileTransfer.java |  133 +-
 framework/src/org/apache/cordova/FileUtils.java    |   68 +-
 framework/src/org/apache/cordova/GeoBroker.java    |  183 +-
 framework/src/org/apache/cordova/HttpHandler.java  |  105 +-
 .../cordova/LinearLayoutSoftKeyboardDetect.java    |   27 +-
 .../src/org/apache/cordova/NetworkListener.java    |    6 +-
 .../src/org/apache/cordova/NetworkManager.java     |   51 +-
 framework/src/org/apache/cordova/Notification.java |  593 ++--
 framework/src/org/apache/cordova/SplashScreen.java |    3 +-
 framework/src/org/apache/cordova/StandAlone.java   |   18 +-
 framework/src/org/apache/cordova/Storage.java      |  395 +-
 framework/src/org/apache/cordova/TempListener.java |  130 +-
 .../org/apache/cordova/api/CordovaInterface.java   |  146 +-
 framework/src/org/apache/cordova/api/IPlugin.java  |   78 +-
 framework/src/org/apache/cordova/api/Plugin.java   |  121 +-
 .../src/org/apache/cordova/api/PluginEntry.java    |   12 +-
 .../src/org/apache/cordova/api/PluginManager.java  |   49 +-
 .../src/org/apache/cordova/api/PluginResult.java   |  186 +-
 .../org/apache/cordova/test/ActivityPlugin.java    |    4 +-
 38 files changed, 5505 insertions(+), 5497 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/79048a5a/framework/src/org/apache/cordova/FileUtils.java
----------------------------------------------------------------------
diff --cc framework/src/org/apache/cordova/FileUtils.java
index 75ce979,df6b37f..6351c2e
--- a/framework/src/org/apache/cordova/FileUtils.java
+++ b/framework/src/org/apache/cordova/FileUtils.java
@@@ -222,10 -223,9 +223,10 @@@ public class FileUtils extends Plugin 
       * @param filePath the path to check
       */
      private void notifyDelete(String filePath) {
 -        this.ctx.getActivity().getContentResolver().delete(MediaStore.Images.Media.EXTERNAL_CONTENT_URI,
 -                MediaStore.Images.Media.DATA + " = ?",
 -                new String[] { filePath });
 +        String newFilePath = stripFileProtocol(filePath);
 +        int result = this.ctx.getContentResolver().delete(MediaStore.Images.Media.EXTERNAL_CONTENT_URI,
-                 MediaStore.Images.Media.DATA + " = ?",
-                 new String[] {newFilePath});
++            MediaStore.Images.Media.DATA + " = ?",
++            new String[] { filePath });
      }
  
      /**