jp/baresip-studio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- In account, renamed uri to laddr.

Browse Source
This commit is contained in:
Juha Heinanen
2020-03-21 08:27:03 +02:00
parent 50d828526c
commit 3e19aef78f
4 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/cpp/baresip.c
View File

@ -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);
}
}

15
app/src/main/kotlin/com/tutpro/baresip/Account.kt
View File

@ -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

2
app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt
View File

@ -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)

2
app/src/main/kotlin/com/tutpro/baresip/AccountsActivity.kt
View File

@ -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()