[android] - allow setting an OkHttpClient

mapbox · Jan 18, 2018 · b863871 · b863871
1 parent c404e3b
commit b863871
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 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
@@ -234,4 +234,8 @@ static void enableLog(boolean enabled) {
   static void enablePrintRequestUrlOnFailure(boolean enabled) {
     logRequestUrl = enabled;
   }
+
+  static void setOKHttpClient(OkHttpClient client) {
+    mClient = client;
+  }
 }
diff --git a/...m/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HttpRequestUtil.java b/...m/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 static void setLogEnabled(boolean enabled) {
    *
    * @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);
+  }
+
 }
diff --git a/...tApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DebugModeActivity.java b/...tApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DebugModeActivity.java
@@ -55,7 +55,7 @@ public class DebugModeActivity extends AppCompatActivity implements OnMapReadyCa
   @Override
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
-    HttpRequestUtil.setPrintRequestUrlOnFaillure(true);
+    HttpRequestUtil.setPrintRequestUrlOnFailure(true);
     setContentView(R.layout.activity_debug_mode);
     setupToolbar();
     setupMapView(savedInstanceState);
@@ -206,7 +206,7 @@ protected void onSaveInstanceState(Bundle outState) {
   protected void onDestroy() {
     super.onDestroy();
     mapView.onDestroy();
-    HttpRequestUtil.setPrintRequestUrlOnFaillure(false);
+    HttpRequestUtil.setPrintRequestUrlOnFailure(false);
   }
 
   @Override