chinwag/chinwag-android
chinwag/chinwag-android
2
0
Fork 0
Code Issues Pull requests Releases 1 Activity

Don't markup urls where the display text is exactly the domain (#2732)

Browse source 
* Don't markup urls where the display text is exactly the domain (or www.thedomain)

* Remove unused arguments
This commit is contained in:
Levi Bard 2022-11-01 16:41:55 +01:00 • committed by GitHub
commit 58e8f75287
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 45 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

21
app/src/main/java/com/keylesspalace/tusky/util/LinkHelper.kt
View file

@ -57,7 +57,7 @@ fun getDomain(urlString: String?): String {
* @param listener to notify about particular spans that are clicked
*/
fun setClickableText(view: TextView, content: CharSequence, mentions: List<Mention>, tags: List<HashTag>?, listener: LinkListener) {
val spannableContent = markupHiddenUrls(view.context, content, mentions, tags, listener)
val spannableContent = markupHiddenUrls(view.context, content)
view.text = spannableContent.apply {
getSpans(0, content.length, URLSpan::class.java).forEach {
@ -68,15 +68,26 @@ fun setClickableText(view: TextView, content: CharSequence, mentions: List<Menti
}
@VisibleForTesting
fun markupHiddenUrls(context: Context, content: CharSequence, mentions: List<Mention>, tags: List<HashTag>?, listener: LinkListener): SpannableStringBuilder {
fun markupHiddenUrls(context: Context, content: CharSequence): SpannableStringBuilder {
val spannableContent = SpannableStringBuilder.valueOf(content)
val originalSpans = spannableContent.getSpans(0, content.length, URLSpan::class.java)
val obscuredLinkSpans = originalSpans.filter {
val text = spannableContent.subSequence(spannableContent.getSpanStart(it), spannableContent.getSpanEnd(it))
val firstCharacter = text[0]
firstCharacter != '#' &&
firstCharacter != '@' &&
getDomain(text.toString()) != getDomain(it.url)
return@filter if (firstCharacter == '#' || firstCharacter == '@') {
false
} else {
var textDomain = getDomain(text.toString())
if (textDomain.isBlank()) {
// Allow "some.domain" or "www.some.domain" without a domain notifier
textDomain = if (text.startsWith("www.")) {
text.substring(4)
} else {
text.toString()
}
}
getDomain(it.url) != textDomain
}
}
for (span in obscuredLinkSpans) {