From 78fc7f056a4ba30538aa82094c77600dd6c46dc8 Mon Sep 17 00:00:00 2001
From: Juha Heinanen <jh@tutpro.com>
Date: Mon, 18 Jun 2018 08:55:16 +0300
Subject: [PATCH] simplified mediaenc choices

---
 app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt | 6 +++---
 app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt    | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt
index 099d3cc1..efc6b048 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-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)) {
diff --git a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
index 13de42b9..8f871802 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
@@ -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