[android] [DO NOT MERGE] adapt code to the latest changes on the events library

11 files changed, 58 insertions, 144 deletions

diff --git a/platform/android/MapboxGLAndroidSDK/build.gradle b/platform/android/MapboxGLAndroidSDK/build.gradle
index a52319a120..a613f344a0 100644
--- a/platform/android/MapboxGLAndroidSDK/build.gradle
+++ b/platform/android/MapboxGLAndroidSDK/build.gradle
@@ -120,7 +120,6 @@ android {
 
     lintOptions {
         disable 'MissingTranslation', 'TypographyQuotes'
-        baseline file("lint-baseline-local.xml")
         checkAllWarnings true
         warningsAsErrors false
     }
diff --git a/platform/android/MapboxGLAndroidSDK/lint-baseline-local.xml b/platform/android/MapboxGLAndroidSDK/lint-baseline-local.xml
deleted file mode 100644
index 0a76f53505..0000000000
--- a/platform/android/MapboxGLAndroidSDK/lint-baseline-local.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<issues format="4" by="lint 2.3.1">
-
-    <issue
-        id="MissingTranslation"
-        message="&quot;`mapbox_attributionErrorNoBrowser`&quot; is not translated in &quot;ca&quot; (Catalan), &quot;es&quot; (Spanish), &quot;lt&quot; (Lithuanian), &quot;nl&quot; (Dutch), &quot;sv&quot; (Swedish), &quot;vi&quot; (Vietnamese)"
-        errorLine1="    &lt;string name=&quot;mapbox_attributionErrorNoBrowser&quot;>No web browser installed on device, can\&apos;t open web page.&lt;/string>"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/values/strings.xml"
-            line="13"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="MissingTranslation"
-        message="&quot;`mapbox_telemetrySettings`&quot; is not translated in &quot;ca&quot; (Catalan), &quot;es&quot; (Spanish), &quot;lt&quot; (Lithuanian), &quot;nl&quot; (Dutch), &quot;sv&quot; (Swedish), &quot;vi&quot; (Vietnamese)"
-        errorLine1="    &lt;string name=&quot;mapbox_telemetrySettings&quot;>Telemetry Settings&lt;/string>"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/values/strings.xml"
-            line="15"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="TypographyQuotes"
-        message="Replace straight quotes (&apos;&apos;) with directional quotes (‘’, &amp;#8216; and &amp;#8217;) ?"
-        errorLine1="    &lt;string name=&quot;mapbox_attributionTelemetryMessage&quot;>Estàs ajudant a millorar els mapes d\&apos;OpenStreetMap i de Mapbox aportant dades d\&apos;ús anònimes.&lt;/string>"
-        errorLine2="                                                      ^">
-        <location
-            file="src/main/res/values-ca/strings.xml"
-            line="9"
-            column="55"/>
-    </issue>
-
-</issues>
diff --git a/platform/android/MapboxGLAndroidSDK/lint/lint-baseline-ci.xml b/platform/android/MapboxGLAndroidSDK/lint/lint-baseline-ci.xml
deleted file mode 100644
index fd65c9f627..0000000000
--- a/platform/android/MapboxGLAndroidSDK/lint/lint-baseline-ci.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- REMEMBER! First you run Lint locally you'll need to move lint-baseline-local.xml.xml file
-    generated into the lint folder and called it lint-baseline-local.xml
-    If you remove any error when running Lint locally, you'll get a warning from the command
-    line advising you to remove it from the baseline. If you remove it (remember to remove it
-    from lint-baseline-local.xml file) you should remove it too from
-    lint-baseline-ci.xml (THIS FILE) which is the only one included in the repo.
-    Eventually, it'll be removed (when we remove all current lint errors included). -->
-<issues format="4" by="lint 2.3.1">
-
-    <issue
-        id="MissingTranslation"
-        message="&quot;`mapbox_attributionErrorNoBrowser`&quot; is not translated in &quot;ca&quot; (Catalan), &quot;es&quot; (Spanish), &quot;lt&quot; (Lithuanian), &quot;nl&quot; (Dutch), &quot;sv&quot; (Swedish), &quot;vi&quot; (Vietnamese)"
-        errorLine1="    &lt;string name=&quot;mapbox_attributionErrorNoBrowser&quot;>No web browser installed on device, can\&apos;t open web page.&lt;/string>"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/values/strings.xml"
-            line="13"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="MissingTranslation"
-        message="&quot;`mapbox_telemetrySettings`&quot; is not translated in &quot;ca&quot; (Catalan), &quot;es&quot; (Spanish), &quot;lt&quot; (Lithuanian), &quot;nl&quot; (Dutch), &quot;sv&quot; (Swedish), &quot;vi&quot; (Vietnamese)"
-        errorLine1="    &lt;string name=&quot;mapbox_telemetrySettings&quot;>Telemetry Settings&lt;/string>"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/values/strings.xml"
-            line="15"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="TypographyQuotes"
-        message="Replace straight quotes (&apos;&apos;) with directional quotes (‘’, &amp;#8216; and &amp;#8217;) ?"
-        errorLine1="    &lt;string name=&quot;mapbox_attributionTelemetryMessage&quot;>Estàs ajudant a millorar els mapes d\&apos;OpenStreetMap i de Mapbox aportant dades d\&apos;ús anònimes.&lt;/string>"
-        errorLine2="                                                      ^">
-        <location
-            file="src/main/res/values-ca/strings.xml"
-            line="9"
-            column="55"/>
-    </issue>
-
-</issues>
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/Mapbox.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/Mapbox.java
index 9393fb09a3..ddc2c4a37b 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/Mapbox.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/Mapbox.java
@@ -41,7 +41,8 @@ public final class Mapbox {
   private String accessToken;
   private Boolean connected;
   private LocationEngine locationEngine;
-  private static MapboxTelemetry mapboxTelemetry;
+  @SuppressLint("StaticFieldLeak")
+  private static MapboxTelemetry telemetry;
 
   /**
    * Get an instance of Mapbox.
@@ -63,7 +64,7 @@ public final class Mapbox {
       locationEngine.setPriority(LocationEnginePriority.NO_POWER);
 
       try {
-        mapboxTelemetry = new MapboxTelemetry(appContext, accessToken, BuildConfig.MAPBOX_EVENTS_USER_AGENT,
+        telemetry = new MapboxTelemetry(appContext, accessToken, BuildConfig.MAPBOX_EVENTS_USER_AGENT,
           new Callback() {
             @Override
             public void onFailure(Call call, IOException exception) {
@@ -72,10 +73,10 @@ public final class Mapbox {
 
             @Override
             public void onResponse(Call call, Response response) throws IOException {
-              Timber.d("Mapbox telemetry response: ", response);
+              Timber.d("Mapbox telemetry response: %s", response.body().string());
             }
           });
-        mapboxTelemetry.enable();
+        telemetry.enable();
       } catch (Exception exception) {
         Timber.e(exception, "Unable to instantiate Mapbox telemetry");
       }
@@ -182,7 +183,7 @@ public final class Mapbox {
     return INSTANCE.locationEngine;
   }
 
-  public static MapboxTelemetry obtainMapboxTelemetry() {
-    return INSTANCE.mapboxTelemetry;
+  public static MapboxTelemetry obtainTelemetry() {
+    return INSTANCE.telemetry;
   }
 }
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AttributionDialogManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AttributionDialogManager.java
index bca0f35dbd..4aab528181 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AttributionDialogManager.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AttributionDialogManager.java
@@ -90,7 +90,7 @@ class AttributionDialogManager implements View.OnClickListener, DialogInterface.
     builder.setPositiveButton(R.string.mapbox_attributionTelemetryPositive, new DialogInterface.OnClickListener() {
       @Override
       public void onClick(DialogInterface dialog, int which) {
-        Mapbox.obtainMapboxTelemetry().optIn();
+        Mapbox.obtainTelemetry().optIn();
         dialog.cancel();
       }
     });
@@ -104,7 +104,7 @@ class AttributionDialogManager implements View.OnClickListener, DialogInterface.
     builder.setNegativeButton(R.string.mapbox_attributionTelemetryNegative, new DialogInterface.OnClickListener() {
       @Override
       public void onClick(DialogInterface dialog, int which) {
-        Mapbox.obtainMapboxTelemetry().optOut();
+        Mapbox.obtainTelemetry().optOut();
         dialog.cancel();
       }
     });
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java
index 83e5812965..c3b300ecff 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java
@@ -134,7 +134,7 @@ final class MapGestureDetector {
    */
   private Location getLocationFromGesture(float x, float y) {
     LatLng latLng = projection.fromScreenLocation(new PointF(x, y));
-//    return TelemetryUtils.buildLocation(latLng.getLongitude(), latLng.getLatitude());
+    // return TelemetryUtils.buildLocation(latLng.getLongitude(), latLng.getLatitude());
     return null;
   }
 
@@ -183,16 +183,16 @@ final class MapGestureDetector {
           && uiSettings.isZoomGesturesEnabled();
         if (twoTap) {
           // Confirmed 2nd Finger Down
-          MapEventFactory mapEventFactory = new MapEventFactory(Mapbox.getApplicationContext());
+          MapEventFactory mapEventFactory = new MapEventFactory();
           LatLng latLng = projection.fromScreenLocation(new PointF(event.getX(), event.getY()));
           // TODO transform.getZoom() may cause a NullPointerException
           MapState twoFingerTap = new MapState((float) latLng.getLatitude(), (float) latLng.getLongitude(), (float)
             transform.getZoom());
           twoFingerTap.setGesture("TwoFingerTap");
-          Mapbox.obtainMapboxTelemetry().push(mapEventFactory.createMapEvent(Event.Type.MAP_CLICK, twoFingerTap));
-//          MapboxTelemetry.getInstance().pushEvent(MapboxEventWrapper.buildMapClickEvent(
-//            getLocationFromGesture(event.getX(), event.getY()),
-//            MapboxEvent.GESTURE_TWO_FINGER_SINGLETAP, transform));
+          Mapbox.obtainTelemetry().push(mapEventFactory.createMapGestureEvent(Event.Type.MAP_CLICK, twoFingerTap));
+          // MapboxTelemetry.getInstance().pushEvent(MapboxEventWrapper.buildMapClickEvent(
+          // getLocationFromGesture(event.getX(), event.getY()),
+          // MapboxEvent.GESTURE_TWO_FINGER_SINGLETAP, transform));
         }
         break;
 
@@ -221,14 +221,14 @@ final class MapGestureDetector {
 
         // Scroll / Pan Has Stopped
         if (scrollGestureOccurred) {
-          MapEventFactory mapEventFactory = new MapEventFactory(Mapbox.getApplicationContext());
+          MapEventFactory mapEventFactory = new MapEventFactory();
           LatLng latLng = projection.fromScreenLocation(new PointF(event.getX(), event.getY()));
           // TODO transform.getZoom() may cause a NullPointerException
           MapState dragend = new MapState((float) latLng.getLatitude(), (float) latLng.getLongitude(), (float)
             transform.getZoom());
-          Mapbox.obtainMapboxTelemetry().push(mapEventFactory.createMapEvent(Event.Type.MAP_DRAGEND, dragend));
-//          MapboxTelemetry.getInstance().pushEvent(MapboxEventWrapper.buildMapDragEndEvent(
-//            getLocationFromGesture(event.getX(), event.getY()), transform));
+          Mapbox.obtainTelemetry().push(mapEventFactory.createMapGestureEvent(Event.Type.MAP_DRAGEND, dragend));
+          // MapboxTelemetry.getInstance().pushEvent(MapboxEventWrapper.buildMapDragEndEvent(
+          // getLocationFromGesture(event.getX(), event.getY()), transform));
           scrollGestureOccurred = false;
           cameraChangeDispatcher.onCameraIdle();
         }
@@ -344,16 +344,16 @@ final class MapGestureDetector {
           }
           break;
       }
-      MapEventFactory mapEventFactory = new MapEventFactory(Mapbox.getApplicationContext());
+      MapEventFactory mapEventFactory = new MapEventFactory();
       LatLng latLng = projection.fromScreenLocation(new PointF(e.getX(), e.getY()));
       // TODO transform.getZoom() may cause a NullPointerException
       MapState doubleTap = new MapState((float) latLng.getLatitude(), (float) latLng.getLongitude(), (float)
         transform.getZoom());
       doubleTap.setGesture("DoubleTap");
-      Mapbox.obtainMapboxTelemetry().push(mapEventFactory.createMapEvent(Event.Type.MAP_CLICK, doubleTap));
-//      MapboxTelemetry.getInstance().pushEvent(MapboxEventWrapper.buildMapClickEvent(
-//        getLocationFromGesture(e.getX(), e.getY()),
-//        MapboxEvent.GESTURE_DOUBLETAP, transform));
+      Mapbox.obtainTelemetry().push(mapEventFactory.createMapGestureEvent(Event.Type.MAP_CLICK, doubleTap));
+      // MapboxTelemetry.getInstance().pushEvent(MapboxEventWrapper.buildMapClickEvent(
+      // getLocationFromGesture(e.getX(), e.getY()),
+      // MapboxEvent.GESTURE_DOUBLETAP, transform));
 
       return true;
     }
@@ -381,16 +381,16 @@ final class MapGestureDetector {
           onMapClickListener.onMapClick(projection.fromScreenLocation(tapPoint));
         }
       }
-      MapEventFactory mapEventFactory = new MapEventFactory(Mapbox.getApplicationContext());
+      MapEventFactory mapEventFactory = new MapEventFactory();
       LatLng latLng = projection.fromScreenLocation(new PointF(motionEvent.getX(), motionEvent.getY()));
       // TODO transform.getZoom() may cause a NullPointerException
       MapState singleTap = new MapState((float) latLng.getLatitude(), (float) latLng.getLongitude(), (float)
         transform.getZoom());
       singleTap.setGesture("SingleTap");
-      Mapbox.obtainMapboxTelemetry().push(mapEventFactory.createMapEvent(Event.Type.MAP_CLICK, singleTap));
-//      MapboxTelemetry.getInstance().pushEvent(MapboxEventWrapper.buildMapClickEvent(
-//        getLocationFromGesture(motionEvent.getX(), motionEvent.getY()),
-//        MapboxEvent.GESTURE_SINGLETAP, transform));
+      Mapbox.obtainTelemetry().push(mapEventFactory.createMapGestureEvent(Event.Type.MAP_CLICK, singleTap));
+      // MapboxTelemetry.getInstance().pushEvent(MapboxEventWrapper.buildMapClickEvent(
+      // getLocationFromGesture(motionEvent.getX(), motionEvent.getY()),
+      // MapboxEvent.GESTURE_SINGLETAP, transform));
 
       return true;
     }
