diff options
| author | Andrew Dolgov <[email protected]> | 2014-11-01 22:55:27 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2014-11-01 22:55:27 +0400 |
| commit | e37fcb9ab3184d3b670595bb58b59882b1b9534b (patch) | |
| tree | 96445bbd5a2f8e58496c605db3db1b65ee1dcdfd /org.fox.ttrss/src/main | |
| parent | 911cc1acef2947fa119ecb7ed0bad55eddfae52c (diff) | |
| parent | a5b62f36b1a447bdc61544157c22aba4482703ec (diff) | |
Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS-for-Honeycomb
Diffstat (limited to 'org.fox.ttrss/src/main')
| -rw-r--r-- | org.fox.ttrss/src/main/java/org/fox/ttrss/ApiRequest.java | 2 | ||||
| -rw-r--r-- | org.fox.ttrss/src/main/java/org/fox/ttrss/tasker/TaskerReceiver.java | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ApiRequest.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ApiRequest.java index b6de9a32..e603b989 100644 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ApiRequest.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ApiRequest.java @@ -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() { diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/tasker/TaskerReceiver.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/tasker/TaskerReceiver.java index 1b1351cb..4b6d81a9 100644 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/tasker/TaskerReceiver.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/tasker/TaskerReceiver.java @@ -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); |