Skip to content

5195: Fix upload wizard crash on tapping target icon #5306

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

Merged
merged 9 commits into from
Sep 25, 2023
Merged

5195: Fix upload wizard crash on tapping target icon #5306

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6988177
LocationPickerActivity: fix crash on setting location for pictures wi…
RitikaPahwa4444 Apr 10, 2023
6aaa87a
strings.xml: remove extra string introduced
RitikaPahwa4444 Apr 10, 2023
57560dc
optimise constants
RitikaPahwa4444 Apr 10, 2023
4675909
LocationPickerActivity: request for permission only on tapping target…
RitikaPahwa4444 Apr 15, 2023
f53e3ca
remove newline
RitikaPahwa4444 Apr 15, 2023
d81be9f
merge branch 'main' into issue-5195_upload_wizard_crash_on_tapping_ta…
RitikaPahwa4444 Sep 23, 2023
95da511
handle location permissions using LocationPermissionsHelper
RitikaPahwa4444 Sep 23, 2023
0c7f21a
merge branch 'main' into issue-5195_upload_wizard_crash_on_tapping_ta…
RitikaPahwa4444 Sep 25, 2023
80dd046
add null check to prevent crash
RitikaPahwa4444 Sep 25, 2023
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
17 changes: 10 additions & 7 deletions app/src/main/java/fr/free/nrw/commons/LocationPicker/LocationPickerActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,13 +483,16 @@ public void onLocationPermissionDenied(String toastMessage) {
@Override
public void onLocationPermissionGranted() {
fr.free.nrw.commons.location.LatLng currLocation = locationManager.getLastLocation();
final CameraPosition position;
position = new CameraPosition.Builder()
.target(new com.mapbox.mapboxsdk.geometry.LatLng(currLocation.getLatitude(), currLocation.getLongitude(), 0)) // Sets the new camera position
.zoom(mapboxMap.getCameraPosition().zoom) // Same zoom level
.build();

mapboxMap.animateCamera(CameraUpdateFactory.newCameraPosition(position), 1000);
if (currLocation != null) {
final CameraPosition position;
position = new CameraPosition.Builder()
.target(new com.mapbox.mapboxsdk.geometry.LatLng(currLocation.getLatitude(),
currLocation.getLongitude(), 0)) // Sets the new camera position
.zoom(mapboxMap.getCameraPosition().zoom) // Same zoom level
.build();

mapboxMap.animateCamera(CameraUpdateFactory.newCameraPosition(position), 1000);
}
}
});
locationPermissionsHelper.handleLocationPermissions(locationAccessDialog, locationOffDialog);
Expand Down