From b5df50adda0b51e5dc86f29152a98206c10332a0 Mon Sep 17 00:00:00 2001 From: Ben Kibbey Date: Sat, 16 Nov 2013 18:02:44 -0500 Subject: Fix trusted certificate setting with Tasker plugin. --- org.fox.ttrss/src/main/java/org/fox/ttrss/ApiRequest.java | 2 +- org.fox.ttrss/src/main/java/org/fox/ttrss/tasker/TaskerReceiver.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'org.fox.ttrss/src/main') 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, 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); -- cgit v1.2.3