From 1fde27020872b252e9030fc08354d67e4cdff9c9 Mon Sep 17 00:00:00 2001 From: kunfei Date: Wed, 4 Mar 2020 09:09:47 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/legado/app/help/storage/SyncBookProgress.kt | 5 +++-- .../java/io/legado/app/help/storage/WebDavHelp.kt | 14 +++++++++----- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/io/legado/app/help/storage/SyncBookProgress.kt b/app/src/main/java/io/legado/app/help/storage/SyncBookProgress.kt index 8f2bbaf47..ddb4d6ef5 100644 --- a/app/src/main/java/io/legado/app/help/storage/SyncBookProgress.kt +++ b/app/src/main/java/io/legado/app/help/storage/SyncBookProgress.kt @@ -10,8 +10,9 @@ import io.legado.app.utils.fromJsonArray @Suppress("BlockingMethodInNonBlockingContext") object SyncBookProgress { - private val file = FileUtils.createFileIfNotExist(App.INSTANCE.cacheDir, "bookProgress.json") - private val webDavUrl = "${WebDavHelp.rootWebDavUrl}bookProgress.json" + const val fileName = "bookProgress.json" + private val file = FileUtils.createFileIfNotExist(App.INSTANCE.cacheDir, fileName) + private val webDavUrl = "${WebDavHelp.rootWebDavUrl}$fileName" fun uploadBookProgress() { Coroutine.async { diff --git a/app/src/main/java/io/legado/app/help/storage/WebDavHelp.kt b/app/src/main/java/io/legado/app/help/storage/WebDavHelp.kt index fc14289c5..50857893d 100644 --- a/app/src/main/java/io/legado/app/help/storage/WebDavHelp.kt +++ b/app/src/main/java/io/legado/app/help/storage/WebDavHelp.kt @@ -88,11 +88,15 @@ object WebDavHelp { private fun restoreWebDav(name: String, success: () -> Unit) { Coroutine.async { rootWebDavUrl.let { - val webDav = WebDav(it + name) - webDav.downloadTo(zipFilePath, true) - @Suppress("BlockingMethodInNonBlockingContext") - ZipUtils.unzipFile(zipFilePath, Backup.backupPath) - Restore.restore(Backup.backupPath) + if (name == SyncBookProgress.fileName) { + SyncBookProgress.downloadBookProgress() + } else { + val webDav = WebDav(it + name) + webDav.downloadTo(zipFilePath, true) + @Suppress("BlockingMethodInNonBlockingContext") + ZipUtils.unzipFile(zipFilePath, Backup.backupPath) + Restore.restore(Backup.backupPath) + } } }.onSuccess { success.invoke()