From 73d2f25ce5e92c7a9e729764c877b0edc3dadf40 Mon Sep 17 00:00:00 2001
From: Xwite <1797350009@qq.com>
Date: Mon, 6 Mar 2023 17:15:31 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20webDav=E6=9C=8D=E5=8A=A1=E5=99=A8?=
 =?UTF-8?q?=E7=9A=84config=E5=92=8CwebDavConfig=E5=AE=9A=E4=B9=89=E4=B8=8D?=
 =?UTF-8?q?=E5=90=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/io/legado/app/data/entities/Server.kt         | 2 +-
 app/src/main/java/io/legado/app/lib/webdav/Authorization.kt     | 2 +-
 .../io/legado/app/ui/book/import/remote/ServerConfigDialog.kt   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/io/legado/app/data/entities/Server.kt b/app/src/main/java/io/legado/app/data/entities/Server.kt
index 093cfef21..4c47e135e 100644
--- a/app/src/main/java/io/legado/app/data/entities/Server.kt
+++ b/app/src/main/java/io/legado/app/data/entities/Server.kt
@@ -44,7 +44,7 @@ data class Server(
     }
 
     fun getWebDavConfig(): WebDavConfig? {
-        return GSON.fromJsonObject<WebDavConfig>(config).getOrNull()
+        return if (type == TYPE.WEBDAV) GSON.fromJsonObject<WebDavConfig>(config).getOrNull() else null
     }
 
     @Parcelize
diff --git a/app/src/main/java/io/legado/app/lib/webdav/Authorization.kt b/app/src/main/java/io/legado/app/lib/webdav/Authorization.kt
index b626b90e7..1b44d5f78 100644
--- a/app/src/main/java/io/legado/app/lib/webdav/Authorization.kt
+++ b/app/src/main/java/io/legado/app/lib/webdav/Authorization.kt
@@ -26,7 +26,7 @@ data class Authorization(
         serverID ?: throw NoStackTraceException("Unexpected server ID")
         appDb.serverDao.get(serverID)?.getWebDavConfig().run {
             data = Credentials.basic(username, password, charset)
-        }
+        } ?: throw WebDavException("Unexpected WebDav Authorization")
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/io/legado/app/ui/book/import/remote/ServerConfigDialog.kt b/app/src/main/java/io/legado/app/ui/book/import/remote/ServerConfigDialog.kt
index 65af6ed8e..ec2282c86 100644
--- a/app/src/main/java/io/legado/app/ui/book/import/remote/ServerConfigDialog.kt
+++ b/app/src/main/java/io/legado/app/ui/book/import/remote/ServerConfigDialog.kt
@@ -27,7 +27,7 @@ class ServerConfigDialog : BaseDialogFragment(R.layout.dialog_webdav_server, tru
 
     private val serverUi = listOf(
         RowUi("url"),
-        RowUi("user"),
+        RowUi("username"),
         RowUi("password", RowUi.Type.password)
     )