From 5337ab6413a949372dbf5d64a340e30dc7f94f36 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 26 Jun 2025 13:06:36 +0200
Subject: [PATCH] Make sure an account is set in CallParams when initiating a
 call

---
 app/src/main/java/org/linphone/core/CoreContext.kt | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/linphone/core/CoreContext.kt b/app/src/main/java/org/linphone/core/CoreContext.kt
index 932841519..e9e33cf01 100644
--- a/app/src/main/java/org/linphone/core/CoreContext.kt
+++ b/app/src/main/java/org/linphone/core/CoreContext.kt
@@ -888,19 +888,25 @@ class CoreContext
                     "$TAG Using account matching address ${localAddress.asStringUriOnly()} as From"
                 )
             } else {
+                val defaultAccount = core.defaultAccount
+                params.account = defaultAccount
                 Log.e(
-                    "$TAG Failed to find account matching address ${localAddress.asStringUriOnly()}"
+                    "$TAG Failed to find account matching address ${localAddress.asStringUriOnly()}, using default one [${defaultAccount?.params?.identityAddress?.asStringUriOnly()}]"
                 )
             }
+        } else {
+            val defaultAccount = core.defaultAccount
+            params.account = defaultAccount
+            Log.i("$TAG No local address given, using default account [${defaultAccount?.params?.identityAddress?.asStringUriOnly()}]")
         }
 
         val username = address.username.orEmpty()
         val domain = address.domain.orEmpty()
-        val defaultAccount = params.account ?: core.defaultAccount
-        if (defaultAccount != null && Compatibility.isIpAddress(domain)) {
+        val account = params.account ?: core.defaultAccount
+        if (account != null && Compatibility.isIpAddress(domain)) {
             Log.i("$TAG SIP URI [${address.asStringUriOnly()}] seems to have an IP address as domain")
             if (username.isNotEmpty() && (username.startsWith("+") || username.isDigitsOnly())) {
-                val identityDomain = defaultAccount.params.identityAddress?.domain
+                val identityDomain = account.params.identityAddress?.domain
                 Log.w("$TAG Username [$username] looks like a phone number, replacing domain [$domain] by the local account one [$identityDomain]")
                 if (identityDomain != null) {
                     val newAddress = address.clone()