From d20b1adcc20c4c589da732f8883b9c02e0a289dc Mon Sep 17 00:00:00 2001 From: Juha Heinanen Date: Wed, 1 Apr 2026 17:16:12 +0300 Subject: [PATCH] Always resume to active call on main screen if there is one --- .../kotlin/com/tutpro/baresip/MainScreen.kt | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/app/src/main/kotlin/com/tutpro/baresip/MainScreen.kt b/app/src/main/kotlin/com/tutpro/baresip/MainScreen.kt index d78798c6..8ddd8d75 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/MainScreen.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/MainScreen.kt @@ -231,19 +231,12 @@ private fun MainScreen( Lifecycle.Event.ON_RESUME -> { Log.d(TAG, "Resumed to MainScreen") BaresipService.isMainVisible = true - val incomingCall = Call.call("incoming") viewModel.updateCalls(Call.calls().toList()) - if (incomingCall != null) - spinToAor(viewModel, incomingCall.ua.account.aor) - else { - if (uas.value.isNotEmpty()) { - if (viewModel.selectedAor.value == "") { - if (Call.inCall()) - spinToAor(viewModel, Call.calls().last().ua.account.aor) - else - spinToAor(viewModel, uas.value.first().account.aor) - } - } + (Call.call("incoming") ?: Call.calls().lastOrNull())?.let { + spinToAor(viewModel, it.ua.account.aor) + } ?: run { + if (uas.value.isNotEmpty() && viewModel.selectedAor.value == "") + spinToAor(viewModel, uas.value.first().account.aor) } val ua = UserAgent.ofAor(viewModel.selectedAor.value) if (ua != null) {