diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml index 47a801e2..63f0f76b 100644 --- a/org.fox.ttrss/src/main/AndroidManifest.xml +++ b/org.fox.ttrss/src/main/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="292" + android:versionName="1.83" > = 11) { + excerpt = article.excerpt != null ? article.excerpt : ""; + excerpt = excerpt.replace("…", ""); + } else { + excerpt = articleDoc.text(); + } if (excerpt.length() > CommonActivity.EXCERPT_MAX_LENGTH) excerpt = excerpt.substring(0, CommonActivity.EXCERPT_MAX_LENGTH) + "…"; 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 9beea81a..9c34487b 100644 --- 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 @@ -1,11 +1,11 @@ package org.fox.ttrss.types; -import java.util.ArrayList; -import java.util.List; - import android.os.Parcel; import android.os.Parcelable; +import java.util.ArrayList; +import java.util.List; + // TODO: serialize Labels public class Article implements Parcelable { public int id; @@ -21,6 +21,7 @@ public class Article implements Parcelable { public List tags; public List attachments; public String content; + public String excerpt; public List> labels; public String feed_title; public int comments_count; @@ -63,6 +64,7 @@ public class Article implements Parcelable { out.writeInt(feed_id); out.writeStringList(tags); out.writeString(content); + out.writeString(excerpt); out.writeList(attachments); out.writeString(feed_title); out.writeInt(comments_count); @@ -88,6 +90,7 @@ public class Article implements Parcelable { in.readStringList(tags); content = in.readString(); + excerpt = in.readString(); attachments = new ArrayList(); in.readList(attachments, Attachment.class.getClassLoader());