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

simplified mediaenc choices

Browse Source
This commit is contained in:
Juha Heinanen
2018-06-18 08:55:16 +03:00
parent af386a89eb
commit 78fc7f056a
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt
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-mandf", "srtp-mand", "srtp", "")
val mediaEncVals = arrayListOf("ZRTP", "DTLS-SRTP", "SRTP-MANDF", "SRTP-MAND", "SRTP", "")
val mediaEncKeys = arrayListOf("zrtp", "dtls_srtpf", "srtp-mand", "srtp", "")
val mediaEncVals = arrayListOf("ZRTP", "DTLS-SRTPF", "SRTP-MAND", "SRTP", "")
val keyIx = mediaEncKeys.indexOf(acc.mediaenc)
val keyVal = mediaEncVals.elementAt(keyIx)
mediaEncKeys.removeAt(keyIx)
@ -124,7 +124,7 @@ class AccountActivity : AppCompatActivity() {
val intent = Intent(this, MainActivity::class.java)
if (item.itemId == R.id.checkIcon) {
val dn = displayName.text.toString().trim()
if (dn != acc.displayName) {
if (checkDisplayName(dn)) {

4
app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
View File

@ -130,7 +130,7 @@ class MainActivity : AppCompatActivity() {
holdButton.visibility = View.VISIBLE
securityButton.setImageResource(callsOut[0].security)
setSecurityButtonTag(securityButton, callsOut[0].security)
if ((acc.mediaenc == "zrtp") || (acc.mediaenc == "dtls_srtp"))
if ((acc.mediaenc == "zrtp") || (acc.mediaenc == "dtls_srtpf"))
securityButton.visibility = View.VISIBLE
else
securityButton.visibility = View.INVISIBLE
@ -574,7 +574,7 @@ class MainActivity : AppCompatActivity() {
val security_button_params = LinearLayout.LayoutParams(dp24px, dp24px, 0.0f)
security_button_params.gravity = Gravity.CENTER_VERTICAL
security_button.layoutParams = security_button_params
if ((call.security != 0) && ((acc.mediaenc == "zrtp") || (acc.mediaenc == "dtls_srtp"))) {
if ((call.security != 0) && ((acc.mediaenc == "zrtp") || (acc.mediaenc == "dtls_srtpf"))) {
security_button.setImageResource(call.security)
setSecurityButtonTag(securityButton, call.security)
security_button.visibility = View.VISIBLE