From 5d34aa0afefad62e604fb1717be8860ff3579b2c Mon Sep 17 00:00:00 2001 From: Simon MacDonald Date: Wed, 3 Oct 2012 11:31:58 -0400 Subject: [PATCH] Guard against null pointer exception in ES File Explorer being used to get a picture using DATA_URL --- framework/src/org/apache/cordova/CameraLauncher.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/framework/src/org/apache/cordova/CameraLauncher.java b/framework/src/org/apache/cordova/CameraLauncher.java index 211cb42d..efb14fc8 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;