Cleanup code

This commit is contained in:
tarsin committed 2023-06-20 19:40:32 +08:00
1 parent 40c6135214
commit 5fd890cf9b
2 files changed
+4 -4

No files matched your search

@@ -28,7 +28,7 @@ val cronetHttpClientExecutor = EhApplication.nonCacheOkHttpClient.dispatcher.exe
// TODO: Rewrite this to use android.net.http.HttpEngine and make it Android 14 only when released
class CronetRequest : AutoCloseable {
lateinit var consumer: (UrlResponseInfo, ByteBuffer) -> Unit
lateinit var consumer: (ByteBuffer) -> Unit
lateinit var onResponse: CronetRequest.(UrlResponseInfo) -> Unit
lateinit var request: UrlRequest
lateinit var daemonCont: Continuation<Boolean>
@@ -44,7 +44,7 @@ class CronetRequest : AutoCloseable {
override fun onReadCompleted(req: UrlRequest, info: UrlResponseInfo, data: ByteBuffer) {
data.flip()
consumer(info, data)
consumer(data)
buffer.clear()
request.read(buffer)
}
@@ -73,7 +73,7 @@ inline fun cronetRequest(url: String, conf: UrlRequest.Builder.() -> Unit) = Cro
request = cronetHttpClient.newUrlRequestBuilder(url, callback, cronetHttpClientExecutor).apply(conf).build()
}
suspend infix fun CronetRequest.awaitBodyFully(consumer: (UrlResponseInfo, ByteBuffer) -> Unit) = run {
suspend infix fun CronetRequest.awaitBodyFully(consumer: (ByteBuffer) -> Unit) = run {
this.consumer = consumer
suspendCancellableCoroutine { cont ->
readerCont = cont
@@ -141,7 +141,7 @@ class SpiderDen(private val mGalleryInfo: GalleryInfo) {
saveResponseMeta(index, type, length) { file ->
file.openOutputStream().use {
val chan = it.channel
awaitBodyFully { info, buffer ->
awaitBodyFully { buffer ->
val read = chan.write(buffer)
notifyProgress(length, info.receivedByteCount, read)
}