From ec4504050d83daa7b32489f924b9510689f6ac2e Mon Sep 17 00:00:00 2001 From: Alister Stevens Date: Tue, 21 Jan 2025 08:24:50 +0000 Subject: [PATCH] fix(android): Prevent out of memory errors on Android when selecting large media (video) files from the gallery picker. Changes from #906 resulted in all gallery picker results being read in full into a byte array. This works fine when dealing with images, however when larger files (videos for example) are selected it will nearly always result in an out of memory error (reading too much data in one go). With videos no transformation is required, the URI simply need to be returned. --- src/android/CameraLauncher.java | 143 ++++++++++++-------------------- 1 file changed, 54 insertions(+), 89 deletions(-) diff --git a/src/android/CameraLauncher.java b/src/android/CameraLauncher.java index aea896e43..64d993fda 100644 --- a/src/android/CameraLauncher.java +++ b/src/android/CameraLauncher.java @@ -741,6 +741,23 @@ private void processResultFromGallery(int destType, Intent intent) { String uriString = uri.toString(); String mimeTypeOfGalleryFile = FileHelper.getMimeType(uriString, this.cordova); + + // If you ask for video or the selected file cannot be processed + // there will be no attempt to resize any returned data. + if (this.mediaType == VIDEO || !isImageMimeTypeProcessable(mimeTypeOfGalleryFile)) { + this.callbackContext.success(uriString); + return; + } + + // This is a special case to just return the path as no scaling, + // rotating, nor compressing needs to be done + if (this.targetHeight == -1 && this.targetWidth == -1 && + destType == FILE_URI && !this.correctOrientation && + getMimetypeForEncodingType().equalsIgnoreCase(mimeTypeOfGalleryFile)) { + this.callbackContext.success(uriString); + return; + } + InputStream input; try { input = cordova.getActivity().getContentResolver().openInputStream(uri); @@ -756,105 +773,53 @@ private void processResultFromGallery(int destType, Intent intent) { try { byte[] data = readData(input); + Bitmap bitmap = null; - // If you ask for video or the selected file cannot be processed - // there will be no attempt to resize any returned data. - if (this.mediaType == VIDEO || !isImageMimeTypeProcessable(mimeTypeOfGalleryFile)) { - this.callbackContext.success(uriString); - } else { - Bitmap bitmap = null; + try { + bitmap = getScaledAndRotatedBitmap(data, mimeTypeOfGalleryFile); + } catch (IOException e) { + e.printStackTrace(); + } - // This is a special case to just return the path as no scaling, - // rotating, nor compressing needs to be done - if (this.targetHeight == -1 && this.targetWidth == -1 && - destType == FILE_URI && !this.correctOrientation && - getMimetypeForEncodingType().equalsIgnoreCase(mimeTypeOfGalleryFile)) { - this.callbackContext.success(uriString); - } else { - try { - bitmap = getScaledAndRotatedBitmap(data, mimeTypeOfGalleryFile); - } catch (IOException e) { - e.printStackTrace(); - } - if (bitmap == null) { - LOG.d(LOG_TAG, "I either have an unreadable uri or null bitmap"); - this.failPicture("Unable to create bitmap!"); - return; - } + if (bitmap == null) { + LOG.d(LOG_TAG, "I either have an unreadable uri or null bitmap"); + this.failPicture("Unable to create bitmap!"); + return; + } - // If sending base64 image back - if (destType == DATA_URL) { - this.processPicture(bitmap, this.encodingType); - } + // If sending base64 image back + if (destType == DATA_URL) { + this.processPicture(bitmap, this.encodingType); + } + // If sending filename back + else if (destType == FILE_URI) { + // Did we modify the image? + if ((this.targetHeight > 0 && this.targetWidth > 0) || + (this.correctOrientation && this.orientationCorrected) || + !mimeTypeOfGalleryFile.equalsIgnoreCase(getMimetypeForEncodingType())) { + try { + String modifiedPath = this.outputModifiedBitmap(bitmap, uri, mimeTypeOfGalleryFile); + // The modified image is cached by the app in order to get around this and not have to delete you + // application cache I'm adding the current system time to the end of the file url. + this.callbackContext.success("file://" + modifiedPath + "?" + System.currentTimeMillis()); - // If sending filename back - else if (destType == FILE_URI) { - // Did we modify the image? - if ((this.targetHeight > 0 && this.targetWidth > 0) || - (this.correctOrientation && this.orientationCorrected) || - !mimeTypeOfGalleryFile.equalsIgnoreCase(getMimetypeForEncodingType())) { - try { - String modifiedPath = this.outputModifiedBitmap(bitmap, uri, mimeTypeOfGalleryFile); - // The modified image is cached by the app in order to get around this and not have to delete you - // application cache I'm adding the current system time to the end of the file url. - this.callbackContext.success("file://" + modifiedPath + "?" + System.currentTimeMillis()); - - } catch (Exception e) { - e.printStackTrace(); - this.failPicture("Error retrieving image: " + e.getLocalizedMessage()); - } - } else { - this.callbackContext.success(uriString); - } - } - if (bitmap != null) { - bitmap.recycle(); - bitmap = null; + } catch (Exception e) { + e.printStackTrace(); + this.failPicture("Error retrieving image: " + e.getLocalizedMessage()); } - System.gc(); - } - if (bitmap == null) { - LOG.d(LOG_TAG, "I either have an unreadable uri or null bitmap"); - this.failPicture("Unable to create bitmap!"); - return; - } - - // If sending base64 image back - if (destType == DATA_URL) { - this.processPicture(bitmap, this.encodingType); + } else { + this.callbackContext.success(uriString); } + } - // If sending filename back - else if (destType == FILE_URI) { - // Did we modify the image? - if ( (this.targetHeight > 0 && this.targetWidth > 0) || - (this.correctOrientation && this.orientationCorrected) || - !mimeTypeOfGalleryFile.equalsIgnoreCase(getMimetypeForEncodingType())) - { - try { - String modifiedPath = this.outputModifiedBitmap(bitmap, uri, mimeTypeOfGalleryFile); - // The modified image is cached by the app in order to get around this and not have to delete you - // application cache I'm adding the current system time to the end of the file url. - this.callbackContext.success("file://" + modifiedPath + "?" + System.currentTimeMillis()); - - } catch (Exception e) { - e.printStackTrace(); - this.failPicture("Error retrieving image: "+e.getLocalizedMessage()); - } - } else { - this.callbackContext.success(uriString); - } - } - if (bitmap != null) { - bitmap.recycle(); - bitmap = null; - } - System.gc(); + if (bitmap != null) { + bitmap.recycle(); + bitmap = null; } + System.gc(); input.close(); - } - catch (Exception e) { + } catch (Exception e) { try { input.close(); } catch (IOException ex) {