diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/async_tasks/RssItemToHtmlTask.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/async_tasks/RssItemToHtmlTask.java index 57793331..d83b1bec 100644 --- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/async_tasks/RssItemToHtmlTask.java +++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/async_tasks/RssItemToHtmlTask.java @@ -84,14 +84,12 @@ public class RssItemToHtmlTask extends AsyncTask { * @return given RSS item as full HTML page */ public static String getHtmlPage(RssItem rssItem, boolean showHeader, SharedPreferences mPrefs, boolean isRightToLeft) { - String feedTitle = "Undefined"; String favIconUrl = null; Feed feed = rssItem.getFeed(); //int feedColor = colors[0]; if (feed != null) { - feedTitle = Html.escapeHtml(feed.getFeedTitle()); favIconUrl = feed.getFaviconUrl(); } @@ -119,7 +117,7 @@ public class RssItemToHtmlTask extends AsyncTask { if (showHeader) { builder.append( - buildHeader(rssItem, body_id, feedTitle, favIconUrl) + buildHeader(rssItem, body_id, favIconUrl) ); } @@ -155,14 +153,14 @@ public class RssItemToHtmlTask extends AsyncTask { } } - private static String buildHeader(RssItem rssItem, String body_id, String feedTitle, String favIconUrl) { + private static String buildHeader(RssItem rssItem, String body_id, String favIconUrl) { StringBuilder builder = new StringBuilder(); builder.append("
"); builder.append(String.format("
", body_id)); - String title = Html.escapeHtml(rssItem.getTitle()); + String feedTitle = Html.escapeHtml(rssItem.getTitle()); String linkToFeed = Html.escapeHtml(rssItem.getLink()); - builder.append(String.format("%s", linkToFeed, title)); + builder.append(String.format("%s", linkToFeed, feedTitle)); builder.append("
"); String authorOfArticle = Html.escapeHtml(rssItem.getAuthor()); diff --git a/News-Android-App/src/main/res/layout/activity_new_feed.xml b/News-Android-App/src/main/res/layout/activity_new_feed.xml index 358fce23..f48d6fd0 100644 --- a/News-Android-App/src/main/res/layout/activity_new_feed.xml +++ b/News-Android-App/src/main/res/layout/activity_new_feed.xml @@ -77,7 +77,6 @@ android:layout_height="wrap_content" android:layout_marginTop="16dp" android:layout_marginEnd="8dp" - android:text="Import OPML" android:text="@string/import_opml" android:textStyle="bold" /> @@ -89,7 +88,6 @@ android:layout_height="wrap_content" android:layout_marginTop="16dp" android:layout_marginStart="8dp" - android:text="Export OPML" android:text="@string/export_opml" android:textStyle="bold" />