mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-31 23:03:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

LocationPickerActivity.java: fix bug with permissions menu moving map

Browse source 
Prior to this change, if the menu asking for permissions to access the device's GPS was accepted, the map
would automatically move to the most recent or current GPS location, rather than staying at the uploaded
image's available EXIF location.

After this change, the map will stay centered at the image's available EXIF location, as intended.
The relevant method name and javadoc have been changed to more accurately describe the method's behavior.
This commit is contained in:
Jason Whitmore 2024-09-06 18:07:14 -07:00
parent 8ca6348c8c
commit 102fbfbeea
1 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
app/src/main/java/fr/free/nrw/commons/LocationPicker/LocationPickerActivity.java
View file

@ -40,12 +40,10 @@ import fr.free.nrw.commons.R;
import fr.free.nrw.commons.Utils; import fr.free.nrw.commons.Utils;
import fr.free.nrw.commons.auth.SessionManager; import fr.free.nrw.commons.auth.SessionManager;
import fr.free.nrw.commons.auth.csrf.CsrfTokenClient; import fr.free.nrw.commons.auth.csrf.CsrfTokenClient;
import fr.free.nrw.commons.auth.csrf.InvalidLoginTokenException;
import fr.free.nrw.commons.coordinates.CoordinateEditHelper; import fr.free.nrw.commons.coordinates.CoordinateEditHelper;
import fr.free.nrw.commons.filepicker.Constants; import fr.free.nrw.commons.filepicker.Constants;
import fr.free.nrw.commons.kvstore.BasicKvStore; import fr.free.nrw.commons.kvstore.BasicKvStore;
import fr.free.nrw.commons.kvstore.JsonKvStore; import fr.free.nrw.commons.kvstore.JsonKvStore;
import fr.free.nrw.commons.location.LatLng;
import fr.free.nrw.commons.location.LocationPermissionsHelper; import fr.free.nrw.commons.location.LocationPermissionsHelper;
import fr.free.nrw.commons.location.LocationPermissionsHelper.LocationPermissionCallback; import fr.free.nrw.commons.location.LocationPermissionsHelper.LocationPermissionCallback;
import fr.free.nrw.commons.location.LocationServiceManager; import fr.free.nrw.commons.location.LocationServiceManager;
@ -606,9 +604,9 @@ public class LocationPickerActivity extends BaseActivity implements
locationManager.requestLocationUpdatesFromProvider( locationManager.requestLocationUpdatesFromProvider(
LocationManager.NETWORK_PROVIDER); LocationManager.NETWORK_PROVIDER);
locationManager.requestLocationUpdatesFromProvider(LocationManager.GPS_PROVIDER); locationManager.requestLocationUpdatesFromProvider(LocationManager.GPS_PROVIDER);
getLocation(); addMarkerAtGPSLocation();
} else { } else {
getLocation(); addMarkerAtGPSLocation();
locationPermissionsHelper.showLocationOffDialog(this, locationPermissionsHelper.showLocationOffDialog(this,
R.string.ask_to_turn_location_on_text); R.string.ask_to_turn_location_on_text);
} }
@ -616,16 +614,15 @@ public class LocationPickerActivity extends BaseActivity implements
} }
/** /**
* Gets new location if locations services are on, else gets last location * Adds a marker to the map at the most recent GPS location
* (which may be the current GPS location).
*/ */
private void getLocation() { private void addMarkerAtGPSLocation() {
fr.free.nrw.commons.location.LatLng currLocation = locationManager.getLastLocation(); fr.free.nrw.commons.location.LatLng currLocation = locationManager.getLastLocation();
if (currLocation != null) { if (currLocation != null) {
GeoPoint currLocationGeopoint = new GeoPoint(currLocation.getLatitude(), GeoPoint currLocationGeopoint = new GeoPoint(currLocation.getLatitude(),
currLocation.getLongitude()); currLocation.getLongitude());
addLocationMarker(currLocationGeopoint); addLocationMarker(currLocationGeopoint);
mapView.getController().setCenter(currLocationGeopoint);
mapView.getController().animateTo(currLocationGeopoint);
markerImage.setTranslationY(0); markerImage.setTranslationY(0);
} }
} }