From 1509f3fcb66317ce623c8f196f5f2143f25ead94 Mon Sep 17 00:00:00 2001 From: Cameron Mace Date: Tue, 27 Feb 2018 17:32:35 -0500 Subject: [PATCH 1/3] upgraded telem version --- platform/android/dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/android/dependencies.gradle b/platform/android/dependencies.gradle index 541b3c5236c..f3ec2f5a25a 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' From 61404693d75e1ad6ecdd60e649c2a426155c471e Mon Sep 17 00:00:00 2001 From: Cameron Mace Date: Tue, 27 Feb 2018 17:59:17 -0500 Subject: [PATCH 2/3] use telem method instead of Okhttp --- .../main/java/com/mapbox/mapboxsdk/http/HTTPRequest.java | 6 +++--- 1 file changed, 3 insertions(+), 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 index caee493e6f6..129e75965ef 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.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 @@ private void logFailure(int type, String errorMessage, String requestUrl) { 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, From c468df72078dcc50ee39ce9b61634a9885241966 Mon Sep 17 00:00:00 2001 From: Cameron Mace Date: Wed, 28 Feb 2018 10:01:59 -0500 Subject: [PATCH 3/3] use telem util in test --- .../com/mapbox/mapboxsdk/telemetry/HttpTransportTest.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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 94a6dc21948..5b54496329b 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 @@ 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 void testNonAsciiUserAgent() { 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)); } }