@@ -465,16 +465,16 @@ final class MapGestureDetector {
           cameraChangeDispatcher.onCameraMoveStarted(REASON_API_GESTURE);
         }
 
-        MapEventFactory mapEventFactory = new MapEventFactory(Mapbox.getApplicationContext());
+        MapEventFactory mapEventFactory = new MapEventFactory();
         LatLng latLng = projection.fromScreenLocation(new PointF(e1.getX(), e1.getY()));
         // TODO transform.getZoom() may cause a NullPointerException
         MapState pan = new MapState((float) latLng.getLatitude(), (float) latLng.getLongitude(), (float) transform
           .getZoom());
         pan.setGesture("Pan");
-        Mapbox.obtainMapboxTelemetry().push(mapEventFactory.createMapEvent(Event.Type.MAP_CLICK, pan));
-//        MapboxTelemetry.getInstance().pushEvent(MapboxEventWrapper.buildMapClickEvent(
-//          getLocationFromGesture(e1.getX(), e1.getY()),
-//          MapboxEvent.GESTURE_PAN_START, transform));
+        Mapbox.obtainTelemetry().push(mapEventFactory.createMapGestureEvent(Event.Type.MAP_CLICK, pan));
+        // MapboxTelemetry.getInstance().pushEvent(MapboxEventWrapper.buildMapClickEvent(
+        // getLocationFromGesture(e1.getX(), e1.getY()),
+        // MapboxEvent.GESTURE_PAN_START, transform));
       }
 
       // reset tracking if needed
