From b8040aef39129a420dbcefa60956e9ac1ebef925 Mon Sep 17 00:00:00 2001 From: Vivek Maskara Date: Fri, 7 Feb 2020 12:34:03 -0700 Subject: [PATCH] Handle null context and drawable in nearby map fragment --- .../commons/nearby/fragments/NearbyMapFragment.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyMapFragment.java b/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyMapFragment.java index 3280a80cb..0b708808a 100644 --- a/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyMapFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyMapFragment.java @@ -558,12 +558,19 @@ public class NearbyMapFragment extends CommonsDaggerSupportFragment * Greys out all markers except current location marker */ public void greyOutAllMarkers() { - VectorDrawableCompat vectorDrawable; - vectorDrawable = VectorDrawableCompat.create( + if (getContext() == null) { + Timber.d("Context is null. Skipping greying out of all markers"); + return; + } + VectorDrawableCompat vectorDrawable = VectorDrawableCompat.create( getContext().getResources(), R.drawable.ic_custom_greyed_out_marker, getContext().getTheme()); + if (vectorDrawable == null) { + Timber.d("Vector drawable ic_custom_greyed_out_marker is null"); + return; + } Bitmap icon = UiUtils.getBitmap(vectorDrawable); for (Marker marker : mapboxMap.getMarkers()) { - if (currentLocationMarker.getTitle() != marker.getTitle()) { + if (!currentLocationMarker.getTitle().equals(marker.getTitle())) { marker.setIcon(IconFactory.getInstance(getContext()).fromBitmap(icon)); } }