From 2402c6d3c72b19b8eded017ff3fbeb83c30ae0a8 Mon Sep 17 00:00:00 2001
From: Adithya Abraham Philip <adithyaphilip@gmail.com>
Date: Tue, 16 Jun 2015 14:36:18 +0530
Subject: ensuring code style is preserved

---
 .../keychain/keyimport/CloudSearch.java            |  2 +-
 .../keychain/keyimport/HkpKeyserver.java           | 31 +++++++++-------------
 .../keychain/keyimport/Keyserver.java              |  1 +
 3 files changed, 14 insertions(+), 20 deletions(-)

(limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport')

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/CloudSearch.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/CloudSearch.java
index c089db17f..d91dd28bc 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/CloudSearch.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/CloudSearch.java
@@ -70,7 +70,7 @@ public class CloudSearch {
             try {
                 if (proxy != null) {
                     results.wait(30 * SECONDS);
-                } else{
+                } else {
                     results.wait(10 * SECONDS);
                 }
                 for (Thread thread : searchThreads) {
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 26f4da4e5..33565803b 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserver.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserver.java
@@ -18,20 +18,23 @@
 
 package org.sufficientlysecure.keychain.keyimport;
 
-import com.squareup.okhttp.*;
-import okio.BufferedSink;
+import com.squareup.okhttp.MediaType;
+import com.squareup.okhttp.OkHttpClient;
+import com.squareup.okhttp.Request;
+import com.squareup.okhttp.RequestBody;
+import com.squareup.okhttp.Response;
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.pgp.PgpHelper;
 import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
 import org.sufficientlysecure.keychain.util.Log;
 import org.sufficientlysecure.keychain.util.TlsHelper;
 
-import java.io.BufferedWriter;
 import java.io.IOException;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
 import java.io.UnsupportedEncodingException;
-import java.net.*;
+import java.net.Proxy;
+import java.net.URL;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Comparator;
@@ -197,7 +200,7 @@ public class HkpKeyserver extends Keyserver {
      * @param proxy
      * @return
      */
-    public static OkHttpClient getClient(URL url, Proxy proxy) throws  IOException {
+    public static OkHttpClient getClient(URL url, Proxy proxy) throws IOException {
         OkHttpClient client = new OkHttpClient();
 
         try {
@@ -207,7 +210,6 @@ public class HkpKeyserver extends Keyserver {
         }
 
         client.setProxy(proxy);
-        // TODO: PHILIP if proxy !=null increase timeout?
         client.setConnectTimeout(proxy != null ? 30000 : 5000, TimeUnit.MILLISECONDS);
         client.setReadTimeout(45000, TimeUnit.MILLISECONDS);
 
@@ -222,8 +224,6 @@ public class HkpKeyserver extends Keyserver {
             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()) {
@@ -237,12 +237,6 @@ 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!
      *
@@ -388,8 +382,6 @@ public class HkpKeyserver extends Keyserver {
 
             RequestBody body = RequestBody.create(MediaType.parse("application/x-www-form-urlencoded"), params);
 
-            Log.e("PHILIP", "Media Type charset: "+body.contentType().charset());
-
             Request request = new Request.Builder()
                     .url(url)
                     .addHeader("Content-Type", "application/x-www-form-urlencoded")
@@ -397,10 +389,11 @@ public class HkpKeyserver extends Keyserver {
                     .post(body)
                     .build();
 
-            Response response = new OkHttpClient().setProxy(proxy).newCall(request).execute();
+            Response response = getClient(url, proxy).newCall(request).execute();
 
             Log.d(Constants.TAG, "response code: " + response.code());
             Log.d(Constants.TAG, "answer: " + response.body().string());
+
         } catch (IOException e) {
             Log.e(Constants.TAG, "IOException", e);
             throw new AddKeyException();
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/Keyserver.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/Keyserver.java
index 260e2af40..640b39f44 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/Keyserver.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/Keyserver.java
@@ -32,6 +32,7 @@ public abstract class Keyserver {
         public CloudSearchFailureException(String message) {
             super(message);
         }
+
         public CloudSearchFailureException() {
             super();
         }
-- 
cgit v1.2.3