improved account media encryption help text

This commit is contained in:
Juha Heinanen
2018-06-13 15:22:24 +03:00
parent fbf454dfb8
commit 45b3cadaa3
2 changed files with 18 additions and 5 deletions

View File

@ -91,8 +91,8 @@ class AccountActivity : AppCompatActivity() {
mediaEnc = acc.mediaenc
val mediaEncSpinner = findViewById(R.id.mediaEncSpinner) as Spinner
val mediaEncKeys = arrayListOf("zrtp", "dtls_srtp", "srtp", "srtp-mand", "")
val mediaEncVals = arrayListOf("ZRTP", "DTLS SRTP", "SRTP", "Mandatory SRTP", "")
val mediaEncKeys = arrayListOf("zrtp", "dtls_srtp", "srtp-mandf", "srtp-mand", "srtp", "")
val mediaEncVals = arrayListOf("ZRTP", "DTLS-SRTP", "SRTP-MANDF", "SRTP-MAND", "SRTP", "")
val keyIx = mediaEncKeys.indexOf(acc.mediaenc)
val keyVal = mediaEncVals.elementAt(keyIx)
mediaEncKeys.removeAt(keyIx)
@ -283,7 +283,6 @@ class AccountActivity : AppCompatActivity() {
}
fun onClick(v: View) {
Log.d("Baresip", "Account click on $v")
when (v) {
findViewById(R.id.DisplayNameTitle) -> {
Utils.alertView(this, "Display Name", getString(R.string.dispName))
@ -307,7 +306,8 @@ class AccountActivity : AppCompatActivity() {
Utils.alertView(this, "Audio Codecs", getString(R.string.auCodecs))
}
findViewById(R.id.MediaEncTitle) -> {
Utils.alertView(this, "Media Encryption", getString(R.string.mediaEnc))
Utils.alertView(this, "Media Encryption",
getText(R.string.mediaEnc).toString())
}
}
}

View File

@ -24,5 +24,18 @@
disables registration.
</string>
<string name="auCodecs">List of supported audio codecs in priority order.</string>
<string name="mediaEnc">Supported or required media encryption protocol.</string>
<string name="mediaEnc">Selects media transport encryption protocol.\n
ZRTP (recommended) means that ZRTP end-to-end media encryption negotiation is tried after
the call has been established.\n
DTLS-SRTP means that UDP/TLS/RTP/SAVP is offered in outgoing call and that RTP/SAVP,
RTP/SAVPF, or UDP/TLS/RTP/SAVP is used if offered in incoming call.\n
SRTP-MANF means that RTP/SAVPS is offered in outgoing call and that RTP/SAVP or RTP/SAVPF
is used if offered in incoming call.\n
SRTP-MAND means that RTP/SAVP is offered in outgoing call and that RTP/SAVP or RTP/SAVPF
is used if offered in incoming call.\n
SRTP means that RTP/AVP is offered in outgoing call and that RTP/SAVP or RTP/SAVPF is used
if offered in incoming call.\n
EMPTY value means that media encryption is not supported and that media transport protocol
thus is RTP/AVP.
</string>
</resources>