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

Impoved starting of baresip due to DIAL action

Browse Source
This commit is contained in:
Juha Heinanen
2023-05-07 19:27:43 +03:00
parent 5bae9c2c84
commit b6b39ae40b
1 changed files with 7 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -656,7 +656,7 @@ class MainActivity : AppCompatActivity() {
when (intent?.action) { when (intent?.action) {
ACTION_DIAL, ACTION_CALL, ACTION_VIEW -> ACTION_DIAL, ACTION_CALL, ACTION_VIEW ->
if (BaresipService.isServiceRunning) if (BaresipService.isServiceRunning)
callAction(intent, if (intent?.action == ACTION_CALL) "call" else "dial") callAction(intent.data, if (intent?.action == ACTION_CALL) "call" else "dial")
else else
BaresipService.callActionUri = intent.data.toString() BaresipService.callActionUri = intent.data.toString()
.replace("tel:%2B", "tel:+") .replace("tel:%2B", "tel:+")
@ -833,7 +833,7 @@ class MainActivity : AppCompatActivity() {
when (intent.action) { when (intent.action) {
ACTION_DIAL, ACTION_CALL, ACTION_VIEW -> { ACTION_DIAL, ACTION_CALL, ACTION_VIEW -> {
callAction(intent, if (intent.action == ACTION_CALL) "call" else "dial") callAction(intent.data, if (intent.action == ACTION_CALL) "call" else "dial")
} }
else -> { else -> {
val action = intent.getStringExtra("action") val action = intent.getStringExtra("action")
@ -845,10 +845,9 @@ class MainActivity : AppCompatActivity() {
} }
} }
private fun callAction(intent: Intent, action: String) { private fun callAction(uri: Uri?, action: String) {
if (Call.inCall() || BaresipService.uas.size == 0) if (Call.inCall() || BaresipService.uas.size == 0)
return return
val uri: Uri? = intent.data
Log.d(TAG, "Action $action to $uri") Log.d(TAG, "Action $action to $uri")
if (uri != null) { if (uri != null) {
when (uri.scheme) { when (uri.scheme) {
@ -1010,27 +1009,16 @@ class MainActivity : AppCompatActivity() {
} }
if (event == "started") { if (event == "started") {
val callActionUri = params[0] as String val uriString = params[0] as String
Log.d(TAG, "Handling service event 'started' with '$callActionUri'") Log.d(TAG, "Handling service event 'started' with URI '$uriString'")
if (!this::uaAdapter.isInitialized) { if (!this::uaAdapter.isInitialized) {
// Android has restarted baresip when permission has been denied in app settings // Android has restarted baresip when permission has been denied in app settings
recreate() recreate()
return return
} }
uaAdapter.notifyDataSetChanged() uaAdapter.notifyDataSetChanged()
if (callActionUri != "") { if (uriString != "") {
var ua = UserAgent.ofDomain(Utils.uriHostPart(callActionUri)) callAction(uriString.toUri(), "dial")
if (ua == null)
if (BaresipService.uas.size > 0) {
ua = BaresipService.uas[0]
} else {
handleNextEvent("No UAs to make the call to '$callActionUri'")
return
}
spinToAor(ua.account.aor)
ua.account.resumeUri = callActionUri
callUri.setText(callActionUri)
callButton.performClick()
} else { } else {
if ((aorSpinner.selectedItemPosition == -1) && (BaresipService.uas.size > 0)) { if ((aorSpinner.selectedItemPosition == -1) && (BaresipService.uas.size > 0)) {
aorSpinner.setSelection(0) aorSpinner.setSelection(0)