Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions app/src/main/java/com/manuelmaly/hn/ArticleReaderActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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();
}
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/com/manuelmaly/hn/MainActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 2 additions & 4 deletions app/src/main/res/values/preference_values.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,13 @@
<string name="pref_title_htmlprovider">View Articles via &#8230;</string>
<string name="pref_default_htmlprovider">Original Article URL</string>
<string name="pref_htmlprovider_original_url">Original Article URL</string>
<string name="pref_htmlprovider_viewtext">ViewText.org</string>
<string name="pref_htmlprovider_google">Google for Mobile Devices</string>
<string name="pref_htmlprovider_instapaper">Instapaper Text</string>
<string name="pref_htmlprovider_textise">Textise</string>

<string-array name="pref_array_htmlprovider">
<item>@string/pref_htmlprovider_original_url</item>
<item>@string/pref_htmlprovider_viewtext</item>
<item>@string/pref_htmlprovider_google</item>
<item>@string/pref_htmlprovider_instapaper</item>
<item>@string/pref_htmlprovider_textise</item>
</string-array>

<string name="pref_title_htmlviewer">View Articles within &#8230;</string>
Expand Down