From e5c336ee29c717d8a02b0d65e572bf6240b480f6 Mon Sep 17 00:00:00 2001 From: gedoor Date: Sun, 9 Aug 2020 21:38:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=81=A2=E5=A4=8D=E6=8A=A5?= =?UTF-8?q?=E9=94=99bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/io/legado/app/help/storage/WebDavHelp.kt | 8 +++----- .../main/java/io/legado/app/ui/config/BackupRestoreUi.kt | 7 ++----- 2 files changed, 5 insertions(+), 10 deletions(-) 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 01696a749..190ec2176 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 @@ -70,7 +70,7 @@ object WebDavHelp { return names } - suspend fun showRestoreDialog(context: Context, restoreSuccess: () -> Unit): Boolean { + suspend fun showRestoreDialog(context: Context): Boolean { val names = withContext(IO) { getWebDavFileNames() } return if (names.isNotEmpty()) { withContext(Main) { @@ -79,7 +79,7 @@ object WebDavHelp { items = names ) { _, index -> if (index in 0 until names.size) { - restoreWebDav(names[index], restoreSuccess) + restoreWebDav(names[index]) } } } @@ -89,7 +89,7 @@ object WebDavHelp { } } - private fun restoreWebDav(name: String, success: () -> Unit) { + private fun restoreWebDav(name: String) { Coroutine.async { rootWebDavUrl.let { if (name == SyncBookProgress.fileName) { @@ -103,8 +103,6 @@ object WebDavHelp { Restore.restoreConfig() } } - }.onSuccess { - success.invoke() }.onError { App.INSTANCE.toast("WebDavError:${it.localizedMessage}") } diff --git a/app/src/main/java/io/legado/app/ui/config/BackupRestoreUi.kt b/app/src/main/java/io/legado/app/ui/config/BackupRestoreUi.kt index b99ef4d8d..391a76ddf 100644 --- a/app/src/main/java/io/legado/app/ui/config/BackupRestoreUi.kt +++ b/app/src/main/java/io/legado/app/ui/config/BackupRestoreUi.kt @@ -77,9 +77,8 @@ object BackupRestoreUi { fun restore(fragment: Fragment) { Coroutine.async(context = Main) { - if (!WebDavHelp.showRestoreDialog(fragment.requireContext()) { - fragment.toast(R.string.restore_success) - }) { + val restoreFromWebDav = WebDavHelp.showRestoreDialog(fragment.requireContext()) + if (!restoreFromWebDav) { val backupPath = fragment.getPrefString(PreferKey.backupPath) if (backupPath?.isNotEmpty() == true) { if (backupPath.isContentPath()) { @@ -113,8 +112,6 @@ object BackupRestoreUi { AppConfig.backupPath = path Restore.restoreDatabase(path) Restore.restoreConfig(path) - }.onSuccess { - fragment.toast(R.string.restore_success) } } .request()