Use site_url instead of comments_link

requires tt-rss API 21+

2 files changed, 4 insertions, 1 deletions

diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java
index bf89e324..04d5889f 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java
@@ -338,7 +338,7 @@ public class ArticleFragment extends StateSavedFragment  {
         TextView host = view.findViewById(R.id.host);
         if (host != null) {
             try {
-                URL inurl = new URL(m_article.comments_link); /* This could be improved if /tt-rss/api:getArticle returned feed_url */
+                URL inurl = new URL(m_article.site_url != null ? m_article.site_url : m_article.comments_link);
                 URL outurl = new URL(m_article.link);
                 String inhost = inurl.getHost();
                 String outhost = outurl.getHost();
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 2daaba49..dbfe8a72 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
@@ -49,6 +49,7 @@ public class Article implements Parcelable {
     public String flavor_image;
     public String flavor_stream;
     public int flavor_kind;
+	public String site_url;
 
 	/* not serialized */
 	transient public Document articleDoc;
@@ -213,6 +214,7 @@ public class Article implements Parcelable {
 		out.writeString(author);
 		out.writeString(note);
         out.writeInt(selected ? 1 : 0);
+		out.writeString(site_url);
 	}
 	
 	public void readFromParcel(Parcel in) {
@@ -244,6 +246,7 @@ public class Article implements Parcelable {
 		author = in.readString();
 		note = in.readString();
         selected = in.readInt() == 1;
+		site_url = in.readString();
 	}
 	
 	@SuppressWarnings("rawtypes")