etc/VancedMicroG
0
0
Fork 0
mirror of https://github.com/YTVanced/VancedMicroG synced 2024-11-24 04:05:13 +00:00
Code Issues Projects Releases Wiki Activity

Location: do not try to access network location provider if not present on system

Browse source 
Related to #269
This commit is contained in:
Marvin W 2017-01-18 17:35:01 +01:00
parent dde462c73a
commit 6766fa4d95
No known key found for this signature in database
GPG key ID: 072E9235DB996F2A
3 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
extern/GmsApi vendored

@ -1 +1 @@
Subproject commit bfae24a17c11d9633fdce4f9b82dff0da4769f8d Subproject commit 3dabc13028b56c792573743107b2a56f2fdd3148

19
play-services-core/src/main/java/org/microg/gms/location/GoogleLocationManager.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright 2013-2015 microG Project Team * Copyright 2013-2017 microG Project Team
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -22,11 +22,7 @@ import android.content.Context;
import android.location.Location; import android.location.Location;
import android.location.LocationManager; import android.location.LocationManager;
import android.os.RemoteException; import android.os.RemoteException;
import android.support.v4.content.ContextCompat;
import android.util.Log;
import android.widget.Toast;
import com.google.android.gms.R;
import com.google.android.gms.location.ILocationListener; import com.google.android.gms.location.ILocationListener;
import com.google.android.gms.location.LocationRequest; import com.google.android.gms.location.LocationRequest;
import com.google.android.gms.location.internal.FusedLocationProviderResult; import com.google.android.gms.location.internal.FusedLocationProviderResult;
@ -65,7 +61,12 @@ public class GoogleLocationManager implements LocationChangeListener {
this.gpsProvider = null; this.gpsProvider = null;
} }
if (Utils.hasSelfPermissionOrNotify(context, Manifest.permission.ACCESS_COARSE_LOCATION)) { if (Utils.hasSelfPermissionOrNotify(context, Manifest.permission.ACCESS_COARSE_LOCATION)) {
this.networkProvider = new RealLocationProvider(locationManager, NETWORK_PROVIDER, this); if (locationManager.getAllProviders().contains(NETWORK_PROVIDER)) {
this.networkProvider = new RealLocationProvider(locationManager, NETWORK_PROVIDER, this);
} else {
// TODO: Add ability to directly contact UnifiedNlp without the system location provider
this.networkProvider = null;
}
} else { } else {
this.networkProvider = null; this.networkProvider = null;
} }
@ -119,14 +120,12 @@ public class GoogleLocationManager implements LocationChangeListener {
networkProvider.addRequest(request); networkProvider.addRequest(request);
} }
public void requestLocationUpdates(LocationRequest request, ILocationListener listener, public void requestLocationUpdates(LocationRequest request, ILocationListener listener, String packageName) {
String packageName) {
requestLocationUpdates(new LocationRequestHelper(context, request, hasFineLocationPermission(), requestLocationUpdates(new LocationRequestHelper(context, request, hasFineLocationPermission(),
hasCoarseLocationPermission(), packageName, listener)); hasCoarseLocationPermission(), packageName, listener));
} }
public void requestLocationUpdates(LocationRequest request, PendingIntent intent, public void requestLocationUpdates(LocationRequest request, PendingIntent intent, String packageName) {
String packageName) {
requestLocationUpdates(new LocationRequestHelper(context, request, hasFineLocationPermission(), requestLocationUpdates(new LocationRequestHelper(context, request, hasFineLocationPermission(),
hasCoarseLocationPermission(), packageName, intent)); hasCoarseLocationPermission(), packageName, intent));
} }

7
play-services-core/src/main/java/org/microg/gms/location/RealLocationProvider.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright 2013-2015 microG Project Team * Copyright 2013-2017 microG Project Team
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -63,8 +63,7 @@ public class RealLocationProvider {
} }
}; };
public RealLocationProvider(LocationManager locationManager, String name, public RealLocationProvider(LocationManager locationManager, String name, LocationChangeListener changeListener) {
LocationChangeListener changeListener) {
this.locationManager = locationManager; this.locationManager = locationManager;
this.name = name; this.name = name;
this.changeListener = changeListener; this.changeListener = changeListener;
@ -110,6 +109,7 @@ public class RealLocationProvider {
minTime = Math.min(request.locationRequest.getInterval(), minTime); minTime = Math.min(request.locationRequest.getInterval(), minTime);
minDistance = Math.min(request.locationRequest.getSmallestDesplacement(), minDistance); minDistance = Math.min(request.locationRequest.getSmallestDesplacement(), minDistance);
} }
Log.d(TAG, name + ": requesting location updates. minTime=" + minTime + " minDistance=" + minDistance);
if (connected.get()) { if (connected.get()) {
if (connectedMinTime != minTime || connectedMinDistance != minDistance) { if (connectedMinTime != minTime || connectedMinDistance != minDistance) {
locationManager.removeUpdates(listener); locationManager.removeUpdates(listener);
@ -119,7 +119,6 @@ public class RealLocationProvider {
} else { } else {
locationManager.requestLocationUpdates(name, minTime, minDistance, listener, Looper.getMainLooper()); locationManager.requestLocationUpdates(name, minTime, minDistance, listener, Looper.getMainLooper());
} }
Log.d(TAG, name + ": requesting location updates. minTime=" + minTime + " minDistance=" + minDistance);
connected.set(true); connected.set(true);
connectedMinTime = minTime; connectedMinTime = minTime;
connectedMinDistance = minDistance; connectedMinDistance = minDistance;