From 37e127a896f2bdd9f449fa0f7587b91bd4d09408 Mon Sep 17 00:00:00 2001 From: gedoor Date: Tue, 24 Aug 2021 09:48:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=99=BB=E5=BD=95ui?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/io/legado/app/data/entities/BookSource.kt | 5 +++++ .../app/ui/book/source/edit/BookSourceEditActivity.kt | 8 +------- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/io/legado/app/data/entities/BookSource.kt b/app/src/main/java/io/legado/app/data/entities/BookSource.kt index 3a23d3c6e..10d5157af 100644 --- a/app/src/main/java/io/legado/app/data/entities/BookSource.kt +++ b/app/src/main/java/io/legado/app/data/entities/BookSource.kt @@ -104,6 +104,11 @@ data class BookSource( override fun equals(other: Any?) = if (other is BookSource) other.bookSourceUrl == bookSourceUrl else false + fun getLoginUiStr(): String? { + return loginUi?.let { + GSON.toJson(it) + } + } fun getSearchRule() = ruleSearch ?: SearchRule() diff --git a/app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditActivity.kt b/app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditActivity.kt index aa02e1448..ee14fe40e 100644 --- a/app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditActivity.kt @@ -198,13 +198,7 @@ class BookSourceEditActivity : add(EditEntity("bookSourceGroup", source?.bookSourceGroup, R.string.source_group)) add(EditEntity("bookSourceComment", source?.bookSourceComment, R.string.comment)) add(EditEntity("loginUrl", source?.loginUrl, R.string.login_url)) - add( - EditEntity( - "loginUi", - source?.loginUi?.let { GSON.toJson(source.loginUi) }, - R.string.login_ui - ) - ) + add(EditEntity("loginUi", source?.getLoginUiStr(), R.string.login_ui)) add(EditEntity("loginCheckJs", source?.loginCheckJs, R.string.login_check_js)) add(EditEntity("bookUrlPattern", source?.bookUrlPattern, R.string.book_url_pattern)) add(EditEntity("header", source?.header, R.string.source_http_header))