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

- Replaced account_laddr API function with account_luri.

Browse Source
This commit is contained in:
Juha Heinanen
2020-03-24 10:23:04 +02:00
parent b9e4bd58bf
commit e6a1c356ad
7 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

6
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 laddr = account_laddr(accp)
var luri = account_luri(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 + "<$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

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.laddr)
uri.setText(acc.luri)
displayName = findViewById(R.id.DisplayName) as EditText
displayName.setText(acc.displayName)

1
app/src/main/kotlin/com/tutpro/baresip/AccountListAdapter.kt
View File

@ -36,7 +36,6 @@ class AccountListAdapter(private val cxt: Context, private val rows: ArrayList<A
val actionView = rowView.findViewById(R.id.action) as ImageButton
actionView.setImageResource(row.action)
actionView.setOnClickListener { _ ->
Log.d("Baresip", "Delete button clicked")
val deleteDialog = AlertDialog.Builder(cxt)
deleteDialog.setMessage(String.format(cxt.getString(R.string.delete_account),
aorView.text))

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

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

1
app/src/main/kotlin/com/tutpro/baresip/Api.kt
View File

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

1
app/src/main/kotlin/com/tutpro/baresip/UserAgent.kt
View File

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