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

Added DTMFMODE_AUTO dtmfmode

Browse Source
This commit is contained in:
Juha Heinanen
2024-03-31 09:21:07 +03:00
parent c6df57f47b
commit 9a07ed26b0
5 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/kotlin/com/tutpro/baresip/Account.kt
+2
View File
@@ -133,6 +133,8 @@ class Account(val accp: Long) {
if (dtmfMode == Api.DTMFMODE_SIP_INFO) if (dtmfMode == Api.DTMFMODE_SIP_INFO)
res += ";dtmfmode=info" res += ";dtmfmode=info"
else if (dtmfMode == Api.DTMFMODE_AUTO)
res += ";dtmfmode=auto"
res = if (vmUri == "") res = if (vmUri == "")
"$res;mwi=no" "$res;mwi=no"
app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt
+8 -9
View File
@@ -200,19 +200,18 @@ class AccountActivity : AppCompatActivity() {
else else
Api.REL100_DISABLED Api.REL100_DISABLED
"dtmf-mode" -> "dtmf-mode" ->
if (text in arrayOf("rtp-event", "sip-info")) { if (text in arrayOf("rtp-event", "sip-info", "auto"))
acc.dtmfMode = if (text == "rtp-event") acc.dtmfMode = when (text) {
Api.DTMFMODE_RTP_EVENT "rtp-event" -> Api.DTMFMODE_RTP_EVENT
else "sip-info" -> Api.DTMFMODE_SIP_INFO
Api.DTMFMODE_SIP_INFO else -> Api.DTMFMODE_AUTO
} }
"answer-mode" -> "answer-mode" ->
if (text in arrayOf("manual", "auto")) { if (text in arrayOf("manual", "auto"))
acc.answerMode = if (text == "manual") acc.answerMode = if (text == "manual")
Api.ANSWERMODE_MANUAL Api.ANSWERMODE_MANUAL
else else
Api.ANSWERMODE_AUTO Api.ANSWERMODE_AUTO
}
"redirect-mode" -> "redirect-mode" ->
acc.autoRedirect = text == "yes" acc.autoRedirect = text == "yes"
"voicemail-uri" -> "voicemail-uri" ->
@@ -317,8 +316,8 @@ class AccountActivity : AppCompatActivity() {
rel100Check.isChecked = acc.rel100Mode == Api.REL100_ENABLED rel100Check.isChecked = acc.rel100Mode == Api.REL100_ENABLED
dtmfMode = acc.dtmfMode dtmfMode = acc.dtmfMode
val dtmfModeKeys = arrayListOf(Api.DTMFMODE_RTP_EVENT, Api.DTMFMODE_SIP_INFO) val dtmfModeKeys = arrayListOf(Api.DTMFMODE_RTP_EVENT, Api.DTMFMODE_SIP_INFO, Api.DTMFMODE_AUTO)
val dtmfModeVals = arrayListOf(getString(R.string.dtmf_inband), getString(R.string.dtmf_info)) val dtmfModeVals = arrayListOf(getString(R.string.dtmf_inband), getString(R.string.dtmf_info), getString(R.string.dtmf_auto))
keyIx = dtmfModeKeys.indexOf(acc.dtmfMode) keyIx = dtmfModeKeys.indexOf(acc.dtmfMode)
keyVal = dtmfModeVals.elementAt(keyIx) keyVal = dtmfModeVals.elementAt(keyIx)
dtmfModeKeys.removeAt(keyIx) dtmfModeKeys.removeAt(keyIx)
app/src/main/kotlin/com/tutpro/baresip/Api.kt
+1
View File
@@ -8,6 +8,7 @@ object Api {
const val ANSWERMODE_AUTO = 2 const val ANSWERMODE_AUTO = 2
const val DTMFMODE_RTP_EVENT = 0 const val DTMFMODE_RTP_EVENT = 0
const val DTMFMODE_SIP_INFO = 1 const val DTMFMODE_SIP_INFO = 1
const val DTMFMODE_AUTO = 2
const val REL100_DISABLED = 0 const val REL100_DISABLED = 0
const val REL100_ENABLED = 1 const val REL100_ENABLED = 1
// const cal REL100_REQUIRED = 2 // const cal REL100_REQUIRED = 2
app/src/main/res/values-fi/strings.xml
+3 -2
View File
@@ -185,8 +185,9 @@
tukemisesta (RFC 3262).</string> tukemisesta (RFC 3262).</string>
<string name="dtmf_mode">DTMF-moodi</string> <string name="dtmf_mode">DTMF-moodi</string>
<string name="dtmf_mode_help">Valitsee tavan, miten DTMF-merkit 0–9, #, * ja A-D lähetetään.</string> <string name="dtmf_mode_help">Valitsee tavan, miten DTMF-merkit 0–9, #, * ja A-D lähetetään.</string>
<string name="dtmf_inband">RTP</string> <string name="dtmf_inband">RTP-tapahtuma</string>
<string name="dtmf_info">SIP INFO</string> <string name="dtmf_info">SIP INFO -pyyntö</string>
<string name="dtmf_auto">RTP tai SIP INFO</string>
<string name="answer_mode">Vastaustapa</string> <string name="answer_mode">Vastaustapa</string>
<string name="answer_mode_help">Valitsee tulevien puheluiden vastaustavan.</string> <string name="answer_mode_help">Valitsee tulevien puheluiden vastaustavan.</string>
<string name="manual">Manuaalinen</string> <string name="manual">Manuaalinen</string>
app/src/main/res/values/strings.xml
+1
View File
@@ -176,6 +176,7 @@
<string name="dtmf_mode_help">Selects how DTMF tones 0–9, #, *, and A-D are sent.</string> <string name="dtmf_mode_help">Selects how DTMF tones 0–9, #, *, and A-D are sent.</string>
<string name="dtmf_inband">In-band RTP Events</string> <string name="dtmf_inband">In-band RTP Events</string>
<string name="dtmf_info">SIP INFO Requests</string> <string name="dtmf_info">SIP INFO Requests</string>
<string name="dtmf_auto">In-band RTP or SIP INFO</string>
<string name="answer_mode">Answer Mode</string> <string name="answer_mode">Answer Mode</string>
<string name="answer_mode_help">Selects how incoming calls are answered.</string> <string name="answer_mode_help">Selects how incoming calls are answered.</string>
<string name="redirect_mode">Redirect Mode</string> <string name="redirect_mode">Redirect Mode</string>