get okhttp singleton removal changes to compile

Author: theScrabi

owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/OwnCloudClientFactory.java

@@ -0,0 +1,54 @@
+/* ownCloud Android Library is available under MIT license
+ *   Copyright (C) 2020 ownCloud GmbH.
+ *
+ *   Permission is hereby granted, free of charge, to any person obtaining a copy
+ *   of this software and associated documentation files (the "Software"), to deal
+ *   in the Software without restriction, including without limitation the rights
+ *   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *   copies of the Software, and to permit persons to whom the Software is
+ *   furnished to do so, subject to the following conditions:
+ *
+ *   The above copyright notice and this permission notice shall be included in
+ *   all copies or substantial portions of the Software.
+ *
+ *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ *   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ *   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ *   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *   THE SOFTWARE.
+ *
+ */
+
+package com.owncloud.android.lib.common;
+
+import android.net.Uri;
+
+import com.owncloud.android.lib.common.http.HttpClient;
+import com.owncloud.android.lib.resources.status.GetRemoteStatusOperation;
+
+public class OwnCloudClientFactory {
+
+    /**
+     * Creates a OwnCloudClient to access a URL and sets the desired parameters for ownCloud
+     * client connections.
+     *
+     * @param uri     URL to the ownCloud server; BASE ENTRY POINT, not WebDavPATH
+     * @return A OwnCloudClient object ready to be used
+     */
+    public static OwnCloudClient createOwnCloudClient(Uri uri, boolean followRedirects) {
+        OwnCloudClient client = new OwnCloudClient(uri);
+
+        client.setFollowRedirects(followRedirects);
+        HttpClient.setContext(context);
+        retrieveCookiesFromMiddleware(client);
+        return client;
+    }
+
+    private static void retrieveCookiesFromMiddleware(OwnCloudClient client) {
+        final GetRemoteStatusOperation statusOperation = new GetRemoteStatusOperation();
+        statusOperation.run(client);
+    }
+}

owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/SingleSessionManager.java

