From b252a9e0603d1553b009d08aa097d2c5dd8b548c Mon Sep 17 00:00:00 2001 From: Jobobby04 Date: Sat, 24 Oct 2020 19:41:16 -0400 Subject: [PATCH] Fixed EH update helper crashes --- app/src/main/java/exh/eh/EHentaiUpdateHelper.kt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/exh/eh/EHentaiUpdateHelper.kt b/app/src/main/java/exh/eh/EHentaiUpdateHelper.kt index 4e5262f04..5b1064b9c 100644 --- a/app/src/main/java/exh/eh/EHentaiUpdateHelper.kt +++ b/app/src/main/java/exh/eh/EHentaiUpdateHelper.kt @@ -11,6 +11,7 @@ import exh.metadata.metadata.base.getFlatMetadataForManga import exh.util.await import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.asFlow +import kotlinx.coroutines.flow.flowOf import kotlinx.coroutines.flow.map import uy.kohesive.injekt.injectLazy import java.io.File @@ -33,9 +34,11 @@ class EHentaiUpdateHelper(context: Context) { */ fun findAcceptedRootAndDiscardOthers(sourceId: Long, chapters: List): Flow, Boolean>> { // Find other chains - val chainsFlow = chapters.asFlow() - .map { chapter -> - db.getChapters(chapter.url).await().mapNotNull { it.manga_id }.distinct() + val chainsFlow = flowOf(chapters) + .map { chapterList -> + chapterList.flatMap { chapter -> + db.getChapters(chapter.url).await().mapNotNull { it.manga_id } + }.distinct() } .map { mangaIds -> mangaIds