diff --git a/app/src/main/cpp/baresip.c b/app/src/main/cpp/baresip.c index 778c736b..c0409beb 100644 --- a/app/src/main/cpp/baresip.c +++ b/app/src/main/cpp/baresip.c @@ -659,15 +659,16 @@ Java_com_tutpro_baresip_AccountKt_account_1aor(JNIEnv *env, jobject thiz, jstrin return (*env)->NewStringUTF(env, ""); } + JNIEXPORT jstring JNICALL -Java_com_tutpro_baresip_AccountKt_account_1laddr(JNIEnv *env, jobject thiz, jstring javaAcc) { +Java_com_tutpro_baresip_AccountKt_account_1luri(JNIEnv *env, jclass clazz, 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); - const struct sip_addr *addr = account_laddr(acc); + const struct uri *uri = account_luri(acc); char uri_buf[512]; int l; - l = re_snprintf(&(uri_buf[0]), 511, "%H", uri_encode, addr->uri); + l = re_snprintf(&(uri_buf[0]), 511, "%H", uri_encode, uri); if (l != -1) uri_buf[l] = '\0'; else @@ -1239,6 +1240,13 @@ Java_com_tutpro_baresip_Api_ua_1set_1media_1af(JNIEnv *env, jobject thiz, jstrin ua_set_media_af(ua, javaAf); } +JNIEXPORT void JNICALL +Java_com_tutpro_baresip_Api_account_1debug(JNIEnv *env, jobject thiz, jstring javaAccount) { + const char *native_account = (*env)->GetStringUTFChars(env, javaAccount, 0); + struct account *acc = (struct account *)strtoul(native_account, NULL, 10); + account_debug_log(acc); +} + JNIEXPORT void JNICALL Java_com_tutpro_baresip_Api_ua_1debug(JNIEnv *env, jobject thiz, jstring javaUA) { const char *native_ua = (*env)->GetStringUTFChars(env, javaUA, 0); diff --git a/app/src/main/kotlin/com/tutpro/baresip/Account.kt b/app/src/main/kotlin/com/tutpro/baresip/Account.kt index 94d6db09..764c1ed2 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 laddr = account_laddr(accp) + var luri = account_luri(accp) var authUser = account_auth_user(accp) var authPass = account_auth_pass(accp) var outbound = ArrayList() @@ -76,7 +76,7 @@ class Account(val accp: String) { else res = "" - res = res + "<$laddr>" + res = res + "<$luri>" if (authUser != "") res = res + ";auth_user=\"${authUser}\"" @@ -220,7 +220,7 @@ class Account(val accp: String) { 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_laddr(acc: String): String +external fun account_luri(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 10da1b2c..bc317589 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.laddr) + uri.setText(acc.luri) displayName = findViewById(R.id.DisplayName) as EditText displayName.setText(acc.displayName) diff --git a/app/src/main/kotlin/com/tutpro/baresip/AccountListAdapter.kt b/app/src/main/kotlin/com/tutpro/baresip/AccountListAdapter.kt index d0b7a540..9b5d8aee 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/AccountListAdapter.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/AccountListAdapter.kt @@ -36,7 +36,6 @@ class AccountListAdapter(private val cxt: Context, private val rows: ArrayList - Log.d("Baresip", "Delete button clicked") val deleteDialog = AlertDialog.Builder(cxt) deleteDialog.setMessage(String.format(cxt.getString(R.string.delete_account), aorView.text)) diff --git a/app/src/main/kotlin/com/tutpro/baresip/AccountsActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/AccountsActivity.kt index 6ae16c20..3f429a6d 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/AccountsActivity.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/AccountsActivity.kt @@ -46,8 +46,8 @@ class AccountsActivity : AppCompatActivity() { Utils.alertView(this, getString(R.string.notice), getString(R.string.account_allocation_failure)) } else { - ua.account.laddr = laddr - Log.d("Baresip", "Allocated UA ${ua.uap} for $laddr") + // Api.account_debug(ua.account.accp) + Log.d("Baresip", "Allocated UA ${ua.uap} for ${account_luri(ua.account.accp)}") newAorView.setText("") newAorView.hint = getString(R.string.user_domain) newAorView.clearFocus() diff --git a/app/src/main/kotlin/com/tutpro/baresip/Api.kt b/app/src/main/kotlin/com/tutpro/baresip/Api.kt index 9e37a755..9ffa3264 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/Api.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/Api.kt @@ -21,6 +21,7 @@ object Api { external fun ua_call_alloc(uap: String, xcallp: String): String external fun ua_answer(uap: String, callp: String) external fun ua_set_media_af(uap: String, af: Int) + external fun account_debug(accp: String) external fun ua_debug(uap: String) external fun call_hold(callp: String): Int external fun call_unhold(callp: String): Int diff --git a/app/src/main/kotlin/com/tutpro/baresip/UserAgent.kt b/app/src/main/kotlin/com/tutpro/baresip/UserAgent.kt index 6bd72e53..da0b4e2f 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/UserAgent.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/UserAgent.kt @@ -38,6 +38,7 @@ class UserAgent(val uap: String) { fun uaAlloc(uri: String): UserAgent? { val uap = Api.ua_alloc(uri) if (uap != "") return UserAgent(uap) + Log.e("Baresip", "Failed to allocate UserAgent for $uri") return null }