From c58685a23edf952e2b2f00e7697178dcb812ff04 Mon Sep 17 00:00:00 2001 From: Wilko Kunert Date: Wed, 29 Apr 2020 11:13:28 +0200 Subject: [PATCH] Add type to device context --- .../main/java/com/segment/analytics/AnalyticsContext.java | 2 ++ .../java/com/segment/analytics/AnalyticsContextTest.java | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/analytics/src/main/java/com/segment/analytics/AnalyticsContext.java b/analytics/src/main/java/com/segment/analytics/AnalyticsContext.java index 55f70e0b4..72bfd445f 100644 --- a/analytics/src/main/java/com/segment/analytics/AnalyticsContext.java +++ b/analytics/src/main/java/com/segment/analytics/AnalyticsContext.java @@ -239,6 +239,7 @@ void putDevice(Context context, boolean collectDeviceID) { device.put(Device.DEVICE_MANUFACTURER_KEY, Build.MANUFACTURER); device.put(Device.DEVICE_MODEL_KEY, Build.MODEL); device.put(Device.DEVICE_NAME_KEY, Build.DEVICE); + device.put(Device.DEVICE_TYPE_KEY, "android"); put(DEVICE_KEY, device); } @@ -414,6 +415,7 @@ public static class Device extends ValueMap { @Private static final String DEVICE_MANUFACTURER_KEY = "manufacturer"; @Private static final String DEVICE_MODEL_KEY = "model"; @Private static final String DEVICE_NAME_KEY = "name"; + @Private static final String DEVICE_TYPE_KEY = "type"; @Private static final String DEVICE_TOKEN_KEY = "token"; @Private static final String DEVICE_ADVERTISING_ID_KEY = "advertisingId"; @Private static final String DEVICE_AD_TRACKING_ENABLED_KEY = "adTrackingEnabled"; diff --git a/analytics/src/test/java/com/segment/analytics/AnalyticsContextTest.java b/analytics/src/test/java/com/segment/analytics/AnalyticsContextTest.java index 203c4d6b9..3713bf749 100644 --- a/analytics/src/test/java/com/segment/analytics/AnalyticsContextTest.java +++ b/analytics/src/test/java/com/segment/analytics/AnalyticsContextTest.java @@ -82,7 +82,8 @@ public void create() { .containsEntry("id", "unknown") .containsEntry("manufacturer", "unknown") .containsEntry("model", "unknown") - .containsEntry("name", "unknown"); + .containsEntry("name", "unknown") + .containsEntry("type", "android"); assertThat(context.getValueMap("library")) // .containsEntry("name", "analytics-android") @@ -109,7 +110,8 @@ public void createWithoutDeviceIdCollection() { .containsEntry("id", traits.anonymousId()) .containsEntry("manufacturer", "unknown") .containsEntry("model", "unknown") - .containsEntry("name", "unknown"); + .containsEntry("name", "unknown") + .containsEntry("type", "android"); } @Test