Merge remote-tracking branch 'origin/master' into 1156Fix

This commit is contained in:
hismaeel 2018-02-20 21:38:55 -05:00
commit c7ed3b4b5b

View file

@ -276,12 +276,7 @@ public class MediaDetailFragment extends CommonsDaggerSupportFragment {
} }
private void setOnClickListeners(final Media media) { private void setOnClickListeners(final Media media) {
if (licenseLink(media) != null) {
license.setOnClickListener(v -> openWebBrowser(licenseLink(media))); license.setOnClickListener(v -> openWebBrowser(licenseLink(media)));
} else {
Toast toast = Toast.makeText(getContext(), getString(R.string.description_info), Toast.LENGTH_SHORT);
toast.show();
}
if (media.getCoordinates() != null) { if (media.getCoordinates() != null) {
coordinates.setOnClickListener(v -> openMap(media.getCoordinates())); coordinates.setOnClickListener(v -> openMap(media.getCoordinates()));
} }