Remove dependency on OkHttp, make it more modular

Author: Dominik Schürmann

Lib/build.gradle

@@ -1,18 +1,14 @@
 apply plugin: 'com.android.library'
 
-dependencies {
-    compile 'com.squareup.okhttp:okhttp:2.4.0'
-}
-
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
     buildToolsVersion rootProject.ext.buildToolsVersion
 
     defaultConfig {
         minSdkVersion 9
-        targetSdkVersion 19
+        targetSdkVersion 22
     }
-    
+
     lintOptions {
         abortOnError false
     }

Lib/src/main/java/com/textuality/keybase/lib/DefaultKeybaseUrlConnectionClient.java

@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2015 Dominik Schürmann <[email protected]>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.textuality.keybase.lib;
+
+import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.net.Proxy;
+import java.net.URL;
+
+public class DefaultKeybaseUrlConnectionClient implements KeybaseUrlConnectionClient {
+
+    @Override
+    public HttpURLConnection openConnection(URL url) throws IOException {
+        return openConnection(url, null);
+    }
+
+    @Override
+    public HttpURLConnection openConnection(URL url, Proxy proxy) throws IOException {
+        HttpURLConnection conn;
+        if (proxy == null) {
+            conn = (HttpURLConnection) url.openConnection();
+            conn.setConnectTimeout(5000);
+            conn.setReadTimeout(25000);
+        } else {
+            conn = (HttpURLConnection) url.openConnection(proxy);
+            conn.setConnectTimeout(30000);
+            conn.setReadTimeout(40000);
+        }
+        return conn;
+    }
+}

Lib/src/main/java/com/textuality/keybase/lib/JWalk.java

