Skip to content

#14084 fix: preserve trailing hyphen in URLs when followed by space or newline #14579

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
polaris428 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

#14084 fix: preserve trailing hyphen in URLs when followed by space or newline #14579

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions ...src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,20 @@ object V2ConversationItemUtils {

messageBody.getSpans(0, messageBody.length, URLSpan::class.java).forEach { urlSpan ->
val start = messageBody.getSpanStart(urlSpan)
val end = messageBody.getSpanEnd(urlSpan)
val span = InterceptableLongClickCopyLinkSpan(urlSpan.url, urlClickHandler)
var end = messageBody.getSpanEnd(urlSpan)
var url = urlSpan.url

while (end < messageBody.length && messageBody[end] == '-') {
val nextCharIndex = end + 1
if (nextCharIndex >= messageBody.length || messageBody[nextCharIndex] == ' ' || messageBody[nextCharIndex] == '\n') {
url += '-'
end++
} else {
break
}
}

val span = InterceptableLongClickCopyLinkSpan(url, urlClickHandler)

messageBody.setSpan(span, start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
messageBody.removeSpan(urlSpan)
Expand Down
2 changes: 2 additions & 0 deletions ...test/java/org/thoughtcrime/securesms/conversation/ConversationItemTest_linkifyUrlLinks.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ class ConversationItemTest_linkifyUrlLinks(private val input: String, private va
arrayOf("https://www.google.com%d332", "https://www.google.com"),
// arrayOf("https://www.instagram.com/tv/CfImYdngccQ/?igshid=YmMyMTA2M2Y= ", "https://www.instagram.com/tv/CfImYdngccQ/?igshid=YmMyMTA2M2Y="),
arrayOf("https://www.instagram.com/tv/CfImYdngccQ/?igshid=YmMyMTA2M2Y=\n", "https://www.instagram.com/tv/CfImYdngccQ/?igshid=YmMyMTA2M2Y="),
arrayOf("https://example.com/link- word", "https://example.com/link-"),
arrayOf("https://example.com/link-\nword.", "https://example.com/link-"),
// arrayOf("https://fr.ulule.com/sapins-barbus-la-bd-/ ", "https://fr.ulule.com/sapins-barbus-la-bd-/"),
arrayOf("https://fr.ulule.com/sapins-barbus-la-bd-/\n", "https://fr.ulule.com/sapins-barbus-la-bd-/"),
arrayOf("https://de.m.wikipedia.org/wiki/Red_Dawn_(2012)", "https://de.m.wikipedia.org/wiki/Red_Dawn_(2012)")
Expand Down