Return-Path: X-Original-To: apmail-incubator-callback-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-callback-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 674999F91 for ; Thu, 7 Jun 2012 20:20:57 +0000 (UTC) Received: (qmail 9422 invoked by uid 500); 7 Jun 2012 20:20:56 -0000 Delivered-To: apmail-incubator-callback-commits-archive@incubator.apache.org Received: (qmail 9366 invoked by uid 500); 7 Jun 2012 20:20:56 -0000 Mailing-List: contact callback-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: callback-dev@incubator.apache.org Delivered-To: mailing list callback-commits@incubator.apache.org Received: (qmail 8769 invoked by uid 99); 7 Jun 2012 20:20:55 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Jun 2012 20:20:55 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 4218110ABF; Thu, 7 Jun 2012 20:20:55 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bowserj@apache.org To: callback-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [40/50] [abbrv] android commit: Fixing FileUtils change. We are using contexts now, not CordovaInterfaces. CordovaInterface is a SHOULD, not a MUST Message-Id: <20120607202055.4218110ABF@tyr.zones.apache.org> Date: Thu, 7 Jun 2012 20:20:55 +0000 (UTC) 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 Authored: Tue May 15 08:55:42 2012 -0700 Committer: Joe Bowser 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 }); } /**