jp/baresip-studio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

In e164Uri, don't assume that scheme is sip:

Browse Source
This commit is contained in:
Juha Heinanen
2023-03-02 07:18:10 +02:00
parent c54439df21
commit 70ad950484
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/kotlin/com/tutpro/baresip/Utils.kt
+6 -4
View File
@@ -162,13 +162,15 @@ object Utils {
fun e164Uri(uri: String, countryCode: String): String { fun e164Uri(uri: String, countryCode: String): String {
if (countryCode == "") return uri if (countryCode == "") return uri
val scheme = uri.substring(0, 3)
val userPart = uriUserPart(uri) val userPart = uriUserPart(uri)
return if (userPart.isDigitsOnly()) { return if (userPart.isDigitsOnly()) {
when { when {
userPart.startsWith("00") -> uri.replace("sip:$userPart", userPart.startsWith("00") -> uri.replace("$scheme$userPart",
"sip:+" + userPart.substring(2)) scheme + userPart.substring(2))
userPart.startsWith("0") -> uri.replace("sip:0", "sip:$countryCode") userPart.startsWith("0") -> uri.replace("${scheme}0",
else -> uri.replace("sip:", "sip:$countryCode") "$scheme$countryCode")
else -> uri.replace(scheme, "$scheme$countryCode")
} }
} else } else
uri uri