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

Fixed crash on location engine access and location request hang #535

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fixed crash on location engine access and location request hang #535

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
347ceb4
fix: Add activation check before location engine access
albertmoravec Dec 19, 2024
5282b21
fix: Return error when location unavailable on request
albertmoravec Dec 13, 2024
968cf67
fix: Check style for null
albertmoravec Dec 19, 2024
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
14 changes: 12 additions & 2 deletions maplibre_gl/android/src/main/java/org/maplibre/maplibregl/MapLibreMapController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1242,7 +1242,10 @@ public void onError(@NonNull String message) {
case "locationComponent#getLastLocation":
{
Log.e(TAG, "location component: getLastLocation");
if (this.myLocationEnabled && locationComponent != null) {
if (this.myLocationEnabled
&& locationComponent != null
&& locationComponent.isLocationComponentActivated()
&& locationComponent.getLocationEngine() != null) {
Map<String, Object> reply = new HashMap<>();

mapLibreMap.getLocationComponent().getLocationEngine().getLastLocation(
Expand All @@ -1265,6 +1268,11 @@ public void onFailure(@NonNull Exception exception) {
result.error("", "", null); // ???
}
});
} else {
result.error(
"LOCATION DISABLED",
"Location is disabled or location component is unavailable",
null);
}
break;
}
Expand Down Expand Up @@ -2017,7 +2025,7 @@ public void setAttributionButtonMargins(int x, int y) {
}

private void updateMyLocationEnabled() {
if (this.locationComponent == null && myLocationEnabled) {
if (this.locationComponent == null && mapLibreMap.getStyle() != null && myLocationEnabled) {
enableLocationComponent(mapLibreMap.getStyle());
}

Expand All @@ -2035,6 +2043,7 @@ private void updateMyLocationEnabled() {
private void startListeningForLocationUpdates() {
if (locationEngineCallback == null
&& locationComponent != null
&& locationComponent.isLocationComponentActivated()
&& locationComponent.getLocationEngine() != null) {
locationEngineCallback =
new LocationEngineCallback<LocationEngineResult>() {
Expand All @@ -2056,6 +2065,7 @@ public void onFailure(@NonNull Exception exception) {}
private void stopListeningForLocationUpdates() {
if (locationEngineCallback != null
&& locationComponent != null
&& locationComponent.isLocationComponentActivated()
&& locationComponent.getLocationEngine() != null) {
locationComponent.getLocationEngine().removeLocationUpdates(locationEngineCallback);
locationEngineCallback = null;
Expand Down
Loading