[image_picker_android] Adjust file extension in FileUtils when it does not match its mime type by SynSzakala · Pull Request #3409 · flutter/packages

SynSzakala · 2023-03-07T23:53:10Z

Sometimes a file name returned by the ContentResolver can have an extension that doesn't match its real type (e.g. if the file was re-encoded).
Previously file extension was selected only based on the mime type. flutter/plugins#6096 changed it, so that the name returned by ContentResolver was used if available, with mime-based extension used only as fallback.
This PR fixes the regression by changing extension of the name returned from ContentResolver so that it matches its mime type (if known).

Fixes flutter/flutter#121878.

Pre-launch Checklist

If you need help, consider asking for advice on the #hackers-new channel on Discord.

…s not match its mime type.

…hed_extension' into image_picker_android_fix_mismatched_extension

stuartmorgan-g

Thanks for the follow up PR!

I updated pubspec.yaml with an appropriate new version according to the pub versioning philosophy, or this PR is exempt from version changes.

I updated CHANGELOG.md to add a description of the change, following repository CHANGELOG style.

These changes aren't in the PR that was uploaded.

stuartmorgan-g · 2023-03-08T00:38:48Z

...ker/image_picker_android/android/src/main/java/io/flutter/plugins/imagepicker/FileUtils.java

  }
+
+  private static String getBaseName(String fileName) {
+    return fileName.split("\\.")[0];


The basename is everything before the last ., not the first, so this will return the wrong name in some cases.

stuartmorgan-g · 2023-03-08T00:42:12Z

.../image_picker_android/android/src/test/java/io/flutter/plugins/imagepicker/FileUtilTest.java

+    shadowContentResolver.registerInputStream(
+        uri, new ByteArrayInputStream("imageStream".getBytes(UTF_8)));
+    String path = fileUtils.getPathFromUri(context, uri);
+    assertTrue(path.endsWith("png.png"));


Please do not make the filename and the extension the same; this would mask bugs that used the wrong components when constructing the output name.

stuartmorgan-g · 2023-03-08T00:42:46Z

.../image_picker_android/android/src/test/java/io/flutter/plugins/imagepicker/FileUtilTest.java

+    String path = fileUtils.getPathFromUri(context, uri);
+    assertTrue(path.endsWith("png.png"));
+  }
+


Please add another test for the case where a file's basename contains .s.

stuartmorgan-g · 2023-03-08T00:46:05Z

.../image_picker_android/android/src/test/java/io/flutter/plugins/imagepicker/FileUtilTest.java

+    String path = fileUtils.getPathFromUri(context, uri);
+    assertTrue(path.endsWith("png.png"));
+  }
+


You created a new codepath in this PR for the case where the filename is non-null but the extension is null; that case needs a test as well.

…pe in FileUtils.

…d_fix_mismatched_extension # Conflicts: # packages/image_picker/image_picker_android/CHANGELOG.md # packages/image_picker/image_picker_android/pubspec.yaml

stuartmorgan-g

LGTM!

gmackall

LGTM as well!

auto-submit · 2023-03-16T17:29:41Z

auto label is removed for flutter/packages, pr: 3409, due to - This commit is not mergeable and has conflicts. Please rebase your PR and fix all the conflicts.

SynSzakala · 2023-03-17T08:56:54Z

@stuartmorgan Fixed conflicts, auto-submit can be re-added.

stuartmorgan-g · 2023-03-17T19:17:32Z

Thanks!

reimager · 2023-03-20T01:04:29Z

Thank you all!

