From aeb727b40b25dc52fb6f1c7f639f9802866a1aa7 Mon Sep 17 00:00:00 2001
From: Xwite <1797350009@qq.com>
Date: Fri, 10 Mar 2023 19:43:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B7=BB=E5=8A=A0=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E5=99=A8=E9=85=8D=E7=BD=AE=E6=97=B6=E4=B8=8D=E5=9B=9E?=
 =?UTF-8?q?=E8=B0=83=20id=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/legado/app/constant/AppConst.kt   |  2 +-
 .../book/import/remote/ServerConfigDialog.kt  | 26 +++++++------------
 .../main/res/layout/dialog_webdav_server.xml  | 15 -----------
 3 files changed, 10 insertions(+), 33 deletions(-)

diff --git a/app/src/main/java/io/legado/app/constant/AppConst.kt b/app/src/main/java/io/legado/app/constant/AppConst.kt
index 215fe431c..6d72bee68 100644
--- a/app/src/main/java/io/legado/app/constant/AppConst.kt
+++ b/app/src/main/java/io/legado/app/constant/AppConst.kt
@@ -25,7 +25,7 @@ object AppConst {
 
     const val MAX_THREAD = 9
 
-    const val DEFAULT_WEBDAV_ID = -1
+    const val DEFAULT_WEBDAV_ID = -1L
 
     val SCRIPT_ENGINE: RhinoScriptEngine by lazy {
         RhinoScriptEngine()
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 8c7296fe6..de8d97dc4 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
@@ -67,7 +67,6 @@ class ServerConfigDialog() : BaseDialogFragment(R.layout.dialog_webdav_server, t
     }
 
     private fun upConfigView(server: Server?) {
-        binding.etId.setText(server?.id?.toString())
         binding.etName.setText(server?.name)
         binding.spType.setSelection(
             when (server?.type) {
@@ -109,14 +108,7 @@ class ServerConfigDialog() : BaseDialogFragment(R.layout.dialog_webdav_server, t
     }
 
     private fun getServer(): Server? {
-        val id = kotlin.runCatching {
-            binding.etId.text.toString().toLong()
-        }.getOrNull()
-        if (id == null) {
-            toastOnUi("id不能为空")
-            return null
-        }
-        val server = viewModel.mServer?.copy(id = id) ?: Server(id = id)
+        val server = viewModel.mServer?.copy() ?: Server()
         server.name = binding.etName.text.toString()
         server.type = when (binding.spType.selectedItemPosition) {
             else -> Server.TYPE.WEBDAV
@@ -139,15 +131,15 @@ class ServerConfigDialog() : BaseDialogFragment(R.layout.dialog_webdav_server, t
     }
 
 
-    override fun onDismiss(dialog: DialogInterface) {
-        super.onDismiss(dialog)
-        ((parentFragment as? Callback) ?: (activity as? Callback))
-            ?.onDialogDismiss("serverConfig")
-    }
+    // override fun onDismiss(dialog: DialogInterface) {
+        // super.onDismiss(dialog)
+       // ((parentFragment as? Callback) ?: (activity as? Callback))
+           // ?.onDialogDismiss("serverConfig")
+    // }
 
-    interface Callback {
+    // interface Callback {
 
-        fun onDialogDismiss(tag: String)
+        // fun onDialogDismiss(tag: String)
 
-    }
+    // }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_webdav_server.xml b/app/src/main/res/layout/dialog_webdav_server.xml
index 85efe466e..08d332ea0 100644
--- a/app/src/main/res/layout/dialog_webdav_server.xml
+++ b/app/src/main/res/layout/dialog_webdav_server.xml
@@ -28,21 +28,6 @@
             app:popupTheme="@style/AppTheme.PopupOverlay"
             app:titleTextAppearance="@style/ToolbarTitle" />
 
-        <io.legado.app.ui.widget.text.TextInputLayout
-            android:id="@+id/til_id"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:hint="ID"
-            tools:ignore="HardcodedText">
-
-            <io.legado.app.lib.theme.view.ThemeEditText
-                android:id="@+id/et_id"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:numeric="integer"
-                tools:ignore="SpeakableTextPresentCheck,TouchTargetSizeCheck" />
-        </io.legado.app.ui.widget.text.TextInputLayout>
-
         <io.legado.app.ui.widget.text.TextInputLayout
             android:id="@+id/til_name"
             android:layout_width="match_parent"