diff options
3 files changed, 11 insertions, 5 deletions
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java index 19f6bae2..8db258f9 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java @@ -1094,11 +1094,8 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, String excerpt; try { - if (m_activity.getApiLevel() >= 11) { - excerpt = article.excerpt != null ? article.excerpt : ""; - excerpt = excerpt.replace("…", "…"); - excerpt = excerpt.replace("]]>", ""); - excerpt = Jsoup.parse(excerpt).text(); + if (article.excerpt != null) { + excerpt = article.excerpt; } else { excerpt = article.articleDoc.text(); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/types/Article.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/types/Article.java index f1eafe8f..aaa78532 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/types/Article.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/types/Article.java @@ -58,6 +58,14 @@ public class Article implements Parcelable { } + public void cleanupExcerpt() { + if (excerpt != null) { + excerpt = excerpt.replace("…", "…"); + excerpt = excerpt.replace("]]>", ""); + excerpt = Jsoup.parse(excerpt).text(); + } + } + public void collectMediaInfo() { articleDoc = Jsoup.parse(content); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/util/HeadlinesRequest.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/util/HeadlinesRequest.java index 8581addc..891d1d1a 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/util/HeadlinesRequest.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/util/HeadlinesRequest.java @@ -95,6 +95,7 @@ public class HeadlinesRequest extends ApiRequest { for (Article f : articles) if (!m_articles.containsId(f.id)) { f.collectMediaInfo(); + f.cleanupExcerpt(); m_articles.add(f); } |