From 85c09828dfc1706c1312fdab4c9834ff9c26a752 Mon Sep 17 00:00:00 2001
From: Guardiola31337 <pablo.guardiola@mapbox.com>
Date: Thu, 21 Sep 2017 10:40:49 +0200
Subject: [PATCH] fix missing device attribute for navigation events

---
 .../java/com/mapbox/services/android/telemetry/MapboxEvent.java | 1 -
 .../com/mapbox/services/android/telemetry/MapboxTelemetry.java  | 2 +-
 .../mapbox/services/android/telemetry/http/TelemetryClient.java | 1 +
 .../android/telemetry/navigation/MapboxNavigationEvent.java     | 1 +
 4 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/mapbox/libandroid-telemetry/src/main/java/com/mapbox/services/android/telemetry/MapboxEvent.java b/mapbox/libandroid-telemetry/src/main/java/com/mapbox/services/android/telemetry/MapboxEvent.java
index 3de931d6b..57e017af6 100644
--- a/mapbox/libandroid-telemetry/src/main/java/com/mapbox/services/android/telemetry/MapboxEvent.java
+++ b/mapbox/libandroid-telemetry/src/main/java/com/mapbox/services/android/telemetry/MapboxEvent.java
@@ -31,7 +31,6 @@ public class MapboxEvent implements Serializable {
   public static final String KEY_USER_ID = "userId";
   public static final String KEY_ENABLED_TELEMETRY = "enabled.telemetry";
   public static final String KEY_MODEL = "model";
-  public static final String KEY_DEVICE = "device";
   public static final String KEY_OPERATING_SYSTEM = "operatingSystem";
   public static final String KEY_RESOLUTION = "resolution";
   public static final String KEY_ACCESSIBILITY_FONT_SCALE = "accessibilityFontScale";
diff --git a/mapbox/libandroid-telemetry/src/main/java/com/mapbox/services/android/telemetry/MapboxTelemetry.java b/mapbox/libandroid-telemetry/src/main/java/com/mapbox/services/android/telemetry/MapboxTelemetry.java
index 7aa1fe633..d43145422 100644
--- a/mapbox/libandroid-telemetry/src/main/java/com/mapbox/services/android/telemetry/MapboxTelemetry.java
+++ b/mapbox/libandroid-telemetry/src/main/java/com/mapbox/services/android/telemetry/MapboxTelemetry.java
@@ -603,7 +603,7 @@ private boolean isANavigationEvent(String eventType) {
   }
 
   private void addGeneralNavigationMetadataTo(Hashtable<String, Object> eventWithAttributes) {
-    eventWithAttributes.put(MapboxEvent.KEY_DEVICE, Build.MODEL);
+    eventWithAttributes.put(MapboxNavigationEvent.KEY_DEVICE, Build.MODEL);
     eventWithAttributes.put(MapboxNavigationEvent.KEY_VOLUME_LEVEL, TelemetryUtils.getVolumeLevel(context));
     eventWithAttributes.put(MapboxNavigationEvent.KEY_SCREEN_BRIGHTNESS, TelemetryUtils.getScreenBrightness(context));
     eventWithAttributes.put(MapboxNavigationEvent.KEY_APPLICATION_STATE, TelemetryUtils.getApplicationState(context));
diff --git a/mapbox/libandroid-telemetry/src/main/java/com/mapbox/services/android/telemetry/http/TelemetryClient.java b/mapbox/libandroid-telemetry/src/main/java/com/mapbox/services/android/telemetry/http/TelemetryClient.java
index b3f849c3d..c316f3610 100644
--- a/mapbox/libandroid-telemetry/src/main/java/com/mapbox/services/android/telemetry/http/TelemetryClient.java
+++ b/mapbox/libandroid-telemetry/src/main/java/com/mapbox/services/android/telemetry/http/TelemetryClient.java
@@ -177,6 +177,7 @@ private void sendEventsWrapped(Vector<Hashtable<String, Object>> events, Callbac
       jsonObject.putOpt(MapboxNavigationEvent.KEY_ESTIMATED_DURATION,
         evt.get(MapboxNavigationEvent.KEY_ESTIMATED_DURATION));
       jsonObject.putOpt(MapboxNavigationEvent.KEY_REROUTE_COUNT, evt.get(MapboxNavigationEvent.KEY_REROUTE_COUNT));
+      jsonObject.putOpt(MapboxNavigationEvent.KEY_DEVICE, evt.get(MapboxNavigationEvent.KEY_DEVICE));
       jsonObject.putOpt(MapboxNavigationEvent.KEY_VOLUME_LEVEL, evt.get(MapboxNavigationEvent.KEY_VOLUME_LEVEL));
       jsonObject.putOpt(MapboxNavigationEvent.KEY_SCREEN_BRIGHTNESS,
         evt.get(MapboxNavigationEvent.KEY_SCREEN_BRIGHTNESS));
diff --git a/mapbox/libandroid-telemetry/src/main/java/com/mapbox/services/android/telemetry/navigation/MapboxNavigationEvent.java b/mapbox/libandroid-telemetry/src/main/java/com/mapbox/services/android/telemetry/navigation/MapboxNavigationEvent.java
index 3bafbfce4..1c4248692 100644
--- a/mapbox/libandroid-telemetry/src/main/java/com/mapbox/services/android/telemetry/navigation/MapboxNavigationEvent.java
+++ b/mapbox/libandroid-telemetry/src/main/java/com/mapbox/services/android/telemetry/navigation/MapboxNavigationEvent.java
@@ -47,6 +47,7 @@ public class MapboxNavigationEvent {
   public static final String KEY_ESTIMATED_DISTANCE = "estimatedDistance";
   public static final String KEY_ESTIMATED_DURATION = "estimatedDuration";
   public static final String KEY_REROUTE_COUNT = "rerouteCount";
+  public static final String KEY_DEVICE = "device";
   public static final String KEY_VOLUME_LEVEL = "volumeLevel";
   public static final String KEY_SCREEN_BRIGHTNESS = "screenBrightness";
   public static final String KEY_APPLICATION_STATE = "applicationState";