mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-27 04:43:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

Browse source
This commit is contained in:
Ashish Kumar 2020-05-12 16:07:17 +05:30 • committed by GitHub
parent 63018fcbd5
commit bff923135e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java
View file

@ -209,11 +209,13 @@ public class MediaDetailFragment extends CommonsDaggerSupportFragment {
@OnClick(R.id.mediaDetailImageViewSpacer) @OnClick(R.id.mediaDetailImageViewSpacer)
public void launchZoomActivity(View view) { public void launchZoomActivity(View view) {
if (media.getImageUrl() != null) {
Context ctx = view.getContext(); Context ctx = view.getContext();
ctx.startActivity( ctx.startActivity(
new Intent(ctx,ZoomableActivity.class).setData(Uri.parse(media.getImageUrl())) new Intent(ctx, ZoomableActivity.class).setData(Uri.parse(media.getImageUrl()))
); );
} }
}
@Override @Override
public void onResume() { public void onResume() {

4
app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.java
View file

@ -1120,9 +1120,7 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
boolean filterForPlaceState, boolean filterForPlaceState,
boolean filterForAllNoneType) { boolean filterForAllNoneType) {
// Remove the previous markers before updating them
hideAllMarkers(); hideAllMarkers();
for (MarkerPlaceGroup markerPlaceGroup : NearbyController.markerLabelList) { for (MarkerPlaceGroup markerPlaceGroup : NearbyController.markerLabelList) {
Place place = markerPlaceGroup.getPlace(); 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 * since grey icon may lead the users to believe that it is disabled or prohibited contribution
*/ */
private void hideAllMArkers() { private void hideAllMarkers() {
VectorDrawableCompat vectorDrawable; VectorDrawableCompat vectorDrawable;
vectorDrawable = VectorDrawableCompat.create( vectorDrawable = VectorDrawableCompat.create(
getContext().getResources(), R.drawable.ic_custom_greyed_out_marker, getContext().getTheme()); getContext().getResources(), R.drawable.ic_custom_greyed_out_marker, getContext().getTheme());