@@ -511,16 +511,16 @@ final class MapGestureDetector {
       recentScaleGestureOccurred = true;
       scalePointBegin = new PointF(detector.getFocusX(), detector.getFocusY());
       scaleBeginTime = detector.getEventTime();
-      MapEventFactory mapEventFactory = new MapEventFactory(Mapbox.getApplicationContext());
+      MapEventFactory mapEventFactory = new MapEventFactory();
       LatLng latLng = projection.fromScreenLocation(new PointF(detector.getFocusX(), detector.getFocusY()));
       // TODO transform.getZoom() may cause a NullPointerException
       MapState pinch = new MapState((float) latLng.getLatitude(), (float) latLng.getLongitude(), (float) transform
         .getZoom());
       pinch.setGesture("Pinch");
-      Mapbox.obtainMapboxTelemetry().push(mapEventFactory.createMapEvent(Event.Type.MAP_CLICK, pinch));
-//      MapboxTelemetry.getInstance().pushEvent(MapboxEventWrapper.buildMapClickEvent(
-//        getLocationFromGesture(detector.getFocusX(), detector.getFocusY()),
-//        MapboxEvent.GESTURE_PINCH_START, transform));
+      Mapbox.obtainTelemetry().push(mapEventFactory.createMapGestureEvent(Event.Type.MAP_CLICK, pinch));
+      // MapboxTelemetry.getInstance().pushEvent(MapboxEventWrapper.buildMapClickEvent(
+      // getLocationFromGesture(detector.getFocusX(), detector.getFocusY()),
+      // MapboxEvent.GESTURE_PINCH_START, transform));
       return true;
     }
 
