From 23c2d904963539cb01343e2aa1eb7e5b24973928 Mon Sep 17 00:00:00 2001
From: Juha Heinanen <jh@tutpro.com>
Date: Mon, 1 Apr 2019 19:04:32 +0300
Subject: [PATCH] - Unregister and destroy UA when account is deleted.

---
 app/src/main/cpp/baresip.c                                   | 1 +
 app/src/main/kotlin/com/tutpro/baresip/AccountListAdapter.kt | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/app/src/main/cpp/baresip.c b/app/src/main/cpp/baresip.c
index 9433909f..669fd592 100644
--- a/app/src/main/cpp/baresip.c
+++ b/app/src/main/cpp/baresip.c
@@ -948,6 +948,7 @@ Java_com_tutpro_baresip_Api_ua_1destroy(JNIEnv *env, jobject thiz, jstring javaU
 {
     const char *native_ua = (*env)->GetStringUTFChars(env, javaUA, 0);
     struct ua *ua = (struct ua *)strtoul(native_ua, NULL, 10);
+    LOGD("destroying ua %s\n", native_ua);
     (*env)->ReleaseStringUTFChars(env, javaUA, native_ua);
     mem_deref(ua);
 }
diff --git a/app/src/main/kotlin/com/tutpro/baresip/AccountListAdapter.kt b/app/src/main/kotlin/com/tutpro/baresip/AccountListAdapter.kt
index 3961921a..0187e265 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/AccountListAdapter.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/AccountListAdapter.kt
@@ -41,6 +41,8 @@ class AccountListAdapter(private val cxt: Context, private val rows: ArrayList<A
             val deleteDialog = AlertDialog.Builder(cxt)
             deleteDialog.setMessage("Do you want to delete account ${ua.account.aor}?")
             deleteDialog.setPositiveButton("Delete") { dialog, _ ->
+                if (Api.ua_isregistered(ua.uap)) Api.ua_unregister(ua.uap)
+                Api.ua_destroy(ua.uap)
                 UserAgent.remove(ua)
                 AccountsActivity.generateAccounts()
                 AccountsActivity.saveAccounts()