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

feat(geolocation): Throw error if location is disabled #589

Merged
merged 2 commits into from
Sep 1, 2021
Merged

feat(geolocation): Throw error if location is disabled #589

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f34665
feat(geolocation): Throw error if location is disabled
jcesarmobile Sep 1, 2021
d36e474
fmt
jcesarmobile Sep 1, 2021
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
67 changes: 32 additions & 35 deletions geolocation/android/src/main/java/com/capacitorjs/plugins/geolocation/Geolocation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import android.content.Context;
import android.location.Location;
import android.location.LocationManager;
import androidx.core.location.LocationManagerCompat;
import com.google.android.gms.location.FusedLocationProviderClient;
import com.google.android.gms.location.LocationAvailability;
import com.google.android.gms.location.LocationCallback;
import com.google.android.gms.location.LocationRequest;
import com.google.android.gms.location.LocationResult;
Expand Down Expand Up @@ -41,45 +41,42 @@ public void requestLocationUpdates(
fusedLocationClient = LocationServices.getFusedLocationProviderClient(context);

LocationManager lm = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);
boolean networkEnabled = false;
if (LocationManagerCompat.isLocationEnabled(lm)) {
boolean networkEnabled = false;

try {
networkEnabled = lm.isProviderEnabled(LocationManager.NETWORK_PROVIDER);
} catch (Exception ex) {}
try {
networkEnabled = lm.isProviderEnabled(LocationManager.NETWORK_PROVIDER);
} catch (Exception ex) {}

LocationRequest locationRequest = new LocationRequest();
locationRequest.setMaxWaitTime(timeout);
locationRequest.setInterval(10000);
locationRequest.setFastestInterval(5000);
int lowPriority = networkEnabled ? LocationRequest.PRIORITY_BALANCED_POWER_ACCURACY : LocationRequest.PRIORITY_LOW_POWER;
int priority = enableHighAccuracy ? LocationRequest.PRIORITY_HIGH_ACCURACY : lowPriority;
locationRequest.setPriority(priority);
LocationRequest locationRequest = new LocationRequest();
locationRequest.setMaxWaitTime(timeout);
locationRequest.setInterval(10000);
locationRequest.setFastestInterval(5000);
int lowPriority = networkEnabled ? LocationRequest.PRIORITY_BALANCED_POWER_ACCURACY : LocationRequest.PRIORITY_LOW_POWER;
int priority = enableHighAccuracy ? LocationRequest.PRIORITY_HIGH_ACCURACY : lowPriority;
locationRequest.setPriority(priority);

locationCallback =
new LocationCallback() {
@Override
public void onLocationResult(LocationResult locationResult) {
if (getCurrentPosition) {
clearLocationUpdates();
}
Location lastLocation = locationResult.getLastLocation();
if (lastLocation == null) {
resultCallback.error("location unavailable");
} else {
resultCallback.success(lastLocation);
}
}
locationCallback =
new LocationCallback() {
@Override
public void onLocationResult(LocationResult locationResult) {
if (getCurrentPosition) {
clearLocationUpdates();
}
Location lastLocation = locationResult.getLastLocation();
if (lastLocation == null) {
resultCallback.error("location unavailable");
} else {
resultCallback.success(lastLocation);
}
}
};

@Override
public void onLocationAvailability(LocationAvailability availability) {
if (!availability.isLocationAvailable()) {
resultCallback.error("location unavailable");
clearLocationUpdates();
}
}
};
fusedLocationClient.requestLocationUpdates(locationRequest, locationCallback, null);
} else {
resultCallback.error("location disabled");
}

fusedLocationClient.requestLocationUpdates(locationRequest, locationCallback, null);
}

public void clearLocationUpdates() {
Expand Down