From ca35b5e544c13f87b2766d420b3089f9fefa7216 Mon Sep 17 00:00:00 2001 From: misaochan Date: Sun, 31 Dec 2017 02:08:11 +1000 Subject: [PATCH] Return longDescription instead of description --- .../java/fr/free/nrw/commons/nearby/NearbyInfoDialog.java | 2 +- app/src/main/java/fr/free/nrw/commons/nearby/Place.java | 4 ++++ .../main/java/fr/free/nrw/commons/nearby/PlaceRenderer.java | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyInfoDialog.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyInfoDialog.java index 2e677f33d..b383fd9b9 100644 --- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyInfoDialog.java +++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyInfoDialog.java @@ -109,7 +109,7 @@ public class NearbyInfoDialog extends OverlayDialog { NearbyInfoDialog mDialog = new NearbyInfoDialog(); Bundle bundle = new Bundle(); bundle.putString(ARG_TITLE, place.name); - bundle.putString(ARG_DESC, place.getDescription().getText()); + bundle.putString(ARG_DESC, place.getLongDescription()); bundle.putDouble(ARG_LATITUDE, place.location.getLatitude()); bundle.putDouble(ARG_LONGITUDE, place.location.getLongitude()); bundle.putParcelable(ARG_SITE_LINK, place.siteLinks); diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/Place.java b/app/src/main/java/fr/free/nrw/commons/nearby/Place.java index 428fcf6de..f83e01c99 100644 --- a/app/src/main/java/fr/free/nrw/commons/nearby/Place.java +++ b/app/src/main/java/fr/free/nrw/commons/nearby/Place.java @@ -38,6 +38,10 @@ public class Place { return description; } + public String getLongDescription() { + return longDescription; + } + public void setDistance(String distance) { this.distance = distance; } diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/PlaceRenderer.java b/app/src/main/java/fr/free/nrw/commons/nearby/PlaceRenderer.java index f4c8a5d61..ae34d55b9 100644 --- a/app/src/main/java/fr/free/nrw/commons/nearby/PlaceRenderer.java +++ b/app/src/main/java/fr/free/nrw/commons/nearby/PlaceRenderer.java @@ -43,7 +43,7 @@ class PlaceRenderer extends Renderer { public void render() { Place place = getContent(); tvName.setText(place.name); - String descriptionText = place.getDescription().getText(); + String descriptionText = place.getLongDescription(); if (descriptionText.equals("?")) { descriptionText = getContext().getString(R.string.no_description_found); }