Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down