From ee3777e5119e9e084840c9d61be267cee54b9666 Mon Sep 17 00:00:00 2001
From: kunfei <gekunfei@live.com>
Date: Tue, 9 Aug 2022 11:46:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/ui/book/changesource/ChangeBookSourceDialog.kt       | 5 ++++-
 .../app/ui/book/changesource/ChangeBookSourceViewModel.kt    | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/io/legado/app/ui/book/changesource/ChangeBookSourceDialog.kt b/app/src/main/java/io/legado/app/ui/book/changesource/ChangeBookSourceDialog.kt
index 06eb167a7..ee7410764 100644
--- a/app/src/main/java/io/legado/app/ui/book/changesource/ChangeBookSourceDialog.kt
+++ b/app/src/main/java/io/legado/app/ui/book/changesource/ChangeBookSourceDialog.kt
@@ -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()
+        }
     }
 
     /**
diff --git a/app/src/main/java/io/legado/app/ui/book/changesource/ChangeBookSourceViewModel.kt b/app/src/main/java/io/legado/app/ui/book/changesource/ChangeBookSourceViewModel.kt
index 1aa7cca12..73e9fee69 100644
--- a/app/src/main/java/io/legado/app/ui/book/changesource/ChangeBookSourceViewModel.kt
+++ b/app/src/main/java/io/legado/app/ui/book/changesource/ChangeBookSourceViewModel.kt
@@ -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)