From e4fda86bf15f6a3aa0e9fcba934ad303d549dbef Mon Sep 17 00:00:00 2001 From: Koitharu Date: Sat, 2 Nov 2024 14:53:12 +0200 Subject: [PATCH] Small fixes --- .../koitharu/kotatsu/core/backup/BackupZipOutput.kt | 4 ++-- .../ui/pager/chapters/ChaptersSelectionCallback.kt | 10 ++++++---- .../kotatsu/download/ui/list/DownloadsViewModel.kt | 3 +-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/backup/BackupZipOutput.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/backup/BackupZipOutput.kt index 816a26d8b..9fa018811 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/core/backup/BackupZipOutput.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/backup/BackupZipOutput.kt @@ -9,8 +9,8 @@ import org.koitharu.kotatsu.R import org.koitharu.kotatsu.core.util.ext.printStackTraceDebug import org.koitharu.kotatsu.core.zip.ZipOutput import java.io.File +import java.text.ParseException import java.text.SimpleDateFormat -import java.time.format.DateTimeParseException import java.util.Date import java.util.Locale import java.util.zip.Deflater @@ -46,7 +46,7 @@ class BackupZipOutput(val file: File) : Closeable { fun parseBackupDateTime(fileName: String): Date? = try { dateTimeFormat.parse(fileName.substringAfterLast('_').substringBefore('.')) - } catch (e: DateTimeParseException) { + } catch (e: ParseException) { e.printStackTraceDebug() null } diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/pager/chapters/ChaptersSelectionCallback.kt b/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/pager/chapters/ChaptersSelectionCallback.kt index fa9d69111..4c4925d75 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/pager/chapters/ChaptersSelectionCallback.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/pager/chapters/ChaptersSelectionCallback.kt @@ -62,10 +62,12 @@ class ChaptersSelectionCallback( R.id.action_save -> { val snapshot = controller.snapshot() mode?.finish() - commonAlertDialogs.askForDownloadOverMeteredNetwork( - context = recyclerView.context, - onConfirmed = { viewModel.download(snapshot, it) }, - ) + if (snapshot.isNotEmpty()) { + commonAlertDialogs.askForDownloadOverMeteredNetwork( + context = recyclerView.context, + onConfirmed = { viewModel.download(snapshot, it) }, + ) + } true } diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/download/ui/list/DownloadsViewModel.kt b/app/src/main/kotlin/org/koitharu/kotatsu/download/ui/list/DownloadsViewModel.kt index bd6229d96..33db4f1c7 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/download/ui/list/DownloadsViewModel.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/download/ui/list/DownloadsViewModel.kt @@ -25,7 +25,6 @@ import org.koitharu.kotatsu.R import org.koitharu.kotatsu.core.model.formatNumber import org.koitharu.kotatsu.core.parser.MangaDataRepository import org.koitharu.kotatsu.core.parser.MangaRepository -import org.koitharu.kotatsu.core.parser.ParserMangaRepository import org.koitharu.kotatsu.core.ui.BaseViewModel import org.koitharu.kotatsu.core.ui.model.DateTimeAgo import org.koitharu.kotatsu.core.ui.util.ReversibleAction @@ -327,6 +326,6 @@ class DownloadsViewModel @Inject constructor( }.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, null) private suspend fun tryLoad(manga: Manga) = runCatchingCancellable { - (mangaRepositoryFactory.create(manga.source) as ParserMangaRepository).getDetails(manga) + mangaRepositoryFactory.create(manga.source).getDetails(manga) }.getOrNull() }