up

app/src/main/java/io/legado/app/ui/readbook/ReadBookViewModel.kt

@@ -136,48 +136,32 @@ class ReadBookViewModel(application: Application) : BaseViewModel(application) {
     }
 
     fun loadContent(book: Book, index: Int) {
-        synchronized(loadingLock) {
+        if (addLoading(index)) {
-            if (loadingChapters.contains(index)) return
-            loadingChapters.add(index)
-        }
             execute {
                 App.db.bookChapterDao().getChapter(book.bookUrl, index)?.let { chapter ->
                     BookHelp.getContent(book, chapter)?.let {
                         contentLoadFinish(chapter, it)
-                    synchronized(loadingLock) {
+                        removeLoading(chapter.index)
-                        loadingChapters.remove(index)
-                    }
                     } ?: download(book, chapter)
-            } ?: synchronized(loadingLock) {
+                } ?: removeLoading(index)
-                loadingChapters.remove(index)
-            }
             }.onError {
-            synchronized(loadingLock) {
+                removeLoading(index)
-                loadingChapters.remove(index)
             }
         }
     }
 
     private fun download(book: Book, index: Int) {
-        synchronized(loadingLock) {
+        if (addLoading(index)) {
-            if (loadingChapters.contains(index)) return
-            loadingChapters.add(index)
-        }
             execute {
                 App.db.bookChapterDao().getChapter(book.bookUrl, index)?.let { chapter ->
-                if (!BookHelp.hasContent(book, chapter)) {
+                    if (BookHelp.hasContent(book, chapter)) {
-                    download(book, chapter)
+                        removeLoading(chapter.index)
                     } else {
-                    synchronized(loadingLock) {
+                        download(book, chapter)
-                        loadingChapters.remove(index)
-                    }
-                }
-            } ?: synchronized(loadingLock) {
-                loadingChapters.remove(index)
                     }
+                } ?: removeLoading(index)
             }.onError {
-            synchronized(loadingLock) {
+                removeLoading(index)
-                loadingChapters.remove(index)
             }
         }
     }
@@ -187,22 +171,30 @@ class ReadBookViewModel(application: Application) : BaseViewModel(application) {
             ?.onSuccess(IO) { content ->
                 if (content.isNullOrEmpty()) {
                     contentLoadFinish(chapter, context.getString(R.string.content_empty))
-                    synchronized(loadingLock) {
+                    removeLoading(chapter.index)
-                        loadingChapters.remove(chapter.index)
-                    }
                 } else {
                     BookHelp.saveContent(book, chapter, content)
                     contentLoadFinish(chapter, content)
-                    synchronized(loadingLock) {
+                    removeLoading(chapter.index)
-                        loadingChapters.remove(chapter.index)
-                    }
                 }
             }?.onError {
                 contentLoadFinish(chapter, it.localizedMessage)
+                removeLoading(chapter.index)
+            }
+    }
+
+    private fun addLoading(index: Int): Boolean {
         synchronized(loadingLock) {
-                    loadingChapters.remove(chapter.index)
+            if (loadingChapters.contains(index)) return false
+            loadingChapters.add(index)
+            return true
         }
     }
+
+    private fun removeLoading(index: Int) {
+        synchronized(loadingLock) {
+            loadingChapters.remove(index)
+        }
     }
 
     private fun contentLoadFinish(chapter: BookChapter, content: String) {