diff --git a/app/src/main/java/io/legado/app/ui/rss/source/edit/RssSourceEditActivity.kt b/app/src/main/java/io/legado/app/ui/rss/source/edit/RssSourceEditActivity.kt index 57e763562..a4e17e84d 100644 --- a/app/src/main/java/io/legado/app/ui/rss/source/edit/RssSourceEditActivity.kt +++ b/app/src/main/java/io/legado/app/ui/rss/source/edit/RssSourceEditActivity.kt @@ -152,53 +152,41 @@ class RssSourceEditActivity : binding.recyclerView.adapter = adapter } - private fun upSourceView(source: RssSource? = viewModel.rssSource) { - source?.let { - binding.cbIsEnable.isChecked = source.enabled - binding.cbSingleUrl.isChecked = source.singleUrl - binding.cbIsEnableCookie.isChecked = source.enabledCookieJar == true - binding.cbEnableJs.isChecked = source.enableJs - binding.cbEnableBaseUrl.isChecked = source.loadWithBaseUrl + private fun upSourceView(rs: RssSource? = viewModel.rssSource) { + rs?.let { + binding.cbIsEnable.isChecked = rs.enabled + binding.cbSingleUrl.isChecked = rs.singleUrl + binding.cbIsEnableCookie.isChecked = rs.enabledCookieJar == true + binding.cbEnableJs.isChecked = rs.enableJs + binding.cbEnableBaseUrl.isChecked = rs.loadWithBaseUrl } sourceEntities.clear() sourceEntities.apply { - add(EditEntity("sourceName", source?.sourceName, R.string.source_name)) - add(EditEntity("sourceUrl", source?.sourceUrl, R.string.source_url)) - add(EditEntity("sourceIcon", source?.sourceIcon, R.string.source_icon)) - add(EditEntity("sourceGroup", source?.sourceGroup, R.string.source_group)) - add(EditEntity("sourceComment", source?.sourceComment, R.string.comment)) - add(EditEntity("loginUrl", source?.loginUrl, R.string.login_url)) - add(EditEntity("loginUi", source?.loginUi, R.string.login_ui)) - add(EditEntity("loginCheckJs", source?.loginCheckJs, R.string.login_check_js)) - add(EditEntity("coverDecodeJs", source?.coverDecodeJs, R.string.cover_decode_js)) - add(EditEntity("header", source?.header, R.string.source_http_header)) - add(EditEntity("variableComment", source?.variableComment, R.string.variable_comment)) - add(EditEntity("concurrentRate", source?.concurrentRate, R.string.concurrent_rate)) - add(EditEntity("sortUrl", source?.sortUrl, R.string.sort_url)) - add(EditEntity("ruleArticles", source?.ruleArticles, R.string.r_articles)) - add(EditEntity("ruleNextPage", source?.ruleNextPage, R.string.r_next)) - add(EditEntity("ruleTitle", source?.ruleTitle, R.string.r_title)) - add(EditEntity("rulePubDate", source?.rulePubDate, R.string.r_date)) - add(EditEntity("ruleDescription", source?.ruleDescription, R.string.r_description)) - add(EditEntity("ruleImage", source?.ruleImage, R.string.r_image)) - add(EditEntity("ruleLink", source?.ruleLink, R.string.r_link)) - add(EditEntity("ruleContent", source?.ruleContent, R.string.r_content)) - add(EditEntity("style", source?.style, R.string.r_style)) - add(EditEntity("injectJs", source?.injectJs, R.string.r_inject_js)) - add( - EditEntity( - "contentWhitelist", - source?.contentWhitelist, - R.string.content_whitelist - ) - ) - add( - EditEntity( - "contentBlacklist", - source?.contentBlacklist, - R.string.content_blacklist - ) - ) + add(EditEntity("sourceName", rs?.sourceName, R.string.source_name)) + add(EditEntity("sourceUrl", rs?.sourceUrl, R.string.source_url)) + add(EditEntity("sourceIcon", rs?.sourceIcon, R.string.source_icon)) + add(EditEntity("sourceGroup", rs?.sourceGroup, R.string.source_group)) + add(EditEntity("sourceComment", rs?.sourceComment, R.string.comment)) + add(EditEntity("loginUrl", rs?.loginUrl, R.string.login_url)) + add(EditEntity("loginUi", rs?.loginUi, R.string.login_ui)) + add(EditEntity("loginCheckJs", rs?.loginCheckJs, R.string.login_check_js)) + add(EditEntity("coverDecodeJs", rs?.coverDecodeJs, R.string.cover_decode_js)) + add(EditEntity("header", rs?.header, R.string.source_http_header)) + add(EditEntity("variableComment", rs?.variableComment, R.string.variable_comment)) + add(EditEntity("concurrentRate", rs?.concurrentRate, R.string.concurrent_rate)) + add(EditEntity("sortUrl", rs?.sortUrl, R.string.sort_url)) + add(EditEntity("ruleArticles", rs?.ruleArticles, R.string.r_articles)) + add(EditEntity("ruleNextPage", rs?.ruleNextPage, R.string.r_next)) + add(EditEntity("ruleTitle", rs?.ruleTitle, R.string.r_title)) + add(EditEntity("rulePubDate", rs?.rulePubDate, R.string.r_date)) + add(EditEntity("ruleDescription", rs?.ruleDescription, R.string.r_description)) + add(EditEntity("ruleImage", rs?.ruleImage, R.string.r_image)) + add(EditEntity("ruleLink", rs?.ruleLink, R.string.r_link)) + add(EditEntity("ruleContent", rs?.ruleContent, R.string.r_content)) + add(EditEntity("style", rs?.style, R.string.r_style)) + add(EditEntity("injectJs", rs?.injectJs, R.string.r_inject_js)) + add(EditEntity("contentWhitelist", rs?.contentWhitelist, R.string.c_whitelist)) + add(EditEntity("contentBlacklist", rs?.contentBlacklist, R.string.c_blacklist)) } adapter.editEntities = sourceEntities } diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml index aad9a9c40..793c0c3a8 100644 --- a/app/src/main/res/values-es-rES/strings.xml +++ b/app/src/main/res/values-es-rES/strings.xml @@ -1065,6 +1065,6 @@ 更新失败 阅读需要发送通知来显示朗读控制和下载进度 webDav书源比本地新,是否恢复 - 白名单(contentWhitelist) - 黑名单(contentBlacklist) + 白名单(contentWhitelist) + 黑名单(contentBlacklist) diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml index 448ec8516..bf0cf9f95 100644 --- a/app/src/main/res/values-ja-rJP/strings.xml +++ b/app/src/main/res/values-ja-rJP/strings.xml @@ -1068,6 +1068,6 @@ 更新失败 阅读需要发送通知来显示朗读控制和下载进度 webDav书源比本地新,是否恢复 - 白名单(contentWhitelist) - 黑名单(contentBlacklist) + 白名单(contentWhitelist) + 黑名单(contentBlacklist) diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 5e8733a1c..72e4e13be 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -1068,6 +1068,6 @@ 更新失败 阅读需要发送通知来显示朗读控制和下载进度 webDav书源比本地新,是否恢复 - 白名单(contentWhitelist) - 黑名单(contentBlacklist) + 白名单(contentWhitelist) + 黑名单(contentBlacklist) diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index e2f095b68..3944c18fd 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -1065,6 +1065,6 @@ 更新失败 阅读需要发送通知来显示朗读控制和下载进度 webDav书源比本地新,是否恢复 - 白名单(contentWhitelist) - 黑名单(contentBlacklist) + 白名单(contentWhitelist) + 黑名单(contentBlacklist) diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 5b437849b..75d19e09f 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -1067,6 +1067,6 @@ 更新失败 阅读需要发送通知来显示朗读控制和下载进度 webDav书源比本地新,是否恢复 - 白名单(contentWhitelist) - 黑名单(contentBlacklist) + 白名单(contentWhitelist) + 黑名单(contentBlacklist) diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index 512ca9ad9..d02b8d228 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -1067,6 +1067,6 @@ 更新失败 阅读需要发送通知来显示朗读控制和下载进度 webDav书源比本地新,是否恢复 - 白名单(contentWhitelist) - 黑名单(contentBlacklist) + 白名单(contentWhitelist) + 黑名单(contentBlacklist) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9c9ddb760..64dce92cb 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1068,6 +1068,6 @@ Update failed Reading requires sending notifications to show reading control and download progress The webDav book source is newer than the local one, whether to restore it or not - 白名单(contentWhitelist) - 黑名单(contentBlacklist) + 白名单(contentWhitelist) + 黑名单(contentBlacklist)