rm audio related classes.

mapbox · Apr 18, 2019 · bd9d924 · bd9d924
1 parent b0cf5e4
commit bd9d924
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 114 deletions.
diff --git a/libtelemetry/src/main/java/com/mapbox/android/telemetry/AudioTypeChain.java b/libtelemetry/src/main/java/com/mapbox/android/telemetry/AudioTypeChain.java
diff --git a/libtelemetry/src/main/java/com/mapbox/android/telemetry/AudioTypeResolver.java b/libtelemetry/src/main/java/com/mapbox/android/telemetry/AudioTypeResolver.java
diff --git a/libtelemetry/src/main/java/com/mapbox/android/telemetry/BluetoothAudioType.java b/libtelemetry/src/main/java/com/mapbox/android/telemetry/BluetoothAudioType.java
diff --git a/libtelemetry/src/main/java/com/mapbox/android/telemetry/HeadphonesAudioType.java b/libtelemetry/src/main/java/com/mapbox/android/telemetry/HeadphonesAudioType.java
diff --git a/libtelemetry/src/main/java/com/mapbox/android/telemetry/SpeakerAudioType.java b/libtelemetry/src/main/java/com/mapbox/android/telemetry/SpeakerAudioType.java
diff --git a/libtelemetry/src/main/java/com/mapbox/android/telemetry/TelemetryClient.java b/libtelemetry/src/main/java/com/mapbox/android/telemetry/TelemetryClient.java
@@ -1,6 +1,7 @@
 package com.mapbox.android.telemetry;
 
 import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
 
 import java.io.File;
 import java.io.IOException;
@@ -131,7 +132,7 @@ TelemetryClientSettings obtainSetting() {
   }
 
   private void sendBatch(List<Event> batch, Callback callback, boolean serializeNulls) {
-    Gson gson = new Gson();
+    Gson gson = serializeNulls ? new GsonBuilder().serializeNulls().create() : new Gson();
     String payload = gson.toJson(batch);
     RequestBody body = RequestBody.create(JSON, payload);
     HttpUrl baseUrl = setting.getBaseUrl();

diff --git a/libtelemetry/src/main/java/com/mapbox/android/telemetry/TelemetryUtils.java b/libtelemetry/src/main/java/com/mapbox/android/telemetry/TelemetryUtils.java
@@ -99,7 +99,7 @@ public static String obtainUniversalUniqueIdentifier() {
     return universalUniqueIdentifier;
   }
 
-  static String obtainApplicationState(Context context) {
+  public static String obtainApplicationState(Context context) {
     ActivityManager activityManager = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
     List<ActivityManager.RunningAppProcessInfo> appProcesses = activityManager.getRunningAppProcesses();
     if (appProcesses == null) {
@@ -147,7 +147,7 @@ public static String obtainCurrentDate() {
     return dateFormat.format(new Date());
   }
 
-  static String generateCreateDateFormatted(Date date) {
+  public static String generateCreateDateFormatted(Date date) {
     return dateFormat.format(date);
   }
 

diff --git a/libtelemetry/src/main/java/com/mapbox/android/telemetry/UnknownAudioType.java b/libtelemetry/src/main/java/com/mapbox/android/telemetry/UnknownAudioType.java
diff --git a/libtelemetry/src/test/java/com/mapbox/android/telemetry/SchemaTest.java b/libtelemetry/src/test/java/com/mapbox/android/telemetry/SchemaTest.java
@@ -203,7 +203,6 @@ private JsonObject grabSchema(String eventName) {
         schema.remove("locationEnabled");
         //temporary need to work out a solution to include this data
         schema.remove("platform");
-        schema.remove("skuId");
 
         return schema;
       }