@@ -693,16 +693,16 @@ final class MapGestureDetector {
       // Also is zoom already started, don't rotate
       float angle = detector.getRotationDegreesDelta();
       if (Math.abs(angle) >= ROTATE_INVOKE_ANGLE) {
-        MapEventFactory mapEventFactory = new MapEventFactory(Mapbox.getApplicationContext());
+        MapEventFactory mapEventFactory = new MapEventFactory();
         LatLng latLng = projection.fromScreenLocation(new PointF(detector.getFocusX(), detector.getFocusY()));
         // TODO transform.getZoom() may cause a NullPointerException
         MapState rotation = new MapState((float) latLng.getLatitude(), (float) latLng.getLongitude(), (float)
           transform.getZoom());
         rotation.setGesture("Rotation");
-        Mapbox.obtainMapboxTelemetry().push(mapEventFactory.createMapEvent(Event.Type.MAP_CLICK, rotation));
-//        MapboxTelemetry.getInstance().pushEvent(MapboxEventWrapper.buildMapClickEvent(
-//          getLocationFromGesture(detector.getFocusX(), detector.getFocusY()),
-//          MapboxEvent.GESTURE_ROTATION_START, transform));
+        Mapbox.obtainTelemetry().push(mapEventFactory.createMapGestureEvent(Event.Type.MAP_CLICK, rotation));
+        // MapboxTelemetry.getInstance().pushEvent(MapboxEventWrapper.buildMapClickEvent(
+        // getLocationFromGesture(detector.getFocusX(), detector.getFocusY()),
+        // MapboxEvent.GESTURE_ROTATION_START, transform));
         started = true;
       }
 
@@ -857,16 +857,16 @@ final class MapGestureDetector {
       if (!tiltGestureOccurred && ((totalDelta > 10.0f) || (totalDelta < -10.0f))) {
         tiltGestureOccurred = true;
         beginTime = detector.getEventTime();
-        MapEventFactory mapEventFactory = new MapEventFactory(Mapbox.getApplicationContext());
+        MapEventFactory mapEventFactory = new MapEventFactory();
         LatLng latLng = projection.fromScreenLocation(new PointF(detector.getFocusX(), detector.getFocusY()));
         // TODO transform.getZoom() may cause a NullPointerException
         MapState pitch = new MapState((float) latLng.getLatitude(), (float) latLng.getLongitude(), (float) transform
           .getZoom());
         pitch.setGesture("Pitch");
-        Mapbox.obtainMapboxTelemetry().push(mapEventFactory.createMapEvent(Event.Type.MAP_CLICK, pitch));
-//        MapboxTelemetry.getInstance().pushEvent(MapboxEventWrapper.buildMapClickEvent(
-//          getLocationFromGesture(detector.getFocusX(), detector.getFocusY()),
-//          MapboxEvent.GESTURE_PITCH_START, transform));
+        Mapbox.obtainTelemetry().push(mapEventFactory.createMapGestureEvent(Event.Type.MAP_CLICK, pitch));
+        // MapboxTelemetry.getInstance().pushEvent(MapboxEventWrapper.buildMapClickEvent(
+        // getLocationFromGesture(detector.getFocusX(), detector.getFocusY()),
+        // MapboxEvent.GESTURE_PITCH_START, transform));
       }
 
       if (!tiltGestureOccurred) {
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
index 7cecf045c0..9d2ec90dc9 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
@@ -29,7 +29,6 @@ import com.mapbox.mapboxsdk.annotations.Annotation;
 import com.mapbox.mapboxsdk.annotations.MarkerViewManager;
 import com.mapbox.mapboxsdk.constants.MapboxConstants;
 import com.mapbox.mapboxsdk.constants.Style;
-import com.mapbox.mapboxsdk.geometry.LatLng;
 import com.mapbox.mapboxsdk.maps.renderer.MapRenderer;
 import com.mapbox.mapboxsdk.maps.renderer.glsurfaceview.GLSurfaceViewMapRenderer;
 import com.mapbox.mapboxsdk.maps.renderer.textureview.TextureViewMapRenderer;
@@ -40,8 +39,6 @@ import com.mapbox.mapboxsdk.net.ConnectivityReceiver;
 import com.mapbox.mapboxsdk.storage.FileSource;
 import com.mapbox.services.android.telemetry.Event;
 import com.mapbox.services.android.telemetry.MapEventFactory;
-import com.mapbox.services.android.telemetry.MapState;
-import com.mapbox.services.android.telemetry.MapboxTelemetry;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -289,11 +286,9 @@ public class MapView extends FrameLayout {
   @UiThread
   public void onCreate(@Nullable Bundle savedInstanceState) {
     if (savedInstanceState == null) {
-      MapEventFactory mapEventFactory = new MapEventFactory(Mapbox.getApplicationContext());
-      // Empty MapState
-      MapState load = new MapState(0.0f, 0.0f, 0.0f);
-      Mapbox.obtainMapboxTelemetry().push(mapEventFactory.createMapEvent(Event.Type.MAP_LOAD, load));
-//      MapboxTelemetry.getInstance().pushEvent(MapboxEventWrapper.buildMapLoadEvent());
+      MapEventFactory mapEventFactory = new MapEventFactory();
+      Mapbox.obtainTelemetry().push(mapEventFactory.createMapLoadEvent(Event.Type.MAP_LOAD));
+      // MapboxTelemetry.getInstance().pushEvent(MapboxEventWrapper.buildMapLoadEvent());
     } else if (savedInstanceState.getBoolean(MapboxConstants.STATE_HAS_SAVED_STATE)) {
       this.savedInstanceState = savedInstanceState;
     }
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxEventWrapper.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxEventWrapper.java
index a032528f28..b8df2f3543 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxEventWrapper.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxEventWrapper.java
@@ -19,7 +19,7 @@ class MapboxEventWrapper {
   static Hashtable<String, Object> buildMapClickEvent(
     @NonNull Location location, @NonNull String gestureId, Transform transform) {
     try {
-//      return MapboxEvent.buildMapClickEvent(location, gestureId, transform.getZoom());
+      // return MapboxEvent.buildMapClickEvent(location, gestureId, transform.getZoom());
       return null;
     } catch (NullPointerException exception) {
       // Map/Transform is not ready yet #8650
@@ -32,7 +32,7 @@ class MapboxEventWrapper {
   static Hashtable<String, Object> buildMapDragEndEvent(
     @NonNull Location location, Transform transform) {
     try {
-//      return MapboxEvent.buildMapDragEndEvent(location, transform.getZoom());
+      // return MapboxEvent.buildMapDragEndEvent(location, transform.getZoom());
       return null;
     } catch (NullPointerException exception) {
       // Map/Transform is not ready yet #8650
@@ -43,7 +43,7 @@ class MapboxEventWrapper {
 
   @Nullable
   static Hashtable<String, Object> buildMapLoadEvent() {
-//    return MapboxEvent.buildMapLoadEvent();
+    // return MapboxEvent.buildMapLoadEvent();
     return null;
   }
 }
diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/MapboxTest.java b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/MapboxTest.java
index 7a28d846ea..09acf3feef 100644
--- a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/MapboxTest.java
+++ b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/MapboxTest.java
@@ -5,7 +5,7 @@ import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 
 import com.mapbox.mapboxsdk.exceptions.MapboxConfigurationException;
-import com.mapbox.services.android.telemetry.location.LocationEngine;
+import com.mapbox.services.android.core.location.LocationEngine;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/build.gradle b/platform/android/MapboxGLAndroidSDKTestApp/build.gradle
index f45ad3dc3a..8c09bfc710 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/build.gradle
+++ b/platform/android/MapboxGLAndroidSDKTestApp/build.gradle
@@ -69,7 +69,7 @@ dependencies {
     compile(rootProject.ext.dep.mapboxJavaServices) {
         transitive = true
     }
-    compile rootProject.ext.dep.lost
+    compile rootProject.ext.dep.gmsLocation
 
     // Testing dependencies
     androidTestCompile rootProject.ext.dep.supportAnnotations
diff --git a/platform/android/dependencies.gradle b/platform/android/dependencies.gradle
index 346b5005e9..be3bb08f0a 100644
--- a/platform/android/dependencies.gradle
+++ b/platform/android/dependencies.gradle
@@ -8,7 +8,7 @@ ext {
     versionName = "5.0.0"
 
     mapboxServicesVersion = "2.2.9"
-    mapboxTelemetryVersion = "3.0.0-20171219.161553-24"
+    mapboxTelemetryVersion = "3.0.0-20180104.124008-27"
     supportLibVersion = "25.4.0"
     espressoVersion = '3.0.1'
     testRunnerVersion = '1.0.1'