Remove cache control on already cacheless image request (#8085)

(cherry picked from commit f4c684b4b8)

# Conflicts:
#	source-api/src/main/java/eu/kanade/tachiyomi/source/online/HttpSource.kt
This commit is contained in:
stevenyomi
2022-09-27 05:13:03 +08:00
committed by Jobobby04
parent 6f56a30582
commit 20a4a3af98
8 changed files with 12 additions and 17 deletions
@@ -2,11 +2,10 @@ package eu.kanade.tachiyomi.source.online
import android.app.Application
import eu.kanade.tachiyomi.network.AndroidCookieJar
import eu.kanade.tachiyomi.network.CACHE_CONTROL_NO_STORE
import eu.kanade.tachiyomi.network.GET
import eu.kanade.tachiyomi.network.NetworkHelper
import eu.kanade.tachiyomi.network.asObservableSuccess
import eu.kanade.tachiyomi.network.newCallWithProgress
import eu.kanade.tachiyomi.network.newCachelessCallWithProgress
import eu.kanade.tachiyomi.source.CatalogueSource
import eu.kanade.tachiyomi.source.model.FilterList
import eu.kanade.tachiyomi.source.model.MangasPage
@@ -335,11 +334,8 @@ abstract class HttpSource : CatalogueSource {
*/
/* SY --> */
open /* SY <-- */ fun fetchImage(page: Page): Observable<Response> {
val request = imageRequest(page).newBuilder()
// images will be cached or saved manually, so don't take up network cache
.cacheControl(CACHE_CONTROL_NO_STORE)
.build()
return client.newCallWithProgress(request, page)
// images will be cached or saved manually, so don't take up network cache
return client.newCachelessCallWithProgress(imageRequest(page), page)
.asObservableSuccess()
}