From ad001d044d9f6b354c948758abe9d6fb2e8036f1 Mon Sep 17 00:00:00 2001 From: Levi Bard Date: Wed, 30 Mar 2022 19:33:31 +0200 Subject: [PATCH] Revert unintentional behavior change for mention spans to use remote usernames (#2408) --- app/src/main/java/com/keylesspalace/tusky/util/LinkHelper.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/keylesspalace/tusky/util/LinkHelper.kt b/app/src/main/java/com/keylesspalace/tusky/util/LinkHelper.kt index 02ecf7735..1abbab14d 100644 --- a/app/src/main/java/com/keylesspalace/tusky/util/LinkHelper.kt +++ b/app/src/main/java/com/keylesspalace/tusky/util/LinkHelper.kt @@ -149,7 +149,7 @@ fun setClickableMentions(view: TextView, mentions: List?, listener: Lin for (mention in mentions) { val customSpan = getCustomSpanForMentionUrl(mention.url, mention.id, listener) - end += 1 + mention.username.length // length of @ + username + end += 1 + mention.localUsername.length // length of @ + username flags = getSpanFlags(customSpan) if (firstMention) { firstMention = false @@ -160,7 +160,7 @@ fun setClickableMentions(view: TextView, mentions: List?, listener: Lin } append("@") - append(mention.username) + append(mention.localUsername) setSpan(customSpan, start, end, flags) append("\u200B") // same reasoning as in setClickableText end += 1 // shift position to take the previous character into account