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

Added Redirect Mode account setting that tells if call redirect requests

Browse Source 
(3xx responses) can be followed automatically or if confirmation
  needs to be asked
This commit is contained in:
Juha Heinanen
2023-07-02 15:20:06 +03:00
parent 29708ea58f
commit 2394f3fba1
9 changed files with 125 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -184,6 +184,9 @@ static void ua_event_handler(
case UA_EVENT_CALL_ANSWERED:
len = re_snprintf(event_buf, sizeof event_buf, "call answered");
break;
case UA_EVENT_CALL_REDIRECT:
len = re_snprintf(event_buf, sizeof event_buf, "call redirect,%s", prm + 4);
break;
case UA_EVENT_CALL_LOCAL_SDP:
if (strcmp(prm, "offer") == 0)
return;
@ -958,6 +961,18 @@ JNIEXPORT jint JNICALL Java_com_tutpro_baresip_Api_account_1set_1answermode(
return account_set_answermode((struct account *)acc, mode);
}
JNIEXPORT jboolean JNICALL Java_com_tutpro_baresip_Api_account_1sip_1autoredirect(
JNIEnv *env, jobject thiz, jlong acc)
{
return account_sip_autoredirect((struct account *)acc);
}
JNIEXPORT void JNICALL Java_com_tutpro_baresip_Api_account_1set_1sip_1autoredirect(
JNIEnv *env, jobject thiz, jlong acc, jboolean allow)
{
return account_set_sip_autoredirect((struct account *)acc, allow);
}
JNIEXPORT jboolean JNICALL Java_com_tutpro_baresip_Api_account_1rtcp_1mux(
JNIEnv *env, jobject thiz, jlong acc)
{

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

@ -27,6 +27,7 @@ class Account(val accp: Long) {
var rtcpMux = Api.account_rtcp_mux(accp)
var dtmfMode = Api.account_dtmfmode(accp)
var answerMode = Api.account_answermode(accp)
var autoRedirect = Api.account_sip_autoredirect(accp)
var vmUri = Api.account_vm_uri(accp)
var vmNew = 0
var vmOld = 0
@ -132,6 +133,9 @@ class Account(val accp: Long) {
if (answerMode == Api.ANSWERMODE_AUTO)
res += ";answermode=auto"
if (autoRedirect)
res += ";sip_autoredirect=yes"
res += ";ptime=20;regint=${regint};regq=0.5;pubint=0;call_transfer=yes;100rel=no"
var extra = ""

38
app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt
View File

@ -49,6 +49,8 @@ class AccountActivity : AppCompatActivity() {
private lateinit var dtmfModeSpinner: Spinner
private var answerMode = Api.ANSWERMODE_MANUAL
private lateinit var answerModeSpinner: Spinner
private var autoRedirect = false
private lateinit var redirectModeSpinner: Spinner
private lateinit var vmUri: EditText
private lateinit var countryCode: EditText
private lateinit var telProvider: EditText
@ -95,6 +97,7 @@ class AccountActivity : AppCompatActivity() {
rtcpCheck = binding.RtcpMux
dtmfModeSpinner = binding.dtmfModeSpinner
answerModeSpinner = binding.answerModeSpinner
redirectModeSpinner = binding.redirectModeSpinner
vmUri = binding.voicemailUri
countryCode = binding.countryCode
telProvider = binding.telephonyProvider
@ -203,6 +206,8 @@ class AccountActivity : AppCompatActivity() {
else
Api.ANSWERMODE_AUTO
}
"redirect-mode" ->
acc.autoRedirect = text == "yes"
"voicemail-uri" ->
if (text.isNotEmpty())
acc.vmUri = text
@ -344,6 +349,27 @@ class AccountActivity : AppCompatActivity() {
}
}
autoRedirect = acc.autoRedirect
val redirectModeKeys = arrayListOf(false, true)
val redirectModeVals = arrayListOf(getString(R.string.manual), getString(R.string.auto))
keyIx = redirectModeKeys.indexOf(acc.autoRedirect)
keyVal = redirectModeVals.elementAt(keyIx)
redirectModeKeys.removeAt(keyIx)
redirectModeVals.removeAt(keyIx)
redirectModeKeys.add(0, acc.autoRedirect)
redirectModeVals.add(0, keyVal)
val redirectModeAdapter = ArrayAdapter(this,android.R.layout.simple_spinner_item,
redirectModeVals)
redirectModeAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
redirectModeSpinner.adapter = redirectModeAdapter
redirectModeSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
override fun onItemSelected(parent: AdapterView<*>, view: View, position: Int, id: Long) {
autoRedirect = redirectModeKeys[redirectModeVals.indexOf(parent.selectedItem.toString())]
}
override fun onNothingSelected(parent: AdapterView<*>) {
}
}
if (acc.countryCode != "")
countryCode.setText(acc.countryCode)
@ -612,6 +638,12 @@ class AccountActivity : AppCompatActivity() {
}
}
if (autoRedirect != acc.autoRedirect) {
Api.account_set_sip_autoredirect(acc.accp, autoRedirect)
acc.autoRedirect = autoRedirect
Log.d(TAG, "New autoRedirect is ${acc.autoRedirect}")
}
var tVmUri = vmUri.text.toString().trim()
if (tVmUri != acc.vmUri) {
if (tVmUri != "") {
@ -785,6 +817,12 @@ class AccountActivity : AppCompatActivity() {
getString(R.string.answer_mode_help)
)
}
binding.RedirectModeTitle.setOnClickListener {
Utils.alertView(
this, getString(R.string.redirect_mode),
getString(R.string.redirect_mode_help)
)
}
binding.VoicemailUriTitle.setOnClickListener {
Utils.alertView(
this, getString(R.string.voicemail_uri),

2
app/src/main/kotlin/com/tutpro/baresip/Api.kt
View File

@ -46,6 +46,8 @@ object Api {
external fun account_vm_uri(acc: Long): String
external fun account_answermode(acc: Long): Int
external fun account_set_answermode(acc: Long, mode: Int): Int
external fun account_sip_autoredirect(acc: Long): Boolean
external fun account_set_sip_autoredirect(acc: Long, allow: Boolean)
external fun account_rtcp_mux(acc: Long): Boolean
external fun account_set_rtcp_mux(acc: Long, value: Boolean): Int
external fun account_dtmfmode(acc: Long): Int

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

@ -777,6 +777,9 @@ class BaresipService: Service() {
else
return
}
"call redirect" -> {
stopMediaPlayer()
}
"call established" -> {
nm.cancel(CALL_NOTIFICATION_ID)
Log.d(TAG, "AoR $aor call $callp established in mode ${am.mode}")
@ -951,10 +954,12 @@ class BaresipService: Service() {
}
val reason = ev[1].trim()
if ((reason != "") && (ua.calls().isEmpty())) {
if (reason[0].isDigit())
toast("${getString(R.string.call_failed)}: $reason")
else
if (reason[0].isDigit()) {
if (reason[0] != '3')
toast("${getString(R.string.call_failed)}: $reason")
} else {
toast("${getString(R.string.call_closed)}: ${Api.call_peer_uri(callp)}: $reason")
}
}
}
}

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

@ -1086,6 +1086,37 @@ class MainActivity : AppCompatActivity() {
"call answered" -> {
showCall(ua)
}
"call redirect" -> {
val redirectUri = ev[1]
val target = Utils.friendlyUri(this, redirectUri, acc)
if (acc.autoRedirect) {
if (ua.account.aor != aorSpinner.tag)
spinToAor(ua.account.aor)
callUri.setText(redirectUri)
callButton.performClick()
Toast.makeText(applicationContext,
String.format(getString(R.string.redirect_notice), target),
Toast.LENGTH_SHORT
).show()
} else {
with(MaterialAlertDialogBuilder(this, R.style.AlertDialogTheme)) {
setTitle(R.string.redirect_request)
setMessage(String.format(getString(R.string.redirect_request_query), target))
setPositiveButton(getString(R.string.yes)) { dialog, _ ->
if (ua.account.aor != aorSpinner.tag)
spinToAor(ua.account.aor)
callUri.setText(redirectUri)
callButton.performClick()
dialog.dismiss()
}
setNeutralButton(getString(R.string.no)) { dialog, _ ->
dialog.dismiss()
}
show()
}
}
showCall(ua)
}
"call established" -> {
if (aor == aorSpinner.tag) {
dtmf.setText("")

15
app/src/main/res/layout/activity_account.xml
View File

@ -368,6 +368,21 @@
android:paddingTop="8dp" >
</Spinner>
<TextView
android:id="@+id/RedirectModeTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="14dp"
android:textSize="18sp"
android:text="@string/redirect_mode" >
</TextView>
<Spinner
android:id="@+id/redirectModeSpinner"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="8dp" >
</Spinner>
<TextView
android:id="@+id/VoicemailUriTitle"
android:layout_width="wrap_content"

6
app/src/main/res/values-fi/strings.xml
View File

@ -186,6 +186,9 @@
<string name="answer_mode_help">Valitsee tulevien puheluiden vastaustavan.</string>
<string name="manual">Manuaalinen</string>
<string name="auto">Automaattinen</string>
<string name="redirect_mode">Uudelleenohjaustapa</string>
<string name="redirect_mode_help">Valitsee toteutetaanko puhelun uudelleenohjauspyyntö
automaattisesti vai kysytäänkö vahvistusta.</string>
<string name="voicemail_uri">Puhepostin URI</string>
<string name="voicemain_uri_help">SIP URI, jota käytetään
puhepostiviestien kuunteluun. Jos URI:a ei ole annettu, tietoa
@ -521,6 +524,9 @@
<string name="verify_sas">Todennatko SAS:n &lt;%1$s&gt;\?</string>
<string name="transfer_request">Siirtopyyntö</string>
<string name="transfer_request_query">Hyväksytkö tämän puhelun siirron kohteeseen \'%1$s\'\?</string>
<string name="redirect_notice">Automaattinen uudelleenohjaus kohteeseen \'%1$s\'\</string>
<string name="redirect_request">Uudelleenohjauspyyntö</string>
<string name="redirect_request_query">Hyväksytkö puhelun uudelleenohjauksen kohteeseen \'%1$s\'\?</string>
<string name="call_failed">Puhelu epäonnistui</string>
<string name="call_closed">Puhelu on päättynyt</string>
<string name="call_not_secure">Tämä puhelu EI ole turvallinen!</string>

6
app/src/main/res/values/strings.xml
View File

@ -176,6 +176,9 @@
<string name="dtmf_info">SIP INFO Requests</string>
<string name="answer_mode">Answer Mode</string>
<string name="answer_mode_help">Selects how incoming calls are answered.</string>
<string name="redirect_mode">Redirect Mode</string>
<string name="redirect_mode_help">Selects if call redirect request is followed automatically or
if confirmation is requested.</string>
<string name="manual">Manual</string>
<string name="auto">Automatic</string>
<string name="voicemail_uri">Voicemail URI</string>
@ -494,6 +497,9 @@
<string name="verify_sas">Do you want to verify SAS &lt;%1$s&gt;\?</string>
<string name="transfer_request">Transfer Request</string>
<string name="transfer_request_query">Do you accept to transfer this call to \'%1$s\'\?</string>
<string name="redirect_notice">Automatic redirection to \'%1$s\'\</string>
<string name="redirect_request">Redirect Request</string>
<string name="redirect_request_query">Do you accept to call redirection to \'%1$s\'\?</string>
<string name="call_failed">Call failed</string>
<string name="call_closed">Call is closed</string>
<string name="call_not_secure">This call is NOT secure!</string>