Skip to content

Add type to device context #655

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
prayansh merged 1 commit into from
Jun 1, 2020
Merged

Add type to device context #655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions analytics/src/main/java/com/segment/analytics/AnalyticsContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down Expand Up @@ -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";
Expand Down
6 changes: 4 additions & 2 deletions analytics/src/test/java/com/segment/analytics/AnalyticsContextTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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
Expand Down