|
|
@@ -367,6 +367,7 @@ object CacheBook {
|
|
|
downloadFinish(chapter, "获取正文失败\n${it.localizedMessage}", resetPageOffset)
|
|
|
}.onCancel {
|
|
|
onCancel(chapter.index)
|
|
|
+ downloadFinish(chapter, "download canceled", resetPageOffset, true)
|
|
|
}.onFinally {
|
|
|
postEvent(EventBus.UP_DOWNLOAD, book.bookUrl)
|
|
|
}.start()
|
|
|
@@ -375,12 +376,14 @@ object CacheBook {
|
|
|
private fun downloadFinish(
|
|
|
chapter: BookChapter,
|
|
|
content: String,
|
|
|
- resetPageOffset: Boolean = false
|
|
|
+ resetPageOffset: Boolean = false,
|
|
|
+ canceled: Boolean = false
|
|
|
) {
|
|
|
if (ReadBook.book?.bookUrl == book.bookUrl) {
|
|
|
ReadBook.contentLoadFinish(
|
|
|
book, chapter, content,
|
|
|
resetPageOffset = resetPageOffset,
|
|
|
+ canceled = canceled
|
|
|
)
|
|
|
}
|
|
|
}
|