From 20c79d9e71a660a6d3b4e377b033f0d68a5327fa Mon Sep 17 00:00:00 2001
From: Cameron Mace <cameron@mapbox.com>
Date: Wed, 28 Feb 2018 14:38:26 -0500
Subject: upgraded telem version (#11338)

* upgraded telem version

* use telem method instead of Okhttp

* use telem util in test
---
 .../src/main/java/com/mapbox/mapboxsdk/http/HTTPRequest.java        | 6 +++---
 .../test/java/com/mapbox/mapboxsdk/telemetry/HttpTransportTest.java | 5 ++---
 platform/android/dependencies.gradle                                | 2 +-
 3 files changed, 6 insertions(+), 7 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 caee493e6f..129e75965e 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
@@ -1,6 +1,5 @@
 package com.mapbox.mapboxsdk.http;
 
-
 import android.content.Context;
 import android.content.pm.PackageInfo;
 import android.os.Build;
@@ -27,9 +26,10 @@ import okhttp3.HttpUrl;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
-import okhttp3.internal.Util;
 import timber.log.Timber;
 
+import static com.mapbox.services.android.telemetry.utils.TelemetryUtils.toHumanReadableAscii;
+
 import static android.util.Log.DEBUG;
 import static android.util.Log.INFO;
 import static android.util.Log.WARN;
@@ -204,7 +204,7 @@ class HTTPRequest implements Callback {
 
   private String getUserAgent() {
     if (USER_AGENT_STRING == null) {
-      return USER_AGENT_STRING = Util.toHumanReadableAscii(
+      return USER_AGENT_STRING = toHumanReadableAscii(
         String.format("%s %s (%s) Android/%s (%s)",
           getApplicationIdentifier(),
           BuildConfig.MAPBOX_VERSION_STRING,
diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/telemetry/HttpTransportTest.java b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/telemetry/HttpTransportTest.java
index 94a6dc2194..5b54496329 100644
--- a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/telemetry/HttpTransportTest.java
+++ b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/telemetry/HttpTransportTest.java
@@ -2,8 +2,7 @@ package com.mapbox.mapboxsdk.telemetry;
 
 import org.junit.Test;
 
-import okhttp3.internal.Util;
-
+import static com.mapbox.services.android.telemetry.utils.TelemetryUtils.toHumanReadableAscii;
 import static junit.framework.Assert.assertEquals;
 
 public class HttpTransportTest {
@@ -15,6 +14,6 @@ public class HttpTransportTest {
     final String asciiVersion = "Sveriges Fj?ll/1.0/1 MapboxEventsAndroid/4.0.0-SNAPSHOT";
 
     assertEquals("asciiVersion and swedishUserAgent should match", asciiVersion,
-      Util.toHumanReadableAscii(swedishUserAgent));
+      toHumanReadableAscii(swedishUserAgent));
   }
 }
diff --git a/platform/android/dependencies.gradle b/platform/android/dependencies.gradle
index 541b3c5236..f3ec2f5a25 100644
--- a/platform/android/dependencies.gradle
+++ b/platform/android/dependencies.gradle
@@ -7,7 +7,7 @@ ext {
     versionCode = 11
     versionName = "5.0.0"
 
-    mapboxServicesVersion = "2.2.9"
+    mapboxServicesVersion = "2.2.10"
     supportLibVersion = "25.4.0"
     espressoVersion = '3.0.1'
     testRunnerVersion = '1.0.1'
-- 
cgit v1.2.1