From dbc3f90360e56538ca9f599241edce9ac81e063c Mon Sep 17 00:00:00 2001 From: Adithya Abraham Philip Date: Mon, 8 Jun 2015 01:56:35 +0530 Subject: fixed Proxy generation, proxy working for for cloud import --- .../keychain/keyimport/HkpKeyserver.java | 28 +++++++++------------- 1 file changed, 11 insertions(+), 17 deletions(-) (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserver.java') diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserver.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserver.java index da1494ce3..26f4da4e5 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserver.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserver.java @@ -190,21 +190,6 @@ public class HkpKeyserver extends Keyserver { return mSecure ? "https://" : "http://"; } - private HttpURLConnection openConnectioan(URL url) throws IOException { - HttpURLConnection conn = null; - try { - conn = (HttpURLConnection) TlsHelper.opeanConnection(url); - } catch (TlsHelper.TlsHelperException e) { - Log.w(Constants.TAG, e); - } - if (conn == null) { - conn = (HttpURLConnection) url.openConnection(); - } - conn.setConnectTimeout(5000); - conn.setReadTimeout(25000); - return conn; - } - /** * returns a client with pinned certificate if necessary * @@ -223,8 +208,8 @@ public class HkpKeyserver extends Keyserver { client.setProxy(proxy); // TODO: PHILIP if proxy !=null increase timeout? - client.setConnectTimeout(5000, TimeUnit.MILLISECONDS); - client.setReadTimeout(25000, TimeUnit.MILLISECONDS); + client.setConnectTimeout(proxy != null ? 30000 : 5000, TimeUnit.MILLISECONDS); + client.setReadTimeout(45000, TimeUnit.MILLISECONDS); return client; } @@ -233,9 +218,12 @@ public class HkpKeyserver extends Keyserver { try { URL url = new URL(getUrlPrefix() + mHost + ":" + mPort + request); Log.d(Constants.TAG, "hkp keyserver query: " + url); + Log.d("PHILIP", "hkpKeyserver query(): " + proxy); OkHttpClient client = getClient(url, proxy); Response response = client.newCall(new Request.Builder().url(url).build()).execute(); + tempIpTest(proxy); + String responseBody = response.body().string();// contains body both in case of success or failure if (response.isSuccessful()) { @@ -249,6 +237,12 @@ public class HkpKeyserver extends Keyserver { } } + private void tempIpTest(Proxy proxy) throws IOException { + URL url = new URL("https://wtfismyip.com/text"); + Response response = getClient(url, proxy).newCall(new Request.Builder().url(url).build()).execute(); + Log.e("PHILIP", "proxy Test: " + response.body().string()); + } + /** * Results are sorted by creation date of key! * -- cgit v1.2.3