iamthefij/tt-rss-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS-for-Honeycomb

Browse Source
This commit is contained in:
Andrew Dolgov 2014-11-01 22:55:27 +04:00
commit e37fcb9ab3
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.fox.ttrss/src/main/java/org/fox/ttrss/ApiRequest.java
View File

@ -279,7 +279,7 @@ public class ApiRequest extends AsyncTask<HashMap<String,String>, Integer, JsonE
return null;
}
protected static void trustAllHosts(boolean trustAnyCert, boolean trustAnyHost) {
public static void trustAllHosts(boolean trustAnyCert, boolean trustAnyHost) {
try {
if (trustAnyCert) {
X509TrustManager easyTrustManager = new X509TrustManager() {

1
org.fox.ttrss/src/main/java/org/fox/ttrss/tasker/TaskerReceiver.java
View File

@ -80,6 +80,7 @@ public class TaskerReceiver extends BroadcastReceiver {
String login = prefs.getString("login", "").trim();
String password = prefs.getString("password", "").trim();
String ttrssUrl = prefs.getString("ttrss_url", "").trim();
ApiRequest.trustAllHosts(prefs.getBoolean("ssl_trust_any", false), prefs.getBoolean("ssl_trust_any_host", false));
if (ttrssUrl.equals("")) {
Toast toast = Toast.makeText(fContext, "Could not download articles: not configured?", Toast.LENGTH_SHORT);