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

Removed UserAgent.uas() function

Browse Source
This commit is contained in:
Juha Heinanen
2022-03-15 09:02:06 +02:00
parent 3c9205bd9e
commit 3b588c6f7a
7 changed files with 238 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/kotlin/com/tutpro/baresip/Account.kt
+2 -2
View File
@@ -192,7 +192,7 @@ class Account(val accp: Long) {
fun accounts(): ArrayList<Account> { fun accounts(): ArrayList<Account> {
val res = ArrayList<Account>() val res = ArrayList<Account>()
for (ua in UserAgent.uas()) { for (ua in BaresipService.uas) {
res.add(ua.account) res.add(ua.account)
} }
return res return res
@@ -207,7 +207,7 @@ class Account(val accp: Long) {
} }
fun ofAor(aor: String): Account? { fun ofAor(aor: String): Account? {
for (ua in UserAgent.uas()) for (ua in BaresipService.uas)
if (ua.account.aor == aor) return ua.account if (ua.account.aor == aor) return ua.account
return null return null
} }
app/src/main/kotlin/com/tutpro/baresip/AccountListAdapter.kt
+2 -2
View File
@@ -27,7 +27,7 @@ class AccountListAdapter(private val cxt: Context, private val rows: ArrayList<A
val viewHolder: ViewHolder val viewHolder: ViewHolder
val rowView: View val rowView: View
val ua = UserAgent.uas()[position] val ua = BaresipService.uas[position]
if (view == null) { if (view == null) {
rowView = layoutInflater.inflate(R.layout.account_row, parent, false) rowView = layoutInflater.inflate(R.layout.account_row, parent, false)
@@ -47,7 +47,7 @@ class AccountListAdapter(private val cxt: Context, private val rows: ArrayList<A
viewHolder.aorView.setOnClickListener { viewHolder.aorView.setOnClickListener {
val i = Intent(cxt, AccountActivity::class.java) val i = Intent(cxt, AccountActivity::class.java)
val b = Bundle() val b = Bundle()
b.putString("aor", UserAgent.uas()[position].account.aor) b.putString("aor", BaresipService.uas[position].account.aor)
i.putExtras(b) i.putExtras(b)
MainActivity.accountRequest!!.launch(i) MainActivity.accountRequest!!.launch(i)
} }
app/src/main/kotlin/com/tutpro/baresip/AccountsActivity.kt
+1 -1
View File
@@ -161,7 +161,7 @@ class AccountsActivity : AppCompatActivity() {
fun generateAccounts() { fun generateAccounts() {
accounts.clear() accounts.clear()
for (ua in UserAgent.uas()) for (ua in BaresipService.uas)
accounts.add(AccountRow(ua.account.aor.replace("sip:", ""), accounts.add(AccountRow(ua.account.aor.replace("sip:", ""),
R.drawable.action_remove)) R.drawable.action_remove))
} }
app/src/main/kotlin/com/tutpro/baresip/AudioActivity.kt
+1 -1
View File
@@ -157,7 +157,7 @@ class AudioActivity : AppCompatActivity() {
if (!box.isChecked && oldAudioModules[module]!!) { if (!box.isChecked && oldAudioModules[module]!!) {
Api.module_unload("$module.so") Api.module_unload("$module.so")
Config.removeLine("module $module.so") Config.removeLine("module $module.so")
for (ua in UserAgent.uas()) ua.account.removeAudioCodecs(module) for (ua in BaresipService.uas) ua.account.removeAudioCodecs(module)
AccountsActivity.saveAccounts() AccountsActivity.saveAccounts()
save = true save = true
} }
app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
+43 -49
View File
@@ -206,10 +206,10 @@ class MainActivity : AppCompatActivity() {
// Haven't found any explanation why this can happen. // Haven't found any explanation why this can happen.
override fun onItemSelected(parent: AdapterView<*>, view: View?, position: Int, id: Long) { override fun onItemSelected(parent: AdapterView<*>, view: View?, position: Int, id: Long) {
Log.d(TAG, "aorSpinner selecting $position") Log.d(TAG, "aorSpinner selecting $position")
if (position < UserAgent.uas().size) { if (position < BaresipService.uas.size) {
val acc = UserAgent.uas()[position].account val ua = BaresipService.uas[position]
val acc = ua.account
aorSpinner.tag = acc.aor aorSpinner.tag = acc.aor
val ua = UserAgent.uas()[position]
showCall(ua) showCall(ua)
updateIcons(acc) updateIcons(acc)
} }
@@ -260,7 +260,7 @@ class MainActivity : AppCompatActivity() {
accountRequest!!.launch(i) accountRequest!!.launch(i)
true true
} else { } else {
UserAgent.uas()[aorSpinner.selectedItemPosition].account.resumeUri = BaresipService.uas[aorSpinner.selectedItemPosition].account.resumeUri =
callUri.text.toString() callUri.text.toString()
false false
} }
@@ -298,11 +298,11 @@ class MainActivity : AppCompatActivity() {
setTitle(R.string.info) setTitle(R.string.info)
setMessage(getString(R.string.call_is_secure)) setMessage(getString(R.string.call_is_secure))
setPositiveButton(getString(R.string.unverify)) { dialog, _ -> setPositiveButton(getString(R.string.unverify)) { dialog, _ ->
val ua = UserAgent.uas()[aorSpinner.selectedItemPosition] val ua = BaresipService.uas[aorSpinner.selectedItemPosition]
val calls = ua.calls() val call = ua.currentCall()
if (calls.size > 0) { if (call != null) {
if (Api.cmd_exec("zrtp_unverify " + calls[0].zid) != 0) { if (Api.cmd_exec("zrtp_unverify " + call.zid) != 0) {
Log.e(TAG, "Command 'zrtp_unverify ${calls[0].zid}' failed") Log.e(TAG, "Command 'zrtp_unverify ${call.zid}' failed")
} else { } else {
securityButton.setImageResource(R.drawable.box_yellow) securityButton.setImageResource(R.drawable.box_yellow)
securityButton.tag = "yellow" securityButton.tag = "yellow"
@@ -329,7 +329,7 @@ class MainActivity : AppCompatActivity() {
} }
hangupButton.setOnClickListener { hangupButton.setOnClickListener {
val ua = UserAgent.uas()[aorSpinner.selectedItemPosition] val ua = BaresipService.uas[aorSpinner.selectedItemPosition]
val aor = ua.account.aor val aor = ua.account.aor
val uaCalls = ua.calls() val uaCalls = ua.calls()
if (uaCalls.size > 0) { if (uaCalls.size > 0) {
@@ -344,9 +344,9 @@ class MainActivity : AppCompatActivity() {
} }
answerButton.setOnClickListener { answerButton.setOnClickListener {
val ua = UserAgent.uas()[aorSpinner.selectedItemPosition] val ua = BaresipService.uas[aorSpinner.selectedItemPosition]
val aor = ua.account.aor val aor = ua.account.aor
val callp = ua.calls("in")[0].callp val callp = ua.currentCall()!!.callp
Log.d(TAG, "AoR $aor answering call $callp from ${callUri.text}") Log.d(TAG, "AoR $aor answering call $callp from ${callUri.text}")
answerButton.isEnabled = false answerButton.isEnabled = false
rejectButton.isEnabled = false rejectButton.isEnabled = false
@@ -359,9 +359,9 @@ class MainActivity : AppCompatActivity() {
} }
rejectButton.setOnClickListener { rejectButton.setOnClickListener {
val ua = UserAgent.uas()[aorSpinner.selectedItemPosition] val ua = BaresipService.uas[aorSpinner.selectedItemPosition]
val aor = ua.account.aor val aor = ua.account.aor
val call = ua.calls("in")[0] val call = ua.currentCall()!!
val callp = call.callp val callp = call.callp
Log.d(TAG, "AoR $aor rejecting call $callp from ${callUri.text}") Log.d(TAG, "AoR $aor rejecting call $callp from ${callUri.text}")
answerButton.isEnabled = false answerButton.isEnabled = false
@@ -371,9 +371,9 @@ class MainActivity : AppCompatActivity() {
} }
holdButton.setOnClickListener { holdButton.setOnClickListener {
val ua = UserAgent.uas()[aorSpinner.selectedItemPosition] val ua = BaresipService.uas[aorSpinner.selectedItemPosition]
val aor = ua.account.aor val aor = ua.account.aor
val call = ua.calls()[0] val call = ua.currentCall()!!
if (call.onhold) { if (call.onhold) {
Log.d(TAG, "AoR $aor resuming call ${call.callp} with ${callUri.text}") Log.d(TAG, "AoR $aor resuming call ${call.callp} with ${callUri.text}")
call.resume() call.resume()
@@ -388,7 +388,7 @@ class MainActivity : AppCompatActivity() {
} }
transferButton.setOnClickListener { transferButton.setOnClickListener {
val ua = UserAgent.uas()[aorSpinner.selectedItemPosition] val ua = BaresipService.uas[aorSpinner.selectedItemPosition]
val call = ua.currentCall() val call = ua.currentCall()
if (call != null ) { if (call != null ) {
if (call.onHoldCall != null) { if (call.onHoldCall != null) {
@@ -402,10 +402,9 @@ class MainActivity : AppCompatActivity() {
} }
infoButton.setOnClickListener { infoButton.setOnClickListener {
val ua = UserAgent.uas()[aorSpinner.selectedItemPosition] val ua = BaresipService.uas[aorSpinner.selectedItemPosition]
val calls = ua.calls() val call = ua.currentCall()
if (calls.size > 0) { if (call != null) {
val call = calls[0]
val stats = call.stats("audio") val stats = call.stats("audio")
if (stats != "") { if (stats != "") {
val parts = stats.split(",") val parts = stats.split(",")
@@ -431,7 +430,7 @@ class MainActivity : AppCompatActivity() {
voicemailButton.setOnClickListener { voicemailButton.setOnClickListener {
if (aorSpinner.selectedItemPosition >= 0) { if (aorSpinner.selectedItemPosition >= 0) {
val ua = UserAgent.uas()[aorSpinner.selectedItemPosition] val ua = BaresipService.uas[aorSpinner.selectedItemPosition]
val acc = ua.account val acc = ua.account
if (acc.vmUri != "") { if (acc.vmUri != "") {
val dialogClickListener = DialogInterface.OnClickListener { _, which -> val dialogClickListener = DialogInterface.OnClickListener { _, which ->
@@ -565,41 +564,41 @@ class MainActivity : AppCompatActivity() {
override fun onSwipeLeft() { override fun onSwipeLeft() {
super.onSwipeLeft() super.onSwipeLeft()
if (UserAgent.uas().size > 0) { if (BaresipService.uas.size > 0) {
val curPos = aorSpinner.selectedItemPosition val curPos = aorSpinner.selectedItemPosition
val newPos = if (curPos == -1) val newPos = if (curPos == -1)
0 0
else else
(curPos + 1) % UserAgent.uas().size (curPos + 1) % BaresipService.uas.size
if (curPos != newPos) { if (curPos != newPos) {
aorSpinner.setSelection(newPos) aorSpinner.setSelection(newPos)
showCall(UserAgent.uas()[newPos]) showCall(BaresipService.uas[newPos])
} }
} }
} }
override fun onSwipeRight() { override fun onSwipeRight() {
super.onSwipeRight() super.onSwipeRight()
if (UserAgent.uas().size > 0) { if (BaresipService.uas.size > 0) {
val curPos = aorSpinner.selectedItemPosition val curPos = aorSpinner.selectedItemPosition
val newPos = when (curPos) { val newPos = when (curPos) {
-1 -> 0 -1 -> 0
0 -> UserAgent.uas().size - 1 0 -> BaresipService.uas.size - 1
else -> curPos - 1 else -> curPos - 1
} }
if (curPos != newPos) { if (curPos != newPos) {
aorSpinner.setSelection(newPos) aorSpinner.setSelection(newPos)
showCall(UserAgent.uas()[newPos]) showCall(BaresipService.uas[newPos])
} }
} }
} }
}) })
swipeRefresh.setOnRefreshListener { swipeRefresh.setOnRefreshListener {
if (UserAgent.uas().size > 0) { if (BaresipService.uas.size > 0) {
if (aorSpinner.selectedItemPosition == -1) if (aorSpinner.selectedItemPosition == -1)
aorSpinner.setSelection(0) aorSpinner.setSelection(0)
val ua = UserAgent.uas()[aorSpinner.selectedItemPosition] val ua = BaresipService.uas[aorSpinner.selectedItemPosition]
if (ua.account.regint > 0) if (ua.account.regint > 0)
Api.ua_register(ua.uap) Api.ua_register(ua.uap)
} }
@@ -676,7 +675,7 @@ class MainActivity : AppCompatActivity() {
"call reject" -> "call reject" ->
rejectButton.performClick() rejectButton.performClick()
"call" -> { "call" -> {
callUri.setText(UserAgent.uas()[aorSpinner.selectedItemPosition].account.resumeUri) callUri.setText(BaresipService.uas[aorSpinner.selectedItemPosition].account.resumeUri)
callButton.performClick() callButton.performClick()
} }
"call transfer", "transfer show", "transfer accept" -> "call transfer", "transfer show", "transfer accept" ->
@@ -690,20 +689,20 @@ class MainActivity : AppCompatActivity() {
spinToAor(incomingCall.ua.account.aor) spinToAor(incomingCall.ua.account.aor)
} else { } else {
restoreActivities() restoreActivities()
if (UserAgent.uas().size > 0) { if (BaresipService.uas.size > 0) {
if (aorSpinner.selectedItemPosition == -1) { if (aorSpinner.selectedItemPosition == -1) {
if (Call.calls().size > 0) if (Call.calls().size > 0)
spinToAor(Call.calls()[0].ua.account.aor) spinToAor(Call.calls()[0].ua.account.aor)
else { else {
aorSpinner.setSelection(0) aorSpinner.setSelection(0)
aorSpinner.tag = UserAgent.uas()[0].account.aor aorSpinner.tag = BaresipService.uas[0].account.aor
} }
} }
} }
} }
uaAdapter.notifyDataSetChanged() uaAdapter.notifyDataSetChanged()
if (UserAgent.uas().size > 0) { if (BaresipService.uas.size > 0) {
val ua = UserAgent.uas()[aorSpinner.selectedItemPosition] val ua = BaresipService.uas[aorSpinner.selectedItemPosition]
showCall(ua) showCall(ua)
updateIcons(ua.account) updateIcons(ua.account)
} }
@@ -947,9 +946,9 @@ class MainActivity : AppCompatActivity() {
callUri.setText(callActionUri) callUri.setText(callActionUri)
callButton.performClick() callButton.performClick()
} else { } else {
if ((aorSpinner.selectedItemPosition == -1) && (UserAgent.uas().size > 0)) { if ((aorSpinner.selectedItemPosition == -1) && (BaresipService.uas.size > 0)) {
aorSpinner.setSelection(0) aorSpinner.setSelection(0)
aorSpinner.tag = UserAgent.uas()[0].account.aor aorSpinner.tag = BaresipService.uas[0].account.aor
} }
} }
handleNextEvent() handleNextEvent()
@@ -983,8 +982,6 @@ class MainActivity : AppCompatActivity() {
val acc = ua.account val acc = ua.account
val aor = ua.account.aor val aor = ua.account.aor
for (account_index in UserAgent.uas().indices) {
if (UserAgent.uas()[account_index].account.aor == aor) {
when (ev[0]) { when (ev[0]) {
"call rejected" -> { "call rejected" -> {
if (aor == aorSpinner.tag) { if (aor == aorSpinner.tag) {
@@ -1176,9 +1173,6 @@ class MainActivity : AppCompatActivity() {
} }
else -> Log.e(TAG, "Unknown event '${ev[0]}'") else -> Log.e(TAG, "Unknown event '${ev[0]}'")
} }
break
}
}
handleNextEvent() handleNextEvent()
@@ -1648,15 +1642,15 @@ class MainActivity : AppCompatActivity() {
} }
private fun spinToAor(aor: String) { private fun spinToAor(aor: String) {
for (account_index in UserAgent.uas().indices) for (account_index in BaresipService.uas.indices)
if (UserAgent.uas()[account_index].account.aor == aor) { if (BaresipService.uas[account_index].account.aor == aor) {
aorSpinner.setSelection(account_index) aorSpinner.setSelection(account_index)
aorSpinner.tag = aor aorSpinner.tag = aor
return return
} }
if (UserAgent.uas().isNotEmpty()) { if (BaresipService.uas.isNotEmpty()) {
aorSpinner.setSelection(0) aorSpinner.setSelection(0)
aorSpinner.tag = UserAgent.uas()[0].account.aor aorSpinner.tag = BaresipService.uas[0].account.aor
} else { } else {
aorSpinner.setSelection(-1) aorSpinner.setSelection(-1)
aorSpinner.tag = "" aorSpinner.tag = ""
@@ -1726,7 +1720,7 @@ class MainActivity : AppCompatActivity() {
private fun makeCall() { private fun makeCall() {
callUri.setAdapter(null) callUri.setAdapter(null)
val ua = UserAgent.uas()[aorSpinner.selectedItemPosition] val ua = BaresipService.uas[aorSpinner.selectedItemPosition]
val aor = ua.account.aor val aor = ua.account.aor
if (Call.calls().isEmpty()) { if (Call.calls().isEmpty()) {
var uriText = callUri.text.toString().trim() var uriText = callUri.text.toString().trim()
@@ -2040,8 +2034,8 @@ class MainActivity : AppCompatActivity() {
} }
private fun saveCallUri() { private fun saveCallUri() {
if (UserAgent.uas().isNotEmpty() && aorSpinner.selectedItemPosition >= 0) { if (BaresipService.uas.isNotEmpty() && aorSpinner.selectedItemPosition >= 0) {
val ua = UserAgent.uas()[aorSpinner.selectedItemPosition] val ua = BaresipService.uas[aorSpinner.selectedItemPosition]
if (ua.calls().isEmpty()) if (ua.calls().isEmpty())
ua.account.resumeUri = callUri.text.toString() ua.account.resumeUri = callUri.text.toString()
else else
app/src/main/kotlin/com/tutpro/baresip/UaSpinnerAdapter.kt
+1 -1
View File
@@ -44,7 +44,7 @@ class UaSpinnerAdapter(cxt: Context, private val uas: ArrayList<UserAgent>) :
val ua = uas[position] val ua = uas[position]
viewHolder.textView.text = ua.account.aor.split(":")[1] viewHolder.textView.text = ua.account.aor.split(":")[1]
viewHolder.textView.textSize = 17f viewHolder.textView.textSize = 17f
if (UserAgent.uas().size > 1 && ua.calls().isNotEmpty()) if (BaresipService.uas.size > 1 && ua.calls().isNotEmpty())
viewHolder.textView.setTypeface(null, Typeface.BOLD) viewHolder.textView.setTypeface(null, Typeface.BOLD)
viewHolder.imageView.setImageResource(ua.status) viewHolder.imageView.setImageResource(ua.status)
app/src/main/kotlin/com/tutpro/baresip/UserAgent.kt
-4
View File
@@ -29,10 +29,6 @@ class UserAgent(val uap: Long) {
companion object { companion object {
fun uas(): ArrayList<UserAgent> {
return BaresipService.uas
}
fun ofAor(aor: String): UserAgent? { fun ofAor(aor: String): UserAgent? {
for (ua in BaresipService.uas) for (ua in BaresipService.uas)
if (ua.account.aor == aor) return ua if (ua.account.aor == aor) return ua