Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix latest + browse page crash when source returns null

Browse Source
This commit is contained in:
Jobobby04 2020-09-06 16:25:30 -04:00
parent f20e5d864d
commit 86defec57c
1 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/index/IndexPresenter.kt
View File

@ -16,10 +16,12 @@ import eu.kanade.tachiyomi.source.model.SManga
import eu.kanade.tachiyomi.ui.base.presenter.BasePresenter
import eu.kanade.tachiyomi.ui.browse.source.browse.BrowseSourcePresenter.Companion.toItems
import exh.EXHSavedSearch
import exh.util.asFlow
import java.lang.RuntimeException
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.Job
import kotlinx.coroutines.flow.singleOrNull
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import rx.Observable
@ -105,12 +107,17 @@ open class IndexPresenter(
})
}
if (source.supportsLatest) {
val results = source.fetchLatestUpdates(1)
.toBlocking()
.single()
.mangas
.take(10)
.map { networkToLocalManga(it, source.id) }
val results = try {
source.fetchLatestUpdates(1)
.asFlow()
.singleOrNull()
?.mangas
?.take(10)
?.map { networkToLocalManga(it, source.id) }
?: emptyList()
} catch (e: Exception) {
emptyList()
}
fetchImage(results, true)
withContext(Dispatchers.Main) {
@ -128,12 +135,17 @@ open class IndexPresenter(
})
}
val results = source.fetchPopularManga(1)
.toBlocking()
.single()
.mangas
.take(10)
.map { networkToLocalManga(it, source.id) }
val results = try {
source.fetchPopularManga(1)
.asFlow()
.singleOrNull()
?.mangas
?.take(10)
?.map { networkToLocalManga(it, source.id) }
?: emptyList()
} catch (e: Exception) {
emptyList()
}
fetchImage(results, false)
withContext(Dispatchers.Main) {