From 4cf2b5c0780cb5c21ab971be54f491608b1fad5b Mon Sep 17 00:00:00 2001
From: Juha Heinanen <jh@tutpro.com>
Date: Fri, 1 May 2026 14:14:30 +0300
Subject: [PATCH] Simplified callClick function

---
 .../kotlin/com/tutpro/baresip/MainScreen.kt   | 60 ++++++++++++-------
 1 file changed, 37 insertions(+), 23 deletions(-)

diff --git a/app/src/main/kotlin/com/tutpro/baresip/MainScreen.kt b/app/src/main/kotlin/com/tutpro/baresip/MainScreen.kt
index d7341945..85e7da8f 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/MainScreen.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/MainScreen.kt
@@ -2032,33 +2032,47 @@ private fun spinToAor(viewModel: ViewModel, aor: String) {
 }
 
 private fun callClick(ctx: Context, viewModel: ViewModel, dialerState: ViewModel.DialerState?) {
-    if (viewModel.selectedAor.value != "") {
-        if (Utils.checkPermissions(ctx, arrayOf(RECORD_AUDIO))) {
-            if (dialerState != null) {
-                val uriText = dialerState.callUri.value.trim()
-                if (uriText.isNotEmpty()) {
-                    val uris = Contact.contactUris(uriText)
-                    if (uris.isEmpty())
-                        makeCall(ctx, viewModel, uriText, dialerState.showCallConferenceButton.value)
-                    else if (uris.size == 1)
-                        makeCall(ctx, viewModel, uris[0], dialerState.showCallConferenceButton.value)
-                    else {
-                        selectItems.value = uris
-                        selectItemAction.value = { index ->
-                            makeCall(ctx, viewModel, uris[index], dialerState.showCallConferenceButton.value)
-                        }
-                        showSelectItemDialog.value = true
+    if (viewModel.selectedAor.value != "" && dialerState != null) {
+        val uriText = dialerState.callUri.value.trim()
+        if (uriText.isNotEmpty()) {
+            if (Utils.checkPermissions(ctx, arrayOf(RECORD_AUDIO))) {
+                val uris = Contact.contactUris(uriText)
+                if (uris.isEmpty())
+                    makeCall(
+                        ctx,
+                        viewModel,
+                        uriText,
+                        dialerState.showCallConferenceButton.value
+                    )
+                else if (uris.size == 1)
+                    makeCall(
+                        ctx,
+                        viewModel,
+                        uris[0],
+                        dialerState.showCallConferenceButton.value
+                    )
+                else {
+                    selectItems.value = uris
+                    selectItemAction.value = { index ->
+                        makeCall(
+                            ctx,
+                            viewModel,
+                            uris[index],
+                            dialerState.showCallConferenceButton.value
+                        )
                     }
-                } else {
-                    val ua = UserAgent.ofAor(viewModel.selectedAor.value)!!
-                    val latestPeerUri = CallHistoryNew.aorLatestPeerUri(ua.account.aor)
-                    if (latestPeerUri != null)
-                        dialerState.callUri.value = Utils.friendlyUri(ctx, latestPeerUri, ua.account)
+                    showSelectItemDialog.value = true
                 }
             }
+            else
+                Toast.makeText(ctx, R.string.no_calls, Toast.LENGTH_SHORT).show()
+        }
+        else {
+            val ua = UserAgent.ofAor(viewModel.selectedAor.value)!!
+            val latestPeerUri = CallHistoryNew.aorLatestPeerUri(ua.account.aor)
+            if (latestPeerUri != null)
+                dialerState.callUri.value = Utils.friendlyUri(ctx, latestPeerUri, ua.account)
         }
-        else
-            Toast.makeText(ctx, R.string.no_calls, Toast.LENGTH_SHORT).show()
     }
 }