From 3e19aef78fe48ec195c5da88ee2e60a0d39e0875 Mon Sep 17 00:00:00 2001
From: Juha Heinanen <jh@tutpro.com>
Date: Sat, 21 Mar 2020 08:27:03 +0200
Subject: [PATCH] - In account, renamed uri to laddr.

---
 app/src/main/cpp/baresip.c                        |  4 ++--
 app/src/main/kotlin/com/tutpro/baresip/Account.kt | 15 +++------------
 .../kotlin/com/tutpro/baresip/AccountActivity.kt  |  2 +-
 .../kotlin/com/tutpro/baresip/AccountsActivity.kt |  2 +-
 4 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/app/src/main/cpp/baresip.c b/app/src/main/cpp/baresip.c
index 8f59888a..704df1ef 100644
--- a/app/src/main/cpp/baresip.c
+++ b/app/src/main/cpp/baresip.c
@@ -651,7 +651,7 @@ Java_com_tutpro_baresip_AccountKt_account_1aor(JNIEnv *env, jobject thiz, jstrin
 }
 
 JNIEXPORT jstring JNICALL
-Java_com_tutpro_baresip_AccountKt_account_1uri(JNIEnv *env, jobject thiz, jstring javaAcc) {
+Java_com_tutpro_baresip_AccountKt_account_1laddr(JNIEnv *env, jobject thiz, jstring javaAcc) {
     const char *native_acc = (*env)->GetStringUTFChars(env, javaAcc, 0);
     struct account *acc = (struct account *)strtoul(native_acc, NULL, 10);
     (*env)->ReleaseStringUTFChars(env, javaAcc, native_acc);
@@ -1559,4 +1559,4 @@ Java_com_tutpro_baresip_Api_module_1unload(JNIEnv *env, jobject thiz, jstring ja
     module_unload(native_module);
     LOGD("unloaded module %s\n", native_module);
     (*env)->ReleaseStringUTFChars(env, javaModule, native_module);
-}
\ No newline at end of file
+}
diff --git a/app/src/main/kotlin/com/tutpro/baresip/Account.kt b/app/src/main/kotlin/com/tutpro/baresip/Account.kt
index 4b67b57d..94d6db09 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/Account.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/Account.kt
@@ -8,7 +8,7 @@ class Account(val accp: String) {
 
     var displayName = account_display_name(accp)
     val aor = account_aor(accp)
-    var uri = account_uri(accp)
+    var laddr = account_laddr(accp)
     var authUser = account_auth_user(accp)
     var authPass = account_auth_pass(accp)
     var outbound = ArrayList<String>()
@@ -76,7 +76,7 @@ class Account(val accp: String) {
         else
             res = ""
 
-        res = res + "<$uri>"
+        res = res + "<$laddr>"
 
         if (authUser != "") res = res + ";auth_user=\"${authUser}\""
 
@@ -206,7 +206,6 @@ class Account(val accp: String) {
             return null
         }
 
-
         fun exists(aor: String): Boolean {
             for (ua in UserAgent.uas()) {
                 if (ua.account.aor.split(":")[1] == aor.split(":")[0])
@@ -215,21 +214,13 @@ class Account(val accp: String) {
             return false
         }
 
-        fun aor(accp: String): String {
-            return account_aor(accp)
-        }
-
-        fun uri(accp: String): String {
-            return account_uri(accp)
-        }
-
     }
 }
 
 external fun account_set_display_name(acc: String, dn: String): Int
 external fun account_display_name(acc: String): String
 external fun account_aor(acc: String): String
-external fun account_uri(acc: String): String
+external fun account_laddr(acc: String): String
 external fun account_auth_user(acc: String): String
 external fun account_set_auth_user(acc: String, user: String): Int
 external fun account_auth_pass(acc: String): String
diff --git a/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt
index 4dff2519..10da1b2c 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt
@@ -52,7 +52,7 @@ class AccountActivity : AppCompatActivity() {
         setTitle(aor.split(":")[1])
 
         uri = findViewById(R.id.Uri) as TextView
-        uri.setText(acc.uri)
+        uri.setText(acc.laddr)
 
         displayName = findViewById(R.id.DisplayName) as EditText
         displayName.setText(acc.displayName)
diff --git a/app/src/main/kotlin/com/tutpro/baresip/AccountsActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/AccountsActivity.kt
index 9d87e865..5425ba70 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/AccountsActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/AccountsActivity.kt
@@ -46,7 +46,7 @@ class AccountsActivity : AppCompatActivity() {
                             getString(R.string.account_allocation_failure))
                 } else {
                     Log.d("Baresip", "Allocated UA ${ua.uap} for $aor")
-                    ua.account.uri = "sip:$aor"
+                    ua.account.laddr = "sip:$aor"
                     newAorView.setText("")
                     newAorView.hint = getString(R.string.user_domain)
                     newAorView.clearFocus()