This commit is contained in:
kunfei
2022-08-09 11:46:12 +08:00
parent 5110ff8473
commit ee3777e511
2 changed files with 6 additions and 3 deletions
@@ -298,7 +298,7 @@ class ChangeBookSourceDialog() : BaseDialogFragment(R.layout.dialog_book_change_
waitDialog.setText(R.string.load_toc)
waitDialog.show()
val book = searchBook.toBook()
viewModel.getToc(book, {
val coroutine = viewModel.getToc(book, {
waitDialog.dismiss()
toastOnUi(it)
}) { toc, source ->
@@ -306,6 +306,9 @@ class ChangeBookSourceDialog() : BaseDialogFragment(R.layout.dialog_book_change_
callBack?.changeTo(source, book, toc)
onSuccess?.invoke()
}
waitDialog.setOnCancelListener {
coroutine.cancel()
}
}
/**
@@ -275,8 +275,8 @@ open class ChangeBookSourceViewModel(application: Application) : BaseViewModel(a
book: Book,
onError: (msg: String) -> Unit,
onSuccess: (toc: List<BookChapter>, source: BookSource) -> Unit
) {
execute {
): Coroutine<Pair<List<BookChapter>, BookSource>> {
return execute {
val toc = tocMap[book.bookUrl]
if (toc != null) {
val source = appDb.bookSourceDao.getBookSource(book.origin)