diff options
| author | Andrew Dolgov <[email protected]> | 2012-10-14 16:37:39 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2012-10-14 16:37:39 +0400 |
| commit | cbae8a4dc299bc130b4d3837e8e60f23d1051760 (patch) | |
| tree | 92060addc0074476354cb2c65d9f3ac50ea57e3a /src/org | |
| parent | 8b7a93767869134d4b82adb835edebce974825f4 (diff) | |
| parent | c444d3b1e6a69665d2750e15b5eea7f423176663 (diff) | |
Merge branch 'master' of [email protected]:gothfox/Tiny-Tiny-RSS-for-Honeycomb.git
Diffstat (limited to 'src/org')
| -rw-r--r-- | src/org/fox/ttrss/ArticleFragment.java | 21 | ||||
| -rw-r--r-- | src/org/fox/ttrss/ArticlePager.java | 10 | ||||
| -rw-r--r-- | src/org/fox/ttrss/offline/OfflineArticlePager.java | 5 | ||||
| -rw-r--r-- | src/org/fox/ttrss/types/Article.java | 8 |
4 files changed, 30 insertions, 14 deletions
diff --git a/src/org/fox/ttrss/ArticleFragment.java b/src/org/fox/ttrss/ArticleFragment.java index 9a7b0ed3..399f0f10 100644 --- a/src/org/fox/ttrss/ArticleFragment.java +++ b/src/org/fox/ttrss/ArticleFragment.java @@ -2,6 +2,7 @@ package org.fox.ttrss; import java.net.MalformedURLException;
import java.net.URL;
+import java.net.URLEncoder;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
@@ -260,28 +261,30 @@ public class ArticleFragment extends Fragment { getActivity(), android.R.layout.simple_spinner_item, spinnerArray);
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$[\"']", strUrl);
-
- if (a.content_type.indexOf("image") != -1 && !articleContent.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>";
}
-
- spinnerArray.add(a);
} catch (MalformedURLException e) {
//
} catch (Exception e) {
e.printStackTrace();
}
-
+
+ spinnerArray.add(a);
}
}
diff --git a/src/org/fox/ttrss/ArticlePager.java b/src/org/fox/ttrss/ArticlePager.java index bc4e367a..b64d5642 100644 --- a/src/org/fox/ttrss/ArticlePager.java +++ b/src/org/fox/ttrss/ArticlePager.java @@ -47,6 +47,11 @@ public class ArticlePager extends Fragment { if (article != null) {
ArticleFragment af = new ArticleFragment(article);
+
+ if (m_prefs.getBoolean("dim_status_bar", false) && getView() != null) {
+ getView().setSystemUiVisibility(View.STATUS_BAR_HIDDEN);
+ }
+
return af;
}
return null;
@@ -127,11 +132,6 @@ public class ArticlePager extends Fragment { }
});
-
- if (m_prefs.getBoolean("dim_status_bar", false)) {
- view.setSystemUiVisibility(View.STATUS_BAR_HIDDEN);
- }
-
return view;
}
diff --git a/src/org/fox/ttrss/offline/OfflineArticlePager.java b/src/org/fox/ttrss/offline/OfflineArticlePager.java index 7e9384ca..bc138bb0 100644 --- a/src/org/fox/ttrss/offline/OfflineArticlePager.java +++ b/src/org/fox/ttrss/offline/OfflineArticlePager.java @@ -79,6 +79,11 @@ public class OfflineArticlePager extends Fragment { Log.d(TAG, "getItem: " + position);
if (m_cursor.moveToPosition(position)) {
+
+ if (m_prefs.getBoolean("dim_status_bar", false) && getView() != null) {
+ getView().setSystemUiVisibility(View.STATUS_BAR_HIDDEN);
+ }
+
return new OfflineArticleFragment(m_cursor.getInt(m_cursor.getColumnIndex(BaseColumns._ID)));
}
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")
|