From c8042b8efbd1bcaca54d50e1ff47561ebe04045a Mon Sep 17 00:00:00 2001 From: Juha Heinanen Date: Thu, 9 Jun 2022 10:38:09 +0300 Subject: [PATCH] Account related simplifications --- app/src/main/kotlin/com/tutpro/baresip/CodecsActivity.kt | 8 +------- app/src/main/kotlin/com/tutpro/baresip/TaskReceiver.kt | 4 +--- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/app/src/main/kotlin/com/tutpro/baresip/CodecsActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/CodecsActivity.kt index 27ac313e..e898b592 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/CodecsActivity.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/CodecsActivity.kt @@ -141,14 +141,8 @@ class CodecsActivity : AppCompatActivity() { } } - if (save) { + if (save) AccountsActivity.saveAccounts() - if (Api.ua_update_account(ua.uap) != 0) - Log.e(TAG, "Failed to update UA ${ua.uap} with AoR $aor") - } - - if ((acc.regint > 0) && !((acc.authUser != "") && (acc.authPass == ""))) - Api.ua_register(ua.uap) BaresipService.activities.remove("codecs,$aor,$media") finish() diff --git a/app/src/main/kotlin/com/tutpro/baresip/TaskReceiver.kt b/app/src/main/kotlin/com/tutpro/baresip/TaskReceiver.kt index 37a11601..b2c73568 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/TaskReceiver.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/TaskReceiver.kt @@ -25,16 +25,14 @@ class TaskReceiver : BroadcastReceiver() { "com.tutpro.baresip.REGISTER" -> { Log.d(TAG, "TaskReceiver: registering $aor") Api.account_set_regint(acc.accp, REGISTRATION_INTERVAL) - Api.ua_update_account(ua.uap) if (!Api.ua_isregistered(ua.uap)) Api.ua_register(ua.uap) } "com.tutpro.baresip.UNREGISTER" -> { Log.d(TAG, "TaskReceiver: un-registering $aor") + Api.account_set_regint(acc.accp,0) if (Api.ua_isregistered(ua.uap)) Api.ua_unregister(ua.uap) - Api.account_set_regint(acc.accp,0) - Api.ua_update_account(ua.uap) } else -> return }