From 0d5aac45bb0ea0b687d251070d2c64625d13de0c Mon Sep 17 00:00:00 2001 From: Guardiola31337 Date: Mon, 29 Jan 2018 23:24:07 +0100 Subject: [PATCH] [android] fix sdk identifier and sdk version --- platform/android/MapboxGLAndroidSDK/build.gradle | 4 ++-- .../src/main/java/com/mapbox/mapboxsdk/maps/MapView.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/platform/android/MapboxGLAndroidSDK/build.gradle b/platform/android/MapboxGLAndroidSDK/build.gradle index 8305a0cf874..22173592aa5 100644 --- a/platform/android/MapboxGLAndroidSDK/build.gradle +++ b/platform/android/MapboxGLAndroidSDK/build.gradle @@ -25,8 +25,8 @@ android { minSdkVersion androidVersions.minSdkVersion targetSdkVersion androidVersions.targetSdkVersion buildConfigField "String", "GIT_REVISION_SHORT", String.format("\"%s\"", getGitRevision()) - // TODO Review sdkIdentifier and sdkVersion values (used in AppUserTurnstile) - buildConfigField "String", "MAPBOX_SDK_IDENTIFIER", String.format("\"%s\"", "MapboxMapsAndroid") + buildConfigField "String", "MAPBOX_SDK_IDENTIFIER", String.format("\"%s\"", "mapbox-maps-android") + buildConfigField "String", "MAPBOX_SDK_VERSION", String.format("\"%s\"", project.VERSION_NAME) buildConfigField "String", "MAPBOX_VERSION_STRING", String.format("\"Mapbox/%s\"", project.VERSION_NAME) buildConfigField "String", "MAPBOX_EVENTS_USER_AGENT", String.format("\"MapboxEventsAndroid/%s\"", project.VERSION_NAME) } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java index 4bf1f692e7f..29fbce889d6 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java @@ -291,7 +291,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) { if (savedInstanceState == null) { MapboxTelemetry telemetry = Events.obtainTelemetry(); AppUserTurnstile turnstileEvent = new AppUserTurnstile(BuildConfig.MAPBOX_SDK_IDENTIFIER, - BuildConfig.MAPBOX_VERSION_STRING); + BuildConfig.MAPBOX_SDK_VERSION); telemetry.push(turnstileEvent); MapEventFactory mapEventFactory = new MapEventFactory(); telemetry.push(mapEventFactory.createMapLoadEvent(Event.Type.MAP_LOAD));