From 581ccfc472b116a6aef7eee4825fb09868a5c080 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julio=20C=C3=A9sar?= Date: Sat, 24 Nov 2018 22:56:46 +0100 Subject: [PATCH] Android: return DATA_URL for ALLMEDIA if it's an image --- src/android/CameraLauncher.java | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/src/android/CameraLauncher.java b/src/android/CameraLauncher.java index 03210828b..dca09065f 100644 --- a/src/android/CameraLauncher.java +++ b/src/android/CameraLauncher.java @@ -691,15 +691,15 @@ private void processResultFromGallery(int destType, Intent intent) { String fileLocation = FileHelper.getRealPath(uri, this.cordova); LOG.d(LOG_TAG, "File locaton is: " + fileLocation); - // If you ask for video or all media type you will automatically get back a file URI - // and there will be no attempt to resize any returned data - if (this.mediaType != PICTURE) { + String uriString = uri.toString(); + String mimeType = FileHelper.getMimeType(uriString, this.cordova); + + // If you ask for video or the selected file doesn't have JPEG or PNG mime type + // there will be no attempt to resize any returned data + if (this.mediaType == VIDEO || !(JPEG_MIME_TYPE.equalsIgnoreCase(mimeType) || PNG_MIME_TYPE.equalsIgnoreCase(mimeType))) { this.callbackContext.success(fileLocation); } else { - String uriString = uri.toString(); - // Get the path to the image. Makes loading so much easier. - String mimeType = FileHelper.getMimeType(uriString, this.cordova); // This is a special case to just return the path as no scaling, // rotating, nor compressing needs to be done @@ -709,12 +709,6 @@ private void processResultFromGallery(int destType, Intent intent) { { this.callbackContext.success(uriString); } else { - // If we don't have a valid image so quit. - if (!(JPEG_MIME_TYPE.equalsIgnoreCase(mimeType) || PNG_MIME_TYPE.equalsIgnoreCase(mimeType))) { - LOG.d(LOG_TAG, "I either have a null image path or bitmap"); - this.failPicture("Unable to retrieve path to picture!"); - return; - } Bitmap bitmap = null; try { bitmap = getScaledAndRotatedBitmap(uriString);