@@ -40,7 +40,7 @@ public class JWalk {
      * @param json The object
      * @param path list of string object member selectors
      * @return the int addressed by the path, assuming such a thing exists
-     * @throws JSONException if any step in the path doesn���t work
+     * @throws JSONException if any step in the path doesn't work
      */
     public static int getInt(JSONObject json, String... path) throws JSONException {
         json = walk(json, path);
@@ -53,7 +53,7 @@ public static int getInt(JSONObject json, String... path) throws JSONException {
      * @param json The object
      * @param path list of string object member selectors
      * @return the int addressed by the path, assuming such a thing exists
-     * @throws JSONException if any step in the path doesn���t work
+     * @throws JSONException if any step in the path doesn't work
      */
     public static long getLong(JSONObject json, String... path) throws JSONException {
         json = walk(json, path);
@@ -66,7 +66,7 @@ public static long getLong(JSONObject json, String... path) throws JSONException
      * @param json The object
      * @param path list of string object member selectors
      * @return the int addressed by the path, assuming such a thing exists
-     * @throws JSONException if any step in the path doesn���t work
+     * @throws JSONException if any step in the path doesn't work
      */
     public static String getString(JSONObject json, String... path) throws JSONException {
         json = walk(json, path);
@@ -79,7 +79,7 @@ public static String getString(JSONObject json, String... path) throws JSONExcep
      * @param json The object
      * @param path list of string object member selectors
      * @return the int addressed by the path, assuming such a thing exists
-     * @throws JSONException if any step in the path doesn���t work
+     * @throws JSONException if any step in the path doesn't work
      */
     public static JSONArray getArray(JSONObject json, String... path) throws JSONException {
         json = walk(json, path);
@@ -92,7 +92,7 @@ public static JSONArray getArray(JSONObject json, String... path) throws JSONExc
      * @param json The object
      * @param path list of string object member selectors
      * @return the int addressed by the path, assuming such a thing exists
-     * @throws JSONException if any step in the path, except for the last, doesn���t work
+     * @throws JSONException if any step in the path, except for the last, doesn't work
      */
     public static JSONObject optObject(JSONObject json, String... path) throws JSONException {
         json = walk(json, path);
@@ -105,7 +105,7 @@ public static JSONObject optObject(JSONObject json, String... path) throws JSONE
      * @param json The object
      * @param path list of string object member selectors
      * @return the int addressed by the path, assuming such a thing exists
-     * @throws JSONException if any step in the path doesn���t work
+     * @throws JSONException if any step in the path doesn't work
      */
     public static JSONObject getObject(JSONObject json, String... path) throws JSONException {
         json = walk(json, path);
@@ -121,7 +121,7 @@ private static JSONObject walk(JSONObject json, String... path) throws JSONExcep
                 pathIndex++;
             }
         } catch (JSONException e) {
-            // try to give ���em a nice-looking error
+            // try to give them a nice-looking error
             StringBuilder sb = new StringBuilder();
             for (int i = 0; i < len; i++) {
                 sb.append(path[i]).append('.');

Lib/src/main/java/com/textuality/keybase/lib/Search.java renamed to Lib/src/main/java/com/textuality/keybase/lib/KeybaseQuery.java

@@ -16,62 +16,60 @@
  */
 package com.textuality.keybase.lib;
 
-import android.util.Log;
+import com.textuality.keybase.lib.prover.Fetch;
 
-import com.squareup.okhttp.OkHttpClient;
-import com.squareup.okhttp.Request;
-import com.squareup.okhttp.Response;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
 import java.net.Proxy;
 import java.net.URL;
 import java.net.URLEncoder;
 import java.util.Iterator;
 import java.util.NoSuchElementException;
-import java.util.concurrent.TimeUnit;
 
-public class Search {
-    
+public class KeybaseQuery {
+
     private static final String TAG = "KEYBASE-LIB";
 
-    public static Iterable<Match> search(String query, Proxy proxy) throws KeybaseException {
-        JSONObject result = getFromKeybase("_/api/1.0/user/autocomplete.json?q=", query, proxy);
+    private KeybaseUrlConnectionClient connectionClient;
+    private Proxy proxy;
+
+    public KeybaseQuery(KeybaseUrlConnectionClient connectionClient) {
+        this.connectionClient = connectionClient;
+    }
+
+    public void setProxy(Proxy proxy) {
+        this.proxy = proxy;
+    }
+
+    public Iterable<Match> search(String query) throws KeybaseException {
+        JSONObject result = getFromKeybase("_/api/1.0/user/autocomplete.json?q=", query);
         try {
             return new MatchIterator(JWalk.getArray(result, "completions"));
         } catch (JSONException e) {
             throw KeybaseException.keybaseScrewup(e);
         }
     }
 
-    public static JSONObject getFromKeybase(String path, String query, Proxy proxy) throws KeybaseException {
+    public JSONObject getFromKeybase(String path, String query) throws KeybaseException {
         try {
             String url = "https://keybase.io/" + path + URLEncoder.encode(query, "utf8");
 
             URL realUrl = new URL(url);
 
-            OkHttpClient client = new OkHttpClient();
-            client.setProxy(proxy);
+            HttpURLConnection conn = (HttpURLConnection) connectionClient.openConnection(realUrl, proxy);
+            conn.connect();
 
-            if (proxy != null) {
-                client.setConnectTimeout(30000, TimeUnit.MILLISECONDS);
-                client.setReadTimeout(40000, TimeUnit.MILLISECONDS);
-            } else {
-                client.setConnectTimeout(5000, TimeUnit.MILLISECONDS); // TODO: Reasonable values for keybase
-                client.setReadTimeout(25000, TimeUnit.MILLISECONDS);
-            }
-
-            Response resp = client.newCall(new Request.Builder().url(realUrl).build()).execute();
-
-            int response = resp.code();
-
-            String text = resp.body().string();
+            int response = conn.getResponseCode();
 
             if (response >= 200 && response < 300) {
+                String text = snarf(conn.getInputStream());
                 try {
                     JSONObject json = new JSONObject(text);
                     if (JWalk.getInt(json, "status", "code") != 0) {
@@ -83,7 +81,8 @@ public static JSONObject getFromKeybase(String path, String query, Proxy proxy)
                     throw KeybaseException.keybaseScrewup(e);
                 }
             } else {
-                throw KeybaseException.networkScrewup("Keybase.io query error (status=" + response + "): " + text);
+                String message = snarf(conn.getErrorStream());
+                throw KeybaseException.networkScrewup("Keybase.io query error (status=" + response + "): " + message);
             }
         } catch (Exception e) {
             throw KeybaseException.networkScrewup(e);
@@ -95,25 +94,62 @@ public static String snarf(InputStream in)
         byte[] buf = new byte[1024];
         int count = 0;
         ByteArrayOutputStream out = new ByteArrayOutputStream(1024);
-        while ((count = in.read(buf)) != -1) 
+        while ((count = in.read(buf)) != -1)
             out.write(buf, 0, count);
         return out.toString();
     }
 
+    public static final int REDIRECT_TRIES = 5;
+
+    public Fetch fetchProof(String urlString) {
+        Fetch result = new Fetch();
+
+        try {
+            HttpURLConnection conn = null;
+            int status = 0;
+            int redirects = 0;
+            while (redirects < REDIRECT_TRIES) {
+                result.mActualUrl = urlString;
+                URL url = new URL(urlString);
+                conn = (HttpURLConnection) connectionClient.openConnection(url, proxy);
+                conn.addRequestProperty("User-Agent", "Keybase Java client, github.com/timbray/KeybaseLib");
+                conn.connect();
+                status = conn.getResponseCode();
+                if (status == 301) {
+                    redirects++;
+                    urlString = conn.getHeaderFields().get("Location").get(0);
+                } else {
+                    break;
+                }
+            }
+            if (status >= 200 && status < 300) {
+                result.mBody = KeybaseQuery.snarf(conn.getInputStream());
+            } else {
+                result.mProblem = "Fetch failed, status " + status + ": " + KeybaseQuery.snarf(conn.getErrorStream());
+            }
+
+        } catch (MalformedURLException e) {
+            result.mProblem = "Bad URL: " + urlString;
+        } catch (IOException e) {
+            result.mProblem = "Network error: " + e.getLocalizedMessage();
+        }
+
+        return result;
+    }
+
     static class MatchIterator implements Iterable<Match>, Iterator<Match> {
 
         private final JSONArray mMatches;
         private int mLastIndex;
         private Match mNextMatch;
 
         public MatchIterator(JSONArray matches) throws KeybaseException {
-            Log.d(TAG, "match count=" + matches.length());
             mMatches = matches;
             mLastIndex = -1;
             mNextMatch = null;
             hasNext();
         }
-        
+
         // caches mNextMatch but not the index
         private int findNext() {
             try {
@@ -148,7 +184,7 @@ public Match next() {
 
         @Override
         public void remove() {
-            throw new RuntimeException("UserIterator.remove() not supported");            
+            throw new RuntimeException("UserIterator.remove() not supported");
         }
 
         @Override

Lib/src/main/java/com/textuality/keybase/lib/KeybaseUrlConnectionClient.java

@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2015 Dominik Schürmann <[email protected]>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.textuality.keybase.lib;
+
+import java.io.IOException;
+import java.net.Proxy;
+import java.net.URL;
+import java.net.URLConnection;
+
+/**
+ * wrapper
+ */
+public interface KeybaseUrlConnectionClient {
+
+    URLConnection openConnection(URL url) throws IOException;
+    URLConnection openConnection(URL url, Proxy proxy) throws IOException;
+}

Lib/src/main/java/com/textuality/keybase/lib/User.java

@@ -20,27 +20,26 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import java.net.Proxy;
 import java.util.Iterator;
 
 public class User {
 
     private final JSONObject mJson;
 
-    public static User findByUsername(String username, Proxy proxy) throws KeybaseException {
-        JSONObject json = Search.getFromKeybase("_/api/1.0/user/lookup.json?username=", username, proxy);
+    public static User findByUsername(KeybaseQuery keybaseQuery, String username) throws KeybaseException {
+        JSONObject json = keybaseQuery.getFromKeybase("_/api/1.0/user/lookup.json?username=", username);
         try {
             json = JWalk.getObject(json, "them");
         } catch (JSONException e) {
             throw KeybaseException.keybaseScrewup(e);
         }
         return new User(json);
     }
-    public static String keyForUsername(String username, Proxy proxy) throws KeybaseException {
-        return findByUsername(username, proxy).getKey();
+    public static String keyForUsername(KeybaseQuery keybaseQuery, String username) throws KeybaseException {
+        return findByUsername(keybaseQuery, username).getKey();
     }
-    public static User findByFingerprint(String fingerprint, Proxy proxy) throws KeybaseException {
-        JSONObject json = Search.getFromKeybase("_/api/1.0/user/lookup.json?key_fingerprint=", fingerprint, proxy);
+    public static User findByFingerprint(KeybaseQuery keybaseQuery, String fingerprint) throws KeybaseException {
+        JSONObject json = keybaseQuery.getFromKeybase("_/api/1.0/user/lookup.json?key_fingerprint=", fingerprint);
         try {
             JSONArray them = JWalk.getArray(json, "them");
             if (them.length() != 1) {