Merge pull request #2607 from brandonpage/revert-retain-client-builder

Revert retain client builder

Author: brandonpage

libs/SalesforceSDK/src/com/salesforce/androidsdk/auth/HttpAccess.java

@@ -58,8 +58,6 @@ public class HttpAccess {
 
     private String userAgent;
     private OkHttpClient okHttpClient;
-    private OkHttpClient.Builder okHttpBuilder;
-    private OkHttpClient.Builder unauthenticatedOkHttpBuilder;
 
     // Connection manager.
     private final ConnectivityManager conMgr;
@@ -100,26 +98,41 @@ public HttpAccess(Context app, String userAgent) {
      *
      * @return okHttpClient.Builder with appropriate connection spec
      * and user agent interceptor for an authenticated client.
+     *
+     * @deprecated To be removed in 14.0.  Please use {@link #createNewClientBuilder()} instead.
      */
+    @Deprecated
     public OkHttpClient.Builder getOkHttpClientBuilder() {
-        if (okHttpBuilder == null) {
-            okHttpBuilder = createNewClientBuilder();
-        }
-
-        return okHttpBuilder;
+        return createNewClientBuilder();
     }
 
     /**
      *
      * @return okHttpClient.Builder with appropriate connection spec
      * and user agent interceptor for an unauthenticated client.
+     *
+     * @deprecated To be removed in 14.0.  Please use {@link #createNewClientBuilder()} instead.
      */
+    @Deprecated
     public OkHttpClient.Builder getUnauthenticatedOkHttpBuilder() {
-        if (unauthenticatedOkHttpBuilder == null) {
-            unauthenticatedOkHttpBuilder = createNewClientBuilder();
-        }
+        return createNewClientBuilder();
+    }
 
-        return unauthenticatedOkHttpBuilder;
+    /**
+     * Creates a new OkHttp Client Builder with appropriate connection spec
+     * and user agent interceptor.
+     *
+     * @return the okHttpClient.Builder
+     */
+    public OkHttpClient.Builder createNewClientBuilder() {
+        ConnectionSpec connectionSpec = new ConnectionSpec.Builder(ConnectionSpec.MODERN_TLS)
+                .tlsVersions(TlsVersion.TLS_1_1, TlsVersion.TLS_1_2)
+                .build();
+        return new OkHttpClient.Builder()
+                .connectionSpecs(Collections.singletonList(connectionSpec))
+                .connectTimeout(CONNECT_TIMEOUT, TimeUnit.SECONDS)
+                .readTimeout(READ_TIMEOUT, TimeUnit.SECONDS)
+                .addNetworkInterceptor(new UserAgentInterceptor());
     }
 
     /**
@@ -128,7 +141,7 @@ public OkHttpClient.Builder getUnauthenticatedOkHttpBuilder() {
      */
     public synchronized OkHttpClient getOkHttpClient() {
         if (okHttpClient == null) {
-            okHttpClient = getOkHttpClientBuilder().build();
+            okHttpClient = createNewClientBuilder().build();
         }
         return okHttpClient;
     }
@@ -158,17 +171,6 @@ public String getUserAgent() {
     	return userAgent;
     }
 
-    private OkHttpClient.Builder createNewClientBuilder() {
-        ConnectionSpec connectionSpec = new ConnectionSpec.Builder(ConnectionSpec.MODERN_TLS)
-                .tlsVersions(TlsVersion.TLS_1_1, TlsVersion.TLS_1_2)
-                .build();
-        return new OkHttpClient.Builder()
-                .connectionSpecs(Collections.singletonList(connectionSpec))
-                .connectTimeout(CONNECT_TIMEOUT, TimeUnit.SECONDS)
-                .readTimeout(READ_TIMEOUT, TimeUnit.SECONDS)
-                .addNetworkInterceptor(new UserAgentInterceptor());
-    }
-
     /**
      * Exception thrown if the device is offline, during an attempted HTTP call.
      */

libs/SalesforceSDK/src/com/salesforce/androidsdk/rest/RestClient.java

@@ -204,11 +204,9 @@ private synchronized void setOkHttpClientBuilder() {
 
 		// If none cached, create new one
 		if (okHttpClientBuilder == null) {
-			if (cacheKey.equals("unauthenticated")) {
-				okHttpClientBuilder = httpAccessor.getUnauthenticatedOkHttpBuilder();
-			} else {
-				okHttpClientBuilder = httpAccessor.getOkHttpClientBuilder()
-						.addInterceptor(getOAuthRefreshInterceptor());
+			okHttpClientBuilder = httpAccessor.createNewClientBuilder();
+			if (!cacheKey.equals("unauthenticated")) {
+				okHttpClientBuilder.addInterceptor(getOAuthRefreshInterceptor());
 			}
 
 			OK_CLIENT_BUILDERS.put(getCacheKey(), okHttpClientBuilder);