Always resume to active call on main screen if there is one
This commit is contained in:
@@ -231,19 +231,12 @@ private fun MainScreen(
|
|||||||
Lifecycle.Event.ON_RESUME -> {
|
Lifecycle.Event.ON_RESUME -> {
|
||||||
Log.d(TAG, "Resumed to MainScreen")
|
Log.d(TAG, "Resumed to MainScreen")
|
||||||
BaresipService.isMainVisible = true
|
BaresipService.isMainVisible = true
|
||||||
val incomingCall = Call.call("incoming")
|
|
||||||
viewModel.updateCalls(Call.calls().toList())
|
viewModel.updateCalls(Call.calls().toList())
|
||||||
if (incomingCall != null)
|
(Call.call("incoming") ?: Call.calls().lastOrNull())?.let {
|
||||||
spinToAor(viewModel, incomingCall.ua.account.aor)
|
spinToAor(viewModel, it.ua.account.aor)
|
||||||
else {
|
} ?: run {
|
||||||
if (uas.value.isNotEmpty()) {
|
if (uas.value.isNotEmpty() && viewModel.selectedAor.value == "")
|
||||||
if (viewModel.selectedAor.value == "") {
|
spinToAor(viewModel, uas.value.first().account.aor)
|
||||||
if (Call.inCall())
|
|
||||||
spinToAor(viewModel, Call.calls().last().ua.account.aor)
|
|
||||||
else
|
|
||||||
spinToAor(viewModel, uas.value.first().account.aor)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
val ua = UserAgent.ofAor(viewModel.selectedAor.value)
|
val ua = UserAgent.ofAor(viewModel.selectedAor.value)
|
||||||
if (ua != null) {
|
if (ua != null) {
|
||||||
|
|||||||
Reference in New Issue
Block a user