diff --git a/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt index 8eac84ba..099d3cc1 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt @@ -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()) } } } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9c80c42d..27f2447c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -24,5 +24,18 @@ disables registration. List of supported audio codecs in priority order. - Supported or required media encryption protocol. + 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. +