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

Minor transfer code improvements

Browse Source
This commit is contained in:
Juha Heinanen
2021-12-08 12:25:45 +02:00
parent f0523e0fb0
commit 48a9ffb695
3 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -761,16 +761,11 @@ class BaresipService: Service() {
}
"transfer failed" -> {
Log.d(TAG, "AoR $aor call $callp transfer failed: ${ev[1]}")
// stopMediaPlayer()
val call = Call.ofCallp(callp)
if (call == null) {
if (call == null)
Log.w(TAG, "Call $callp with failed transfer is not found")
} else {
else
call.referTo = ""
//Timer().schedule(500) {
// call.resume()
//}
}
if (!Utils.isVisible()) return
}
"call closed" -> {

5
app/src/main/kotlin/com/tutpro/baresip/Config.kt
View File

@ -26,11 +26,6 @@ object Config {
"module_app mwi.so")
}
if (!config.contains("module presence.so")) {
config = config.replace("module_app mwi.so",
"module_app mwi.so\nmodule_app presence.so")
}
if (!config.contains("opus_application")) {
config = "${config}opus_application voip\n"
}

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

@ -371,7 +371,7 @@ class MainActivity : AppCompatActivity() {
}
transferButton.setOnClickListener {
callTransfer(UserAgent.uas()[aorSpinner.selectedItemPosition])
makeTransfer(UserAgent.uas()[aorSpinner.selectedItemPosition])
}
infoButton.setOnClickListener {
@ -1315,7 +1315,7 @@ class MainActivity : AppCompatActivity() {
}
}
private fun callTransfer(ua: UserAgent) {
private fun makeTransfer(ua: UserAgent) {
val layout = LayoutInflater.from(this)
.inflate(R.layout.call_transfer_dialog, findViewById(android.R.id.content),
false)
@ -1334,12 +1334,15 @@ class MainActivity : AppCompatActivity() {
dialog.dismiss()
val uriText = transferUri.text.toString().trim()
if (uriText.isNotEmpty()) {
val uri = Utils.uriComplete(ContactsActivity.findContactURI(uriText),
Utils.aorDomain(ua.account.aor))
if (!Utils.checkSipUri(uri))
val uri = Utils.uriComplete(
ContactsActivity.findContactURI(uriText)
.filterNot { it.isWhitespace() },
Utils.aorDomain(ua.account.aor)
)
if (!Utils.checkSipUri(uri)) {
Utils.alertView(this@MainActivity, getString(R.string.notice),
String.format(getString(R.string.invalid_sip_uri), uri))
else {
} else {
if (Call.uaCalls(ua, "").size > 0) {
Call.uaCalls(ua, "")[0].transfer(uri)
showCall(ua)