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

Remove account's PreferIPv6MediaTitle setting

Browse Source
This commit is contained in:
Juha Heinanen
2021-11-12 11:14:09 +02:00
parent 89d7d686fb
commit badb3eddd6
7 changed files with 2 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt
-22
View File
@@ -40,7 +40,6 @@ class AccountActivity : AppCompatActivity() {
private lateinit var mediaNatSpinner: Spinner
private lateinit var mediaEnc: String
private lateinit var mediaEncSpinner: Spinner
private lateinit var ipV6MediaCheck: CheckBox
private var dtmfMode = Api.DTMFMODE_RTP_EVENT
private lateinit var dtmfModeSpinner: Spinner
private var answerMode = Api.ANSWERMODE_MANUAL
@@ -78,7 +77,6 @@ class AccountActivity : AppCompatActivity() {
stunUser = binding.StunUser
stunPass = binding.StunPass
mediaEncSpinner = binding.mediaEncSpinner
ipV6MediaCheck = binding.PreferIPv6Media
dtmfModeSpinner = binding.dtmfModeSpinner
answerModeSpinner = binding.answerModeSpinner
vmUri = binding.voicemailUri
@@ -162,8 +160,6 @@ class AccountActivity : AppCompatActivity() {
"stun-turn-server" ->
if (text.isNotEmpty())
acc.stunServer = text
"prefer-ipv6-media" ->
acc.preferIPv6Media = text == "yes"
"dtmf-mode" ->
if (text in arrayOf("rtp-event", "sip-info")) {
acc.dtmfMode = if (text == "rtp-event")
@@ -275,8 +271,6 @@ class AccountActivity : AppCompatActivity() {
}
}
ipV6MediaCheck.isChecked = acc.preferIPv6Media
dtmfMode = acc.dtmfMode
val dtmfModeKeys = arrayListOf(Api.DTMFMODE_RTP_EVENT, Api.DTMFMODE_SIP_INFO)
val dtmfModeVals = arrayListOf(getString(R.string.dtmf_inband), getString(R.string.dtmf_info))
@@ -544,16 +538,6 @@ class AccountActivity : AppCompatActivity() {
}
}
if (ipV6MediaCheck.isChecked != acc.preferIPv6Media) {
acc.preferIPv6Media = ipV6MediaCheck.isChecked
Log.d(TAG, "New preferIPv6Media is ${acc.preferIPv6Media}")
if (acc.preferIPv6Media)
Api.account_set_mediaaf(acc.accp, Api.AF_INET6)
else
Api.account_set_mediaaf(acc.accp, Api.AF_UNSPEC)
save = true
}
if (dtmfMode != acc.dtmfMode) {
if (Api.account_set_dtmfmode(acc.accp, dtmfMode) == 0) {
acc.dtmfMode = Api.account_dtmfmode(acc.accp)
@@ -706,12 +690,6 @@ class AccountActivity : AppCompatActivity() {
getString(R.string.media_encryption_help)
)
}
binding.PreferIPv6Media.setOnClickListener {
Utils.alertView(
this, getString(R.string.prefer_ipv6_media),
getString(R.string.prefer_ipv6_media_help)
)
}
binding.DtmfModeTitle.setOnClickListener {
Utils.alertView(
this, getString(R.string.dtmf_mode),