- added srtp-mandf media encryption

- show yellow security button if media encryption is srtp-mand or
  srtp-mandf
- updated account's media encryption help text
- updated baresip libs and include files to current master
This commit is contained in:
Juha Heinanen
2019-02-16 06:53:14 +02:00
parent 2e1bd926e8
commit c74124702a
3 changed files with 19 additions and 14 deletions
@@ -108,8 +108,8 @@ class AccountActivity : AppCompatActivity() {
mediaEnc = acc.mediaEnc
val mediaEncSpinner = findViewById(R.id.mediaEncSpinner) as Spinner
val mediaEncKeys = arrayListOf("zrtp", "dtls_srtpf", "srtp-mand", "srtp", "")
val mediaEncVals = arrayListOf("ZRTP", "DTLS-SRTPF", "SRTP-MAND", "SRTP", "")
val mediaEncKeys = arrayListOf("zrtp", "dtls_srtpf", "srtp-mandf", "srtp-mand", "srtp", "")
val mediaEncVals = arrayListOf("ZRTP", "DTLS-SRTPF", "SRTP-MANDF", "SRTP-MAND", "SRTP", "None")
val keyIx = mediaEncKeys.indexOf(acc.mediaEnc)
val keyVal = mediaEncVals.elementAt(keyIx)
mediaEncKeys.removeAt(keyIx)
@@ -512,8 +512,13 @@ class MainActivity : AppCompatActivity() {
if (acc.mediaEnc == "") {
securityButton.visibility = View.INVISIBLE
} else {
securityButton.setImageResource(R.drawable.box_red)
securityButton.tag = "red"
if ((acc.mediaEnc == "srtp-mand") || (acc.mediaEnc == "srtp-mandf")) {
securityButton.setImageResource(R.drawable.box_yellow)
securityButton.tag = "yellow"
} else {
securityButton.setImageResource(R.drawable.box_red)
securityButton.tag = "red"
}
securityButton.visibility = View.VISIBLE
}
callButton.visibility = View.INVISIBLE