Skip to content

Fix NullPointer when clicking on image in MediaDetailFragment (#3730)… #3739

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 4 commits into from
May 12, 2020
Merged

Fix NullPointer when clicking on image in MediaDetailFragment (#3730)… #3739

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3c2afba
Fix NullPointer when clicking on image in MediaDetailFragment (#3730)…
gvaibhav1734 May 8, 2020
f42d026
Merge branch '2.13-release' of https://github.com/commons-app/apps-an…
ashishkumar468 May 8, 2020
3c21d5b
Fix compile time errors
ashishkumar468 May 8, 2020
1c73aef
typo fix hideAllMArkers-> hideAllMarkers
ashishkumar468 May 11, 2020
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
10 changes: 6 additions & 4 deletions app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,10 +209,12 @@ && getParentFragment() instanceof MediaDetailPagerFragment) {

@OnClick(R.id.mediaDetailImageViewSpacer)
public void launchZoomActivity(View view) {
Context ctx = view.getContext();
ctx.startActivity(
new Intent(ctx,ZoomableActivity.class).setData(Uri.parse(media.getImageUrl()))
);
if (media.getImageUrl() != null) {
Context ctx = view.getContext();
ctx.startActivity(
new Intent(ctx, ZoomableActivity.class).setData(Uri.parse(media.getImageUrl()))
);
}
}

@Override
Expand Down
4 changes: 1 addition & 3 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 @@ -1120,9 +1120,7 @@ public void filterMarkersByLabels(List<Label> selectedLabels,
boolean filterForPlaceState,
boolean filterForAllNoneType) {

// Remove the previous markers before updating them
hideAllMarkers();

for (MarkerPlaceGroup markerPlaceGroup : NearbyController.markerLabelList) {
Place place = markerPlaceGroup.getPlace();

Expand Down Expand Up @@ -1217,7 +1215,7 @@ public void updateMarker(boolean isBookmarked, Place place, @Nullable fr.free.nr
* since grey icon may lead the users to believe that it is disabled or prohibited contribution
*/

private void hideAllMArkers() {
private void hideAllMarkers() {
VectorDrawableCompat vectorDrawable;
vectorDrawable = VectorDrawableCompat.create(
getContext().getResources(), R.drawable.ic_custom_greyed_out_marker, getContext().getTheme());
Expand Down