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 495BED3FE for ; Wed, 3 Oct 2012 15:32:11 +0000 (UTC) Received: (qmail 48826 invoked by uid 500); 3 Oct 2012 15:32:11 -0000 Delivered-To: apmail-incubator-callback-commits-archive@incubator.apache.org Received: (qmail 48789 invoked by uid 500); 3 Oct 2012 15:32:11 -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 48782 invoked by uid 99); 3 Oct 2012 15:32:11 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Oct 2012 15:32:11 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id D144437AA3; Wed, 3 Oct 2012 15:32:10 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: macdonst@apache.org To: callback-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: android commit: Guard against null pointer exception in ES File Explorer being used to get a picture using DATA_URL Message-Id: <20121003153210.D144437AA3@tyr.zones.apache.org> Date: Wed, 3 Oct 2012 15:32:10 +0000 (UTC) Updated Branches: refs/heads/master 979ae9469 -> 5d34aa0af Guard against null pointer exception in ES File Explorer being used to get a picture using DATA_URL 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/5d34aa0a Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/5d34aa0a Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/5d34aa0a Branch: refs/heads/master Commit: 5d34aa0afefad62e604fb1717be8860ff3579b2c Parents: 979ae94 Author: Simon MacDonald Authored: Wed Oct 3 11:31:58 2012 -0400 Committer: Simon MacDonald Committed: Wed Oct 3 11:31:58 2012 -0400 ---------------------------------------------------------------------- .../src/org/apache/cordova/CameraLauncher.java | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/5d34aa0a/framework/src/org/apache/cordova/CameraLauncher.java ---------------------------------------------------------------------- diff --git a/framework/src/org/apache/cordova/CameraLauncher.java b/framework/src/org/apache/cordova/CameraLauncher.java index 211cb42..efb14fc 100755 --- a/framework/src/org/apache/cordova/CameraLauncher.java +++ b/framework/src/org/apache/cordova/CameraLauncher.java @@ -388,9 +388,12 @@ public class CameraLauncher extends Plugin implements MediaScannerConnectionClie } else { // Get the path to the image. Makes loading so much easier. String imagePath = FileUtils.getRealPathFromURI(uri, this.cordova); - Log.d(LOG_TAG, "Real path = " + imagePath); + String mimeType = FileUtils.getMimeType(imagePath); + // Log.d(LOG_TAG, "Real path = " + imagePath); + // Log.d(LOG_TAG, "mime type = " + mimeType); // If we don't have a valid image so quit. - if (imagePath == null) { + if (imagePath == null || mimeType == null || + !(mimeType.equalsIgnoreCase("image/jpeg") || mimeType.equalsIgnoreCase("image/png"))) { Log.d(LOG_TAG, "I either have a null image path or bitmap"); this.failPicture("Unable to retrieve path to picture!"); return;