From c8a20f4f5710b8487892044ccd15b7dc9ab2df95 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 15 Jan 2024 14:45:58 +0100
Subject: [PATCH] Prevent input error causing crash

---
 .../assistant/viewmodel/AccountLoginViewModel.kt  | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/linphone/ui/assistant/viewmodel/AccountLoginViewModel.kt b/app/src/main/java/org/linphone/ui/assistant/viewmodel/AccountLoginViewModel.kt
index a255c156f..cc0157589 100644
--- a/app/src/main/java/org/linphone/ui/assistant/viewmodel/AccountLoginViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/assistant/viewmodel/AccountLoginViewModel.kt
@@ -154,7 +154,20 @@ class AccountLoginViewModel @UiThread constructor() : ViewModel() {
             core.addAuthInfo(newlyCreatedAuthInfo)
 
             val accountParams = core.createAccountParams()
-            val identityAddress = Factory.instance().createAddress("sip:$user@$domain")
+            val identity = if (user.startsWith("sip:")) {
+                if (user.contains("@")) {
+                    user
+                } else {
+                    "$user@$domain"
+                }
+            } else {
+                if (user.contains("@")) {
+                    "sip:$user"
+                } else {
+                    "sip:$user@$domain"
+                }
+            }
+            val identityAddress = Factory.instance().createAddress(identity)
             accountParams.identityAddress = identityAddress
 
             val prefix = internationalPrefix.value.orEmpty().trim()