diff --git a/app/src/main/java/com/hippo/ehviewer/spider/Android14CoroutineHttpEngine.kt b/app/src/main/java/com/hippo/ehviewer/spider/Android14CoroutineHttpEngine.kt index ec66c5c61..75c77612f 100644 --- a/app/src/main/java/com/hippo/ehviewer/spider/Android14CoroutineHttpEngine.kt +++ b/app/src/main/java/com/hippo/ehviewer/spider/Android14CoroutineHttpEngine.kt @@ -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 @@ -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 diff --git a/app/src/main/java/com/hippo/ehviewer/spider/SpiderDen.kt b/app/src/main/java/com/hippo/ehviewer/spider/SpiderDen.kt index 7edfdf556..848751a98 100644 --- a/app/src/main/java/com/hippo/ehviewer/spider/SpiderDen.kt +++ b/app/src/main/java/com/hippo/ehviewer/spider/SpiderDen.kt @@ -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) }