65af26993bThis pull request takes advantage of the Okio library to simplify, fix or improve performance of some I/O related code in Tusky. - Return early or throw `FileNotFoundException` early in case `contentResolver.openInputStream()` returns `null` instead of throwing `NullPointerException` later. Change the signature of `Closeable.closeQuietly()` to only accept a non-null `Closeable`. - Reimplement `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. - Reimplement `ProgressRequestBody` as `Uri.asRequestBody()` (adding to the existing extension functions available in the Okio library to create a `RequestBody`). The new implementation uses Okio's `Buffer` instead 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 case `contentLength` is `0`. Finally, this implementation now takes a `Uri` as input instead of an `InputStream`, because a `RequestBody` must be replayable in case Okio retries the request, and an `InputStream` can only be used once.
47 lines
1.4 KiB
Kotlin
47 lines
1.4 KiB
Kotlin
/* Copyright 2017 Andrew Dawson
|
|
*
|
|
* This file is a part of Tusky.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it under the terms of the
|
|
* GNU General Public License as published by the Free Software Foundation; either version 3 of the
|
|
* License, or (at your option) any later version.
|
|
*
|
|
* Tusky is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
|
|
* the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
|
|
* Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along with Tusky; if not,
|
|
* see <http://www.gnu.org/licenses>. */
|
|
|
|
package com.keylesspalace.tusky.util
|
|
|
|
import android.content.ContentResolver
|
|
import android.net.Uri
|
|
import java.io.Closeable
|
|
import java.io.File
|
|
import java.io.IOException
|
|
import okio.buffer
|
|
import okio.sink
|
|
import okio.source
|
|
|
|
fun Closeable.closeQuietly() {
|
|
try {
|
|
close()
|
|
} catch (e: IOException) {
|
|
// intentionally unhandled
|
|
}
|
|
}
|
|
|
|
fun Uri.copyToFile(contentResolver: ContentResolver, file: File): Boolean {
|
|
return try {
|
|
val inputStream = contentResolver.openInputStream(this) ?: return false
|
|
inputStream.source().use { source ->
|
|
file.sink().buffer().use { bufferedSink ->
|
|
bufferedSink.writeAll(source)
|
|
}
|
|
}
|
|
true
|
|
} catch (e: IOException) {
|
|
false
|
|
}
|
|
}
|