dandri/simplex-chat
1
0
Fork 0
mirror of https://github.com/simplex-chat/simplex-chat.git synced 2026-10-19 10:30:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

ui: additional check for plain domains (#7699)

Browse Source 
Co-authored-by: Evgeny @ SimpleX Chat <259188159+evgeny-simplex@users.noreply.github.com>
This commit is contained in:
Evgeny
2026-10-13 08:53:04 +01:00
committed by GitHub
co-authored by Evgeny @ SimpleX Chat
parent d673a6b021
commit 1bd7c95006
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/ios/Shared/Views/Chat/ChatItem/CILinkView.swift
+3 -4
View File
@@ -106,13 +106,12 @@ func unicodeMarker(_ s: Unicode.Scalar) -> String {
}
func displayedUri(_ uri: String) -> String {
let authority = uri.range(of: "://").map { scheme in
scheme.upperBound ..< (uri[scheme.upperBound...].firstIndex(where: { "/?#".contains($0) }) ?? uri.endIndex)
}
let authorityStart = uri.range(of: "://")?.upperBound ?? uri.startIndex
let authority = authorityStart ..< (uri[authorityStart...].firstIndex(where: { "/?#".contains($0) }) ?? uri.endIndex)
var shown = ""
for i in uri.unicodeScalars.indices {
let s = uri.unicodeScalars[i]
if s.properties.generalCategory == .format || (!s.isASCII && authority?.contains(i) == true) {
if s.properties.generalCategory == .format || (!s.isASCII && authority.contains(i)) {
shown += unicodeMarker(s)
} else {
shown.unicodeScalars.append(s)
apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/Utils.kt
+1 -1
View File
@@ -632,7 +632,7 @@ private val nonAsciiChar = Regex("[^\\x00-\\x7F]")
fun unicodeMarker(c: String): String = "[U+" + Integer.toHexString(c.codePointAt(0)).uppercase().padStart(4, '0') + "]"
fun displayedUri(uri: String): String {
val authorityStart = uri.indexOf("://").takeIf { it >= 0 }?.plus(3) ?: uri.length
val authorityStart = uri.indexOf("://").takeIf { it >= 0 }?.plus(3) ?: 0
val authorityEnd = uri.indexOfAny(charArrayOf('/', '?', '#'), authorityStart).takeIf { it >= 0 } ?: uri.length
val authority = uri.substring(authorityStart, authorityEnd).replace(nonAsciiChar) { unicodeMarker(it.value) }
return uri.replaceRange(authorityStart, authorityEnd, authority).replace(invisibleChar) { unicodeMarker(it.value) }