diff options
author | Tobrun <tobrun@mapbox.com> | 2017-06-30 11:21:39 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-30 11:21:39 +0200 |
commit | 95735c06f6c394bde67532913fd7b51b2938cbc1 (patch) | |
tree | bc95cb7400706ee78541354b3d5fd26449154e53 /platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location | |
parent | 3821ce27de9da37fd8ea04e292ca9fdfea2d8ab7 (diff) | |
download | qtlocation-mapboxgl-95735c06f6c394bde67532913fd7b51b2938cbc1.tar.gz |
Downgrade location provider dependency (#9394)
* [android] - downgrade LOST to Mapbox SDK 5.0.2 version.
* bump LOST back to Mapbox Android SDK version 4.x
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location')
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationSource.java | 33 |
1 files changed, 8 insertions, 25 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 12e3300429..6652142be3 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 @@ -28,7 +28,7 @@ import com.mapzen.android.lost.api.LostApiClient; * in the history stack. * </p> */ -public class LocationSource extends LocationEngine implements LostApiClient.ConnectionCallbacks, LocationListener { +public class LocationSource extends LocationEngine implements LocationListener { private Context context; private LostApiClient lostApiClient; @@ -41,9 +41,7 @@ public class LocationSource extends LocationEngine implements LostApiClient.Conn public LocationSource(Context context) { super(); this.context = context.getApplicationContext(); - lostApiClient = new LostApiClient.Builder(this.context) - .addConnectionCallbacks(this) - .build(); + lostApiClient = new LostApiClient.Builder(this.context).build(); } /** @@ -55,6 +53,9 @@ public class LocationSource extends LocationEngine implements LostApiClient.Conn if (!lostApiClient.isConnected()) { lostApiClient.connect(); } + for (LocationEngineListener listener : locationListeners) { + listener.onConnected(); + } } /** @@ -81,23 +82,6 @@ public class LocationSource extends LocationEngine implements LostApiClient.Conn } /** - * 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() { - } - - /** * Returns the Last known location is the location provider is connected and location permissions are granted. * * @return the last known location @@ -107,9 +91,8 @@ public class LocationSource extends LocationEngine implements LostApiClient.Conn public Location getLastLocation() { if (lostApiClient.isConnected() && PermissionsManager.areLocationPermissionsGranted(context)) { //noinspection MissingPermission - return LocationServices.FusedLocationApi.getLastLocation(lostApiClient); + return LocationServices.FusedLocationApi.getLastLocation(); } - return null; } @@ -137,7 +120,7 @@ public class LocationSource extends LocationEngine implements LostApiClient.Conn if (lostApiClient.isConnected() && PermissionsManager.areLocationPermissionsGranted(context)) { //noinspection MissingPermission - LocationServices.FusedLocationApi.requestLocationUpdates(lostApiClient, request, this); + LocationServices.FusedLocationApi.requestLocationUpdates(request, this); } } @@ -147,7 +130,7 @@ public class LocationSource extends LocationEngine implements LostApiClient.Conn @Override public void removeLocationUpdates() { if (lostApiClient.isConnected()) { - LocationServices.FusedLocationApi.removeLocationUpdates(lostApiClient, this); + LocationServices.FusedLocationApi.removeLocationUpdates(this); } } |