Merge "Enable android.net to reuse OkHttpClient creation logic"

2 files changed, 18 insertions, 2 deletions

diff --git a/android/main/java/com/squareup/okhttp/HttpHandler.java b/android/main/java/com/squareup/okhttp/HttpHandler.java
index a7179bd..3a02848 100644
--- a/android/main/java/com/squareup/okhttp/HttpHandler.java
+++ b/android/main/java/com/squareup/okhttp/HttpHandler.java
@@ -41,6 +41,14 @@ public class HttpHandler extends URLStreamHandler {
     }
 
     protected OkHttpClient newOkHttpClient(Proxy proxy) {
+        return createHttpOkHttpClient(proxy);
+    }
+
+    /**
+     * Creates an OkHttpClient suitable for creating {@link java.net.HttpURLConnection} instances on
+     * Android.
+     */
+    public static OkHttpClient createHttpOkHttpClient(Proxy proxy) {
         OkHttpClient client = new OkHttpClient();
         client.setFollowProtocolRedirects(false);
         if (proxy != null) {
@@ -50,7 +58,7 @@ public class HttpHandler extends URLStreamHandler {
         // Explicitly set the response cache.
         ResponseCache responseCache = ResponseCache.getDefault();
         if (responseCache != null) {
-          client.setResponseCache(responseCache);
+            client.setResponseCache(responseCache);
         }
         return client;
     }
diff --git a/android/main/java/com/squareup/okhttp/HttpsHandler.java b/android/main/java/com/squareup/okhttp/HttpsHandler.java
index 191b7eb..670dcc1 100644
--- a/android/main/java/com/squareup/okhttp/HttpsHandler.java
+++ b/android/main/java/com/squareup/okhttp/HttpsHandler.java
@@ -35,7 +35,15 @@ public final class HttpsHandler extends HttpHandler {
 
     @Override
     protected OkHttpClient newOkHttpClient(Proxy proxy) {
-        OkHttpClient client = super.newOkHttpClient(proxy);
+        return createHttpsOkHttpClient(proxy);
+    }
+
+    /**
+     * Creates an OkHttpClient suitable for creating {@link HttpsURLConnection} instances on
+     * Android.
+     */
+    public static OkHttpClient createHttpsOkHttpClient(Proxy proxy) {
+        OkHttpClient client = HttpHandler.createHttpOkHttpClient(proxy);
         client.setProtocols(ENABLED_PROTOCOLS);
 
         HostnameVerifier verifier = HttpsURLConnection.getDefaultHostnameVerifier();