|
@@ -26,7 +26,7 @@ class ChapterLoader(
|
|
|
* completes if the chapter is already loaded.
|
|
|
*/
|
|
|
fun loadChapter(chapter: ReaderChapter): Completable {
|
|
|
- if (chapter.state is ReaderChapter.State.Loaded) {
|
|
|
+ if (chapterIsReady(chapter)) {
|
|
|
return Completable.complete()
|
|
|
}
|
|
|
|
|
@@ -61,6 +61,13 @@ class ChapterLoader(
|
|
|
.doOnError { chapter.state = ReaderChapter.State.Error(it) }
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * Checks [chapter] to be loaded based on present pages and loader in addition to state.
|
|
|
+ */
|
|
|
+ private fun chapterIsReady(chapter: ReaderChapter): Boolean {
|
|
|
+ return chapter.state is ReaderChapter.State.Loaded && chapter.pageLoader != null
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* Returns the page loader to use for this [chapter].
|
|
|
*/
|