From 75683291f4ee95a9a7cdf6784103a5b30aee9250 Mon Sep 17 00:00:00 2001
From: Juha Heinanen <jh@tutpro.com>
Date: Mon, 11 May 2026 12:46:30 +0300
Subject: [PATCH] Mobile account configuration enhancements

---
 app/src/main/kotlin/com/tutpro/baresip/Account.kt     |  1 -
 .../main/kotlin/com/tutpro/baresip/AccountScreen.kt   | 11 ++++++++---
 app/src/main/res/values/strings.xml                   |  2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/src/main/kotlin/com/tutpro/baresip/Account.kt b/app/src/main/kotlin/com/tutpro/baresip/Account.kt
index 84de4bb9..3180e44f 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/Account.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/Account.kt
@@ -100,7 +100,6 @@ class Account(val accp: Long, virtualAor: String? = null) {
 
         if (!isMobile) {
             res = "$res<$luri>"
-
             if (authUser != "") res += ";auth_user=\"${authUser}\""
         }
 
diff --git a/app/src/main/kotlin/com/tutpro/baresip/AccountScreen.kt b/app/src/main/kotlin/com/tutpro/baresip/AccountScreen.kt
index 86ad2a97..e77cb5df 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/AccountScreen.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/AccountScreen.kt
@@ -1285,8 +1285,8 @@ private fun AccountContent(
             Rel100()
             Dtmf()
             Redirect()
+            Answer()
         }
-        Answer()
         Voicemail()
         if (!ua.account.isMobile) {
             CountryCode()
@@ -1616,8 +1616,13 @@ private fun checkOnClick(ctx: Context, viewModel: AccountViewModel, ua: UserAgen
     var newVmUri = viewModel.vmUri.value.trim()
     if (newVmUri != acc.vmUri) {
         if (newVmUri != "") {
-            if (!newVmUri.startsWith("sip:")) newVmUri = "sip:$newVmUri"
-            if (!newVmUri.contains("@")) newVmUri = "$newVmUri@${acc.host()}"
+            if (acc.isMobile) {
+                if (!newVmUri.startsWith("tel:")) newVmUri = "tel:$newVmUri"
+            }
+            else {
+                if (!newVmUri.startsWith("sip:")) newVmUri = "sip:$newVmUri"
+                if (!newVmUri.contains("@")) newVmUri = "$newVmUri@${acc.host()}"
+            }
             if (!Utils.checkUri(newVmUri)) {
                 alertTitle.value = noticeTitle
                 alertMessage.value = String.format(ctx.getString(R.string.invalid_sip_or_tel_uri),
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ec665ca1..ab7a16b0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -206,7 +206,7 @@
     <string name="block_unknown">Block Unknown</string>
     <string name="block_unknown_help">Block calls and messages from peers that are not found in contacts.</string>
     <string name="voicemail_uri">Voicemail URI</string>
-    <string name="voicemain_uri_help">SIP URI for checking of voicemail messages. If left empty, voicemail
+    <string name="voicemain_uri_help">SIP or TEL URI for checking of voicemail messages. If left empty, voicemail
         messages (Message Waiting Indications) are not subscribed to.
     </string>
     <string name="country_code">Country Code</string>