mirror of
https://github.com/gedoor/legado.git
synced 2024-09-01 09:34:25 +08:00
Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
11d3f4aff3
@ -16,4 +16,8 @@
|
|||||||
### 自动备份说明
|
### 自动备份说明
|
||||||
|
|
||||||
* 设置好备份之后每次退出App会自动进行备份
|
* 设置好备份之后每次退出App会自动进行备份
|
||||||
* WebDav同一天的备份会覆盖,不同日期的备份不会覆盖
|
* WebDav同一天的备份会覆盖,不同日期的备份不会覆盖
|
||||||
|
|
||||||
|
### 手动恢复备份说明
|
||||||
|
|
||||||
|
* 从WebDav手动下载备份文件需要解压才能恢复
|
@ -333,7 +333,7 @@ class BackupConfigFragment : PreferenceFragment(),
|
|||||||
AppLog.put("恢复备份出错WebDavError\n${it.localizedMessage}", it)
|
AppLog.put("恢复备份出错WebDavError\n${it.localizedMessage}", it)
|
||||||
alert {
|
alert {
|
||||||
setTitle(R.string.restore)
|
setTitle(R.string.restore)
|
||||||
setMessage("WebDavError\n${it.localizedMessage}\n将从本地备份恢复。")
|
setMessage("WebDavError\n${it.localizedMessage}\n将从本地备份恢复。\n从WebDav手动下载备份文件需要解压才能恢复。")
|
||||||
okButton {
|
okButton {
|
||||||
restoreFromLocal()
|
restoreFromLocal()
|
||||||
}
|
}
|
||||||
|
@ -45,7 +45,7 @@ fun Element.findNS(tag: String, namespace: HashSet<String>): Elements {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fun Element.findNSPrefix(namespaceURI: String): HashSet<String> {
|
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) }
|
element.attributes().filter { it.value == namespaceURI }.map { it.key.substring(6) }
|
||||||
}.flatten().toHashSet()
|
}.flatten().toHashSet()
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user