From c1036cddde23a6632988580cbf83f026da9f22bb Mon Sep 17 00:00:00 2001 From: Juha Heinanen Date: Sun, 7 Aug 2022 18:03:45 +0300 Subject: [PATCH] Use lock icons for call security indication --- .../com/tutpro/baresip/BaresipService.kt | 4 ++-- .../main/kotlin/com/tutpro/baresip/Call.kt | 2 +- .../kotlin/com/tutpro/baresip/MainActivity.kt | 18 +++++++++--------- app/src/main/res/drawable/box_green.png | Bin 3542 -> 0 bytes app/src/main/res/drawable/box_red.png | Bin 3512 -> 0 bytes app/src/main/res/drawable/box_yellow.png | Bin 3419 -> 0 bytes app/src/main/res/drawable/locked_green.xml | 5 +++++ app/src/main/res/drawable/locked_yellow.xml | 5 +++++ app/src/main/res/drawable/unlocked.xml | 5 +++++ app/src/main/res/layout/activity_main.xml | 1 + app/src/main/res/values/colors.xml | 3 ++- 11 files changed, 30 insertions(+), 13 deletions(-) delete mode 100644 app/src/main/res/drawable/box_green.png delete mode 100644 app/src/main/res/drawable/box_red.png delete mode 100644 app/src/main/res/drawable/box_yellow.png create mode 100644 app/src/main/res/drawable/locked_green.xml create mode 100644 app/src/main/res/drawable/locked_yellow.xml create mode 100644 app/src/main/res/drawable/unlocked.xml diff --git a/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt b/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt index 66821cfe..f64d0731 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt @@ -788,9 +788,9 @@ class BaresipService: Service() { } "call verified", "call secure" -> { if (ev[0] == "call secure") { - call!!.security = R.drawable.box_yellow + call!!.security = R.drawable.locked_yellow } else { - call!!.security = R.drawable.box_green + call!!.security = R.drawable.locked_green call.zid = ev[1] } if (!isMainVisible) diff --git a/app/src/main/kotlin/com/tutpro/baresip/Call.kt b/app/src/main/kotlin/com/tutpro/baresip/Call.kt index ec593561..7605e7d1 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/Call.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/Call.kt @@ -83,7 +83,7 @@ class Call(val callp: Long, val ua: UserAgent, val peerUri: String, val dir: Str } init { - if (ua.account.mediaEnc != "") security = R.drawable.box_red + if (ua.account.mediaEnc != "") security = R.drawable.unlocked } fun destroy() { diff --git a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt index e2e3d526..965b2745 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt @@ -303,7 +303,7 @@ class MainActivity : AppCompatActivity() { if (Api.cmd_exec("zrtp_unverify " + call.zid) != 0) { Log.e(TAG, "Command 'zrtp_unverify ${call.zid}' failed") } else { - securityButton.setImageResource(R.drawable.box_yellow) + securityButton.setImageResource(R.drawable.locked_yellow) securityButton.tag = "yellow" } } @@ -1039,9 +1039,9 @@ class MainActivity : AppCompatActivity() { setPositiveButton(getString(R.string.yes)) { dialog, _ -> val security: Int = if (Api.cmd_exec("zrtp_verify ${ev[3]}") != 0) { Log.e(TAG, "Command 'zrtp_verify ${ev[3]}' failed") - R.drawable.box_yellow + R.drawable.locked_yellow } else { - R.drawable.box_green + R.drawable.locked_green } call.security = security call.zid = ev[3] @@ -1056,10 +1056,10 @@ class MainActivity : AppCompatActivity() { dialog.dismiss() } setNeutralButton(getString(R.string.no)) { dialog, _ -> - call.security = R.drawable.box_yellow + call.security = R.drawable.locked_yellow call.zid = ev[3] if (aor == aorSpinner.tag) { - securityButton.setImageResource(R.drawable.box_yellow) + securityButton.setImageResource(R.drawable.locked_yellow) securityButton.tag = "yellow" securityButton.visibility = if (Call.ofCallp(callp) == null) View.INVISIBLE @@ -1078,7 +1078,7 @@ class MainActivity : AppCompatActivity() { handleNextEvent("Call $callp that is verified is not found") return } - val tag: String = if (call.security == R.drawable.box_yellow) + val tag: String = if (call.security == R.drawable.locked_yellow) "yellow" else "green" @@ -1718,13 +1718,13 @@ class MainActivity : AppCompatActivity() { private fun setSecurityButtonTag(button: ImageButton, security: Int) { when (security) { - R.drawable.box_red -> { + R.drawable.unlocked -> { button.tag = "red" } - R.drawable.box_yellow -> { + R.drawable.locked_yellow -> { button.tag = "yellow" } - R.drawable.box_green -> { + R.drawable.locked_green -> { button.tag = "green" } } diff --git a/app/src/main/res/drawable/box_green.png b/app/src/main/res/drawable/box_green.png deleted file mode 100644 index 16563e6ff82eea82490842cecfbee8573da8ee34..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3542 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 QNB{r;07*qoM6N<$f-SSFQ2+n{ diff --git a/app/src/main/res/drawable/box_red.png b/app/src/main/res/drawable/box_red.png deleted file mode 100644 index dbbd1374b82b25dcac3b88bd81ef8dfa518e4e4a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3512 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 + + diff --git a/app/src/main/res/drawable/locked_yellow.xml b/app/src/main/res/drawable/locked_yellow.xml new file mode 100644 index 00000000..07ceaf57 --- /dev/null +++ b/app/src/main/res/drawable/locked_yellow.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/unlocked.xml b/app/src/main/res/drawable/unlocked.xml new file mode 100644 index 00000000..4812d509 --- /dev/null +++ b/app/src/main/res/drawable/unlocked.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 0e664bc3..6ed4a683 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -104,6 +104,7 @@ android:layout_weight ="0" android:layout_gravity="center_vertical" android:visibility="invisible" + android:background="#00000000" android:contentDescription="@string/app_name" > diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 047a49af..6a400504 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -15,7 +15,8 @@ #000000 @color/colorBlack #01df01 - #df0101 + #ff0000 + #ffef00 @color/colorWhite #383838 @color/colorDark