github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-02-22 00:32:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Guard against null pointer exception in ES File Explorer being used to get a picture using DATA_URL

Browse Source
This commit is contained in:
Simon MacDonald 2012-10-03 11:31:58 -04:00
parent 979ae94698
commit 5d34aa0afe
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
framework/src/org/apache/cordova/CameraLauncher.java
View File

@ -388,9 +388,12 @@ public class CameraLauncher extends Plugin implements MediaScannerConnectionClie
} else { } else {
// Get the path to the image. Makes loading so much easier. // Get the path to the image. Makes loading so much easier.
String imagePath = FileUtils.getRealPathFromURI(uri, this.cordova); 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 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"); Log.d(LOG_TAG, "I either have a null image path or bitmap");
this.failPicture("Unable to retrieve path to picture!"); this.failPicture("Unable to retrieve path to picture!");
return; return;