From 0af667c9aa3076eee77641e679a02f247155f28c Mon Sep 17 00:00:00 2001 From: FlaminSarge Date: Thu, 6 Mar 2025 01:51:09 -0800 Subject: [PATCH] Attempt to fix crash when migrating or removing entries from library (#1828) Co-authored-by: AntsyLich <59261191+AntsyLich@users.noreply.github.com> (cherry picked from commit 563bc02113a5ebc53650fdfdd13f408284a0cdc8) # Conflicts: # CHANGELOG.md # app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/MigrateDialog.kt # domain/src/main/java/tachiyomi/domain/manga/interactor/GetLibraryManga.kt --- .../tachiyomi/domain/manga/interactor/GetLibraryManga.kt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/domain/src/main/java/tachiyomi/domain/manga/interactor/GetLibraryManga.kt b/domain/src/main/java/tachiyomi/domain/manga/interactor/GetLibraryManga.kt index 052c3dbd7..58ef64110 100644 --- a/domain/src/main/java/tachiyomi/domain/manga/interactor/GetLibraryManga.kt +++ b/domain/src/main/java/tachiyomi/domain/manga/interactor/GetLibraryManga.kt @@ -2,7 +2,10 @@ package tachiyomi.domain.manga.interactor import kotlinx.coroutines.delay import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.retry +import logcat.LogPriority +import tachiyomi.core.common.util.system.logcat import tachiyomi.domain.library.model.LibraryManga import tachiyomi.domain.manga.repository.MangaRepository import kotlin.time.Duration.Companion.seconds @@ -17,15 +20,15 @@ class GetLibraryManga( fun subscribe(): Flow> { return mangaRepository.getLibraryMangaAsFlow() - // SY --> .retry { if (it is NullPointerException) { - delay(5.seconds) + delay(0.5.seconds) true } else { false } + }.catch { + this@GetLibraryManga.logcat(LogPriority.ERROR, it) } - // SY <-- } }