Merge branch 'release-agua' into masterupstream/fabian-merge-release-agua

# Conflicts:
#	circle.yml
#	cmake/core-files.cmake
#	platform/android/CHANGELOG.md
#	platform/android/MapboxGLAndroidSDK/build.gradle
#	platform/android/MapboxGLAndroidSDK/gradle.properties
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/CameraChangeDispatcher.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/text/LocalGlyphRasterizer.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/BitmapUtils.java
#	platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
#	platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DebugModeActivity.java
#	platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/LocalGlyphActivity.java
#	platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MyLocationTintActivity.java
#	platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_local_glyph.xml
#	platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/descriptions.xml
#	platform/darwin/src/MGLMapSnapshotter.mm
#	platform/darwin/src/MGLRendererConfiguration.h
#	platform/ios/CHANGELOG.md
#	platform/ios/DEVELOPING.md
#	platform/ios/INSTALL.md
#	platform/ios/README.md
#	platform/ios/resources/bg.lproj/Localizable.strings
#	platform/ios/resources/es.lproj/Localizable.strings
#	platform/ios/resources/vi.lproj/Localizable.strings
#	platform/ios/src/MGLMapView.mm
#	platform/macos/macos.xcodeproj/project.pbxproj
#	src/mbgl/text/glyph_manager.cpp

1 files changed, 37 insertions, 12 deletions

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationSource.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationSource.java
index c6bc13f538..1313587158 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationSource.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationSource.java
@@ -32,7 +32,7 @@ import com.mapzen.android.lost.api.LostApiClient;
  * @deprecated Use a {@link Mapbox#getLocationEngine()} instead.
  */
 @Deprecated
-public class LocationSource extends LocationEngine implements LocationListener {
+public class LocationSource extends LocationEngine implements LostApiClient.ConnectionCallbacks, LocationListener {
 
   private Context context;
   private LostApiClient lostApiClient;
@@ -45,7 +45,9 @@ public class LocationSource extends LocationEngine implements LocationListener {
   public LocationSource(Context context) {
     super();
     this.context = context.getApplicationContext();
-    lostApiClient = new LostApiClient.Builder(this.context).build();
+    lostApiClient = new LostApiClient.Builder(this.context)
+      .addConnectionCallbacks(this)
+      .build();
   }
 
   /**
@@ -61,12 +63,7 @@ public class LocationSource extends LocationEngine implements LocationListener {
    */
   @Override
   public void activate() {
-    if (!lostApiClient.isConnected()) {
-      lostApiClient.connect();
-    }
-    for (LocationEngineListener listener : locationListeners) {
-      listener.onConnected();
-    }
+    connect();
   }
 
   /**
@@ -76,7 +73,7 @@ public class LocationSource extends LocationEngine implements LocationListener {
    */
   @Override
   public void deactivate() {
-    if (lostApiClient.isConnected()) {
+    if (lostApiClient != null && lostApiClient.isConnected()) {
       lostApiClient.disconnect();
     }
   }
@@ -93,6 +90,24 @@ public class LocationSource extends LocationEngine implements LocationListener {
   }
 
   /**
+   * 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 is the location provider is connected and location permissions are granted.
    *
    * @return the last known location
@@ -102,7 +117,7 @@ public class LocationSource extends LocationEngine implements LocationListener {
   public Location getLastLocation() {
     if (lostApiClient.isConnected()) {
       //noinspection MissingPermission
-      return LocationServices.FusedLocationApi.getLastLocation();
+      return LocationServices.FusedLocationApi.getLastLocation(lostApiClient);
     }
     return null;
   }
@@ -136,7 +151,7 @@ public class LocationSource extends LocationEngine implements LocationListener {
 
     if (lostApiClient.isConnected()) {
       //noinspection MissingPermission
-      LocationServices.FusedLocationApi.requestLocationUpdates(request, this);
+      LocationServices.FusedLocationApi.requestLocationUpdates(lostApiClient, request, this);
     }
   }
 
@@ -146,7 +161,7 @@ public class LocationSource extends LocationEngine implements LocationListener {
   @Override
   public void removeLocationUpdates() {
     if (lostApiClient.isConnected()) {
-      LocationServices.FusedLocationApi.removeLocationUpdates(this);
+      LocationServices.FusedLocationApi.removeLocationUpdates(lostApiClient, this);
     }
   }
 
@@ -171,4 +186,14 @@ public class LocationSource extends LocationEngine implements LocationListener {
       listener.onLocationChanged(location);
     }
   }
+
+  private void connect() {
+    if (lostApiClient != null) {
+      if (lostApiClient.isConnected()) {
+        onConnected();
+      } else {
+        lostApiClient.connect();
+      }
+    }
+  }
 }
\ No newline at end of file