From bff923135e4973c2ad7c7701fa7caf2fff944b30 Mon Sep 17 00:00:00 2001 From: Ashish Kumar Date: Tue, 12 May 2020 16:07:17 +0530 Subject: [PATCH] =?UTF-8?q?Fix=20NullPointer=20when=20clicking=20on=20imag?= =?UTF-8?q?e=20in=20MediaDetailFragment=20(#3730)=E2=80=A6=20(#3739)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/free/nrw/commons/media/MediaDetailFragment.java | 10 ++++++---- .../commons/nearby/fragments/NearbyParentFragment.java | 4 +--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java index 689e62395..adc63fbd2 100644 --- a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java @@ -209,10 +209,12 @@ public class MediaDetailFragment extends CommonsDaggerSupportFragment { @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 diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.java b/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.java index ad161f033..80cf1f33a 100644 --- a/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.java @@ -1120,9 +1120,7 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment boolean filterForPlaceState, boolean filterForAllNoneType) { - // Remove the previous markers before updating them hideAllMarkers(); - for (MarkerPlaceGroup markerPlaceGroup : NearbyController.markerLabelList) { Place place = markerPlaceGroup.getPlace(); @@ -1217,7 +1215,7 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment * 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());