From c74365db8a8ac779479f577035af4bbf79a02eb8 Mon Sep 17 00:00:00 2001 From: Juha Heinanen Date: Thu, 19 Nov 2020 11:29:37 +0200 Subject: [PATCH] Prefix account API calls with 'Api.' --- .../main/kotlin/com/tutpro/baresip/Account.kt | 30 ++++++------ .../com/tutpro/baresip/AccountActivity.kt | 48 +++++++++---------- .../com/tutpro/baresip/AccountsActivity.kt | 6 +-- .../com/tutpro/baresip/CodecsActivity.kt | 4 +- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/app/src/main/kotlin/com/tutpro/baresip/Account.kt b/app/src/main/kotlin/com/tutpro/baresip/Account.kt index 8c318795..ee1cb2ef 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/Account.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/Account.kt @@ -6,23 +6,23 @@ import kotlin.collections.ArrayList class Account(val accp: String) { - var displayName = account_display_name(accp) - val aor = account_aor(accp) - var luri = account_luri(accp) - var authUser = account_auth_user(accp) - var authPass = account_auth_pass(accp) + var displayName = Api.account_display_name(accp) + val aor = Api.account_aor(accp) + var luri = Api.account_luri(accp) + var authUser = Api.account_auth_user(accp) + var authPass = Api.account_auth_pass(accp) var outbound = ArrayList() - var mediaNat = account_medianat(accp) - var stunServer = account_stun_uri(accp) - var stunUser = account_stun_user(accp) - var stunPass = account_stun_pass(accp) + var mediaNat = Api.account_medianat(accp) + var stunServer = Api.account_stun_uri(accp) + var stunUser = Api.account_stun_user(accp) + var stunPass = Api.account_stun_pass(accp) var audioCodec = ArrayList() var videoCodec = ArrayList() - var regint = account_regint(accp) - var mediaEnc = account_mediaenc(accp) + var regint = Api.account_regint(accp) + var mediaEnc = Api.account_mediaenc(accp) var preferIPv6Media = false var answerMode = "" - var vmUri = account_vm_uri(accp) + var vmUri = Api.account_vm_uri(accp) var vmNew = 0 var vmOld = 0 var missedCalls = false @@ -33,7 +33,7 @@ class Account(val accp: String) { var i = 0 while (true) { - val ob = account_outbound(accp, i) + val ob = Api.account_outbound(accp, i) if (ob != "") { outbound.add(ob) i++ @@ -44,7 +44,7 @@ class Account(val accp: String) { i = 0 while (true) { - val ac = account_audio_codec(accp, i) + val ac = Api.account_audio_codec(accp, i) if (ac != "") { audioCodec.add(ac) i++ @@ -53,7 +53,7 @@ class Account(val accp: String) { } } - val extra = account_extra(accp) + val extra = Api.account_extra(accp) preferIPv6Media = Utils.paramValue(extra,"prefer_ipv6_media") == "yes" answerMode = Utils.paramValue(extra,"answer_mode") if (answerMode == "") answerMode = "manual" diff --git a/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt index b5f171bc..6c4b72b0 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt @@ -202,8 +202,8 @@ class AccountActivity : AppCompatActivity() { val dn = displayName.text.toString().trim() if (dn != acc.displayName) { if (Account.checkDisplayName(dn)) { - if (account_set_display_name(acc.accp, dn) == 0) { - acc.displayName = account_display_name(acc.accp); + if (Api.account_set_display_name(acc.accp, dn) == 0) { + acc.displayName = Api.account_display_name(acc.accp); Log.d("Baresip", "New display name is ${acc.displayName}") save = true } else { @@ -221,8 +221,8 @@ class AccountActivity : AppCompatActivity() { if (au != acc.authUser) { if (Account.checkAuthUser(au)) { - if (account_set_auth_user(acc.accp, au) == 0) { - acc.authUser = account_auth_user(acc.accp); + if (Api.account_set_auth_user(acc.accp, au) == 0) { + acc.authUser = Api.account_auth_user(acc.accp); Log.d("Baresip", "New auth user is ${acc.authUser}") save = true } else { @@ -281,9 +281,9 @@ class AccountActivity : AppCompatActivity() { val outbound = ArrayList() for (i in ob.indices) { if ((ob[i] == "") || checkOutboundUri(ob[i])) { - if (account_set_outbound(acc.accp, ob[i], i) == 0) { + if (Api.account_set_outbound(acc.accp, ob[i], i) == 0) { if (ob[i] != "") - outbound.add(account_outbound(acc.accp, i)) + outbound.add(Api.account_outbound(acc.accp, i)) } else { Log.e("Baresip", "Setting of outbound proxy ${ob[i]} failed") break @@ -297,9 +297,9 @@ class AccountActivity : AppCompatActivity() { Log.d("Baresip", "New outbound proxies are ${outbound}") acc.outbound = outbound if (outbound.isEmpty()) - account_set_sipnat(acc.accp, "") + Api.account_set_sipnat(acc.accp, "") else - account_set_sipnat(acc.accp, "outbound") + Api.account_set_sipnat(acc.accp, "outbound") save = true } @@ -317,8 +317,8 @@ class AccountActivity : AppCompatActivity() { } } if (newRegint != -1) - if (account_set_regint(acc.accp, newRegint) == 0) { - acc.regint = account_regint(acc.accp) + if (Api.account_set_regint(acc.accp, newRegint) == 0) { + acc.regint = Api.account_regint(acc.accp) Log.d("Baresip", "New regint is ${acc.regint}") save = true } else { @@ -326,8 +326,8 @@ class AccountActivity : AppCompatActivity() { } if (mediaNat != acc.mediaNat) { - if (account_set_medianat(acc.accp, mediaNat) == 0) { - acc.mediaNat = account_medianat(acc.accp) + if (Api.account_set_medianat(acc.accp, mediaNat) == 0) { + acc.mediaNat = Api.account_medianat(acc.accp) Log.d("Baresip", "New medianat is ${acc.mediaNat}") save = true } else { @@ -348,8 +348,8 @@ class AccountActivity : AppCompatActivity() { } if (acc.stunServer != newStunServer) { - if (account_set_stun_uri(acc.accp, newStunServer) == 0) { - acc.stunServer = account_stun_uri(acc.accp) + if (Api.account_set_stun_uri(acc.accp, newStunServer) == 0) { + acc.stunServer = Api.account_stun_uri(acc.accp) Log.d("Baresip", "New STUN/TURN server URI is '${acc.stunServer}'") save = true } else { @@ -360,8 +360,8 @@ class AccountActivity : AppCompatActivity() { val newStunUser = stunUser.text.toString().trim() if (acc.stunUser != newStunUser) { if (Account.checkAuthUser(newStunUser)) { - if (account_set_stun_user(acc.accp, newStunUser) == 0) { - acc.stunUser = account_stun_user(acc.accp); + if (Api.account_set_stun_user(acc.accp, newStunUser) == 0) { + acc.stunUser = Api.account_stun_user(acc.accp); Log.d("Baresip", "New STUN/TURN user is ${acc.stunUser}") save = true } else { @@ -377,8 +377,8 @@ class AccountActivity : AppCompatActivity() { val newStunPass = stunPass.text.toString().trim() if (acc.stunPass != newStunPass) { if (newStunPass.isEmpty() || Account.checkAuthPass(newStunPass)) { - if (account_set_stun_pass(acc.accp, newStunPass) == 0) { - acc.stunPass = account_stun_pass(acc.accp); + if (Api.account_set_stun_pass(acc.accp, newStunPass) == 0) { + acc.stunPass = Api.account_stun_pass(acc.accp); save = true } else { Log.e("Baresip", "Setting of stun pass failed") @@ -391,8 +391,8 @@ class AccountActivity : AppCompatActivity() { } if (mediaEnc != acc.mediaEnc) { - if (account_set_mediaenc(acc.accp, mediaEnc) == 0) { - acc.mediaEnc = account_mediaenc(acc.accp) + if (Api.account_set_mediaenc(acc.accp, mediaEnc) == 0) { + acc.mediaEnc = Api.account_mediaenc(acc.accp) Log.d("Baresip", "New mediaenc is ${acc.mediaEnc}") save = true } else { @@ -426,9 +426,9 @@ class AccountActivity : AppCompatActivity() { String.format(getString(R.string.invalid_voicemail_uri), tVmUri)) return false } - account_set_mwi(acc.accp, "yes") + Api.account_set_mwi(acc.accp, "yes") } else { - account_set_mwi(acc.accp, "no") + Api.account_set_mwi(acc.accp, "no") } acc.vmUri = tVmUri save = true @@ -560,8 +560,8 @@ class AccountActivity : AppCompatActivity() { } private fun setAuthPass(acc: Account, ap: String) { - if (account_set_auth_pass(acc.accp, ap) == 0) { - acc.authPass = account_auth_pass(acc.accp) + if (Api.account_set_auth_pass(acc.accp, ap) == 0) { + acc.authPass = Api.account_auth_pass(acc.accp) MainActivity.aorPasswords.remove(acc.aor) save = true } else { diff --git a/app/src/main/kotlin/com/tutpro/baresip/AccountsActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/AccountsActivity.kt index 56d84266..1fd22674 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/AccountsActivity.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/AccountsActivity.kt @@ -54,7 +54,7 @@ class AccountsActivity : AppCompatActivity() { getString(R.string.account_allocation_failure)) } else { // Api.account_debug(ua.account.accp) - Log.d("Baresip", "Allocated UA ${ua.uap} for ${account_luri(ua.account.accp)}") + Log.d("Baresip", "Allocated UA ${ua.uap} for ${Api.account_luri(ua.account.accp)}") newAorView.setText("") newAorView.hint = getString(R.string.user_domain) newAorView.clearFocus() @@ -196,8 +196,8 @@ class AccountsActivity : AppCompatActivity() { fun setAuthPass(ua: UserAgent, ap: String) { val acc = ua.account - if (account_set_auth_pass(acc.accp, ap) == 0) { - acc.authPass = account_auth_pass(acc.accp) + if (Api.account_set_auth_pass(acc.accp, ap) == 0) { + acc.authPass = Api.account_auth_pass(acc.accp) MainActivity.aorPasswords[acc.aor] = ap if ((ap != "") && (acc.regint > 0)) Api.ua_register(ua.uap) diff --git a/app/src/main/kotlin/com/tutpro/baresip/CodecsActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/CodecsActivity.kt index 2d444d19..b0787e35 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/CodecsActivity.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/CodecsActivity.kt @@ -111,7 +111,7 @@ class CodecsActivity : AppCompatActivity() { if (media == "audio") if (mc != acc.audioCodec) { - if (account_set_audio_codecs(acc.accp, mcList) == 0) { + if (Api.account_set_audio_codecs(acc.accp, mcList) == 0) { Log.d("Baresip", "New audio codecs '$mcList'") acc.audioCodec = mc save = true @@ -122,7 +122,7 @@ class CodecsActivity : AppCompatActivity() { if (media == "video") if (mc != acc.videoCodec) { - if (account_set_video_codecs(acc.accp, mcList) == 0) { + if (Api.account_set_video_codecs(acc.accp, mcList) == 0) { Log.d("Baresip", "New video codecs '$mcList'") acc.videoCodec = mc save = true