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" />
-
-
-
-
-