moved more api functions to Api class

This commit is contained in:
Juha Heinanen
2018-06-21 20:24:30 +03:00
parent e9436812b7
commit ad06fe9208
5 changed files with 12 additions and 13 deletions
@@ -53,7 +53,7 @@ class AccountActivity : AppCompatActivity() {
regint = findViewById(R.id.RegInt) as EditText
regint.setText(acc.regint.toString())
val audioCodecs = ArrayList(Utils.audio_codecs().split(","))
val audioCodecs = ArrayList(Api.audio_codecs().split(","))
newCodecs.addAll(audioCodecs)
while (newCodecs.size < audioCodecs.size) newCodecs.add("")
@@ -183,7 +183,7 @@ class AccountActivity : AppCompatActivity() {
if (ob != acc.outbound) {
val outbound = ArrayList<String>()
for (i in ob.indices) {
if ((ob[i] == "") || Utils.uri_decode(ob[i])) {
if ((ob[i] == "") || Api.uri_decode(ob[i])) {
if (account_set_outbound(acc.accp, ob[i], i) == 0) {
if (ob[i] != "")
outbound.add(account_outbound(acc.accp, i))
@@ -2,6 +2,9 @@ package com.tutpro.baresip
object Api {
external fun audio_codecs(): String
external fun call_peeruri(callp: String): String
external fun cmd_exec(cmd: String): Int
external fun uri_decode(uri: String): Boolean
}
@@ -195,7 +195,7 @@ class MainActivity : AppCompatActivity() {
unverifyDialog.setPositiveButton("Unverify") { dialog, _ ->
val outCalls = Call.uaCalls(calls, uas[aorSpinner.selectedItemPosition], "out")
if (outCalls.size > 0) {
if (Utils.cmd_exec("zrtp_unverify " + outCalls[0].zid) != 0) {
if (Api.cmd_exec("zrtp_unverify " + outCalls[0].zid) != 0) {
Log.w("Baresip",
"Command 'zrtp_unverify ${outCalls[0].zid}' failed")
} else {
@@ -405,7 +405,7 @@ class MainActivity : AppCompatActivity() {
verifyDialog.setMessage("Do you want to verify SAS <${ev[1]}> <${ev[2]}>?")
verifyDialog.setPositiveButton("Yes") { dialog, _ ->
val security: Int
if (Utils.cmd_exec("zrtp_verify ${ev[3]}") != 0) {
if (Api.cmd_exec("zrtp_verify ${ev[3]}") != 0) {
Log.w("Baresip", "Command 'zrtp_verify ${ev[3]}' failed")
security = R.drawable.box_yellow
} else {
@@ -605,7 +605,7 @@ class MainActivity : AppCompatActivity() {
return true
}
R.id.about -> {
Utils.cmd_exec("audio_debug")
Api.cmd_exec("audio_debug")
i = Intent(this, AboutActivity::class.java)
startActivityForResult(i, ABOUT_CODE)
return true
@@ -761,7 +761,7 @@ class MainActivity : AppCompatActivity() {
unverifyDialog.setMessage("This call is SECURE and peer is VERIFIED! " +
"Do you want to unverify the peer?")
unverifyDialog.setPositiveButton("Unverify") { dialog, _ ->
if (Utils.cmd_exec("zrtp_unverify " + call.zid) != 0) {
if (Api.cmd_exec("zrtp_unverify " + call.zid) != 0) {
Log.w("Baresip", "Command 'zrtp_unverify ${call.zid}' failed")
} else {
security_button.setImageResource(R.drawable.box_yellow)
@@ -182,8 +182,4 @@ object Utils {
return isLocked
}
external fun cmd_exec(cmd: String): Int
external fun uri_decode(uri: String): Boolean
external fun audio_codecs(): String
}