fix: Fix build

This commit is contained in:
Ahmad Ansori Palembani 2024-07-10 12:29:15 +07:00
parent 859674681a
commit 17588ed1c6
Signed by: null2264
GPG key ID: BA64F8B60AF3EFB6
8 changed files with 12 additions and 7 deletions

View file

@ -16,6 +16,7 @@ import androidx.glance.appwidget.provideContent
import androidx.glance.appwidget.updateAll import androidx.glance.appwidget.updateAll
import androidx.glance.background import androidx.glance.background
import androidx.glance.layout.fillMaxSize import androidx.glance.layout.fillMaxSize
import coil3.asDrawable
import coil3.executeBlocking import coil3.executeBlocking
import coil3.imageLoader import coil3.imageLoader
import coil3.request.CachePolicy import coil3.request.CachePolicy

View file

@ -28,7 +28,6 @@ import okhttp3.CacheControl
import okhttp3.Call import okhttp3.Call
import okhttp3.Request import okhttp3.Request
import okhttp3.Response import okhttp3.Response
import okhttp3.internal.closeQuietly
import okio.FileSystem import okio.FileSystem
import okio.Path.Companion.toOkioPath import okio.Path.Companion.toOkioPath
import okio.Source import okio.Source
@ -139,11 +138,11 @@ class MangaCoverFetcher(
dataSource = if (response.cacheResponse != null) DataSource.DISK else DataSource.NETWORK, dataSource = if (response.cacheResponse != null) DataSource.DISK else DataSource.NETWORK,
) )
} catch (e: Exception) { } catch (e: Exception) {
responseBody.closeQuietly() responseBody.close()
throw e throw e
} }
} catch (e: Exception) { } catch (e: Exception) {
snapshot?.closeQuietly() snapshot?.close()
throw e throw e
} }
} }
@ -152,7 +151,7 @@ class MangaCoverFetcher(
val client = sourceLazy.value?.client ?: callFactoryLazy.value val client = sourceLazy.value?.client ?: callFactoryLazy.value
val response = client.newCall(newRequest()).await() val response = client.newCall(newRequest()).await()
if (!response.isSuccessful && response.code != HttpURLConnection.HTTP_NOT_MODIFIED) { if (!response.isSuccessful && response.code != HttpURLConnection.HTTP_NOT_MODIFIED) {
response.body.closeQuietly() response.close()
throw Exception(response.message) // FIXME: Should probably use something else other than generic Exception throw Exception(response.message) // FIXME: Should probably use something else other than generic Exception
} }
return response return response
@ -244,7 +243,7 @@ class MangaCoverFetcher(
response: Response, response: Response,
): DiskCache.Snapshot? { ): DiskCache.Snapshot? {
if (!options.diskCachePolicy.writeEnabled) { if (!options.diskCachePolicy.writeEnabled) {
snapshot?.closeQuietly() snapshot?.close()
return null return null
} }
val editor = if (snapshot != null) { val editor = if (snapshot != null) {

View file

@ -3,7 +3,7 @@ package eu.kanade.tachiyomi.data.coil
import android.graphics.Bitmap import android.graphics.Bitmap
import android.os.Build import android.os.Build
import coil3.ImageLoader import coil3.ImageLoader
import coil3.asCoilImage import coil3.asImage
import coil3.decode.DecodeResult import coil3.decode.DecodeResult
import coil3.decode.DecodeUtils import coil3.decode.DecodeUtils
import coil3.decode.Decoder import coil3.decode.Decoder
@ -83,7 +83,7 @@ class TachiyomiImageDecoder(private val resources: ImageSource, private val opti
*/ */
return DecodeResult( return DecodeResult(
image = bitmap.asCoilImage(), image = bitmap.asImage(),
isSampled = sampleSize > 1, isSampled = sampleSize > 1,
) )
} }

View file

@ -13,6 +13,7 @@ import androidx.core.app.ActivityCompat
import androidx.core.app.NotificationCompat import androidx.core.app.NotificationCompat
import androidx.core.app.NotificationManagerCompat import androidx.core.app.NotificationManagerCompat
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import coil3.asDrawable
import coil3.imageLoader import coil3.imageLoader
import coil3.request.CachePolicy import coil3.request.CachePolicy
import coil3.request.ImageRequest import coil3.request.ImageRequest

View file

@ -43,6 +43,7 @@ import androidx.recyclerview.widget.ItemTouchHelper
import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import co.touchlab.kermit.Logger import co.touchlab.kermit.Logger
import coil3.asDrawable
import coil3.imageLoader import coil3.imageLoader
import coil3.request.ImageRequest import coil3.request.ImageRequest
import coil3.request.allowHardware import coil3.request.allowHardware

View file

@ -25,6 +25,7 @@ import androidx.core.view.updateLayoutParams
import androidx.core.widget.TextViewCompat import androidx.core.widget.TextViewCompat
import androidx.transition.TransitionSet import androidx.transition.TransitionSet
import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
import coil3.asDrawable
import coil3.request.CachePolicy import coil3.request.CachePolicy
import coil3.request.error import coil3.request.error
import coil3.request.placeholder import coil3.request.placeholder

View file

@ -18,6 +18,7 @@ import androidx.annotation.CallSuper
import androidx.annotation.StyleRes import androidx.annotation.StyleRes
import androidx.appcompat.widget.AppCompatImageView import androidx.appcompat.widget.AppCompatImageView
import androidx.core.view.isVisible import androidx.core.view.isVisible
import coil3.asDrawable
import coil3.dispose import coil3.dispose
import coil3.imageLoader import coil3.imageLoader
import coil3.request.CachePolicy import coil3.request.CachePolicy

View file

@ -8,6 +8,7 @@ import android.graphics.Bitmap
import android.graphics.drawable.BitmapDrawable import android.graphics.drawable.BitmapDrawable
import android.graphics.drawable.Icon import android.graphics.drawable.Icon
import co.touchlab.kermit.Logger import co.touchlab.kermit.Logger
import coil3.asDrawable
import coil3.imageLoader import coil3.imageLoader
import coil3.request.ImageRequest import coil3.request.ImageRequest
import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.R