…n it does not match its mime type (flutter/packages#3409)

* 7636eb7 [go_router_builder] Support default value for `Set`, `List` and `Iterable` route parameters (flutter/packages#3391) * 26c95da [image_picker] Move HashSet construction within if-statement (flutter/packages#3448) * f5687b2 [image_picker] fix typos in comments (flutter/packages#3413) * 84afba7 [image_picker] Migrate Android to Pigeon (flutter/packages#3476) * 42927fc [image_picker]: Bump androidx.exifinterface:exifinterface from 1.3.3 to 1.3.6 in /packages/image_picker/image_picker_android/android (flutter/packages#3238) * 9a44bdf Require Dart SDK 2.14, because of using APIs. (flutter/packages#3468) * 12609a2 [ci] Clean up iOS simulators (flutter/packages#3458) * 9b136a9 [ci/tool] Add external dependency validation (flutter/packages#3466) * 11aab47 Manual roll Flutter from fb7e828 to 67e5f66 (8 revisions) (flutter/packages#3482) * 784291b Update goldens (flutter/packages#3442) * 43a42d1 [webview_flutter_android] Updates Dart and Java InstanceManagers (flutter/packages#3282) * d0de136 [camera] Reland android flip/change camera while recording (flutter/packages#3460) * 74fd094 [image_picker_android] Adjust file extension in FileUtils when it does not match its mime type (flutter/packages#3409) * d2f1d2d [flutter_adaptive_scaffold] : 🐛 [FIX] : Issue: 121135. (flutter/packages#3253) * 3d078b5 Roll Flutter from 67e5f66 to 53dfd23 (39 revisions) (flutter/packages#3484) * 3b3a09d [url_launcher] Convert iOS to Pigeon (flutter/packages#3481) * 80cd50a Roll Flutter from 53dfd23 to 6bd2b3c (17 revisions) (flutter/packages#3486) * 998bb29 [webview_flutter] Updates the README with the migration of `WebView.initialCookies` and Hybrid Composition on (flutter/packages#3470) * bbf86a7 Roll Flutter from 6bd2b3c to 3e4e092 (7 revisions) (flutter/packages#3490)

…s not match its mime type (flutter#3409) [image_picker_android] Adjust file extension in FileUtils when it does not match its mime type

[image_picker_android] Adjust file extension in FileUtils when it doe…

0e80b62

…s not match its mime type.

SynSzakala requested a review from gmackall as a code owner March 7, 2023 23:53

Merge branch 'main' into image_picker_android_fix_mismatched_extension

033fec4

github-actions bot added p: image_picker platform-android labels Mar 7, 2023

jakub.walusiak added 2 commits March 8, 2023 00:59

[image_picker_android] Fixed formatting

a76ca85

Merge remote-tracking branch 'origin/image_picker_android_fix_mismatc…

40c0605

…hed_extension' into image_picker_android_fix_mismatched_extension

stuartmorgan-g requested changes Mar 8, 2023

View reviewed changes

jakub.walusiak added 2 commits March 11, 2023 19:08

[in_app_purchases_android_platform] Add test case for unknown mime ty…

637d240

…pe in FileUtils.

Merge remote-tracking branch 'upstream/main' into image_picker_androi…

b9bf893

…d_fix_mismatched_extension # Conflicts: # packages/image_picker/image_picker_android/CHANGELOG.md # packages/image_picker/image_picker_android/pubspec.yaml

SynSzakala requested review from stuartmorgan-g and removed request for gmackall March 11, 2023 18:12

SynSzakala and others added 3 commits March 13, 2023 10:21

Merge branch 'main' into image_picker_android_fix_mismatched_extension

4aa46c3

[in_app_purchases_android_platform] Fix formatting in FileUtilTest

31cb6b6

Merge branch 'main' into image_picker_android_fix_mismatched_extension

9318db9

stuartmorgan-g approved these changes Mar 14, 2023

View reviewed changes

stuartmorgan-g requested review from gmackall and reidbaker March 14, 2023 17:41

gmackall approved these changes Mar 16, 2023

View reviewed changes

stuartmorgan-g added the autosubmit Merge PR when tree becomes green via auto submit App label Mar 16, 2023

auto-submit bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Mar 16, 2023

Merge branch 'main' into image_picker_android_fix_mismatched_extension

71af4a2

stuartmorgan-g added the autosubmit Merge PR when tree becomes green via auto submit App label Mar 17, 2023

auto-submit bot merged commit 74fd094 into flutter:main Mar 17, 2023

engine-flutter-autoroll mentioned this pull request Mar 20, 2023

Roll Packages from 44ddf2ceeb00 to bbf86a7e1a83 (19 revisions) flutter/flutter#123015

Merged

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Mar 20, 2023

74fd094 [image_picker_android] Adjust file extension in FileUtils whe…

892c473

…n it does not match its mime type (flutter/packages#3409)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[image_picker_android] Adjust file extension in FileUtils when it does not match its mime type#3409

[image_picker_android] Adjust file extension in FileUtils when it does not match its mime type#3409
auto-submit[bot] merged 10 commits intoflutter:mainfrom
Utopia-USS:image_picker_android_fix_mismatched_extension

SynSzakala commented Mar 7, 2023

Uh oh!

stuartmorgan-g left a comment

Uh oh!

stuartmorgan-g Mar 8, 2023

Uh oh!

stuartmorgan-g Mar 8, 2023

Uh oh!

stuartmorgan-g Mar 8, 2023

Uh oh!

stuartmorgan-g Mar 8, 2023

Uh oh!

stuartmorgan-g left a comment

Uh oh!

gmackall left a comment

Uh oh!

auto-submit bot commented Mar 16, 2023

Uh oh!

SynSzakala commented Mar 17, 2023

Uh oh!

stuartmorgan-g commented Mar 17, 2023

Uh oh!

reimager commented Mar 20, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

SynSzakala commented Mar 7, 2023

Pre-launch Checklist

Uh oh!

stuartmorgan-g left a comment

Choose a reason for hiding this comment

Uh oh!

stuartmorgan-g Mar 8, 2023

Choose a reason for hiding this comment

Uh oh!

stuartmorgan-g Mar 8, 2023

Choose a reason for hiding this comment

Uh oh!

stuartmorgan-g Mar 8, 2023

Choose a reason for hiding this comment

Uh oh!

stuartmorgan-g Mar 8, 2023

Choose a reason for hiding this comment

Uh oh!

stuartmorgan-g left a comment

Choose a reason for hiding this comment

Uh oh!

gmackall left a comment

Choose a reason for hiding this comment

Uh oh!

auto-submit bot commented Mar 16, 2023

Uh oh!

SynSzakala commented Mar 17, 2023

Uh oh!

stuartmorgan-g commented Mar 17, 2023

Uh oh!

reimager commented Mar 20, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants