ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-03 16:10:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #4913 - Email addresses are detected as URLs

Browse Source
This commit is contained in:
Stefan Ceriu
2026-01-12 15:47:44 +02:00
committed by Stefan Ceriu
parent 29dfba140d
commit 8f9df47a2c
2 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Other/HTMLParsing/AttributedStringBuilder.swift
+8 -3
View File
@@ -330,12 +330,17 @@ struct AttributedStringBuilder: AttributedStringBuilderProtocol {
})
matches.append(contentsOf: MatrixEntityRegex.linkRegex.matches(in: string).compactMap { match in
guard let matchRange = Range(match.range, in: string) else {
guard let matchRange = Range(match.range, in: string), let url = match.url else {
return nil
}
let link = String(string[matchRange]).asSanitizedLink
return TextParsingMatch(type: .link(urlString: link), range: match.range)
// If the NSDataDetector found a hyperlink then sanitise it
if url.scheme?.contains("http") ?? false {
// Use the underlying string so it gets an `https` scheme if it didn't have any
return TextParsingMatch(type: .link(urlString: String(string[matchRange]).asSanitizedLink), range: match.range)
} else { // otherwise use it as it is e.g. mailto: (https://github.com/element-hq/element-x-ios/issues/4913)
return TextParsingMatch(type: .link(urlString: url.absoluteString), range: match.range)
}
})
matches.append(contentsOf: MatrixEntityRegex.allUsersRegex.matches(in: attributedString.string).map { match in