Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Also linkify emails.

Browse source
This commit is contained in:
Benoit Marty 2023-12-15 15:38:34 +01:00 • committed by Benoit Marty
parent bce100e913
commit bc4da250e1
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentMessageFactory.kt
View file

@ -230,7 +230,7 @@ class TimelineItemContentMessageFactory @Inject constructor(
Pair(start, end) Pair(start, end)
} }
// Find and set as URLSpans any links present in the text // Find and set as URLSpans any links present in the text
LinkifyCompat.addLinks(this, Linkify.WEB_URLS or Linkify.PHONE_NUMBERS) LinkifyCompat.addLinks(this, Linkify.WEB_URLS or Linkify.PHONE_NUMBERS or Linkify.EMAIL_ADDRESSES)
// Restore old spans if they don't conflict with the new ones // Restore old spans if they don't conflict with the new ones
for ((urlSpan, location) in oldURLSpans) { for ((urlSpan, location) in oldURLSpans) {
val (start, end) = location val (start, end) = location
@ -244,6 +244,6 @@ class TimelineItemContentMessageFactory @Inject constructor(
private fun String.withLinks(): CharSequence? { private fun String.withLinks(): CharSequence? {
val spannable = toSpannable() val spannable = toSpannable()
val addedLinks = LinkifyCompat.addLinks(spannable, Linkify.WEB_URLS or Linkify.PHONE_NUMBERS) val addedLinks = LinkifyCompat.addLinks(spannable, Linkify.WEB_URLS or Linkify.PHONE_NUMBERS or Linkify.EMAIL_ADDRESSES)
return spannable.takeIf { addedLinks } return spannable.takeIf { addedLinks }
} }

2
libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/ClickableLinkText.kt
View file

@ -142,7 +142,7 @@ fun ClickableLinkText(
fun AnnotatedString.linkify(linkStyle: SpanStyle): AnnotatedString { fun AnnotatedString.linkify(linkStyle: SpanStyle): AnnotatedString {
val original = this val original = this
val spannable = SpannableString(this.text) val spannable = SpannableString(this.text)
LinkifyCompat.addLinks(spannable, Linkify.WEB_URLS or Linkify.PHONE_NUMBERS) LinkifyCompat.addLinks(spannable, Linkify.WEB_URLS or Linkify.PHONE_NUMBERS or Linkify.EMAIL_ADDRESSES)
val spans = spannable.getSpans(0, spannable.length, URLSpan::class.java) val spans = spannable.getSpans(0, spannable.length, URLSpan::class.java)
return buildAnnotatedString { return buildAnnotatedString {