diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2016-05-28 16:07:25 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2016-05-28 16:07:25 +0200 |
| commit | b3f50d1ad01b7d5a5f9d1d17623bc64404faf626 (patch) | |
| tree | 70a38b31ea0375f6dcbc9fbf044ea3ffd076a27c /src/main/java | |
| parent | bc326efd2cce02bd8a68ac35257efdae4ffe66c0 (diff) | |
| parent | 82c3cbaf2a794bbfabe305be08bca217469fbaaa (diff) | |
Merge branch 'master' of https://github.com/gjedeer/Conversations into gjedeer-master
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java | 5 | ||||
| -rw-r--r-- | src/main/java/eu/siacs/conversations/utils/GeoHelper.java | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java index 10179d7e..c08b41f0 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java @@ -356,10 +356,15 @@ public class MessageAdapter extends ArrayAdapter<Message> { while (matcher.find()) { urlCount++; } + Matcher geoMatcher = GeoHelper.GEO_URI.matcher(body); + while (matcher.find()) { + urlCount++; + } viewHolder.messageBody.setTextIsSelectable(urlCount <= 1); viewHolder.messageBody.setAutoLinkMask(0); Linkify.addLinks(viewHolder.messageBody, Linkify.WEB_URLS); Linkify.addLinks(viewHolder.messageBody, XMPP_PATTERN, "xmpp"); + Linkify.addLinks(viewHolder.messageBody, GeoHelper.GEO_URI, "geo"); } else { viewHolder.messageBody.setText(""); viewHolder.messageBody.setTextIsSelectable(false); diff --git a/src/main/java/eu/siacs/conversations/utils/GeoHelper.java b/src/main/java/eu/siacs/conversations/utils/GeoHelper.java index 9a93df38..e2e9a212 100644 --- a/src/main/java/eu/siacs/conversations/utils/GeoHelper.java +++ b/src/main/java/eu/siacs/conversations/utils/GeoHelper.java @@ -14,7 +14,7 @@ import eu.siacs.conversations.entities.Conversation; import eu.siacs.conversations.entities.Message; public class GeoHelper { - private static Pattern GEO_URI = Pattern.compile("geo:([\\-0-9.]+),([\\-0-9.]+)(?:,([\\-0-9.]+))?(?:\\?(.*))?", Pattern.CASE_INSENSITIVE); + public static Pattern GEO_URI = Pattern.compile("geo:([\\-0-9.]+),([\\-0-9.]+)(?:,([\\-0-9.]+))?(?:\\?(.*))?", Pattern.CASE_INSENSITIVE); public static boolean isGeoUri(String body) { return body != null && GEO_URI.matcher(body).matches(); |