From d14303f48ade38873f1611640e70630473e4d290 Mon Sep 17 00:00:00 2001 From: Karthik Ponnam Date: Sun, 30 Aug 2020 11:15:27 +0530 Subject: [PATCH 1/3] #52419 Fixes pickVideo returns jpg --- .../java/io/flutter/plugins/imagepicker/FileUtils.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/image_picker/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/FileUtils.java b/packages/image_picker/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/FileUtils.java index 9ebf1fad826b..a55fbd55a054 100644 --- a/packages/image_picker/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/FileUtils.java +++ b/packages/image_picker/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/FileUtils.java @@ -67,13 +67,13 @@ String getPathFromUri(final Context context, final Uri uri) { } /** @return extension of image with dot, or default .jpg if it none. */ - private static String getImageExtension(Uri uriImage) { + private static String getImageExtension(Uri uriImage, Context context) { String extension = null; try { - String imagePath = uriImage.getPath(); - if (imagePath != null && imagePath.lastIndexOf(".") != -1) { - extension = imagePath.substring(imagePath.lastIndexOf(".") + 1); + String mimeType = context.getContentResolver().getType(uriImage); + if(mimeType != null && mimeType.lastIndexOf("/") != -1) { + extension = mimeType.substring(mimeType.lastIndexOf("/") + 1); } } catch (Exception e) { extension = null; From d4f25427eea91560a0502f9d8c8f37486d7c6621 Mon Sep 17 00:00:00 2001 From: Karthik Ponnam Date: Sun, 30 Aug 2020 11:16:37 +0530 Subject: [PATCH 2/3] #52419 Fixes pickVideo returns jpg --- .../src/main/java/io/flutter/plugins/imagepicker/FileUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/image_picker/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/FileUtils.java b/packages/image_picker/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/FileUtils.java index a55fbd55a054..c98acb863ac6 100644 --- a/packages/image_picker/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/FileUtils.java +++ b/packages/image_picker/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/FileUtils.java @@ -39,7 +39,7 @@ String getPathFromUri(final Context context, final Uri uri) { OutputStream outputStream = null; boolean success = false; try { - String extension = getImageExtension(uri); + String extension = getImageExtension(uri, context); inputStream = context.getContentResolver().openInputStream(uri); file = File.createTempFile("image_picker", extension, context.getCacheDir()); file.deleteOnExit(); From 6743a9f9700dd70a6762d0c14b05a204d0c50e7a Mon Sep 17 00:00:00 2001 From: Karthik Ponnam Date: Sun, 30 Aug 2020 12:06:30 +0530 Subject: [PATCH 3/3] Format Fix --- .../src/main/java/io/flutter/plugins/imagepicker/FileUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/image_picker/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/FileUtils.java b/packages/image_picker/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/FileUtils.java index c98acb863ac6..a064e1959ea6 100644 --- a/packages/image_picker/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/FileUtils.java +++ b/packages/image_picker/image_picker/android/src/main/java/io/flutter/plugins/imagepicker/FileUtils.java @@ -72,7 +72,7 @@ private static String getImageExtension(Uri uriImage, Context context) { try { String mimeType = context.getContentResolver().getType(uriImage); - if(mimeType != null && mimeType.lastIndexOf("/") != -1) { + if (mimeType != null && mimeType.lastIndexOf("/") != -1) { extension = mimeType.substring(mimeType.lastIndexOf("/") + 1); } } catch (Exception e) {