Add geo: link support in longer messages
This commit is contained in:
parent
841e718d6a
commit
82c3cbaf2a
|
@ -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);
|
||||
|
|
|
@ -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();
|
||||
|
|
Loading…
Reference in New Issue