Support JPGs (in addition to PNGs) as feedback screenshots and set correct content-type/filename #4783
Conversation
This file contains hidden or 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
Generated by 🚫 Danger |
Coverage Report 1Affected Products
Test Logs |
Size Report 1Affected Products
Test Logs |
Startup Time Report 1Note: Layout is sometimes suboptimal due to limited formatting support on GitHub. Please check this report on GCS. Startup time comparison between the CI merge commit (b9aaa74) and the base commit (05f8d44) are not available. No macrobenchmark data found for the base commit (05f8d44). Analysis for the CI merge commit (b9aaa74) can be found at: |
kaibolay
reviewed
Mar 14, 2023
| String.format( | ||
| "Unable to get filename from URI '%s', using default '%s'", | ||
| contentUri, DEFAULT_FILENAME)); | ||
| return DEFAULT_FILENAME; |
There was a problem hiding this comment.
This should probably be based on the content type (if we were able to figure that out), so have a default filename for each (supported) content type.
There was a problem hiding this comment.
Done. I am also letting unknown content types through, with a filename with no extension. It will still fail to upload in our backend but this way we're less rigid in the SDK, and can always add support for more file types in the backend.
| "Error getting filename from URI '%s', using default '%s'", | ||
| contentUri, DEFAULT_FILENAME), | ||
| e); | ||
| return DEFAULT_FILENAME; |
kaibolay
approved these changes
Mar 14, 2023
| } else if (screenshotUri.getScheme().equals("content")) { | ||
| contentType = contentResolver.getType(screenshotUri); | ||
| } | ||
| if (contentType == null) { |
There was a problem hiding this comment.
nit: I'd flip the condition:
if (contentType != null} {
return contentType;
}
LogWrapper...
return CONTENT_TYPE_PNG
24456dc to
423e4f0
Compare
lfkellogg
added a commit
that referenced
this pull request
Mar 14, 2023
…rrect content-type/filename (#4783) * Support PNGs as feedback screenshots * Add tests and inject ContentResolver * Address feedback * Flip order of conditional
lfkellogg
added a commit
that referenced
this pull request
Mar 15, 2023
* Some App Distribution javadoc updates (#4740) * Support JPGs (in addition to PNGs) as feedback screenshots and set correct content-type/filename (#4783) * Support PNGs as feedback screenshots * Add tests and inject ContentResolver * Address feedback * Flip order of conditional * Update changelog and version for M129
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
No description provided.