From 774db8d3a4bf048cdb285ad8e01b0df3ca152f5a Mon Sep 17 00:00:00 2001 From: tarsin Date: Tue, 30 May 2023 21:26:19 +0800 Subject: [PATCH] Always merge requests when preloadThumbAggressively --- app/src/main/java/com/hippo/ehviewer/coil/MergeInterceptor.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/hippo/ehviewer/coil/MergeInterceptor.kt b/app/src/main/java/com/hippo/ehviewer/coil/MergeInterceptor.kt index ab38f36cf..db3f523d6 100644 --- a/app/src/main/java/com/hippo/ehviewer/coil/MergeInterceptor.kt +++ b/app/src/main/java/com/hippo/ehviewer/coil/MergeInterceptor.kt @@ -2,6 +2,7 @@ package com.hippo.ehviewer.coil import coil.intercept.Interceptor import coil.request.ImageResult +import com.hippo.ehviewer.Settings import kotlinx.coroutines.CancellationException import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers @@ -21,7 +22,7 @@ object MergeInterceptor : Interceptor { private val EMPTY_LIST = mutableListOf>() override suspend fun intercept(chain: Interceptor.Chain): ImageResult { val req = chain.request - val key = req.memoryCacheKey?.key?.takeIf { it.startsWith("m/") } ?: return withContext(req.interceptorDispatcher) { chain.proceed(req) } + val key = req.memoryCacheKey?.key?.takeIf { it.startsWith("m/") || Settings.preloadThumbAggressively } ?: return withContext(req.interceptorDispatcher) { chain.proceed(req) } pendingContinuationMapLock.lock() val existPendingContinuations = pendingContinuationMap[key]