kunfei 4 лет назад
Родитель
Сommit
8c654faffd
1 измененных файлов с 16 добавлено и 12 удалено
  1. 16 12
      app/src/main/java/io/legado/app/ui/book/read/ReadBookViewModel.kt

+ 16 - 12
app/src/main/java/io/legado/app/ui/book/read/ReadBookViewModel.kt

@@ -168,20 +168,24 @@ class ReadBookViewModel(application: Application) : BaseViewModel(application) {
         book: Book,
         book: Book,
         alertSync: ((progress: BookProgress) -> Unit)? = null
         alertSync: ((progress: BookProgress) -> Unit)? = null
     ) {
     ) {
-        if (AppWebDav.syncBookProgress)
-            execute {
+        execute {
+            if (AppWebDav.syncBookProgress) {
                 AppWebDav.getBookProgress(book)
                 AppWebDav.getBookProgress(book)
-            }.onSuccess {
-                it?.let { progress ->
-                    if (progress.durChapterIndex < book.durChapterIndex ||
-                        (progress.durChapterIndex == book.durChapterIndex && progress.durChapterPos < book.durChapterPos)
-                    ) {
-                        alertSync?.invoke(progress)
-                    } else {
-                        ReadBook.setProgress(progress)
-                    }
-                }
+                    ?: throw NoStackTraceException("没有进度")
+            } else {
+                throw NoStackTraceException("进度同步未启用")
             }
             }
+        }.onSuccess { progress ->
+            if (progress.durChapterIndex < book.durChapterIndex ||
+                (progress.durChapterIndex == book.durChapterIndex
+                    && progress.durChapterPos < book.durChapterPos)
+            ) {
+                alertSync?.invoke(progress)
+            } else {
+                ReadBook.setProgress(progress)
+            }
+        }
+
     }
     }
 
 
     /**
     /**