If unregistering fails, update registration status to white anyway

This commit is contained in:
Juha Heinanen
2022-06-29 20:41:44 +03:00
parent 71c390a394
commit 62965faf0a
2 changed files with 6 additions and 3 deletions
@@ -584,7 +584,10 @@ class BaresipService: Service() {
return return
} }
"registering failed" -> { "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() updateStatusNotification()
if (isMainVisible) if (isMainVisible)
registrationUpdate.postValue(System.currentTimeMillis()) registrationUpdate.postValue(System.currentTimeMillis())
@@ -280,9 +280,9 @@ class MainActivity : AppCompatActivity() {
val ua = UserAgent.ofAor(aorSpinner.tag.toString()) val ua = UserAgent.ofAor(aorSpinner.tag.toString())
if (ua != null) { if (ua != null) {
val acc = ua.account val acc = ua.account
if (Api.ua_isregistered(ua.uap)) { if (Api.account_regint(acc.accp) == REGISTRATION_INTERVAL) {
Api.ua_unregister(ua.uap)
Api.account_set_regint(acc.accp, 0) Api.account_set_regint(acc.accp, 0)
Api.ua_unregister(ua.uap)
} else { } else {
Api.account_set_regint(acc.accp, REGISTRATION_INTERVAL) Api.account_set_regint(acc.accp, REGISTRATION_INTERVAL)
Api.ua_register(ua.uap) Api.ua_register(ua.uap)