Merge branch 'master' into 'master'34f51585

Add hostname of link to article fragment

See merge request tt-rss/tt-rss-android!1

3 files changed, 31 insertions, 0 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 beff9a1f..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
@@ -335,6 +335,20 @@ public class ArticleFragment extends StateSavedFragment  {
             }
         }
 
+        TextView host = view.findViewById(R.id.host);
+        if (host != null) {
+            try {
+                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();
+                if (!inhost.equals(outhost)) {
+                    host.setVisibility(View.VISIBLE);
+                    host.setText(outhost.replaceFirst("^www\\.", ""));
+                }
+            } catch (MalformedURLException ignored) {}
+        }
+
         TextView note = view.findViewById(R.id.note);
 
         if (note != null) {
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")
diff --git a/org.fox.ttrss/src/main/res/layout/fragment_article.xml b/org.fox.ttrss/src/main/res/layout/fragment_article.xml
index 013b898c..61215a40 100755
--- a/org.fox.ttrss/src/main/res/layout/fragment_article.xml
+++ b/org.fox.ttrss/src/main/res/layout/fragment_article.xml
@@ -97,6 +97,20 @@
                     android:textColor="?headlineSecondaryTextColor"
                     android:textSize="12sp" />
 
+                <TextView
+                    android:id="@+id/host"
+                    tools:text="host"
+                    android:background="@drawable/ripple"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textAlignment="viewStart"
+                    android:layout_weight="1"
+                    android:fontFamily="sans-serif-light"
+                    android:paddingTop="8dp"
+                    android:textColor="?headlineSecondaryTextColor"
+                    android:textSize="12sp"
+                    android:visibility="gone"/>
+
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"