From bfebbe7841a409e8af89ffd6133dea8a4e85dfdb Mon Sep 17 00:00:00 2001 From: Brad Leege Date: Thu, 4 Feb 2016 16:50:58 -0600 Subject: [PATCH] [android] #2421 - Adding place holders for event attributes --- .../mapboxsdk/telemetry/MapboxEvent.java | 4 ++- .../telemetry/MapboxEventManager.java | 25 +++++++++++++------ 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/MapboxEvent.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/MapboxEvent.java index af32c24c1..8a0eccf2e 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/MapboxEvent.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/MapboxEvent.java @@ -3,6 +3,7 @@ package com.mapbox.mapboxsdk.telemetry; import java.io.Serializable; public class MapboxEvent implements Serializable { + public static final int VERSION_NUMBER = 1; public static final String MGLMapboxEventsUserAgent = "Sirius/1.0/ANDROID MapboxEventsiOS/1.1"; public static final String MGLMapboxEventsAPIBase = "https://api.tiles.mapbox.com"; @@ -38,7 +39,8 @@ public class MapboxEvent implements Serializable { public static final String GESTURE_PITCH_START = "Pitch"; // Event Attributes - public static final int ATTRIBUTE_VERSION = 1; + public static final String ATTRIBUTE_EVENT = "event"; + public static final String ATTRIBUTE_VERSION = "version"; public static final String ATTRIBUTE_CREATED = "created"; public static final String ATTRIBUTE_INSTANCE = "instance"; public static final String ATTRIBUTE_VENDOR_ID = "vendorId"; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/MapboxEventManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/MapboxEventManager.java index 299cd96f4..0bdc19ccf 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/MapboxEventManager.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/MapboxEventManager.java @@ -83,8 +83,8 @@ public class MapboxEventManager { event.put(MapboxEvent.KEY_COURSE, location.getBearing()); event.put(MapboxEvent.KEY_ALTITUDE, location.getAltitude()); event.put(MapboxEvent.KEY_HORIZONTAL_ACCURACY, location.getAccuracy()); - event.put("created", dateFormat.format(new Date())); - event.put("event", MapboxEvent.TYPE_LOCATION); + event.put(MapboxEvent.ATTRIBUTE_CREATED, dateFormat.format(new Date())); + event.put(MapboxEvent.ATTRIBUTE_EVENT, MapboxEvent.TYPE_LOCATION); events.add(event); @@ -123,11 +123,22 @@ public class MapboxEventManager { jsonObject.put(MapboxEvent.KEY_HORIZONTAL_ACCURACY, evt.get(MapboxEvent.KEY_HORIZONTAL_ACCURACY)); // Basic Event Meta Data - jsonObject.put("event", evt.get("event")); - jsonObject.put("version", MapboxEvent.ATTRIBUTE_VERSION); - jsonObject.put("instance", SESSION_UUID); - jsonObject.put("created", evt.get("created")); - jsonObject.put("appBundleId", context.getPackageName()); + jsonObject.put(MapboxEvent.ATTRIBUTE_EVENT, evt.get("event")); + jsonObject.put(MapboxEvent.ATTRIBUTE_VERSION, MapboxEvent.VERSION_NUMBER); + jsonObject.put(MapboxEvent.ATTRIBUTE_CREATED, evt.get("created")); + jsonObject.put(MapboxEvent.ATTRIBUTE_INSTANCE, SESSION_UUID); + jsonObject.put(MapboxEvent.ATTRIBUTE_VENDOR_ID, ""); + jsonObject.put(MapboxEvent.ATTRIBUTE_APP_BUNDLE_ID, context.getPackageName()); + jsonObject.put(MapboxEvent.ATTRIBUTE_MODEL, ""); + jsonObject.put(MapboxEvent.ATTRIBUTE_OPERATING_SYSTEM, ""); + jsonObject.put(MapboxEvent.ATTRIBUTE_ORIENTATION, ""); + jsonObject.put(MapboxEvent.ATTRIBUTE_BATTERY_LEVEL, ""); + jsonObject.put(MapboxEvent.ATTRIBUTE_APPLICATION_STATE, ""); + jsonObject.put(MapboxEvent.ATTRIBUTE_RESOLUTION, ""); + jsonObject.put(MapboxEvent.ATTRIBUTE_ACCESSIBILITY_FONT_SCALE, ""); + jsonObject.put(MapboxEvent.ATTRIBUTE_CARRIER, ""); + jsonObject.put(MapboxEvent.ATTRIBUTE_CELLULAR_NETWORK_TYPE, ""); + jsonObject.put(MapboxEvent.ATTRIBUTE_WIFI, ""); jsonArray.put(jsonObject); }