1 files changed, 74 insertions, 127 deletions

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/MapLoadEvent.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/MapLoadEvent.java
index 132b620086..e0a7f17e01 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/MapLoadEvent.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/module/telemetry/MapLoadEvent.java
@@ -1,112 +1,101 @@
 package com.mapbox.mapboxsdk.module.telemetry;
 
-import android.content.Context;
+import android.annotation.SuppressLint;
 import android.os.Build;
 import android.os.Parcel;
-import android.os.Parcelable;
 
-import com.google.gson.annotations.SerializedName;
 import com.mapbox.android.telemetry.Event;
-import com.mapbox.android.telemetry.TelemetryUtils;
-
-class MapLoadEvent extends Event implements Parcelable {
-  private static final String MAP_LOAD = "map.load";
-  private static final String OPERATING_SYSTEM = "Android - " + Build.VERSION.RELEASE;
-
-  @SerializedName("event")
-  private final String event;
-  @SerializedName("created")
-  private String created;
-  @SerializedName("userId")
-  private String userId;
-  @SerializedName("model")
-  private String model = null;
-  @SerializedName("operatingSystem")
-  private String operatingSystem = null;
-  @SerializedName("resolution")
-  private Float resolution = null;
-  @SerializedName("accessibilityFontScale")
-  private Float accessibilityFontScale = null;
-  @SerializedName("orientation")
-  private String orientation = null;
-  @SerializedName("batteryLevel")
-  private Integer batteryLevel;
-  @SerializedName("pluggedIn")
-  private Boolean pluggedIn;
-  @SerializedName("carrier")
-  private String carrier = null;
-  @SerializedName("cellularNetworkType")
-  private String cellularNetworkType;
-  @SerializedName("wifi")
-  private Boolean wifi = null;
-  @SerializedName("sdkIdentifier")
-  private String sdkIdentifier = null;
-  @SerializedName("sdkVersion")
-  private String sdkVersion = null;
-
-  MapLoadEvent(String userId) {
-    this.event = MAP_LOAD;
-    this.model = Build.MODEL;
-    this.operatingSystem = OPERATING_SYSTEM;
-    this.created = TelemetryUtils.obtainCurrentDate();
+import com.mapbox.mapboxsdk.BuildConfig;
+
+/**
+ * Event will be sent while map is loaded.
+ */
+@SuppressLint("ParcelCreator")
+class MapLoadEvent extends Event {
+  private final String event = "map.load";
+  private final String operatingSystem = "Android - " + Build.VERSION.RELEASE;
+  private final String sdkIdentifier = BuildConfig.MAPBOX_SDK_IDENTIFIER;
+  private final String sdkVersion = BuildConfig.MAPBOX_SDK_VERSION;
+  private final String model = Build.MODEL;
+  private final String created;
+  private final String userId;
+  private final String carrier;
+  private final String cellularNetworkType;
+  private final String orientation;
+  private final float resolution;
+  private final float accessibilityFontScale;
+  private final int batteryLevel;
+  private final boolean pluggedIn;
+  private final boolean wifi;
+
+
+  MapLoadEvent(String userId, PhoneState phoneState) {
+    this.created = phoneState.getCreated();
     this.userId = userId;
-    this.batteryLevel = 0;
-    this.pluggedIn = false;
-    this.cellularNetworkType = "";
+    this.batteryLevel = phoneState.getBatteryLevel();
+    this.pluggedIn = phoneState.isPluggedIn();
+    this.cellularNetworkType = phoneState.getCellularNetworkType();
+    this.carrier = phoneState.getCarrier();
+    this.resolution = phoneState.getResolution();
+    this.accessibilityFontScale = phoneState.getAccessibilityFontScale();
+    this.wifi = phoneState.isWifi();
+    this.orientation = phoneState.getOrientation();
   }
 
-  MapLoadEvent setDeviceInfo(Context context) {
-    this.batteryLevel = TelemetryUtils.obtainBatteryLevel(context);
-    this.pluggedIn = TelemetryUtils.isPluggedIn(context);
-    this.cellularNetworkType = TelemetryUtils.obtainCellularNetworkType(context);
-    return this;
+  String getOperatingSystem() {
+    return operatingSystem;
   }
 
-  void setResolution(float resolution) {
-    this.resolution = resolution;
+  String getSdkIdentifier() {
+    return sdkIdentifier;
   }
 
-  void setAccessibilityFontScale(float accessibilityFontScale) {
-    this.accessibilityFontScale = accessibilityFontScale;
+  String getSdkVersion() {
+    return sdkVersion;
   }
 
-  void setOrientation(String orientation) {
-    this.orientation = orientation;
+  String getModel() {
+    return model;
   }
 
-  void setCarrier(String carrier) {
-    this.carrier = carrier;
+  String getCreated() {
+    return created;
   }
 
-  void setWifi(boolean wifi) {
-    this.wifi = wifi;
+  String getUserId() {
+    return userId;
   }
 
-  void setSdkIdentifier(String sdkIdentifier) {
-    this.sdkIdentifier = sdkIdentifier;
+  String getCarrier() {
+    return carrier;
   }
 
-  void setSdkVersion(String sdkVersion) {
-    this.sdkVersion = sdkVersion;
+  String getCellularNetworkType() {
+    return cellularNetworkType;
   }
 
-  private MapLoadEvent(Parcel in) {
-    event = in.readString();
-    created = in.readString();
-    userId = in.readString();
-    model = in.readString();
-    operatingSystem = in.readString();
-    resolution = in.readByte() == 0x00 ? null : in.readFloat();
-    accessibilityFontScale = in.readByte() == 0x00 ? null : in.readFloat();
-    orientation = in.readString();
-    batteryLevel = in.readInt();
-    pluggedIn = in.readByte() != 0x00;
-    carrier = in.readString();
-    cellularNetworkType = in.readString();
-    byte wifiVal = in.readByte();
-    wifi = wifiVal == 0x02 ? null : wifiVal != 0x00;
-    sdkIdentifier = in.readString();
-    sdkVersion = in.readString();
+  String getOrientation() {
+    return orientation;
+  }
+
+  float getResolution() {
+    return resolution;
+  }
+
+  float getAccessibilityFontScale() {
+    return accessibilityFontScale;
+  }
+
+  int getBatteryLevel() {
+    return batteryLevel;
+  }
+
+  boolean isPluggedIn() {
+    return pluggedIn;
+  }
+
+  boolean isWifi() {
+    return wifi;
   }
 
   @Override
@@ -116,47 +105,5 @@ class MapLoadEvent extends Event implements Parcelable {
 
   @Override
   public void writeToParcel(Parcel dest, int flags) {
-    dest.writeString(event);
-    dest.writeString(created);
-    dest.writeString(userId);
-    dest.writeString(model);
-    dest.writeString(operatingSystem);
-    if (resolution == null) {
-      dest.writeByte((byte) (0x00));
-    } else {
-      dest.writeByte((byte) (0x01));
-      dest.writeFloat(resolution);
-    }
-    if (accessibilityFontScale == null) {
-      dest.writeByte((byte) (0x00));
-    } else {
-      dest.writeByte((byte) (0x01));
-      dest.writeFloat(accessibilityFontScale);
-    }
-    dest.writeString(orientation);
-    dest.writeInt(batteryLevel);
-    dest.writeByte((byte) (pluggedIn ? 0x01 : 0x00));
-    dest.writeString(carrier);
-    dest.writeString(cellularNetworkType);
-    if (wifi == null) {
-      dest.writeByte((byte) (0x02));
-    } else {
-      dest.writeByte((byte) (wifi ? 0x01 : 0x00));
-    }
-    dest.writeString(sdkIdentifier);
-    dest.writeString(sdkVersion);
-  }
-
-  @SuppressWarnings("unused")
-  public static final Creator<MapLoadEvent> CREATOR = new Creator<MapLoadEvent>() {
-    @Override
-    public MapLoadEvent createFromParcel(Parcel in) {
-      return new MapLoadEvent(in);
-    }
-
-    @Override
-    public MapLoadEvent[] newArray(int size) {
-      return new MapLoadEvent[size];
-    }
-  };
+  }
 }