1 files changed, 14 insertions, 24 deletions

diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MyLocationTrackingModeActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MyLocationTrackingModeActivity.java
index 786aeb8733..726d13a516 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MyLocationTrackingModeActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MyLocationTrackingModeActivity.java
@@ -14,6 +14,7 @@ import android.widget.ArrayAdapter;
 import android.widget.Spinner;
 import android.widget.Toast;
 
+import com.mapbox.mapboxsdk.Mapbox;
 import com.mapbox.mapboxsdk.camera.CameraUpdateFactory;
 import com.mapbox.mapboxsdk.constants.MyBearingTracking;
 import com.mapbox.mapboxsdk.constants.MyLocationTracking;
@@ -24,10 +25,7 @@ import com.mapbox.mapboxsdk.maps.OnMapReadyCallback;
 import com.mapbox.mapboxsdk.maps.TrackingSettings;
 import com.mapbox.mapboxsdk.maps.UiSettings;
 import com.mapbox.mapboxsdk.testapp.R;
-import com.mapzen.android.lost.api.LocationListener;
-import com.mapzen.android.lost.api.LocationRequest;
-import com.mapzen.android.lost.api.LocationServices;
-import com.mapzen.android.lost.api.LostApiClient;
+import com.mapbox.services.android.core.location.LocationEngineListener;
 
 import timber.log.Timber;
 
@@ -39,10 +37,7 @@ import timber.log.Timber;
  * </p>
  */
 public class MyLocationTrackingModeActivity extends AppCompatActivity implements AdapterView.OnItemSelectedListener,
-  OnMapReadyCallback, LocationListener {
-
-  // Testing for user defined LostApiClient
-  private LostApiClient lostApiClient;
+  OnMapReadyCallback, LocationEngineListener {
 
   public static final int TRACKING_NONE_INDEX = 0;
   public static final int TRACKING_FOLLOW_INDEX = 1;
@@ -75,18 +70,15 @@ public class MyLocationTrackingModeActivity extends AppCompatActivity implements
   @Override
   public void onMapReady(MapboxMap mapboxMap) {
     MyLocationTrackingModeActivity.this.mapboxMap = mapboxMap;
-    lostApiClient = new LostApiClient.Builder(this).build();
-    lostApiClient.connect();
-    LocationRequest request = LocationRequest.create()
-      .setPriority(LocationRequest.PRIORITY_LOW_POWER)
-      .setInterval(5000)
-      .setSmallestDisplacement(10);
-
-    Location location = LocationServices.FusedLocationApi.getLastLocation();
-    if (location != null) {
-      setInitialLocation(location, 15);
-    }
-    LocationServices.FusedLocationApi.requestLocationUpdates(request, this);
+
+    mapboxMap.setMyLocationEnabled(true);
+    Mapbox.getLocationEngine().addLocationEngineListener(this);
+    Mapbox.getLocationEngine().requestLocationUpdates();
+  }
+
+  @Override
+  public void onConnected() {
+    // Nothing
   }
 
   @Override
@@ -227,10 +219,8 @@ public class MyLocationTrackingModeActivity extends AppCompatActivity implements
   @Override
   protected void onStop() {
     super.onStop();
-    if (lostApiClient.isConnected()) {
-      LocationServices.FusedLocationApi.removeLocationUpdates(this);
-      lostApiClient.disconnect();
-    }
+    Mapbox.getLocationEngine().removeLocationEngineListener(this);
+    Mapbox.getLocationEngine().removeLocationUpdates();
     mapView.onStop();
   }