From dd01ec6371dd8c2d05feb5db1a8181178b119561 Mon Sep 17 00:00:00 2001
From: Juha Heinanen <jh@tutpro.com>
Date: Thu, 25 Aug 2022 08:22:58 +0300
Subject: [PATCH] Verify event now has only two arguments

---
 .../main/kotlin/com/tutpro/baresip/BaresipService.kt  |  2 +-
 .../main/kotlin/com/tutpro/baresip/MainActivity.kt    | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt b/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
index 921b35ce..f64d0731 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
@@ -791,7 +791,7 @@ class BaresipService: Service() {
                             call!!.security = R.drawable.locked_yellow
                         } else {
                             call!!.security = R.drawable.locked_green
-                            call.zid = ev[3]
+                            call.zid = ev[1]
                         }
                         if (!isMainVisible)
                             return
diff --git a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
index 81777753..526fe292 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
@@ -1034,16 +1034,15 @@ class MainActivity : AppCompatActivity() {
                 }
                 with(MaterialAlertDialogBuilder(this, R.style.AlertDialogTheme)) {
                     setTitle(R.string.verify)
-                    setMessage(String.format(getString(R.string.verify_sas),
-                            ev[1], ev[2]))
+                    setMessage(String.format(getString(R.string.verify_sas), ev[1]))
                     setPositiveButton(getString(R.string.yes)) { dialog, _ ->
-                        call.security = if (Api.cmd_exec("zrtp_verify ${ev[3]}") != 0) {
-                            Log.e(TAG, "Command 'zrtp_verify ${ev[3]}' failed")
+                        call.security = if (Api.cmd_exec("zrtp_verify ${ev[2]}") != 0) {
+                            Log.e(TAG, "Command 'zrtp_verify ${ev[2]}' failed")
                             R.drawable.locked_yellow
                         } else {
                             R.drawable.locked_green
                         }
-                        call.zid = ev[3]
+                        call.zid = ev[2]
                         if (aor == aorSpinner.tag) {
                             securityButton.tag = call.security
                             securityButton.setImageResource(call.security)
@@ -1052,7 +1051,7 @@ class MainActivity : AppCompatActivity() {
                     }
                     setNeutralButton(getString(R.string.no)) { dialog, _ ->
                         call.security = R.drawable.locked_yellow
-                        call.zid = ev[3]
+                        call.zid = ev[2]
                         if (aor == aorSpinner.tag) {
                             securityButton.tag = R.drawable.locked_yellow
                             securityButton.setImageResource(R.drawable.locked_yellow)