diff options
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/java')
3 files changed, 17 insertions, 2 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HTTPRequest.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HTTPRequest.java index 945fb0ba47..da27ee7bb8 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HTTPRequest.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HTTPRequest.java @@ -234,4 +234,8 @@ class HTTPRequest implements Callback { static void enablePrintRequestUrlOnFailure(boolean enabled) { logRequestUrl = enabled; } + + static void setOKHttpClient(OkHttpClient client) { + mClient = client; + } } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HttpRequestUtil.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HttpRequestUtil.java index 5afe3b6572..872032867a 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HttpRequestUtil.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HttpRequestUtil.java @@ -1,5 +1,7 @@ package com.mapbox.mapboxsdk.http; +import okhttp3.OkHttpClient; + /** * Utility class for setting HttpRequest configurations */ @@ -28,8 +30,17 @@ public class HttpRequestUtil { * * @param enabled True will print urls, false will disable */ - public static void setPrintRequestUrlOnFaillure(boolean enabled) { + public static void setPrintRequestUrlOnFailure(boolean enabled) { HTTPRequest.enablePrintRequestUrlOnFailure(enabled); } + /** + * Set the OkHttpClient used for requesting map resources. + * + * @param client the OkHttpClient + */ + public static void setOkHttpClient(OkHttpClient client) { + HTTPRequest.setOKHttpClient(client); + } + }
\ No newline at end of file diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java index 7fa85ae550..84a601039f 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java @@ -261,7 +261,7 @@ final class Transform implements MapView.OnMapChangedListener { setZoom(zoom, focalPoint, 0, false); } - void setZoom(double zoom, @NonNull PointF focalPoint, long duration, boolean isAnimator) { + void setZoom(double zoom, @NonNull PointF focalPoint, long duration, final boolean isAnimator) { if (mapView != null) { mapView.addOnMapChangedListener(new MapView.OnMapChangedListener() { @Override |