@@ -140,7 +140,6 @@ public OwnCloudClient getClientFor(OwnCloudAccount account,
             client.clearCredentials();
 
             client.setAccount(account);
-            HttpClient.setContext(context);
 
             account.loadCredentials(context);
             client.setCredentials(account.getCredentials());

owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/HttpClient.java

@@ -55,30 +55,38 @@
  */
 
 public class HttpClient {
-    private static OkHttpClient sOkHttpClient;
     private static Context sContext;
-    private static HashMap<String, List<Cookie>> sCookieStore = new HashMap<>();
-    private static LogInterceptor sLogInterceptor;
-    private static Interceptor sDebugInterceptor;
+    private HashMap<String, List<Cookie>> mCookieStore = new HashMap<>();
+    private LogInterceptor mLogInterceptor;
 
-    public static OkHttpClient getOkHttpClient() {
-        if (sOkHttpClient == null) {
+    private OkHttpClient mOkHttpClient = null;
+
+    protected HttpClient() {
+        mLogInterceptor = new LogInterceptor();
+    }
+
+    public OkHttpClient getOkHttpClient() {
+        if(sContext == null) {
+            Timber.e("Context not initialized call HttpClient.setContext(applicationContext) in the MainApp.onCrate()");
+            throw new RuntimeException("Context not initialized call HttpClient.setContext(applicationContext) in the MainApp.onCrate()");
+        }
+        if(mOkHttpClient == null) {
             try {
                 final X509TrustManager trustManager = new AdvancedX509TrustManager(
                         NetworkUtils.getKnownServersStore(sContext));
                 final SSLSocketFactory sslSocketFactory = getNewSslSocketFactory(trustManager);
                 // Automatic cookie handling, NOT PERSISTENT
-                final CookieJar cookieJar = new CookieJarImpl(sCookieStore);
+                final CookieJar cookieJar = new CookieJarImpl(mCookieStore);
 
                 // TODO: Not verifying the hostname against certificate. ask owncloud security human if this is ok.
                 //.hostnameVerifier(new BrowserCompatHostnameVerifier());
-                sOkHttpClient = buildNewOkHttpClient(sslSocketFactory, trustManager, cookieJar);
+                mOkHttpClient = buildNewOkHttpClient(sslSocketFactory, trustManager, cookieJar);
 
             } catch (Exception e) {
                 Timber.e(e, "Could not setup SSL system.");
             }
         }
-        return sOkHttpClient;
+        return mOkHttpClient;
     }
 
     private static SSLContext getSslContext() throws NoSuchAlgorithmException {
@@ -109,7 +117,7 @@ private static SSLSocketFactory getNewSslSocketFactory(X509TrustManager trustMan
         return sslContext.getSocketFactory();
     }
 
-    private static OkHttpClient buildNewOkHttpClient(SSLSocketFactory sslSocketFactory, X509TrustManager trustManager,
+    private OkHttpClient buildNewOkHttpClient(SSLSocketFactory sslSocketFactory, X509TrustManager trustManager,
                                                      CookieJar cookieJar) {
         return new OkHttpClient.Builder()
                 .addNetworkInterceptor(getLogInterceptor())
@@ -125,22 +133,23 @@ private static OkHttpClient buildNewOkHttpClient(SSLSocketFactory sslSocketFacto
                 .build();
     }
 
-    public static LogInterceptor getLogInterceptor() {
-        if (sLogInterceptor == null) {
-            sLogInterceptor = new LogInterceptor();
-        }
-        return sLogInterceptor;
-    }
-
     public Context getContext() {
         return sContext;
     }
 
+    public LogInterceptor getLogInterceptor() {
+        return mLogInterceptor;
+    }
+
+    public List<Cookie> getCookiesFromUrl(HttpUrl httpUrl) {
+        return mCookieStore.get(httpUrl.host());
+    }
+
     public static void setContext(Context context) {
         sContext = context;
     }
 
     public void clearCookies() {
-        sCookieStore.clear();
+        mCookieStore.clear();
     }
 }

owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/HttpBaseMethod.kt

@@ -37,7 +37,7 @@ import java.net.MalformedURLException
 import java.net.URL
 import java.util.concurrent.TimeUnit
 
-abstract class HttpBaseMethod constructor(url: URL) {
+abstract class HttpBaseMethod constructor(clientWrapper: HttpClient, url: URL) {
     var okHttpClient: OkHttpClient
     var httpUrl: HttpUrl = url.toHttpUrlOrNull() ?: throw MalformedURLException()
     var request: Request
@@ -47,7 +47,7 @@ abstract class HttpBaseMethod constructor(url: URL) {
     var call: Call? = null
 
     init {
-        okHttpClient = HttpClient.getOkHttpClient()
+        okHttpClient = clientWrapper.okHttpClient
         request = Request.Builder()
             .url(httpUrl)
             .build()

owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/nonwebdav/DeleteMethod.kt

@@ -23,6 +23,7 @@
  */
 package com.owncloud.android.lib.common.http.methods.nonwebdav
 
+import com.owncloud.android.lib.common.http.HttpClient
 import java.io.IOException
 import java.net.URL
 
@@ -31,7 +32,7 @@ import java.net.URL
  *
  * @author David González Verdugo
  */
-class DeleteMethod(url: URL) : HttpMethod(url) {
+class DeleteMethod(httpClient: HttpClient, url: URL) : HttpMethod(httpClient, url) {
     @Throws(IOException::class)
     override fun onExecute(): Int {
         request = request.newBuilder()

owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/nonwebdav/GetMethod.kt

@@ -23,6 +23,7 @@
  */
 package com.owncloud.android.lib.common.http.methods.nonwebdav
 
+import com.owncloud.android.lib.common.http.HttpClient
 import java.io.IOException
 import java.net.URL
 
@@ -31,7 +32,7 @@ import java.net.URL
  *
  * @author David González Verdugo
  */
-class GetMethod(url: URL) : HttpMethod(url) {
+class GetMethod(httpClient: HttpClient, url: URL) : HttpMethod(httpClient, url) {
     @Throws(IOException::class)
     override fun onExecute(): Int {
         request = request.newBuilder()

owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/nonwebdav/HttpMethod.kt

@@ -23,7 +23,9 @@
  */
 package com.owncloud.android.lib.common.http.methods.nonwebdav
 
+import com.owncloud.android.lib.common.http.HttpClient
 import com.owncloud.android.lib.common.http.methods.HttpBaseMethod
+import okhttp3.OkHttpClient
 import okhttp3.Response
 import java.net.URL
 
@@ -33,8 +35,9 @@ import java.net.URL
  * @author David González Verdugo
  */
 abstract class HttpMethod(
+    httpClient: HttpClient,
     url: URL
-) : HttpBaseMethod(url) {
+) : HttpBaseMethod(httpClient, url) {
 
     override lateinit var response: Response
 

owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/nonwebdav/PostMethod.kt

@@ -23,6 +23,8 @@
  */
 package com.owncloud.android.lib.common.http.methods.nonwebdav
 
+import com.owncloud.android.lib.common.http.HttpClient
+import okhttp3.OkHttpClient
 import okhttp3.RequestBody
 import java.io.IOException
 import java.net.URL
@@ -33,9 +35,10 @@ import java.net.URL
  * @author David González Verdugo
  */
 class PostMethod(
+    httpClient: HttpClient,
     url: URL,
     private val postRequestBody: RequestBody
-) : HttpMethod(url) {
+) : HttpMethod(httpClient, url) {
     @Throws(IOException::class)
     override fun onExecute(): Int {
         request = request.newBuilder()

owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/nonwebdav/PutMethod.kt

@@ -23,6 +23,8 @@
  */
 package com.owncloud.android.lib.common.http.methods.nonwebdav
 
+import com.owncloud.android.lib.common.http.HttpClient
+import okhttp3.OkHttpClient
 import okhttp3.RequestBody
 import java.io.IOException
 import java.net.URL
@@ -33,9 +35,10 @@ import java.net.URL
  * @author David González Verdugo
  */
 class PutMethod(
+    httpClient: HttpClient,
     url: URL,
     private val putRequestBody: RequestBody
-) : HttpMethod(url) {
+) : HttpMethod(httpClient, url) {
     @Throws(IOException::class)
     override fun onExecute(): Int {
         request = request.newBuilder()

owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/webdav/CopyMethod.kt

@@ -23,6 +23,7 @@
  */
 package com.owncloud.android.lib.common.http.methods.webdav
 
+import com.owncloud.android.lib.common.http.HttpClient
 import okhttp3.Response
 import java.net.URL
 
@@ -33,10 +34,11 @@ import java.net.URL
  * @author David González Verdugo
  */
 class CopyMethod(
+    httpClient: HttpClient,
     val url: URL,
     private val destinationUrl: String,
     private val forceOverride: Boolean
-) : DavMethod(url) {
+) : DavMethod(httpClient, url) {
     @Throws(Exception::class)
     public override fun onExecute(): Int {
         davResource.copy(