Merge branch 'master' of https://github.com/gedoor/legado

app/src/main/java/io/legado/app/base/adapter/CommonRecyclerAdapter.kt

@@ -174,8 +174,7 @@ abstract class CommonRecyclerAdapter<ITEM, VB : ViewBinding>(protected val conte
                 val srcPosition = oldPosition + getHeaderCount()
                 val targetPosition = newPosition + getHeaderCount()
                 Collections.swap(this.items, srcPosition, targetPosition)
-                notifyItemChanged(srcPosition)
+                notifyItemMoved(srcPosition, targetPosition)
-                notifyItemChanged(targetPosition)
             }
         }
     }

app/src/main/java/io/legado/app/service/help/ReadBook.kt

@@ -90,10 +90,11 @@ object ReadBook {
         nextTextChapter = null
     }
 
-    fun uploadProgress() {
+    fun uploadProgress(syncBookProgress: Boolean = AppConfig.syncBookProgress) {
-        if (!AppConfig.syncBookProgress) return
+        if (syncBookProgress) {
-        book?.let {
+            book?.let {
-            BookWebDav.uploadBookProgress(it)
+                BookWebDav.uploadBookProgress(it)
+            }
         }
     }
 

app/src/main/java/io/legado/app/ui/book/read/ReadBookViewModel.kt

@@ -162,8 +162,8 @@ class ReadBookViewModel(application: Application) : BaseViewModel(application) {
         }
     }
 
-    fun syncBookProgress(book: Book) {
+    fun syncBookProgress(book: Book, syncBookProgress: Boolean = AppConfig.syncBookProgress) {
-        if (!AppConfig.syncBookProgress)
+        if (syncBookProgress)
             execute {
                 BookWebDav.getBookProgress(book)?.let { progress ->
                     if (progress.durChapterIndex < book.durChapterIndex ||