Optimize I/O code using Okio #4366
Merged
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
…e buffer segments and properly close input and output in all cases
…rs, increasing the chunk size and correctly handle Okio retries by allowing the source stream to be reopened multiple times.
…ntentProvider is unavailable during Uri RequestBody read
Goooler
approved these changes
Apr 10, 2024
| fun onProgressUpdate(percentage: Int) | ||
| } | ||
|
|
||
| fun Uri.asRequestBody(contentResolver: ContentResolver, contentType: MediaType? = null, contentLength: Long = -1L, uploadListener: UploadCallback? = null): RequestBody { |
There was a problem hiding this comment.
Suggested change
| fun Uri.asRequestBody(contentResolver: ContentResolver, contentType: MediaType? = null, contentLength: Long = -1L, uploadListener: UploadCallback? = null): RequestBody { | |
| fun Uri.asRequestBody( | |
| contentResolver: ContentResolver, | |
| contentType: MediaType? = null, | |
| contentLength: Long = -1L, | |
| uploadListener: UploadCallback? = null | |
| ): RequestBody { |
connyduck
approved these changes
Apr 10, 2024
Sorry I didn't have time to apply your suggested changes today. Do you mean replacing |
|
Yeah, just wanna replace all nio usages. |
nikclayton
added a commit
to pachli/pachli-android
that referenced
this pull request
Jun 20, 2024
`ImageDownsizer.downsizeImage()`: - Remove the return value, it was ignored - Throw `FileNotFoundException` when `openInputStream` returns null `ImageDownsizer.getImageOrientation()`: - Throw `FileNotFoundException` when `openInputStream` returns null `MediaUploader.prepareMedia()`: - Copy URI contents using Okio buffers / source / sink `UriExtensions`: - Rename from `IOUtils` - Implement `Uri.copyToFile()` using Okio buffers / source / sink - Replace `ProgressRequestBody()` with `Uri.asRequestBody()` using Okio buffers / source / sink `DraftHelper.copyToFolder()` - Use Okio buffers / source / sink `CompositeWithOpaqueBackground` - Use constants `SIZE_BYTES` and `CHARSET` instead of magic values - Use `Objects.hash` when hashing multiple objects Based on work by Christophe Beyls in - tuskyapp/Tusky#4366 - tuskyapp/Tusky#4372
nikclayton
added a commit
to pachli/pachli-android
that referenced
this pull request
Jun 20, 2024
`ImageDownsizer.downsizeImage()`: - Remove the return value, it was ignored - Throw `FileNotFoundException` when `openInputStream` returns null `ImageDownsizer.getImageOrientation()`: - Throw `FileNotFoundException` when `openInputStream` returns null `MediaUploader.prepareMedia()`: - Copy URI contents using Okio buffers / source / sink `UriExtensions`: - Rename from `IOUtils` - Implement `Uri.copyToFile()` using Okio buffers / source / sink - Replace `ProgressRequestBody()` with `Uri.asRequestBody()` using Okio buffers / source / sink `DraftHelper.copyToFolder()` - Use Okio buffers / source / sink `CompositeWithOpaqueBackground` - Use constants `SIZE_BYTES` and `CHARSET` instead of magic values - Use `Objects.hash` when hashing multiple objects Based on work by Christophe Beyls in - tuskyapp/Tusky#4366 - tuskyapp/Tusky#4372
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.
This pull request takes advantage of the Okio library to simplify, fix or improve performance of some I/O related code in Tusky.
FileNotFoundExceptionearly in casecontentResolver.openInputStream()returnsnullinstead of throwingNullPointerExceptionlater. Change the signature ofCloseable.closeQuietly()to only accept a non-nullCloseable.Uri.copyToFile()using Okio. This takes advantage of the built-in high-performance buffers of the library so a buffer doesn't need to be allocated or managed manually. The new implementation also makes sure that the input and output streams are always closed, as the original code could in some cases return without properly closing a stream.ProgressRequestBodyasUri.asRequestBody()(adding to the existing extension functions available in the Okio library to create aRequestBody). The new implementation uses Okio'sBufferinstead of a manually managed byte array, which allows to avoid copying bytes from one buffer to the next. The max number of bytes read at once was increased from 2K to 8K to improve performance. Avoid division by zero in casecontentLengthis0. Finally, this implementation now takes aUrias input instead of anInputStream, because aRequestBodymust be replayable in case Okio retries the request, and anInputStreamcan only be used once.