tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[android] #4083 - relax permissions check + renamed location services + code clean + javadoc

Browse Source
This commit is contained in:
Tobrun
2016-02-24 09:54:32 +01:00
parent 7b40cbcfd9
commit 79609b7ff5
4 changed files with 59 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationListener.java
View File

@@ -2,12 +2,15 @@ package com.mapbox.mapboxsdk.location;
import android.location.Location;
/**
* Callback interface for when a location change occurs.
*/
public interface LocationListener {
/**
* Callback method for receiving location updates from LocationServices.
* Callback method for receiving location updates from LocationService.
* @param location The new Location data
*/
public void onLocationChanged(Location location);
void onLocationChanged(Location location);
}

80
platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationServices.java → platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationService.java
View File

@@ -9,50 +9,48 @@ import android.location.LocationManager;
import android.support.annotation.NonNull;
import android.support.v4.content.ContextCompat;
import android.util.Log;
import com.mapbox.mapboxsdk.telemetry.TelemetryLocationReceiver;
import com.mapzen.android.lost.api.LocationRequest;
import com.mapzen.android.lost.api.LostApiClient;
import java.util.ArrayList;
import java.util.List;
public class LocationServices implements com.mapzen.android.lost.api.LocationListener {
public class LocationService implements com.mapzen.android.lost.api.LocationListener {
private static final String TAG = "LocationServices";
private static final String TAG = "LocationService";
private static LocationServices instance = null;
private static LocationService instance;
private Context context;
private LostApiClient mLocationClient;
private LocationRequest mLocationRequest;
private LostApiClient locationClient;
private Location lastLocation;
private Location lastLocation = null;
private List<LocationListener> locationListeners;
private List<LocationListener> locationListeners = null;
private boolean isGPSEnabled = false;
private boolean isGPSEnabled;
/**
* Private constructor for singleton LocationServices
* Private constructor for singleton LocationService
*/
private LocationServices(Context context) {
private LocationService(Context context) {
super();
this.context = context;
// Setup location services
mLocationClient = new LostApiClient.Builder(context).build();
locationClient = new LostApiClient.Builder(context).build();
locationListeners = new ArrayList<>();
}
/**
* Primary (singleton) access method for LocationServices
* Primary (singleton) access method for LocationService
*
* @param context Context
* @return LocationServices
* @return LocationService
*/
public static LocationServices getLocationServices(@NonNull final Context context) {
public static LocationService getInstance(@NonNull final Context context) {
if (instance == null) {
if (context == null) {
throw new NullPointerException("Context required for accessing LocationServices");
}
instance = new LocationServices(context.getApplicationContext());
instance = new LocationService(context.getApplicationContext());
}
return instance;
}
@@ -63,56 +61,63 @@ public class LocationServices implements com.mapzen.android.lost.api.LocationLis
* @param enableGPS true if GPS is to be enabled, false if GPS is to be disabled
*/
public void toggleGPS(boolean enableGPS) {
if ((ContextCompat.checkSelfPermission(context, Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) ||
if ((ContextCompat.checkSelfPermission(context, Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) &&
(ContextCompat.checkSelfPermission(context, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED)) {
Log.w(TAG, "Location Permissions Not Granted Yet. Try again after requesting.");
return;
}
// Disconnect
if (mLocationClient.isConnected()) {
// Disconnect
if (locationClient.isConnected()) {
// Disconnect first to ensure that the new requests are GPS
com.mapzen.android.lost.api.LocationServices.FusedLocationApi.removeLocationUpdates(this);
mLocationClient.disconnect();
locationClient.disconnect();
}
// Setup Fresh
mLocationClient.connect();
locationClient.connect();
Location lastLocation = com.mapzen.android.lost.api.LocationServices.FusedLocationApi.getLastLocation();
if (lastLocation != null) {
this.lastLocation = lastLocation;
}
if (enableGPS) {
LocationRequest locationRequest;
if (enableGPS) {
// LocationRequest Tuned for GPS
mLocationRequest = LocationRequest.create()
locationRequest = LocationRequest.create()
.setFastestInterval(1000)
.setSmallestDisplacement(3.0f)
.setPriority(LocationRequest.PRIORITY_HIGH_ACCURACY);
com.mapzen.android.lost.api.LocationServices.FusedLocationApi.requestLocationUpdates(mLocationRequest, this);
com.mapzen.android.lost.api.LocationServices.FusedLocationApi.requestLocationUpdates(locationRequest, this);
} else {
// LocationRequest Tuned for PASSIVE
mLocationRequest = LocationRequest.create()
locationRequest = LocationRequest.create()
.setFastestInterval(1000)
.setSmallestDisplacement(3.0f)
.setPriority(LocationRequest.PRIORITY_NO_POWER);
com.mapzen.android.lost.api.LocationServices.FusedLocationApi.requestLocationUpdates(mLocationRequest, this);
com.mapzen.android.lost.api.LocationServices.FusedLocationApi.requestLocationUpdates(locationRequest, this);
}
isGPSEnabled = enableGPS;
}
/**
* Returns if the GPS sensor is currently enabled
*
* @return active state of the GPS
*/
public boolean isGPSEnabled() {
return isGPSEnabled;
}
/**
* Called when the location has changed.
*
* @param location The updated location
*/
@Override
public void onLocationChanged(Location location) {
Log.i(TAG, "onLocationChanged()..." + location);
@@ -131,6 +136,7 @@ public class LocationServices implements com.mapzen.android.lost.api.LocationLis
/**
* Last known location
*
* @return Last known location data
*/
public Location getLastLocation() {
@@ -139,16 +145,18 @@ public class LocationServices implements com.mapzen.android.lost.api.LocationLis
/**
* Registers a LocationListener to receive location updates
*
* @param locationListener LocationListener
*/
public void addLocationListener(@NonNull LocationListener locationListener) {
if(!this.locationListeners.contains(locationListener)){
this.locationListeners.add(locationListener);
}
if (!this.locationListeners.contains(locationListener)) {
this.locationListeners.add(locationListener);
}
}
/**
* Unregister a LocationListener to stop receiving location updates
*
* @param locationListener LocationListener to remove
* @return True if LocationListener was found and removed, False if it was not
*/

14
platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/UserLocationView.java
View File

@@ -31,7 +31,7 @@ import com.mapbox.mapboxsdk.constants.MyBearingTracking;
import com.mapbox.mapboxsdk.constants.MyLocationTracking;
import com.mapbox.mapboxsdk.geometry.LatLng;
import com.mapbox.mapboxsdk.location.LocationListener;
import com.mapbox.mapboxsdk.location.LocationServices;
import com.mapbox.mapboxsdk.location.LocationService;
import java.lang.ref.WeakReference;
@@ -363,11 +363,11 @@ public final class UserLocationView extends View {
*/
private void toggleGps(boolean enableGps) {
LocationServices locationServices = LocationServices.getLocationServices(getContext());
LocationService locationService = LocationService.getInstance(getContext());
if (enableGps) {
// Set an initial location if one available
Location lastLocation = locationServices.getLastLocation();
Location lastLocation = locationService.getLastLocation();
if (lastLocation != null) {
setLocation(lastLocation);
}
@@ -377,16 +377,16 @@ public final class UserLocationView extends View {
}
// Register for Location Updates
locationServices.addLocationListener(mUserLocationListener);
locationService.addLocationListener(mUserLocationListener);
} else {
// Disable location and user dot
setLocation(null);
// Deregister for Location Updates
locationServices.removeLocationListener(mUserLocationListener);
locationService.removeLocationListener(mUserLocationListener);
}
locationServices.toggleGPS(enableGps);
locationService.toggleGPS(enableGps);
}
public void setMyBearingTrackingMode(@MyBearingTracking.Mode int myBearingTrackingMode) {
@@ -502,7 +502,7 @@ public final class UserLocationView extends View {
/**
* Callback method for receiving location updates from LocationServices.
* Callback method for receiving location updates from LocationService.
*
* @param location The new Location data
*/

6
platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/MapboxEventManager.java
View File

@@ -24,7 +24,7 @@ import android.util.DisplayMetrics;
import android.util.Log;
import android.view.WindowManager;
import com.mapbox.mapboxsdk.constants.MapboxConstants;
import com.mapbox.mapboxsdk.location.LocationServices;
import com.mapbox.mapboxsdk.location.LocationService;
import com.mapbox.mapboxsdk.utils.ApiAccess;
import org.json.JSONArray;
import org.json.JSONObject;
@@ -183,8 +183,8 @@ public class MapboxEventManager {
context.startService(new Intent(context, TelemetryService.class));
// Make sure Ambient Mode is started at a minimum
if (LocationServices.getLocationServices(context).isGPSEnabled()) {
LocationServices.getLocationServices(context).toggleGPS(false);
if (LocationService.getInstance(context).isGPSEnabled()) {
LocationService.getInstance(context).toggleGPS(false);
}
// Manage Timer Flush