From e7f84fd8baf74ea4c3e5df9d017c27b23a9f3244 Mon Sep 17 00:00:00 2001 From: Ahmad Ansori Palembani Date: Tue, 25 Jun 2024 11:34:05 +0700 Subject: [PATCH] fix(reader): Save combined page does nothing --- CHANGELOG.md | 1 + .../java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt | 8 +++----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 25d3459e42..8091d79a7b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ ## Fixes - Fixed auto backup, auto extension update, and app update checker stop working if it crash/failed +- Fixed saving combined pages not doing anything ## Other - Some code refactors diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt index 303d59d070..6b4153576a 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt @@ -9,10 +9,6 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import co.touchlab.kermit.Logger import com.hippo.unifile.UniFile -import eu.kanade.tachiyomi.R -import yokai.i18n.MR -import yokai.util.lang.getString -import dev.icerock.moko.resources.compose.stringResource import eu.kanade.tachiyomi.data.cache.CoverCache import eu.kanade.tachiyomi.data.database.DatabaseHelper import eu.kanade.tachiyomi.data.database.models.Chapter @@ -81,6 +77,8 @@ import yokai.domain.download.DownloadPreferences import yokai.domain.manga.interactor.UpdateManga import yokai.domain.manga.models.MangaUpdate import yokai.domain.storage.StorageManager +import yokai.i18n.MR +import yokai.util.lang.getString import java.util.* import java.util.concurrent.* @@ -798,7 +796,7 @@ class ReaderViewModel( "${manga.title} - ${chapter.preferredChapterName(context, manga, preferences)}".take(225), ) + (if (downloadPreferences.downloadWithId().get()) " (${chapter.id})" else "") + " - ${page1.number}-${page2.number}.jpg" - val destFile = directory.findFile(filename)!! + val destFile = directory.createFile(filename)!! stream.use { input -> destFile.openOutputStream().use { output -> input.copyTo(output)