Do not show geo URI as message body

Stephen Paul Weber created 2 years ago

Just show the button

Change summary

src/main/java/eu/siacs/conversations/entities/Message.java  | 2 ++
src/main/java/eu/siacs/conversations/ui/util/ShareUtil.java | 2 +-
src/main/java/eu/siacs/conversations/utils/GeoHelper.java   | 6 +++---
3 files changed, 6 insertions(+), 4 deletions(-)

Detailed changes

src/main/java/eu/siacs/conversations/entities/Message.java

@@ -522,6 +522,8 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
 
         if (spans.isEmpty() && getOob() != null) {
             return body.toString().replace(getOob().toString(), "");
+        } else if (spans.isEmpty() && isGeoUri()) {
+            return "";
         } else {
             return body.toString();
         }

src/main/java/eu/siacs/conversations/ui/util/ShareUtil.java

@@ -97,7 +97,7 @@ public class ShareUtil {
 		final int resId;
 		if (message.isGeoUri()) {
 			resId = R.string.location;
-			url = message.getBody();
+			url = message.getQuoteableBody();
 		} else if (message.hasFileOnRemoteHost()) {
 			resId = R.string.file_url;
 			url = message.getFileParams().url;

src/main/java/eu/siacs/conversations/utils/GeoHelper.java

@@ -72,7 +72,7 @@ public class GeoHelper {
 		final ArrayList<Intent> intents = new ArrayList<>();
 		final GeoPoint geoPoint;
 		try {
-			geoPoint = parseGeoPoint(message.getBody());
+			geoPoint = parseGeoPoint(message.getQuoteableBody());
 		} catch (IllegalArgumentException e) {
 			return intents;
 		}
@@ -113,7 +113,7 @@ public class GeoHelper {
 	}
 
 	public static void view(Context context, Message message) {
-		final GeoPoint geoPoint = parseGeoPoint(message.getBody());
+		final GeoPoint geoPoint = parseGeoPoint(message.getQuoteableBody());
 		final String label = getLabel(context, message);
 		context.startActivity(geoIntent(geoPoint,label));
 	}
@@ -126,7 +126,7 @@ public class GeoHelper {
 
 	public static boolean openInOsmAnd(Context context, Message message) {
 		try {
-			final GeoPoint geoPoint = parseGeoPoint(message.getBody());
+			final GeoPoint geoPoint = parseGeoPoint(message.getQuoteableBody());
 			final String label = getLabel(context, message);
 			return geoIntent(geoPoint, label).resolveActivity(context.getPackageManager()) != null;
 		} catch (IllegalArgumentException e) {