Skip to content

Make lost dependency provided #595

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cammace merged 2 commits into from
Oct 6, 2017
Merged

Make lost dependency provided #595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1df53fc
make lost dependency provided
Oct 6, 2017
1f64f41
reverted back to lost 1.1
Oct 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion mapbox/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ dependencies {
compile rootProject.ext.dep.gmsLocation

// LOST
compile rootProject.ext.dep.lost
compile "com.mapzen.android:lost:3.0.3"

// Picasso (Static Image)
compile rootProject.ext.dep.picasso
Expand Down
2 changes: 1 addition & 1 deletion mapbox/dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ ext {
okhttp3Mockwebserver : 'com.squareup.okhttp3:mockwebserver:3.6.0',

// lost
lost : 'com.mapzen.android:lost:3.0.3',
lost : 'com.mapzen.android:lost:1.1.1',

// play services
gmsLocation : 'com.google.android.gms:play-services-location:10.2.0',
Expand Down
2 changes: 1 addition & 1 deletion mapbox/libandroid-services/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ dependencies {

// LOST
compile(rootProject.ext.dep.lost) {
exclude group: 'com.google.guava'
exclude group: 'com.google.guava'
}

// Testing
Expand Down
95 changes: 19 additions & 76 deletions ...droid-services/src/main/java/com/mapbox/services/android/location/LostLocationEngine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import android.content.Context;
import android.location.Location;
import android.support.annotation.Nullable;
import android.util.Log;

import com.mapbox.services.android.telemetry.location.LocationEngine;
import com.mapbox.services.android.telemetry.location.LocationEngineListener;
Expand All @@ -17,30 +16,20 @@

/**
* Sample LocationEngine using the Open Source Lost library
*
* @deprecated Use {@link com.mapbox.services.android.telemetry.location.LostLocationEngine} instead
*/
@Deprecated
public class LostLocationEngine extends LocationEngine implements
LostApiClient.ConnectionCallbacks, LocationListener {

private static final String LOG_TAG = LostLocationEngine.class.getSimpleName();
public class LostLocationEngine extends LocationEngine implements LocationListener {

private static LocationEngine instance;

private WeakReference<Context> context;
private LostApiClient lostApiClient;

@Deprecated
public LostLocationEngine(Context context) {
super();
this.context = new WeakReference<>(context);
lostApiClient = new LostApiClient.Builder(this.context.get())
.addConnectionCallbacks(this)
.build();
lostApiClient = new LostApiClient.Builder(this.context.get()).build();
}

@Deprecated
public static synchronized LocationEngine getLocationEngine(Context context) {
if (instance == null) {
instance = new LostLocationEngine(context.getApplicationContext());
Expand All @@ -52,26 +41,25 @@ public static synchronized LocationEngine getLocationEngine(Context context) {
/**
* Activate the location engine which will connect whichever location provider you are using. You'll need to call
* this before requesting user location updates using {@link LocationEngine#requestLocationUpdates()}.
*
* @deprecated Use {@link com.mapbox.services.android.telemetry.location.LostLocationEngine} instead
*/
@Deprecated
@Override
public void activate() {
connect();
if (!lostApiClient.isConnected()) {
lostApiClient.connect();
}
for (LocationEngineListener listener : locationListeners) {
listener.onConnected();
}
}

/**
* Disconnect the location engine which is useful when you no longer need location updates or requesting the users
* {@link LocationEngine#getLastLocation()}. Before deactivating, you'll need to stop request user location updates
* using {@link LocationEngine#removeLocationUpdates()}.
*
* @deprecated Use {@link com.mapbox.services.android.telemetry.location.LostLocationEngine} instead
*/
@Deprecated
@Override
public void deactivate() {
if (lostApiClient != null && lostApiClient.isConnected()) {
if (lostApiClient.isConnected()) {
lostApiClient.disconnect();
}
}
Expand All @@ -81,61 +69,30 @@ public void deactivate() {
* the rare case when you'd like to know if your location engine is connected or not.
*
* @return boolean true if the location engine has been activated/connected, else false.
* @deprecated Use {@link com.mapbox.services.android.telemetry.location.LostLocationEngine} instead
*/
@Deprecated
@Override
public boolean isConnected() {
return lostApiClient.isConnected();
}

/**
* Invoked when the location provider has connected.
*
* @deprecated Use {@link com.mapbox.services.android.telemetry.location.LostLocationEngine} instead
*/
@Deprecated
@Override
public void onConnected() {
for (LocationEngineListener listener : locationListeners) {
listener.onConnected();
}
}

/**
* Invoked when the location provider connection has been suspended.
*
* @deprecated Use {@link com.mapbox.services.android.telemetry.location.LostLocationEngine} instead
*/
@Deprecated
@Override
public void onConnectionSuspended() {
Log.d(LOG_TAG, "Connection suspended");
}

/**
* Returns the Last known location if the location provider is connected.
* Returns the Last known location if the location provider is connected and location permissions are granted.
*
* @return the last known location
* @deprecated Use {@link com.mapbox.services.android.telemetry.location.LostLocationEngine} instead
*/
@Deprecated
@Override
@Nullable
public Location getLastLocation() {
if (lostApiClient.isConnected()) {
//noinspection MissingPermission
return LocationServices.FusedLocationApi.getLastLocation(lostApiClient);
return LocationServices.FusedLocationApi.getLastLocation();
}
return null;
}

/**
* Request location updates to the location provider.
*
* @deprecated Use {@link com.mapbox.services.android.telemetry.location.LostLocationEngine} instead
*/
@Deprecated
@Override
public void requestLocationUpdates() {
LocationRequest request = LocationRequest.create();
Expand All @@ -150,6 +107,7 @@ public void requestLocationUpdates() {
request.setSmallestDisplacement(smallestDisplacement);
}

// Priority matching is straightforward
if (priority == LocationEnginePriority.NO_POWER) {
request.setPriority(LocationRequest.PRIORITY_NO_POWER);
} else if (priority == LocationEnginePriority.LOW_POWER) {
Expand All @@ -162,34 +120,29 @@ public void requestLocationUpdates() {

if (lostApiClient.isConnected()) {
//noinspection MissingPermission
LocationServices.FusedLocationApi.requestLocationUpdates(lostApiClient, request, this);
LocationServices.FusedLocationApi.requestLocationUpdates(request, this);
}
}

@Override
public Type obtainType() {
return Type.LOST;
}

/**
* Dismiss ongoing location update to the location provider.
*
* @deprecated Use {@link com.mapbox.services.android.telemetry.location.LostLocationEngine} instead
*/
@Deprecated
@Override
public void removeLocationUpdates() {
if (lostApiClient.isConnected()) {
LocationServices.FusedLocationApi.removeLocationUpdates(lostApiClient, this);
LocationServices.FusedLocationApi.removeLocationUpdates(this);
}
}

@Deprecated
@Override
public Type obtainType() {
return Type.LOST;
}

/**
* Invoked when the Location has changed.
*
* @param location the new location
* @deprecated Use {@link com.mapbox.services.android.telemetry.location.LostLocationEngine} instead
*/
@Deprecated
@Override
Expand All @@ -198,14 +151,4 @@ public void onLocationChanged(Location location) {
listener.onLocationChanged(location);
}
}

private void connect() {
if (lostApiClient != null) {
if (lostApiClient.isConnected()) {
onConnected();
} else {
lostApiClient.connect();
}
}
}
}
2 changes: 1 addition & 1 deletion mapbox/libandroid-telemetry/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ dependencies {
provided rootProject.ext.dep.gmsLocation

// LOST
provided rootProject.ext.dep.lost
provided "com.mapzen.android:lost:3.0.3"

// Testing
testCompile rootProject.ext.dep.junit
Expand Down