diff options
| author | iNPUTmice <daniel@gultsch.de> | 2015-03-10 17:20:50 +0100 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2015-03-10 17:20:50 +0100 |
| commit | 5132cd723476b6f612cf103b927e1fcf869cb039 (patch) | |
| tree | 0e9817071f3dc2c790fbd487397049ec759904e5 /src | |
| parent | 1a5321e41f8ff18356d27a54078a6d742826473f (diff) | |
show geo uris as 'location' in overview
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/utils/UIHelper.java | 8 | ||||
| -rw-r--r-- | src/main/res/values/strings.xml | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/utils/UIHelper.java b/src/main/java/eu/siacs/conversations/utils/UIHelper.java index e36c169b..c3195d86 100644 --- a/src/main/java/eu/siacs/conversations/utils/UIHelper.java +++ b/src/main/java/eu/siacs/conversations/utils/UIHelper.java @@ -153,7 +153,13 @@ public class UIHelper { if (message.getBody().startsWith(Message.ME_COMMAND)) { return new Pair<>(message.getBody().replaceAll("^" + Message.ME_COMMAND, UIHelper.getMessageDisplayName(message) + " "), false); - } else { + } else if (GeoHelper.isGeoUri(message.getBody())) { + if (message.getStatus() == Message.STATUS_RECEIVED) { + return new Pair<>(context.getString(R.string.received_location),true); + } else { + return new Pair<>(context.getString(R.string.location), true); + } + } else{ return new Pair<>(message.getBody().trim(), false); } } diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 316fbb8c..8ebe58ca 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -452,4 +452,6 @@ <string name="send_location">Send location</string> <string name="show_location">Show location</string> <string name="no_application_found_to_display_location">No application found to display location</string> + <string name="location">Location</string> + <string name="received_location">Received location</string> </resources> |