Merge remote-tracking branch 'origin/master'

app/src/main/java/io/legado/app/App.kt

@@ -68,7 +68,7 @@ class App : MultiDexApplication() {
                 2 -> ChineseUtils.preLoad(true, TransType.SIMPLE_TO_TRADITIONAL)
             }
             //同步阅读记录
-            if (AppWebDav.syncBookProgress) {
+            if (AppConfig.syncBookProgress) {
                 AppWebDav.downloadAllBookProgress()
             }
         }

app/src/main/java/io/legado/app/help/AppWebDav.kt

@@ -39,7 +39,6 @@ object AppWebDav {
     private val zipFilePath = "${appCtx.externalFiles.absolutePath}${File.separator}backup.zip"
     private val bookProgressUrl get() = "${rootWebDavUrl}bookProgress/"
     private val exportsWebDavUrl get() = "${rootWebDavUrl}books/"
-    val syncBookProgress get() = appCtx.getPrefBoolean(PreferKey.syncBookProgress, true)
 
     var authorization: Authorization? = null
         private set
@@ -225,7 +224,7 @@ object AppWebDav {
 
     fun uploadBookProgress(book: Book) {
         val authorization = authorization ?: return
-        if (!syncBookProgress) return
+        if (!AppConfig.syncBookProgress) return
         if (!NetworkUtils.isAvailable()) return
         Coroutine.async {
             val bookProgress = BookProgress(book)
@@ -239,7 +238,7 @@ object AppWebDav {
 
     fun uploadBookProgress(bookProgress: BookProgress) {
         val authorization = authorization ?: return
-        if (!syncBookProgress) return
+        if (!AppConfig.syncBookProgress) return
         if (!NetworkUtils.isAvailable()) return
         Coroutine.async {
             val json = GSON.toJson(bookProgress)

app/src/main/java/io/legado/app/help/config/AppConfig.kt

@@ -338,6 +338,8 @@ object AppConfig : SharedPreferences.OnSharedPreferenceChangeListener {
             appCtx.putPrefInt(PreferKey.preDownloadNum, value)
         }
 
+    val syncBookProgress get() = appCtx.getPrefBoolean(PreferKey.syncBookProgress, true)
+
     val mediaButtonOnExit get() = appCtx.getPrefBoolean("mediaButtonOnExit", true)
 
     val replaceEnableDefault get() = appCtx.getPrefBoolean(PreferKey.replaceEnableDefault, true)

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

@@ -186,7 +186,7 @@ class ReadBookViewModel(application: Application) : BaseViewModel(application) {
         book: Book,
         alertSync: ((progress: BookProgress) -> Unit)? = null
     ) {
-        if (!AppWebDav.syncBookProgress) return
+        if (!AppConfig.syncBookProgress) return
         execute {
             AppWebDav.getBookProgress(book)
                 ?: throw NoStackTraceException("没有进度")

app/src/main/java/io/legado/app/ui/book/toc/TocActivity.kt

@@ -86,7 +86,7 @@ class TocActivity : VMBaseActivity<ActivityChapterListBinding, TocViewModel>() {
                     return false
                 }
             })
-            setOnQueryTextFocusChangeListener { v, hasFocus ->
+            setOnQueryTextFocusChangeListener { _, hasFocus ->
                 if (!hasFocus) {
                     searchView?.isIconified = true
                 }