[image_picker_android] Adjust file extension in FileUtils when it does not match its mime type #3409
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…s not match its mime type.
added 2 commits
March 8, 2023 00:59
…hed_extension' into image_picker_android_fix_mismatched_extension
stuartmorgan
requested changes
Mar 8, 2023
There was a problem hiding this comment.
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.
| @@ -121,4 +128,8 @@ private static void copy(InputStream in, OutputStream out) throws IOException { | |||
| } | |||
| out.flush(); | |||
| } | |||
|
|
|||
| private static String getBaseName(String fileName) { | |||
| return fileName.split("\\.")[0]; | |||
There was a problem hiding this comment.
The basename is everything before the last ., not the first, so this will return the wrong name in some cases.
| shadowContentResolver.registerInputStream( | ||
| uri, new ByteArrayInputStream("imageStream".getBytes(UTF_8))); | ||
| String path = fileUtils.getPathFromUri(context, uri); | ||
| assertTrue(path.endsWith("png.png")); |
There was a problem hiding this comment.
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.
| String path = fileUtils.getPathFromUri(context, uri); | ||
| assertTrue(path.endsWith("png.png")); | ||
| } | ||
|
|
There was a problem hiding this comment.
Please add another test for the case where a file's basename contains .s.
| String path = fileUtils.getPathFromUri(context, uri); | ||
| assertTrue(path.endsWith("png.png")); | ||
| } | ||
|
|
There was a problem hiding this comment.
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.
added 2 commits
March 11, 2023 19:08
…d_fix_mismatched_extension # Conflicts: # packages/image_picker/image_picker_android/CHANGELOG.md # packages/image_picker/image_picker_android/pubspec.yaml
stuartmorgan
added
the
autosubmit
auto-submit
bot
removed
the
autosubmit
|
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. |
|
@stuartmorgan Fixed conflicts, auto-submit can be re-added. |
stuartmorgan
added
the
autosubmit
|
Thanks! |
|
Thank you all! |
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/flutter
that referenced
this pull request
Mar 20, 2023
…n it does not match its mime type (flutter/packages#3409)
tarrinneal
pushed a commit
to flutter/flutter
that referenced
this pull request
Mar 20, 2023
* 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)
nploi
pushed a commit
to nploi/packages
that referenced
this pull request
Jul 16, 2023
…s not match its mime type (flutter#3409) [image_picker_android] Adjust file extension in FileUtils when it does not match its mime type
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Sometimes a file name returned by the
ContentResolvercan 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
ContentResolverwas used if available, with mime-based extension used only as fallback.This PR fixes the regression by changing extension of the name returned from
ContentResolverso that it matches its mime type (if known).Fixes flutter/flutter#121878.
Pre-launch Checklist
dart format.)[shared_preferences]pubspec.yamlwith an appropriate new version according to the pub versioning philosophy, or this PR is exempt from version changes.CHANGELOG.mdto add a description of the change, following repository CHANGELOG style.///).If you need help, consider asking for advice on the #hackers-new channel on Discord.