Bump Lost version to 3.0.4

mapbox/app/build.gradle

@@ -60,9 +60,7 @@ dependencies {
     compile rootProject.ext.dep.gmsLocation
 
     // LOST
-    compile(rootProject.ext.dep.lost) {
-        exclude group: 'com.google.guava'
-    }
+    compile rootProject.ext.dep.lost
 
     // Picasso (Static Image)
     compile rootProject.ext.dep.picasso

mapbox/dependencies.gradle

@@ -18,7 +18,7 @@ ext {
             supportCardView      : "com.android.support:cardview-v7:${supportLibVersion}",
 
             // mapbox
-            mapbox               : 'com.mapbox.mapboxsdk:mapbox-android-sdk:5.2.0-SNAPSHOT@aar',
+            mapbox               : 'com.mapbox.mapboxsdk:mapbox-android-sdk:5.2.0-20171110.170407-225@aar',
 
             // gson
             gson                 : 'com.google.code.gson:gson:2.8.0',
@@ -37,7 +37,7 @@ ext {
             okhttp3Mockwebserver : 'com.squareup.okhttp3:mockwebserver:3.6.0',
 
             // lost
-            lost                 : 'com.mapzen.android:lost:1.1.1',
+            lost                 : 'com.mapzen.android:lost:3.0.4',
 
             // play services
             gmsLocation          : 'com.google.android.gms:play-services-location:10.2.0',

mapbox/libandroid-services/build.gradle

@@ -43,9 +43,7 @@ dependencies {
     compile rootProject.ext.dep.timber
 
     // LOST
-    compile(rootProject.ext.dep.lost) {
-        exclude group: 'com.google.guava'
-    }
+    compile rootProject.ext.dep.lost
 
     // Testing
     testCompile rootProject.ext.dep.mockito

mapbox/libandroid-services/src/main/java/com/mapbox/services/android/location/LostLocationEngine.java

@@ -17,7 +17,7 @@
 /**
  * Sample LocationEngine using the Open Source Lost library
  */
-public class LostLocationEngine extends LocationEngine implements LocationListener {
+public class LostLocationEngine extends LocationEngine implements LostApiClient.ConnectionCallbacks, LocationListener {
 
   private static LocationEngine instance;
 
@@ -27,7 +27,9 @@ public class LostLocationEngine extends LocationEngine implements LocationListen
   public LostLocationEngine(Context context) {
     super();
     this.context = new WeakReference<>(context);
-    lostApiClient = new LostApiClient.Builder(this.context.get()).build();
+    lostApiClient = new LostApiClient.Builder(this.context.get())
+      .addConnectionCallbacks(this)
+      .build();
   }
 
   public static synchronized LocationEngine getLocationEngine(Context context) {
@@ -44,12 +46,7 @@ public static synchronized LocationEngine getLocationEngine(Context context) {
    */
   @Override
   public void activate() {
-    if (!lostApiClient.isConnected()) {
-      lostApiClient.connect();
-    }
-    for (LocationEngineListener listener : locationListeners) {
-      listener.onConnected();
-    }
+    connect();
   }
 
   /**
@@ -59,7 +56,7 @@ public void activate() {
    */
   @Override
   public void deactivate() {
-    if (lostApiClient.isConnected()) {
+    if (lostApiClient != null && lostApiClient.isConnected()) {
       lostApiClient.disconnect();
     }
   }
@@ -75,6 +72,24 @@ public boolean isConnected() {
     return lostApiClient.isConnected();
   }
 
+  /**
+   * Invoked when the location provider has connected.
+   */
+  @Override
+  public void onConnected() {
+    for (LocationEngineListener listener : locationListeners) {
+      listener.onConnected();
+    }
+  }
+
+  /**
+   * Invoked when the location provider connection has been suspended.
+   */
+  @Override
+  public void onConnectionSuspended() {
+    // Empty
+  }
+
   /**
    * Returns the Last known location if the location provider is connected and location permissions are granted.
    *
@@ -85,7 +100,7 @@ public boolean isConnected() {
   public Location getLastLocation() {
     if (lostApiClient.isConnected()) {
       //noinspection MissingPermission
-      return LocationServices.FusedLocationApi.getLastLocation();
+      return LocationServices.FusedLocationApi.getLastLocation(lostApiClient);
     }
     return null;
   }
@@ -120,7 +135,7 @@ public void requestLocationUpdates() {
 
     if (lostApiClient.isConnected()) {
       //noinspection MissingPermission
-      LocationServices.FusedLocationApi.requestLocationUpdates(request, this);
+      LocationServices.FusedLocationApi.requestLocationUpdates(lostApiClient, request, this);
     }
   }
 
@@ -135,7 +150,7 @@ public Type obtainType() {
   @Override
   public void removeLocationUpdates() {
     if (lostApiClient.isConnected()) {
-      LocationServices.FusedLocationApi.removeLocationUpdates(this);
+      LocationServices.FusedLocationApi.removeLocationUpdates(lostApiClient, this);
     }
   }
 
@@ -150,4 +165,14 @@ public void onLocationChanged(Location location) {
       listener.onLocationChanged(location);
     }
   }
+
+  private void connect() {
+    if (lostApiClient != null) {
+      if (lostApiClient.isConnected()) {
+        onConnected();
+      } else {
+        lostApiClient.connect();
+      }
+    }
+  }
 }

mapbox/libandroid-telemetry/build.gradle

@@ -36,9 +36,7 @@ dependencies {
     provided rootProject.ext.dep.gmsLocation
 
     // LOST
-    provided(rootProject.ext.dep.lost) {
-        exclude group: 'com.google.guava'
-    }
+    provided rootProject.ext.dep.lost
 
     // Testing
     testCompile rootProject.ext.dep.junit

mapbox/libandroid-telemetry/src/main/java/com/mapbox/services/android/telemetry/location/LostLocationEngine.java

@@ -14,7 +14,7 @@
 /**
  * Sample LocationEngine using the Open Source Lost library
  */
-public class LostLocationEngine extends LocationEngine implements LocationListener {
+public class LostLocationEngine extends LocationEngine implements LostApiClient.ConnectionCallbacks, LocationListener {
 
   private static LocationEngine instance;
 
@@ -24,7 +24,9 @@ public class LostLocationEngine extends LocationEngine implements LocationListen
   public LostLocationEngine(Context context) {
     super();
     this.context = new WeakReference<>(context);
-    lostApiClient = new LostApiClient.Builder(this.context.get()).build();
+    lostApiClient = new LostApiClient.Builder(this.context.get())
+      .addConnectionCallbacks(this)
+      .build();
   }
 
   public static synchronized LocationEngine getLocationEngine(Context context) {
@@ -41,12 +43,7 @@ public static synchronized LocationEngine getLocationEngine(Context context) {
    */
   @Override
   public void activate() {
-    if (!lostApiClient.isConnected()) {
-      lostApiClient.connect();
-    }
-    for (LocationEngineListener listener : locationListeners) {
-      listener.onConnected();
-    }
+    connect();
   }
 
   /**
@@ -56,7 +53,7 @@ public void activate() {
    */
   @Override
   public void deactivate() {
-    if (lostApiClient.isConnected()) {
+    if (lostApiClient != null && lostApiClient.isConnected()) {
       lostApiClient.disconnect();
     }
   }
@@ -72,6 +69,24 @@ public boolean isConnected() {
     return lostApiClient.isConnected();
   }
 
+  /**
+   * Invoked when the location provider has connected.
+   */
+  @Override
+  public void onConnected() {
+    for (LocationEngineListener listener : locationListeners) {
+      listener.onConnected();
+    }
+  }
+
+  /**
+   * Invoked when the location provider connection has been suspended.
+   */
+  @Override
+  public void onConnectionSuspended() {
+    // Empty
+  }
+
   /**
    * Returns the Last known location if the location provider is connected and location permissions are granted.
    *
@@ -82,7 +97,7 @@ public boolean isConnected() {
   public Location getLastLocation() {
     if (lostApiClient.isConnected()) {
       //noinspection MissingPermission
-      return LocationServices.FusedLocationApi.getLastLocation();
+      return LocationServices.FusedLocationApi.getLastLocation(lostApiClient);
     }
     return null;
   }
@@ -117,7 +132,7 @@ public void requestLocationUpdates() {
 
     if (lostApiClient.isConnected()) {
       //noinspection MissingPermission
-      LocationServices.FusedLocationApi.requestLocationUpdates(request, this);
+      LocationServices.FusedLocationApi.requestLocationUpdates(lostApiClient, request, this);
     }
   }
 
@@ -132,7 +147,7 @@ public Type obtainType() {
   @Override
   public void removeLocationUpdates() {
     if (lostApiClient.isConnected()) {
-      LocationServices.FusedLocationApi.removeLocationUpdates(this);
+      LocationServices.FusedLocationApi.removeLocationUpdates(lostApiClient, this);
     }
   }
 
@@ -147,4 +162,14 @@ public void onLocationChanged(Location location) {
       listener.onLocationChanged(location);
     }
   }
+
+  private void connect() {
+    if (lostApiClient != null) {
+      if (lostApiClient.isConnected()) {
+        onConnected();
+      } else {
+        lostApiClient.connect();
+      }
+    }
+  }
 }