diff --git a/app/src/main/java/io/legado/app/constant/PreferKey.kt b/app/src/main/java/io/legado/app/constant/PreferKey.kt index 46ee4428c..b0be01a5b 100644 --- a/app/src/main/java/io/legado/app/constant/PreferKey.kt +++ b/app/src/main/java/io/legado/app/constant/PreferKey.kt @@ -167,6 +167,7 @@ object PreferKey { const val showMangaUi = "showMangaUi" const val disableMangaScale = "disableMangaScale" const val paddingDisplayCutouts = "paddingDisplayCutouts" + const val autoCheckNewBackup = "autoCheckNewBackup" const val cPrimary = "colorPrimary" const val cAccent = "colorAccent" diff --git a/app/src/main/java/io/legado/app/help/config/AppConfig.kt b/app/src/main/java/io/legado/app/help/config/AppConfig.kt index 85b7f9bb0..9896ce51b 100644 --- a/app/src/main/java/io/legado/app/help/config/AppConfig.kt +++ b/app/src/main/java/io/legado/app/help/config/AppConfig.kt @@ -489,6 +489,8 @@ object AppConfig : SharedPreferences.OnSharedPreferenceChangeListener { val onlyLatestBackup get() = appCtx.getPrefBoolean(PreferKey.onlyLatestBackup, true) + val autoCheckNewBackup get() = appCtx.getPrefBoolean(PreferKey.autoCheckNewBackup, true) + val defaultHomePage get() = appCtx.getPrefString(PreferKey.defaultHomePage, "bookshelf") val updateToVariant get() = appCtx.getPrefString(PreferKey.updateToVariant, "default_version") diff --git a/app/src/main/java/io/legado/app/ui/config/BackupConfigFragment.kt b/app/src/main/java/io/legado/app/ui/config/BackupConfigFragment.kt index c3e6f9dcb..fca060189 100644 --- a/app/src/main/java/io/legado/app/ui/config/BackupConfigFragment.kt +++ b/app/src/main/java/io/legado/app/ui/config/BackupConfigFragment.kt @@ -49,11 +49,11 @@ import io.legado.app.utils.toastOnUi import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.Dispatchers.Main import kotlinx.coroutines.Job +import kotlinx.coroutines.currentCoroutineContext import kotlinx.coroutines.ensureActive import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import splitties.init.appCtx -import kotlin.coroutines.coroutineContext class BackupConfigFragment : PreferenceFragment(), SharedPreferences.OnSharedPreferenceChangeListener, @@ -347,7 +347,7 @@ class BackupConfigFragment : PreferenceFragment(), context.toastOnUi("由于坚果云限制列出文件数量,部分备份可能未显示,请及时清理旧备份") } if (names.isNotEmpty()) { - coroutineContext.ensureActive() + currentCoroutineContext().ensureActive() withContext(Main) { context.selector( title = context.getString(R.string.select_restore_file), diff --git a/app/src/main/java/io/legado/app/ui/main/MainActivity.kt b/app/src/main/java/io/legado/app/ui/main/MainActivity.kt index adc8b8f65..893fad5fa 100644 --- a/app/src/main/java/io/legado/app/ui/main/MainActivity.kt +++ b/app/src/main/java/io/legado/app/ui/main/MainActivity.kt @@ -286,6 +286,9 @@ class MainActivity : VMBaseActivity(), * 备份同步 */ private fun backupSync() { + if (!AppConfig.autoCheckNewBackup) { + return + } lifecycleScope.launch { val lastBackupFile = withContext(IO) { AppWebDav.lastBackUp().getOrNull() } ?: return@launch diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml index 533315f27..d4898454c 100644 --- a/app/src/main/res/values-es-rES/strings.xml +++ b/app/src/main/res/values-es-rES/strings.xml @@ -1222,4 +1222,6 @@ 禁用水平滚动动画 开启图片灰色 是否确认开始缓存? + 自动检查新备份 + 打开软件时检查是否有新备份,有新备份时提示是否更新 diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml index 199913f2d..97f4ddb08 100644 --- a/app/src/main/res/values-ja-rJP/strings.xml +++ b/app/src/main/res/values-ja-rJP/strings.xml @@ -1225,4 +1225,6 @@ 禁用水平滚动动画 开启图片灰色 是否确认开始缓存? + 自动检查新备份 + 打开软件时检查是否有新备份,有新备份时提示是否更新 diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 680383f23..b36503081 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -1225,4 +1225,6 @@ 禁用水平滚动动画 开启图片灰色 是否确认开始缓存? + 自动检查新备份 + 打开软件时检查是否有新备份,有新备份时提示是否更新 diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 9e1aa38bf..e214e20cd 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -1216,4 +1216,6 @@ Bật ảnh xám Chế độ phát 是否确认开始缓存? + 自动检查新备份 + 打开软件时检查是否有新备份,有新备份时提示是否更新 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 418aa351c..13ab7ed12 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -1220,4 +1220,6 @@ 禁用水平滚动动画 开启图片灰色 是否确认开始缓存? + 自动检查新备份 + 打开软件时检查是否有新备份,有新备份时提示是否更新 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index c5d96b822..ef48cfc09 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -1221,4 +1221,6 @@ 禁用水平滚动动画 开启图片灰色 是否确认开始缓存? + 自动检查新备份 + 打开软件时检查是否有新备份,有新备份时提示是否更新 diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index 1c40c1b24..b50b366ea 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -1227,4 +1227,6 @@ 禁用水平滚动动画 开启图片灰色 是否确认开始缓存? + 自动检查新备份 + 打开软件时检查是否有新备份,有新备份时提示是否更新 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0b27b8dbc..151b69565 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1229,4 +1229,6 @@ 开启图片灰色 播放模式 是否确认开始缓存? + 自动检查新备份 + 打开软件时检查是否有新备份,有新备份时提示是否更新 diff --git a/app/src/main/res/xml/pref_config_backup.xml b/app/src/main/res/xml/pref_config_backup.xml index 0a5d9c77f..e878fdcc9 100644 --- a/app/src/main/res/xml/pref_config_backup.xml +++ b/app/src/main/res/xml/pref_config_backup.xml @@ -11,20 +11,20 @@ @@ -70,39 +70,46 @@ + +