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 62ff58866..c0951a129 100644 --- a/app/src/main/java/io/legado/app/constant/PreferKey.kt +++ b/app/src/main/java/io/legado/app/constant/PreferKey.kt @@ -49,7 +49,7 @@ object PreferKey { const val webDavUrl = "web_dav_url" const val webDavAccount = "web_dav_account" const val webDavPassword = "web_dav_password" - const val webDavCreateDir = "webDavCreateDir" + const val webDavDir = "webDavDir" const val exportToWebDav = "webDavCacheBackup" const val exportNoChapterName = "exportNoChapterName" const val exportType = "exportType" diff --git a/app/src/main/java/io/legado/app/help/AppConfig.kt b/app/src/main/java/io/legado/app/help/AppConfig.kt index 0f8fa940e..8375e07d6 100644 --- a/app/src/main/java/io/legado/app/help/AppConfig.kt +++ b/app/src/main/java/io/legado/app/help/AppConfig.kt @@ -271,6 +271,8 @@ object AppConfig : SharedPreferences.OnSharedPreferenceChangeListener { val replaceEnableDefault get() = appCtx.getPrefBoolean(PreferKey.replaceEnableDefault, true) + val webDavDir get() = appCtx.getPrefString(PreferKey.webDavDir, "legado") + val recordLog get() = appCtx.getPrefBoolean(PreferKey.recordLog) val doublePageHorizontal: Boolean diff --git a/app/src/main/java/io/legado/app/help/storage/AppWebDav.kt b/app/src/main/java/io/legado/app/help/storage/AppWebDav.kt index 1fc779247..dc6f66aef 100644 --- a/app/src/main/java/io/legado/app/help/storage/AppWebDav.kt +++ b/app/src/main/java/io/legado/app/help/storage/AppWebDav.kt @@ -29,13 +29,13 @@ object AppWebDav { private val rootWebDavUrl: String get() { - var url = appCtx.getPrefString(PreferKey.webDavUrl)?.trim() - if (url.isNullOrEmpty()) { - url = defaultWebDavUrl - } + val configUrl = appCtx.getPrefString(PreferKey.webDavUrl)?.trim() + var url = if (configUrl.isNullOrEmpty()) defaultWebDavUrl else configUrl if (!url.endsWith("/")) url = "${url}/" - if (appCtx.getPrefBoolean(PreferKey.webDavCreateDir, true)) { - url = "${url}legado/" + AppConfig.webDavDir?.trim()?.let { + if (it.isNotEmpty()) { + url = "${url}${it}/" + } } return url } 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 6314e693b..6d5377760 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 @@ -121,6 +121,7 @@ class BackupConfigFragment : BasePreferenceFragment(), upPreferenceSummary(PreferKey.webDavUrl, getPrefString(PreferKey.webDavUrl)) upPreferenceSummary(PreferKey.webDavAccount, getPrefString(PreferKey.webDavAccount)) upPreferenceSummary(PreferKey.webDavPassword, getPrefString(PreferKey.webDavPassword)) + upPreferenceSummary(PreferKey.webDavDir, AppConfig.webDavDir) upPreferenceSummary(PreferKey.backupPath, getPrefString(PreferKey.backupPath)) findPreference("web_dav_restore") ?.onLongClick { restoreDir.launch(); true } @@ -168,6 +169,7 @@ class BackupConfigFragment : BasePreferenceFragment(), PreferKey.backupPath -> { upPreferenceSummary(key, getPrefString(key)) } + PreferKey.webDavDir -> upPreferenceSummary(key, AppConfig.webDavDir) } } @@ -192,6 +194,11 @@ class BackupConfigFragment : BasePreferenceFragment(), } else { preference.summary = "*".repeat(value.toString().length) } + PreferKey.webDavDir -> if (value.isNullOrBlank()) { + preference.summary = "null" + } else { + preference.summary = value + } else -> { if (preference is ListPreference) { val index = preference.findIndexOfValue(value) diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml index 52599d81a..f43d92ac1 100644 --- a/app/src/main/res/values-es-rES/strings.xml +++ b/app/src/main/res/values-es-rES/strings.xml @@ -9,8 +9,6 @@ Inicio Restaurar Importar datos de Legado - Crear carpeta - Crea una carpeta de respaldo bajo el nombre de Legado. Respaldo de caché de libros sin conexión Exporta localmente lo respalda para su exportación Respaldar para @@ -927,5 +925,6 @@ 小于 校验超时: %1$s秒\n校验项目:%2$s 记录调试日志 + 子文件夹 diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml index 7ee8d230b..69147d155 100644 --- a/app/src/main/res/values-ja-rJP/strings.xml +++ b/app/src/main/res/values-ja-rJP/strings.xml @@ -9,8 +9,6 @@ Home Restore Import Legado data - Create a subfolder - Create a folder named Legado as the backup folder. Offline cache book backup Export to local and back up to the exports directory under the legado folder Backup to @@ -930,5 +928,6 @@ 小于 校验超时: %1$s秒\n校验项目:%2$s 记录调试日志 + 子文件夹 diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index e4056e388..94949dc6d 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -9,8 +9,6 @@ Início Restaurar Importar dados ao Legado - Criar uma subpasta - Criar uma pasta de Backup com o nome Legado. Backup do cache dos livros para leitura off-line Exportar localmente e fazer Backup à pasta de exportação Backup para @@ -930,5 +928,6 @@ 小于 校验超时: %1$s秒\n校验项目:%2$s 记录调试日志 + 子文件夹 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 891ea6dcb..6ac0b6001 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -8,8 +8,6 @@ Home 還原 導入閲讀數據 - 創建子文件夾 - 創建 legado 文件夾作爲備份路徑 離線緩存書籍備份 導出本地同時備份到legado文件夾下exports目錄 備份路徑 @@ -927,5 +925,6 @@ 小于 校验超时: %1$s秒\n校验项目:%2$s 记录调试日志 + 子文件夹 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index c1dd02fc1..a9cfc60f2 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -8,8 +8,6 @@ 備份 復原 匯入閱讀資料 - 建立子資料夾 - 建立legado資料夾作為備份資料夾 離線快取書籍備份 匯出本機同時備份到legado資料夾下exports目錄 備份路徑 @@ -929,5 +927,6 @@ 小于 校验超时: %1$s秒\n校验项目:%2$s 记录调试日志 + 子文件夹 diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index 87e293862..656992fdf 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -8,8 +8,6 @@ Home 恢复 导入阅读数据 - 创建子文件夹 - 创建legado文件夹作为备份文件夹 离线缓存书籍备份 导出本地同时备份到legado文件夹下exports目录 备份路径 @@ -929,5 +927,6 @@ 小于 校验超时: %1$s秒\n校验项目:%2$s 记录调试日志 + 子文件夹 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a8314a49f..a5cbace51 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -9,8 +9,6 @@ Home Restore Import Legado data - Create a subfolder - Create a folder named Legado as the backup folder. Offline cache book backup Export to local and back up to the exports directory under the legado folder Backup to @@ -930,5 +928,6 @@ 小于 校验超时: %1$s秒\n校验项目:%2$s 记录调试日志 + Sub dir diff --git a/app/src/main/res/xml/pref_config_backup.xml b/app/src/main/res/xml/pref_config_backup.xml index 6a57dcc87..06085208d 100644 --- a/app/src/main/res/xml/pref_config_backup.xml +++ b/app/src/main/res/xml/pref_config_backup.xml @@ -27,11 +27,9 @@ android:summary="@string/web_dav_pw_s" app:iconSpaceReserved="false" /> -