From 70ad9504844b8fb3b78b9a582524116e56243086 Mon Sep 17 00:00:00 2001
From: Juha Heinanen <jh@tutpro.com>
Date: Thu, 2 Mar 2023 07:18:10 +0200
Subject: [PATCH] In e164Uri, don't assume that scheme is sip:

---
 app/src/main/kotlin/com/tutpro/baresip/Utils.kt | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/src/main/kotlin/com/tutpro/baresip/Utils.kt b/app/src/main/kotlin/com/tutpro/baresip/Utils.kt
index 50a2bb88..c1ecb4c1 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/Utils.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/Utils.kt
@@ -162,13 +162,15 @@ object Utils {
 
     fun e164Uri(uri: String, countryCode: String): String {
         if (countryCode == "") return uri
+        val scheme = uri.substring(0, 3)
         val userPart = uriUserPart(uri)
         return if (userPart.isDigitsOnly()) {
             when {
-                userPart.startsWith("00") -> uri.replace("sip:$userPart",
-                        "sip:+" + userPart.substring(2))
-                userPart.startsWith("0") -> uri.replace("sip:0", "sip:$countryCode")
-                else -> uri.replace("sip:", "sip:$countryCode")
+                userPart.startsWith("00") -> uri.replace("$scheme$userPart",
+                        scheme + userPart.substring(2))
+                userPart.startsWith("0") -> uri.replace("${scheme}0",
+                    "$scheme$countryCode")
+                else -> uri.replace(scheme, "$scheme$countryCode")
             }
         } else
             uri