Merge remote-tracking branch 'origin/master'

pull/2700/head
kunfei 2 years ago
commit 11d3f4aff3
  1. 4
      app/src/main/assets/help/webDavHelp.md
  2. 2
      app/src/main/java/io/legado/app/ui/config/BackupConfigFragment.kt
  3. 2
      app/src/main/java/io/legado/app/utils/JsoupExtensions.kt

@ -17,3 +17,7 @@
* 设置好备份之后每次退出App会自动进行备份
* WebDav同一天的备份会覆盖,不同日期的备份不会覆盖
### 手动恢复备份说明
* 从WebDav手动下载备份文件需要解压才能恢复

@ -333,7 +333,7 @@ class BackupConfigFragment : PreferenceFragment(),
AppLog.put("恢复备份出错WebDavError\n${it.localizedMessage}", it)
alert {
setTitle(R.string.restore)
setMessage("WebDavError\n${it.localizedMessage}\n将从本地备份恢复。")
setMessage("WebDavError\n${it.localizedMessage}\n将从本地备份恢复。\n从WebDav手动下载备份文件需要解压才能恢复。")
okButton {
restoreFromLocal()
}

@ -45,7 +45,7 @@ fun Element.findNS(tag: String, namespace: HashSet<String>): Elements {
}
fun Element.findNSPrefix(namespaceURI: String): HashSet<String> {
return select("[^xmlns]").map { element ->
return select("[^xmlns:]").map { element ->
element.attributes().filter { it.value == namespaceURI }.map { it.key.substring(6) }
}.flatten().toHashSet()
}

Loading…
Cancel
Save