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
This commit is contained in:
Tobrun
2017-06-30 11:21:39 +02:00
committed by GitHub
parent 3821ce27de
commit 95735c06f6
5 changed files with 27 additions and 63 deletions

View File

@@ -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();
}
}
/**
@@ -80,23 +81,6 @@ public class LocationSource extends LocationEngine implements LostApiClient.Conn
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() {
}
/**
* Returns the Last known location is the location provider is connected and location permissions are granted.
*
@@ -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);
}
}