Skip to content
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

fix: added validation for gps and network provider permissions separa… #317

Merged
merged 1 commit into from
Aug 31, 2024
Merged

fix: added validation for gps and network provider permissions separa… #317

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 19 additions & 10 deletions android/src/main/java/com/reactnativecommunity/geolocation/AndroidLocationManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,12 @@ public void onStatusChanged(String provider, int status, Bundle extras) {
}

@Override
public void onProviderEnabled(String provider) { }
public void onProviderEnabled(String provider) {
}

@Override
public void onProviderDisabled(String provider) { }
public void onProviderDisabled(String provider) {
}
};

protected AndroidLocationManager(ReactApplicationContext reactContext) {
Expand Down Expand Up @@ -134,7 +136,8 @@ private String getValidProvider(LocationManager locationManager, boolean highAcc
// If it's an enabled provider, but we don't have permissions, ignore it
int finePermission = ContextCompat.checkSelfPermission(mReactContext, android.Manifest.permission.ACCESS_FINE_LOCATION);
int coarsePermission = ContextCompat.checkSelfPermission(mReactContext, android.Manifest.permission.ACCESS_COARSE_LOCATION);
if (provider.equals(LocationManager.GPS_PROVIDER) && (finePermission != PackageManager.PERMISSION_GRANTED && coarsePermission != PackageManager.PERMISSION_GRANTED)) {
if ((provider.equals(LocationManager.GPS_PROVIDER) && finePermission != PackageManager.PERMISSION_GRANTED) ||
(provider.equals(LocationManager.NETWORK_PROVIDER) && coarsePermission != PackageManager.PERMISSION_GRANTED)) {
return null;
}
return provider;
Expand Down Expand Up @@ -178,13 +181,16 @@ public void onLocationChanged(Location location) {
}

@Override
public void onStatusChanged(String provider, int status, Bundle extras) {}
public void onStatusChanged(String provider, int status, Bundle extras) {
}

@Override
public void onProviderEnabled(String provider) {}
public void onProviderEnabled(String provider) {
}

@Override
public void onProviderDisabled(String provider) {}
public void onProviderDisabled(String provider) {
}
};
private boolean mTriggered;

Expand All @@ -209,11 +215,12 @@ public void invoke(Location location) {

private static final int TWO_MINUTES = 1000 * 60 * 2;

/** Determines whether one Location reading is better than the current Location fix
/**
* Determines whether one Location reading is better than the current Location fix
* taken from Android Examples https://developer.android.com/guide/topics/location/strategies.html
*
* @param location The new Location that you want to evaluate
* @param currentBestLocation The current Location fix, to which you want to compare the new one
* @param location The new Location that you want to evaluate
* @param currentBestLocation The current Location fix, to which you want to compare the new one
*/
private boolean isBetterLocation(Location location, Location currentBestLocation) {
if (currentBestLocation == null) {
Expand Down Expand Up @@ -258,7 +265,9 @@ private boolean isBetterLocation(Location location, Location currentBestLocation
return false;
}

/** Checks whether two providers are the same */
/**
* Checks whether two providers are the same
*/
private boolean isSameProvider(String provider1, String provider2) {
if (provider1 == null) {
return provider2 == null;
Expand Down