From 6db517eaa1af66dc82b93669a6e439fbfe0e6fe4 Mon Sep 17 00:00:00 2001 From: Horis <821938089@qq.com> Date: Sun, 30 Apr 2023 12:40:47 +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/association/FileAssociationViewModel.kt | 3 +-- .../java/io/legado/app/ui/book/toc/TocViewModel.kt | 14 ++++++-------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/io/legado/app/ui/association/FileAssociationViewModel.kt b/app/src/main/java/io/legado/app/ui/association/FileAssociationViewModel.kt index e9b3c47a2..38157327a 100644 --- a/app/src/main/java/io/legado/app/ui/association/FileAssociationViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/association/FileAssociationViewModel.kt @@ -15,7 +15,6 @@ class FileAssociationViewModel(application: Application) : BaseAssociationViewMo val openBookLiveData = MutableLiveData() val notSupportedLiveData = MutableLiveData>() - @Suppress("BlockingMethodInNonBlockingContext") fun dispatchIndent(uri: Uri) { execute { lateinit var fileName: String @@ -42,7 +41,7 @@ class FileAssociationViewModel(application: Application) : BaseAssociationViewMo } } - fun dispatch(fileDoc: FileDoc) { + private fun dispatch(fileDoc: FileDoc) { kotlin.runCatching { if (fileDoc.openInputStream().getOrNull().isJson()) { importJson(fileDoc.uri) diff --git a/app/src/main/java/io/legado/app/ui/book/toc/TocViewModel.kt b/app/src/main/java/io/legado/app/ui/book/toc/TocViewModel.kt index 41c10c731..374a13367 100644 --- a/app/src/main/java/io/legado/app/ui/book/toc/TocViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/book/toc/TocViewModel.kt @@ -26,15 +26,13 @@ class TocViewModel(application: Application) : BaseViewModel(application) { fun upBookTocRule(book: Book, finally: () -> Unit) { execute { - execute { + appDb.bookDao.update(book) + LocalBook.getChapterList(book).let { + book.latestChapterTime = System.currentTimeMillis() + appDb.bookChapterDao.delByBook(book.bookUrl) + appDb.bookChapterDao.insert(*it.toTypedArray()) appDb.bookDao.update(book) - LocalBook.getChapterList(book).let { - book.latestChapterTime = System.currentTimeMillis() - appDb.bookChapterDao.delByBook(book.bookUrl) - appDb.bookChapterDao.insert(*it.toTypedArray()) - appDb.bookDao.update(book) - bookData.postValue(book) - } + bookData.postValue(book) } }.onFinally { finally.invoke()