diff --git a/app/src/main/java/com/manuelmaly/hn/ArticleReaderActivity.java b/app/src/main/java/com/manuelmaly/hn/ArticleReaderActivity.java index 320aece..d59db39 100644 --- a/app/src/main/java/com/manuelmaly/hn/ArticleReaderActivity.java +++ b/app/src/main/java/com/manuelmaly/hn/ArticleReaderActivity.java @@ -42,9 +42,8 @@ public class ArticleReaderActivity extends AppCompatActivity { public static final String EXTRA_HNPOST = "HNPOST"; public static final String EXTRA_HTMLPROVIDER_OVERRIDE = "HTMLPROVIDER_OVERRIDE"; - private static final String HTMLPROVIDER_PREFIX_VIEWTEXT = "http://viewtext.org/article?url="; - private static final String HTMLPROVIDER_PREFIX_GOOGLE = "http://www.google.com/gwt/x?u="; - private static final String HTMLPROVIDER_PREFIX_INSTAPAPER = "http://www.instapaper.com/text?u="; + private static final String HTMLPROVIDER_PREFIX_INSTAPAPER = "https://www.instapaper.com/text?u="; + private static final String HTMLPROVIDER_PRFIX_TEXTISE = "https://www.textise.net/showText.aspx?strURL="; @ViewById(R.id.article_webview) WebView mWebView; @@ -186,13 +185,11 @@ private void toggleSwipeRefreshLayout() { @SuppressWarnings("deprecation") public static String getArticleViewURL( HNPost post, String htmlProvider, Context c ) { - String encodedURL = URLEncoder.encode( post.getURL() ); - if (htmlProvider.equals( c.getString( R.string.pref_htmlprovider_viewtext ) )) { - return HTMLPROVIDER_PREFIX_VIEWTEXT + encodedURL; - } else if (htmlProvider.equals( c.getString( R.string.pref_htmlprovider_google ) )) { - return HTMLPROVIDER_PREFIX_GOOGLE + encodedURL; - } else if (htmlProvider.equals( c.getString( R.string.pref_htmlprovider_instapaper ) )) { + String encodedURL = URLEncoder.encode(post.getURL()); + if (htmlProvider.equals(c.getString(R.string.pref_htmlprovider_instapaper))) { return HTMLPROVIDER_PREFIX_INSTAPAPER + encodedURL; + } else if (htmlProvider.equals(c.getString(R.string.pref_htmlprovider_textise))){ + return HTMLPROVIDER_PRFIX_TEXTISE + encodedURL; } else { return post.getURL(); } diff --git a/app/src/main/java/com/manuelmaly/hn/MainActivity.java b/app/src/main/java/com/manuelmaly/hn/MainActivity.java index dd89e7b..8fcbdff 100644 --- a/app/src/main/java/com/manuelmaly/hn/MainActivity.java +++ b/app/src/main/java/com/manuelmaly/hn/MainActivity.java @@ -603,11 +603,11 @@ public LongPressMenuListAdapter(HNPost post) { } mItems.addAll(Arrays.asList( getString(R.string.pref_htmlprovider_original_url), - getString(R.string.pref_htmlprovider_viewtext), - getString(R.string.pref_htmlprovider_google), getString(R.string.pref_htmlprovider_instapaper), + getString(R.string.pref_htmlprovider_textise), getString(R.string.external_browser), - getString(R.string.share_article_url))); + getString(R.string.share_article_url) + )); } @Override diff --git a/app/src/main/res/values/preference_values.xml b/app/src/main/res/values/preference_values.xml index dd65ea5..0f0066b 100644 --- a/app/src/main/res/values/preference_values.xml +++ b/app/src/main/res/values/preference_values.xml @@ -16,15 +16,13 @@ View Articles via … Original Article URL Original Article URL - ViewText.org - Google for Mobile Devices Instapaper Text + Textise @string/pref_htmlprovider_original_url - @string/pref_htmlprovider_viewtext - @string/pref_htmlprovider_google @string/pref_htmlprovider_instapaper + @string/pref_htmlprovider_textise View Articles within …