From 573cf6542a68ca58043df4f34b4101dda989ec23 Mon Sep 17 00:00:00 2001
From: kunfei <gekunfei@live.com>
Date: Sun, 28 May 2023 11:05:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/legado/app/help/storage/Restore.kt  | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/io/legado/app/help/storage/Restore.kt b/app/src/main/java/io/legado/app/help/storage/Restore.kt
index 6c949bb19..fd4b1dd58 100644
--- a/app/src/main/java/io/legado/app/help/storage/Restore.kt
+++ b/app/src/main/java/io/legado/app/help/storage/Restore.kt
@@ -220,12 +220,17 @@ object Restore {
                 if (BackupConfig.keyIsNotIgnore(key)) {
                     when (key) {
                         PreferKey.webDavPassword -> {
-                            edit.putString(
-                                key,
-                                kotlin.runCatching {
-                                    aes.decryptStr(value.toString())
-                                }.getOrDefault(value.toString())
-                            )
+                            kotlin.runCatching {
+                                aes.decryptStr(value.toString())
+                            }.getOrNull()?.let {
+                                edit.putString(key, it)
+                            } ?: let {
+                                if (appCtx.getPrefString(PreferKey.webDavPassword)
+                                        .isNullOrBlank()
+                                ) {
+                                    edit.putString(key, value.toString())
+                                }
+                            }
                         }
 
                         else -> when (value) {