diff options
| author | Andrew Dolgov <[email protected]> | 2012-10-10 16:45:33 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2012-10-10 16:45:33 +0400 |
| commit | c444d3b1e6a69665d2750e15b5eea7f423176663 (patch) | |
| tree | de1e8e8afe784d3cee530aaea12ddef0accc3d53 /src/org | |
| parent | 84bffe92cd1622c9d3b35802106c48890337c0f9 (diff) | |
support server always_display_attachments
article: properly serialize new fields
Diffstat (limited to 'src/org')
| -rw-r--r-- | src/org/fox/ttrss/ArticleFragment.java | 15 | ||||
| -rw-r--r-- | src/org/fox/ttrss/types/Article.java | 8 |
2 files changed, 17 insertions, 6 deletions
diff --git a/src/org/fox/ttrss/ArticleFragment.java b/src/org/fox/ttrss/ArticleFragment.java index 6da3133a..399f0f10 100644 --- a/src/org/fox/ttrss/ArticleFragment.java +++ b/src/org/fox/ttrss/ArticleFragment.java @@ -262,16 +262,19 @@ public class ArticleFragment extends Fragment { spinnerArrayAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+ String flatContent = articleContent.replaceAll("[\r\n]", "");
+ boolean hasImages = flatContent.matches(".*?<img[^>+].*?");
+
for (Attachment a : m_article.attachments) {
if (a.content_type != null && a.content_url != null) {
try {
- URL url = new URL(a.content_url.trim());
- String strUrl = url.toString().trim();
-
- String regex = String.format(".*?<img.*src=[\"']%1$s[\"'].*", strUrl);
-
- if (a.content_type.indexOf("image") != -1 && !articleContent.replaceAll("[\r\n]", "").matches(regex)) {
+ if (a.content_type.indexOf("image") != -1 &&
+ (!hasImages || m_article.always_display_attachments)) {
+
+ URL url = new URL(a.content_url.trim());
+ String strUrl = url.toString().trim();
+
content += "<p><img src=\"" + strUrl.replace("\"", "\\\"") + "\"></p>";
}
diff --git a/src/org/fox/ttrss/types/Article.java b/src/org/fox/ttrss/types/Article.java index 6db4b938..8e619b4b 100644 --- a/src/org/fox/ttrss/types/Article.java +++ b/src/org/fox/ttrss/types/Article.java @@ -24,6 +24,7 @@ public class Article implements Parcelable { public String feed_title;
public int comments_count;
public String comments_link;
+ public boolean always_display_attachments;
public Article(Parcel in) {
readFromParcel(in);
@@ -60,6 +61,9 @@ public class Article implements Parcelable { out.writeString(content);
out.writeList(attachments);
out.writeString(feed_title);
+ out.writeInt(comments_count);
+ out.writeString(comments_link);
+ out.writeInt(always_display_attachments ? 1 : 0);
}
public void readFromParcel(Parcel in) {
@@ -82,6 +86,10 @@ public class Article implements Parcelable { in.readList(attachments, Attachment.class.getClassLoader());
feed_title = in.readString();
+
+ comments_count = in.readInt();
+ comments_link = in.readString();
+ always_display_attachments = in.readInt() == 1;
}
@SuppressWarnings("rawtypes")
|