From 390639e9e3e5a1107e74c5e43c4e5d22a66ee737 Mon Sep 17 00:00:00 2001 From: Koitharu Date: Sun, 5 Apr 2020 12:58:06 +0300 Subject: [PATCH] Fix recycled bitmap crash --- .../org/koitharu/kotatsu/domain/MangaUtils.kt | 26 ------------------- .../koitharu/kotatsu/utils/ShortcutUtils.kt | 2 +- 2 files changed, 1 insertion(+), 27 deletions(-) diff --git a/app/src/main/java/org/koitharu/kotatsu/domain/MangaUtils.kt b/app/src/main/java/org/koitharu/kotatsu/domain/MangaUtils.kt index 86089ae6f..7a79c011a 100644 --- a/app/src/main/java/org/koitharu/kotatsu/domain/MangaUtils.kt +++ b/app/src/main/java/org/koitharu/kotatsu/domain/MangaUtils.kt @@ -1,19 +1,12 @@ package org.koitharu.kotatsu.domain -import android.graphics.Bitmap import android.graphics.BitmapFactory -import android.media.ThumbnailUtils import android.util.Size -import androidx.annotation.Px -import androidx.core.graphics.drawable.toBitmap -import coil.Coil -import coil.api.get import okhttp3.OkHttpClient import okhttp3.Request import org.koin.core.KoinComponent import org.koin.core.get import org.koitharu.kotatsu.BuildConfig -import org.koitharu.kotatsu.core.model.Manga import org.koitharu.kotatsu.core.model.MangaPage import org.koitharu.kotatsu.core.prefs.ReaderMode import org.koitharu.kotatsu.utils.ext.await @@ -61,23 +54,4 @@ object MangaUtils : KoinComponent { check(imageHeight > 0 && imageWidth > 0) return Size(imageWidth, imageHeight) } - - suspend fun getMangaIcon(manga: Manga, @Px width: Int, @Px height: Int): Bitmap? { - try { - val bmp = Coil.loader().get(manga.coverUrl) { - size(width, height) - }.toBitmap() - return ThumbnailUtils.extractThumbnail( - bmp, - width, - height, - ThumbnailUtils.OPTIONS_RECYCLE_INPUT - ) - } catch (e: Throwable) { - if (BuildConfig.DEBUG) { - e.printStackTrace() - } - return null - } - } } \ No newline at end of file diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/ShortcutUtils.kt b/app/src/main/java/org/koitharu/kotatsu/utils/ShortcutUtils.kt index e394e380f..f89da5400 100644 --- a/app/src/main/java/org/koitharu/kotatsu/utils/ShortcutUtils.kt +++ b/app/src/main/java/org/koitharu/kotatsu/utils/ShortcutUtils.kt @@ -81,7 +81,7 @@ object ShortcutUtils { bmp, size.width, size.height, - ThumbnailUtils.OPTIONS_RECYCLE_INPUT + 0 ) } }