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

upgraded telem version (#11338)

Browse Source 
* upgraded telem version

* use telem method instead of Okhttp

* use telem util in test
This commit is contained in:
Cameron Mace
2018-02-28 14:38:26 -05:00
committed by GitHub
parent b74930c5fc
commit 20c79d9e71
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/HTTPRequest.java
View File

@@ -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,

5
platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/telemetry/HttpTransportTest.java
View File

@@ -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));
}
}

2
platform/android/dependencies.gradle
View File

@@ -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'