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

no need for aors array or aor_ua function

Browse Source
This commit is contained in:
Juha Heinanen
2018-05-16 18:16:12 +03:00
parent dcff966196
commit a5e89d6f6a
4 changed files with 41 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -368,21 +368,6 @@ Java_com_tutpro_baresip_MainActivity_ua_1current(JNIEnv *env, jobject thiz)
return (*env)->NewStringUTF(env, ua_buf); return (*env)->NewStringUTF(env, ua_buf);
} }
JNIEXPORT jstring JNICALL
Java_com_tutpro_baresip_MainActivity_aor_1ua(JNIEnv *env, jobject thiz,
jstring javaAoR)
{
const char *native_aor = (*env)->GetStringUTFChars(env, javaAoR, 0);
struct ua *ua = uag_find_aor(native_aor);
char ua_buf[256];
if (ua == NULL)
ua_buf[0] = '\0';
else
sprintf(ua_buf, "%lu", (unsigned long)ua);
return (*env)->NewStringUTF(env, ua_buf);
}
JNIEXPORT jstring JNICALL JNIEXPORT jstring JNICALL
Java_com_tutpro_baresip_MainActivity_call_1peeruri(JNIEnv *env, jobject thiz, jstring javaCall) Java_com_tutpro_baresip_MainActivity_call_1peeruri(JNIEnv *env, jobject thiz, jstring javaCall)
{ {

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

@ -1,10 +1,3 @@
package com.tutpro.baresip package com.tutpro.baresip
class Account(val ua: String, val aoR: String, val mediaenc: String, var status: String) { class Account(val ua: String, val aoR: String, val mediaenc: String, var status: String) {}
private var statusImage: Int = 0
init {
this.statusImage = 0
}
}

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

@ -10,7 +10,7 @@ import android.widget.TextView
import java.util.ArrayList import java.util.ArrayList
class AccountSpinnerAdapter(private val cxt: Context, private val aors: ArrayList<String>, class AccountSpinnerAdapter(private val cxt: Context, private val accounts: ArrayList<Account>,
private val images: ArrayList<Int>) : private val images: ArrayList<Int>) :
ArrayAdapter<Int>(cxt, android.R.layout.simple_spinner_item, images) { ArrayAdapter<Int>(cxt, android.R.layout.simple_spinner_item, images) {
@ -26,7 +26,7 @@ class AccountSpinnerAdapter(private val cxt: Context, private val aors: ArrayLis
val inflater = cxt.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater val inflater = cxt.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater
val row = inflater.inflate(R.layout.account_spinner, parent, false) val row = inflater.inflate(R.layout.account_spinner, parent, false)
val textView = row.findViewById(R.id.spinnerText) as TextView val textView = row.findViewById(R.id.spinnerText) as TextView
textView.text = aors[position] textView.text = accounts[position].aoR
textView.textSize = 17f textView.textSize = 17f
val imageView = row.findViewById(R.id.spinnerImage) as ImageView val imageView = row.findViewById(R.id.spinnerImage) as ImageView
imageView.setImageResource(images[position]) imageView.setImageResource(images[position])

83
app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
View File

@ -78,12 +78,12 @@ class MainActivity : AppCompatActivity() {
.setContent(RemoteViews(getPackageName(), R.layout.notification)) .setContent(RemoteViews(getPackageName(), R.layout.notification))
aorSpinner = findViewById(R.id.AoRList) as Spinner aorSpinner = findViewById(R.id.AoRList) as Spinner
accountAdapter = AccountSpinnerAdapter(applicationContext, aors, images) accountAdapter = AccountSpinnerAdapter(applicationContext, accounts, images)
aorSpinner.adapter = accountAdapter aorSpinner.adapter = accountAdapter
aorSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener { aorSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
override fun onItemSelected(parent: AdapterView<*>, view: View, position: Int, id: Long) { override fun onItemSelected(parent: AdapterView<*>, view: View, position: Int, id: Long) {
val aor = aors[position] val aor = accounts[position].aoR
val ua = aor_ua(aor) val ua = accounts[position].ua
Log.i("Baresip", "Setting $aor current") Log.i("Baresip", "Setting $aor current")
val out = Call.uaCalls(callsOut, ua) val out = Call.uaCalls(callsOut, ua)
if (out.size == 0) { if (out.size == 0) {
@ -122,7 +122,7 @@ class MainActivity : AppCompatActivity() {
dtmf.visibility = View.INVISIBLE dtmf.visibility = View.INVISIBLE
} }
} }
val `in` = Call.uaCalls(callsIn, aor_ua(aor)) val `in` = Call.uaCalls(callsIn, ua)
val view_count = layout.childCount val view_count = layout.childCount
Log.d("Baresip", "View count is $view_count") Log.d("Baresip", "View count is $view_count")
if (view_count > 7) { if (view_count > 7) {
@ -207,7 +207,7 @@ class MainActivity : AppCompatActivity() {
unverifyDialog.setMessage("This call is SECURE and peer is VERIFIED! " + unverifyDialog.setMessage("This call is SECURE and peer is VERIFIED! " +
"Do you want to unverify the peer?") "Do you want to unverify the peer?")
unverifyDialog.setPositiveButton("Unverify") { dialog, _ -> unverifyDialog.setPositiveButton("Unverify") { dialog, _ ->
val out = Call.uaCalls(callsOut, aor_ua(aors[aorSpinner.selectedItemPosition])) val out = Call.uaCalls(callsOut, accounts[aorSpinner.selectedItemPosition].ua)
if (out.size > 0) { if (out.size > 0) {
if (cmd_exec("zrtp_unverify " + out[0].zid) != 0) { if (cmd_exec("zrtp_unverify " + out[0].zid) != 0) {
Log.w("Baresip", Log.w("Baresip",
@ -229,23 +229,30 @@ class MainActivity : AppCompatActivity() {
callButton.text = "Call" callButton.text = "Call"
callButton.setOnClickListener { callButton.setOnClickListener {
Log.d("Baresip", "AoR at position " + aors[aorSpinner.selectedItemPosition]) val aor = accounts[aorSpinner.selectedItemPosition].aoR
val aor = aors[aorSpinner.selectedItemPosition] val ua = accounts[aorSpinner.selectedItemPosition].ua
when (callButton.text.toString()) { when (callButton.text.toString()) {
"Call" -> { "Call" -> {
call(aor, (findViewById(R.id.callee) as EditText).text.toString()) val callee = (findViewById(R.id.callee) as EditText).text.toString()
if (callee.length > 0) {
var uri = EditContactsActivity.findContactURI(callee)
if (!uri.startsWith("sip:")) uri = "sip:$uri"
if (!uri.contains("@")) {
val host = aor.substring(aor.indexOf("@") + 1)
uri = "$uri@$host"
}
call(ua, uri)
}
} }
"Cancel" -> { "Cancel" -> {
Log.i("Baresip", "Canceling UA " + aor_ua(aor) + " call " + Log.i("Baresip", "Canceling AoR $aor call " +
callsOut[0].call + " to " + callsOut[0].call + " to " + (findViewById(R.id.callee) as EditText).text)
(findViewById(R.id.callee) as EditText).text) ua_hangup(ua, callsOut[0].call, 486, "Rejected")
ua_hangup(aor_ua(aor), callsOut[0].call, 486, "Rejected")
} }
"Hangup" -> { "Hangup" -> {
Log.i("Baresip", "Hanging up UA " + aor_ua(aor) + " call " + Log.i("Baresip", "Hanging up AoR $aor call " +
callsOut[0].call + " to " + callsOut[0].call + " to " + (findViewById(R.id.callee) as EditText).text)
(findViewById(R.id.callee) as EditText).text) ua_hangup(ua, callsOut[0].call,0, "")
ua_hangup(aor_ua(aor), callsOut[0].call,0, "")
} }
} }
} }
@ -268,7 +275,7 @@ class MainActivity : AppCompatActivity() {
"History" -> { "History" -> {
val i = Intent(this@MainActivity, HistoryActivity::class.java) val i = Intent(this@MainActivity, HistoryActivity::class.java)
val b = Bundle() val b = Bundle()
b.putString("aor", aors[aorSpinner.selectedItemPosition]) b.putString("aor", accounts[aorSpinner.selectedItemPosition].aoR)
i.putExtras(b) i.putExtras(b)
startActivityForResult(i, HISTORY_CODE) startActivityForResult(i, HISTORY_CODE)
} }
@ -411,7 +418,7 @@ class MainActivity : AppCompatActivity() {
} }
if (resultCode == RESULT_CANCELED) { if (resultCode == RESULT_CANCELED) {
Log.d("Baresip", "History canceled") Log.d("Baresip", "History canceled")
if (HistoryActivity.aorHistory(aors[aorSpinner.selectedItemPosition]) == 0) { if (HistoryActivity.aorHistory(accounts[aorSpinner.selectedItemPosition].aoR) == 0) {
(findViewById(R.id.holdButton) as Button).visibility = View.INVISIBLE (findViewById(R.id.holdButton) as Button).visibility = View.INVISIBLE
} }
} }
@ -423,16 +430,8 @@ class MainActivity : AppCompatActivity() {
} }
} }
private fun call(aor: String, callee: String) { private fun call(ua: String, uri: String) {
if (callee.length == 0) return
var uri = EditContactsActivity.findContactURI(callee)
if (!uri.startsWith("sip:")) uri = "sip:$uri"
if (!uri.contains("@")) {
val host = aor.substring(aor.indexOf("@") + 1)
uri = "$uri@$host"
}
(findViewById(R.id.callee) as EditText).setText(uri) (findViewById(R.id.callee) as EditText).setText(uri)
val ua = aor_ua(aor)
Log.i("Baresip", "Calling $ua / $uri") Log.i("Baresip", "Calling $ua / $uri")
val call = ua_connect(ua, uri) val call = ua_connect(ua, uri)
if (call != "") { if (call != "") {
@ -597,14 +596,14 @@ class MainActivity : AppCompatActivity() {
val contentView = RemoteViews(getPackageName(), R.layout.notification) val contentView = RemoteViews(getPackageName(), R.layout.notification)
for (i: Int in 0 .. 3) { for (i: Int in 0 .. 3) {
val resID = resources.getIdentifier("status$i", "id", packageName); val resID = resources.getIdentifier("status$i", "id", packageName);
if (i < images.size) { if (i < accounts.size) {
contentView.setImageViewResource(resID, images[i]) contentView.setImageViewResource(resID, images[i])
contentView.setViewVisibility(resID, View.VISIBLE) contentView.setViewVisibility(resID, View.VISIBLE)
} else { } else {
contentView.setViewVisibility(resID, View.INVISIBLE) contentView.setViewVisibility(resID, View.INVISIBLE)
} }
} }
if (images.size > 4) if (accounts.size > 4)
contentView.setViewVisibility(R.id.etc, View.VISIBLE) contentView.setViewVisibility(R.id.etc, View.VISIBLE)
else else
contentView.setViewVisibility(R.id.etc, View.INVISIBLE) contentView.setViewVisibility(R.id.etc, View.INVISIBLE)
@ -617,7 +616,6 @@ class MainActivity : AppCompatActivity() {
val aor = ua_aor(ua) val aor = ua_aor(ua)
Log.d("Baresip", "Adding account $ua with AoR $aor") Log.d("Baresip", "Adding account $ua with AoR $aor")
accounts.add(Account(ua, aor, ua_mediaenc(ua),"")) accounts.add(Account(ua, aor, ua_mediaenc(ua),""))
aors.add(aor)
images.add(R.drawable.dot_yellow) images.add(R.drawable.dot_yellow)
this@MainActivity.runOnUiThread { this@MainActivity.runOnUiThread {
accountAdapter.notifyDataSetChanged() accountAdapter.notifyDataSetChanged()
@ -631,8 +629,7 @@ class MainActivity : AppCompatActivity() {
val aor = ua_aor(ua) val aor = ua_aor(ua)
val ev = event.split(",") val ev = event.split(",")
Log.d("Baresip", "Handling event " + ev[0] + " for " + ua + "/" + call + "/" + Log.d("Baresip", "Handling event ${ev[0]} for $ua/$call/$aor")
aor)
for (account_index in accounts.indices) { for (account_index in accounts.indices) {
if (accounts[account_index].aoR == aor) { if (accounts[account_index].aoR == aor) {
@ -643,7 +640,6 @@ class MainActivity : AppCompatActivity() {
"registered" -> { "registered" -> {
Log.d("Baresip", "Setting status to green") Log.d("Baresip", "Setting status to green")
accounts[account_index].status = "OK" accounts[account_index].status = "OK"
aors[account_index] = aor
images[account_index] = R.drawable.dot_green images[account_index] = R.drawable.dot_green
this@MainActivity.runOnUiThread { this@MainActivity.runOnUiThread {
accountAdapter.notifyDataSetChanged() accountAdapter.notifyDataSetChanged()
@ -653,7 +649,6 @@ class MainActivity : AppCompatActivity() {
"registering failed" -> { "registering failed" -> {
Log.d("Baresip", "Setting status to red") Log.d("Baresip", "Setting status to red")
accounts[account_index].status = "FAIL" accounts[account_index].status = "FAIL"
aors[account_index] = aor
images[account_index] = R.drawable.dot_red images[account_index] = R.drawable.dot_red
this@MainActivity.runOnUiThread { this@MainActivity.runOnUiThread {
accountAdapter.notifyDataSetChanged() accountAdapter.notifyDataSetChanged()
@ -670,7 +665,7 @@ class MainActivity : AppCompatActivity() {
callsOut[out_index].hold = false callsOut[out_index].hold = false
callsOut[out_index].security = R.drawable.box_red callsOut[out_index].security = R.drawable.box_red
this@MainActivity.runOnUiThread { this@MainActivity.runOnUiThread {
if (ua == aor_ua(aors[aorSpinner.selectedItemPosition])) { if (ua == accounts[aorSpinner.selectedItemPosition].ua) {
callButton.text = "Hangup" callButton.text = "Hangup"
holdButton.text = "Hold" holdButton.text = "Hold"
holdButton.visibility = View.VISIBLE holdButton.visibility = View.VISIBLE
@ -697,7 +692,7 @@ class MainActivity : AppCompatActivity() {
callsIn[in_index].status = "Answer" callsIn[in_index].status = "Answer"
callsIn[in_index].security = R.drawable.box_red callsIn[in_index].security = R.drawable.box_red
this@MainActivity.runOnUiThread { this@MainActivity.runOnUiThread {
if (ua == aor_ua(aors[aorSpinner.selectedItemPosition])) { if (ua == accounts[aorSpinner.selectedItemPosition].ua) {
if (ua_mediaenc(ua) != "") { if (ua_mediaenc(ua) != "") {
var view_id = (in_index + 1) * 10 + 3 var view_id = (in_index + 1) * 10 + 3
val securityButton = findViewById(view_id) as ImageButton val securityButton = findViewById(view_id) as ImageButton
@ -731,7 +726,7 @@ class MainActivity : AppCompatActivity() {
val new_call = Call(ua, call, peer_uri, "Answer", null) val new_call = Call(ua, call, peer_uri, "Answer", null)
callsIn.add(new_call) callsIn.add(new_call)
this@MainActivity.runOnUiThread { this@MainActivity.runOnUiThread {
if (ua == aor_ua(aors[aorSpinner.selectedItemPosition])) { if (ua == accounts[aorSpinner.selectedItemPosition].ua) {
addCallViews(ua, new_call, callsIn.size * 10) addCallViews(ua, new_call, callsIn.size * 10)
} }
} }
@ -763,7 +758,7 @@ class MainActivity : AppCompatActivity() {
if (index != -1) { if (index != -1) {
callsIn[index].security = security callsIn[index].security = security
callsIn[index].zid = ev[3] callsIn[index].zid = ev[3]
if (ua == aor_ua(aors[aorSpinner.selectedItemPosition])) { if (ua == accounts[aorSpinner.selectedItemPosition].ua) {
val view_id = (index + 1) * 10 + 3 val view_id = (index + 1) * 10 + 3
val securityButton = layout.findViewById(view_id) as ImageButton val securityButton = layout.findViewById(view_id) as ImageButton
securityButton.setImageResource(security) securityButton.setImageResource(security)
@ -787,7 +782,7 @@ class MainActivity : AppCompatActivity() {
if (index != -1) { if (index != -1) {
callsIn[index].security = R.drawable.box_yellow callsIn[index].security = R.drawable.box_yellow
callsIn[index].zid = ev[3] callsIn[index].zid = ev[3]
if (ua == aor_ua(aors[aorSpinner.selectedItemPosition])) { if (ua == accounts[aorSpinner.selectedItemPosition].ua) {
val view_id = (index + 1) * 10 + 3 val view_id = (index + 1) * 10 + 3
val securityButton = layout.findViewById(view_id) as ImageButton val securityButton = layout.findViewById(view_id) as ImageButton
securityButton.setImageResource(R.drawable.box_yellow) securityButton.setImageResource(R.drawable.box_yellow)
@ -809,7 +804,7 @@ class MainActivity : AppCompatActivity() {
callsOut[out_index].security = R.drawable.box_green callsOut[out_index].security = R.drawable.box_green
callsOut[out_index].zid = ev[1] callsOut[out_index].zid = ev[1]
this@MainActivity.runOnUiThread { this@MainActivity.runOnUiThread {
if (ua == aor_ua(aors[aorSpinner.selectedItemPosition])) { if (ua == accounts[aorSpinner.selectedItemPosition].ua) {
securityButton.setImageResource(R.drawable.box_green) securityButton.setImageResource(R.drawable.box_green)
securityButton.tag = "green" securityButton.tag = "green"
securityButton.visibility = View.VISIBLE securityButton.visibility = View.VISIBLE
@ -821,7 +816,7 @@ class MainActivity : AppCompatActivity() {
callsIn[in_index].security = R.drawable.box_green callsIn[in_index].security = R.drawable.box_green
callsIn[in_index].zid = ev[1] callsIn[in_index].zid = ev[1]
this@MainActivity.runOnUiThread { this@MainActivity.runOnUiThread {
if (ua == aor_ua(aors[aorSpinner.selectedItemPosition])) { if (ua == accounts[aorSpinner.selectedItemPosition].ua) {
val view_id = (in_index + 1) * 10 + 3 val view_id = (in_index + 1) * 10 + 3
val securityButton = layout.findViewById(view_id) as ImageButton val securityButton = layout.findViewById(view_id) as ImageButton
securityButton.setImageResource(R.drawable.box_green) securityButton.setImageResource(R.drawable.box_green)
@ -843,7 +838,7 @@ class MainActivity : AppCompatActivity() {
val remove_count = callsIn.size - in_index val remove_count = callsIn.size - in_index
callsIn.removeAt(in_index) callsIn.removeAt(in_index)
this@MainActivity.runOnUiThread { this@MainActivity.runOnUiThread {
if (ua == aor_ua(aors[aorSpinner.selectedItemPosition])) { if (ua == accounts[aorSpinner.selectedItemPosition].ua) {
if (callButton.text == "Call") { if (callButton.text == "Call") {
holdButton.text = "History" holdButton.text = "History"
holdButton.visibility = View.VISIBLE holdButton.visibility = View.VISIBLE
@ -869,7 +864,7 @@ class MainActivity : AppCompatActivity() {
Log.d("Baresip", "Removing outgoing call " + ua + "/" + Log.d("Baresip", "Removing outgoing call " + ua + "/" +
call + "/" + callsOut[out_index].peerURI) call + "/" + callsOut[out_index].peerURI)
this@MainActivity.runOnUiThread { this@MainActivity.runOnUiThread {
if (ua == aor_ua(aors[aorSpinner.selectedItemPosition])) { if (ua == accounts[aorSpinner.selectedItemPosition].ua) {
callButton.text = "Call" callButton.text = "Call"
callButton.isEnabled = true callButton.isEnabled = true
callee.setText("") callee.setText("")
@ -908,7 +903,6 @@ class MainActivity : AppCompatActivity() {
external fun baresipStart(path: String) external fun baresipStart(path: String)
external fun baresipStop() external fun baresipStop()
external fun call_peeruri(call: String): String external fun call_peeruri(call: String): String
external fun aor_ua(aor: String): String
external fun ua_aor(ua: String): String external fun ua_aor(ua: String): String
external fun ua_mediaenc(ua: String): String external fun ua_mediaenc(ua: String): String
external fun ua_connect(ua: String, peer_uri: String): String external fun ua_connect(ua: String, peer_uri: String): String
@ -924,7 +918,6 @@ class MainActivity : AppCompatActivity() {
internal var running: Boolean = false internal var running: Boolean = false
internal var accounts = ArrayList<Account>() internal var accounts = ArrayList<Account>()
internal var aors = ArrayList<String>()
internal var images = ArrayList<Int>() internal var images = ArrayList<Int>()
internal var callsIn = ArrayList<Call>() internal var callsIn = ArrayList<Call>()
internal var callsOut = ArrayList<Call>() internal var callsOut = ArrayList<Call>()