From 62965faf0ab3a2828dd1ef4087ee27f88f83a619 Mon Sep 17 00:00:00 2001 From: Juha Heinanen Date: Wed, 29 Jun 2022 20:41:44 +0300 Subject: [PATCH] If unregistering fails, update registration status to white anyway --- app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt | 5 ++++- app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt b/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt index 7886014f..f3a49750 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt @@ -584,7 +584,10 @@ class BaresipService: Service() { return } "registering failed" -> { - ua.status = R.drawable.dot_red + ua.status = if (Api.account_regint(ua.account.accp) == 0) + R.drawable.dot_white + else + R.drawable.dot_red updateStatusNotification() if (isMainVisible) registrationUpdate.postValue(System.currentTimeMillis()) diff --git a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt index dc9ca4b6..ea530e1f 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt @@ -280,9 +280,9 @@ class MainActivity : AppCompatActivity() { val ua = UserAgent.ofAor(aorSpinner.tag.toString()) if (ua != null) { val acc = ua.account - if (Api.ua_isregistered(ua.uap)) { - Api.ua_unregister(ua.uap) + if (Api.account_regint(acc.accp) == REGISTRATION_INTERVAL) { Api.account_set_regint(acc.accp, 0) + Api.ua_unregister(ua.uap) } else { Api.account_set_regint(acc.accp, REGISTRATION_INTERVAL) Api.ua_register(ua.uap)