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

Revert "Fix reader bug with new suspend getFlatMetadata"

Browse Source 
This reverts commit 96031869271b3c5ed43d3c7d227dcdcd584d9618.
This commit is contained in:
Jobobby04 2021-01-26 23:36:40 -05:00
parent dc6aa11bc7
commit dbadec2c67
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
View File

@ -247,12 +247,15 @@ class ReaderPresenter(
.first() .first()
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
// SY --> // SY -->
.map { manga -> .flatMap { manga ->
val source = sourceManager.get(manga.source)?.getMainSource() val source = sourceManager.get(manga.source)?.getMainSource()
if (manga.initialized && source is MetadataSource<*, *>) { if (manga.initialized && source is MetadataSource<*, *>) {
val flatMeta = db.getFlatMetadataForManga(mangaId).executeAsBlocking() db.getFlatMetadataForManga(mangaId).asRxSingle().map {
manga to flatMeta?.raise(source.metaClass) manga to it?.raise(source.metaClass)
} else manga to null }.toObservable()
} else {
Observable.just(manga to null)
}
} }
.doOnNext { init(it.first, initialChapterId, it.second) } .doOnNext { init(it.first, initialChapterId, it.second) }
// SY <-- // SY <--