tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[android] - allow resetting a custom OkHttp client to the default implementation

Browse Source
This commit is contained in:
tobrun
2019-04-05 10:49:57 +02:00
committed by Tobrun
parent 8f331f5ae3
commit 744ce2c026
5 changed files with 87 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/http/HttpRequestImpl.java
View File

@@ -3,15 +3,16 @@ package com.mapbox.mapboxsdk.module.http;
import android.os.Build;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.annotation.VisibleForTesting;
import android.text.TextUtils;
import android.util.Log;
import com.mapbox.mapboxsdk.BuildConfig;
import com.mapbox.mapboxsdk.constants.MapboxConstants;
import com.mapbox.mapboxsdk.http.HttpRequest;
import com.mapbox.mapboxsdk.http.HttpIdentifier;
import com.mapbox.mapboxsdk.http.HttpLogger;
import com.mapbox.mapboxsdk.http.HttpResponder;
import com.mapbox.mapboxsdk.http.HttpRequest;
import com.mapbox.mapboxsdk.http.HttpRequestUrl;
import com.mapbox.mapboxsdk.http.HttpResponder;
import okhttp3.Call;
import okhttp3.Callback;
import okhttp3.Dispatcher;
@@ -42,7 +43,11 @@ public class HttpRequestImpl implements HttpRequest {
Build.CPU_ABI)
);
private static OkHttpClient client = new OkHttpClient.Builder().dispatcher(getDispatcher()).build();
@VisibleForTesting
static final OkHttpClient DEFAULT_CLIENT = new OkHttpClient.Builder().dispatcher(getDispatcher()).build();
@VisibleForTesting
static OkHttpClient client = DEFAULT_CLIENT;
private Call call;
@@ -94,8 +99,12 @@ public class HttpRequestImpl implements HttpRequest {
HttpLogger.logEnabled = enabled;
}
public static void setOkHttpClient(OkHttpClient okHttpClient) {
HttpRequestImpl.client = okHttpClient;
public static void setOkHttpClient(@Nullable OkHttpClient okHttpClient) {
if (okHttpClient != null) {
HttpRequestImpl.client = okHttpClient;
} else {
HttpRequestImpl.client = DEFAULT_CLIENT;
}
}
private static class OkHttpCallback implements Callback {

7
platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/http/HttpRequestUtil.java
View File

@@ -1,6 +1,7 @@
package com.mapbox.mapboxsdk.module.http;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import okhttp3.OkHttpClient;
import okio.Buffer;
@@ -38,10 +39,14 @@ public class HttpRequestUtil {
/**
* Set the OkHttpClient used for requesting map resources.
* <p>
* This configuration survives across mapView instances.
* Reset the OkHttpClient to the default by passing null as parameter.
* </p>
*
* @param client the OkHttpClient
*/
public static void setOkHttpClient(OkHttpClient client) {
public static void setOkHttpClient(@Nullable OkHttpClient client) {
HttpRequestImpl.setOkHttpClient(client);
}