diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/org/fox/ttrss/ArticleFragment.java | 6 | ||||
| -rw-r--r-- | src/org/fox/ttrss/HeadlinesFragment.java | 30 |
2 files changed, 33 insertions, 3 deletions
diff --git a/src/org/fox/ttrss/ArticleFragment.java b/src/org/fox/ttrss/ArticleFragment.java index d79998db..071ffba5 100644 --- a/src/org/fox/ttrss/ArticleFragment.java +++ b/src/org/fox/ttrss/ArticleFragment.java @@ -153,7 +153,7 @@ public class ArticleFragment extends Fragment { "<body>" + articleContent;
if (m_article.attachments != null && m_article.attachments.size() != 0) {
- String attachments = "<div class=\"attachments\">Attachments: ";
+ String attachments = "<div class=\"attachments\">" + getString(R.string.attachments) + " ";
for (Attachment a : m_article.attachments) {
if (a.content_type != null && a.content_url != null && a.content_type.indexOf("image") != -1) {
@@ -163,9 +163,9 @@ public class ArticleFragment extends Fragment { String atitle = (a.title != null && a.title.length() > 0) ? a.title : new File(url.getFile()).getName();
- content += "<br/><img src=\"" + url.toString().replace("\"", "\\\"") + "\">";
+ content += "<br/><img src=\"" + url.toString().trim().replace("\"", "\\\"") + "\">";
- attachments += "<a href=\""+url.toString().replace("\"", "\\\"") + "\">" + atitle + "</a>, ";
+ attachments += "<a href=\""+url.toString().trim().replace("\"", "\\\"") + "\">" + atitle + "</a>, ";
} catch (MalformedURLException e) {
//
diff --git a/src/org/fox/ttrss/HeadlinesFragment.java b/src/org/fox/ttrss/HeadlinesFragment.java index 72006654..1adbeff1 100644 --- a/src/org/fox/ttrss/HeadlinesFragment.java +++ b/src/org/fox/ttrss/HeadlinesFragment.java @@ -1,6 +1,9 @@ package org.fox.ttrss;
+import java.io.File;
import java.lang.reflect.Type;
+import java.net.MalformedURLException;
+import java.net.URL;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -441,6 +444,33 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, if (m_combinedMode) {
content.setMovementMethod(LinkMovementMethod.getInstance());
+ if (article.attachments != null && article.attachments.size() != 0) {
+ String attachments = "<div style=\"font-size : 70%; margin-top : 1em;\">" + getString(R.string.attachments) + " ";
+
+ for (Attachment a : article.attachments) {
+ if (a.content_type != null && a.content_url != null && a.content_type.indexOf("image") != -1) {
+
+ try {
+ URL url = new URL(a.content_url.trim());
+
+ String atitle = (a.title != null && a.title.length() > 0) ? a.title : new File(url.getFile()).getName();
+
+ articleContent += "<br/><img src=\"" + url.toString().trim().replace("\"", "\\\"") + "\">";
+
+ attachments += "<a href=\""+url.toString().trim().replace("\"", "\\\"") + "\">" + atitle + "</a>, ";
+
+ } catch (MalformedURLException e) {
+ //
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ }
+ }
+ articleContent += attachments.replaceAll(", $", "");
+ articleContent += "</div>";
+ }
+
//content.setText(Html.fromHtml(article.content, new URLImageGetter(content, getActivity()), null));
content.setText(Html.fromHtml(articleContent, m_dummyGetter, null));
|