mirror/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2025-03-09 22:30:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Attempt to fix crash when migrating or removing entries from library (#1828)

Browse Source 
Co-authored-by: AntsyLich <59261191+AntsyLich@users.noreply.github.com>
This commit is contained in:
FlaminSarge 2025-03-06 01:51:09 -08:00 committed by GitHub
parent b702603965
commit 563bc02113
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -38,6 +38,7 @@ The format is a modified version of [Keep a Changelog](https://keepachangelog.co
- Fix backup/restore of category related preferences ([@cuong-tran](https://github.com/cuong-tran)) ([#1726](https://github.com/mihonapp/mihon/pull/1726)) - Fix backup/restore of category related preferences ([@cuong-tran](https://github.com/cuong-tran)) ([#1726](https://github.com/mihonapp/mihon/pull/1726))
- Fix WebView sending app's package name in `X-Requested-With` header, which led to sources blocking access ([@AwkwardPeak7](https://github.com/AwkwardPeak7)) ([#1812](https://github.com/mihonapp/mihon/pull/1812)) - Fix WebView sending app's package name in `X-Requested-With` header, which led to sources blocking access ([@AwkwardPeak7](https://github.com/AwkwardPeak7)) ([#1812](https://github.com/mihonapp/mihon/pull/1812))
- Fix an issue where tracker reading progress is changed to a lower value ([@Animeboynz](https://github.com/Animeboynz)) ([#1795](https://github.com/mihonapp/mihon/pull/1795)) - Fix an issue where tracker reading progress is changed to a lower value ([@Animeboynz](https://github.com/Animeboynz)) ([#1795](https://github.com/mihonapp/mihon/pull/1795))
- Attempt to fix crash when migrating or removing entries from library ([@FlaminSarge](https://github.com/FlaminSarge)) ([#1828](https://github.com/mihonapp/mihon/pull/1828))
### Removed ### Removed
- Remove alphabetical category sort option - Remove alphabetical category sort option

2
app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/MigrateDialog.kt
View File

@ -284,7 +284,7 @@ internal class MigrateDialogScreenModel(
} }
if (replace) { if (replace) {
updateManga.await(MangaUpdate(oldManga.id, favorite = false, dateAdded = 0)) updateManga.awaitUpdateFavorite(oldManga.id, favorite = false)
} }
// Update custom cover (recheck if custom cover exists) // Update custom cover (recheck if custom cover exists)

16
domain/src/main/java/tachiyomi/domain/manga/interactor/GetLibraryManga.kt
View File

@ -1,8 +1,14 @@
package tachiyomi.domain.manga.interactor package tachiyomi.domain.manga.interactor
import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.Flow 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.library.model.LibraryManga
import tachiyomi.domain.manga.repository.MangaRepository import tachiyomi.domain.manga.repository.MangaRepository
import kotlin.time.Duration.Companion.seconds
class GetLibraryManga( class GetLibraryManga(
private val mangaRepository: MangaRepository, private val mangaRepository: MangaRepository,
@ -14,5 +20,15 @@ class GetLibraryManga(
fun subscribe(): Flow<List<LibraryManga>> { fun subscribe(): Flow<List<LibraryManga>> {
return mangaRepository.getLibraryMangaAsFlow() return mangaRepository.getLibraryMangaAsFlow()
.retry {
if (it is NullPointerException) {
delay(0.5.seconds)
true
} else {
false
}
}.catch {
this@GetLibraryManga.logcat(LogPriority.ERROR, it)
}
} }
} }