Skip to content

Fixes #3237 App crashes if user taps my location button while the map is loading #3238

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 1 commit into from
Nov 29, 2019
Merged

Fixes #3237 App crashes if user taps my location button while the map is loading #3238

Show file tree
Hide file tree
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
2 changes: 2 additions & 0 deletions app/src/main/java/fr/free/nrw/commons/nearby/contract/NearbyParentFragmentContract.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ interface View {
void setCheckBoxAction();
void setCheckBoxState(int state);
void setFilterState();
void disableFABRecenter();
void enableFABRecenter();
}

interface NearbyListView {
Expand Down
10 changes: 10 additions & 0 deletions app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -830,6 +830,16 @@ public void setFABRecenterAction(View.OnClickListener onClickListener) {
fabRecenter.setOnClickListener(onClickListener);
}

@Override
public void disableFABRecenter() {
fabRecenter.setEnabled(false);
}

@Override
public void enableFABRecenter() {
fabRecenter.setEnabled(true);
}

@Override
public void recenterMap(fr.free.nrw.commons.location.LatLng curLatLng) {
nearbyMapFragment.removeCurrentLocationMarker();
Expand Down
5 changes: 5 additions & 0 deletions app/src/main/java/fr/free/nrw/commons/nearby/presenter/NearbyParentFragmentPresenter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,11 @@ public void markerSelected(Marker marker) {
@Override
public void lockUnlockNearby(boolean isNearbyLocked) {
this.isNearbyLocked = isNearbyLocked;
if (isNearbyLocked) {
nearbyParentFragmentView.disableFABRecenter();
} else {
nearbyParentFragmentView.enableFABRecenter();
}
}

public void registerUnregisterLocationListener(boolean removeLocationListener) {
Expand Down