From 35c01961e5cb23465bb9dc11ea3f701c470e3801 Mon Sep 17 00:00:00 2001 From: kunfei Date: Thu, 3 Oct 2019 19:12:23 +0800 Subject: [PATCH] up --- app/src/main/java/io/legado/app/model/rss/RssParserByRule.kt | 2 +- .../io/legado/app/ui/rss/source/edit/RssSourceEditActivity.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/io/legado/app/model/rss/RssParserByRule.kt b/app/src/main/java/io/legado/app/model/rss/RssParserByRule.kt index f2a40bc01..45bbaf637 100644 --- a/app/src/main/java/io/legado/app/model/rss/RssParserByRule.kt +++ b/app/src/main/java/io/legado/app/model/rss/RssParserByRule.kt @@ -84,8 +84,8 @@ object RssParserByRule { rssArticle.categories = analyzeRule.getString(ruleCategories) rssArticle.description = analyzeRule.getString(ruleDescription) rssArticle.image = analyzeRule.getString(ruleImage) - rssArticle.content = analyzeRule.getString(ruleContent) rssArticle.link = analyzeRule.getString(ruleLink) + rssArticle.content = analyzeRule.getString(ruleContent) if (rssArticle.title.isNullOrBlank()) { return null } 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 9283744b4..10e783e15 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 @@ -125,8 +125,8 @@ class RssSourceEditActivity : ) ) add(EditEntity("ruleImage", rssSource?.ruleImage, R.string.rss_rule_image)) - add(EditEntity("ruleContent", rssSource?.ruleContent, R.string.rss_rule_content)) add(EditEntity("ruleLink", rssSource?.ruleLink, R.string.rss_rule_link)) + add(EditEntity("ruleContent", rssSource?.ruleContent, R.string.rss_rule_content)) } adapter.editEntities = sourceEntities } @@ -147,8 +147,8 @@ class RssSourceEditActivity : "ruleCategories" -> source.ruleCategories = it.value "ruleDescription" -> source.ruleDescription = it.value "ruleImage" -> source.ruleImage = it.value - "ruleContent" -> source.ruleContent = it.value "ruleLink" -> source.ruleLink = it.value + "ruleContent" -> source.ruleContent = it.value } } if (source.sourceName.isBlank() || source.sourceName.isBlank()) {