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 16563e6f..00000000
Binary files a/app/src/main/res/drawable/box_green.png and /dev/null differ
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 dbbd1374..00000000
Binary files a/app/src/main/res/drawable/box_red.png and /dev/null differ
diff --git a/app/src/main/res/drawable/box_yellow.png b/app/src/main/res/drawable/box_yellow.png
deleted file mode 100644
index 4f1ae3ad..00000000
Binary files a/app/src/main/res/drawable/box_yellow.png and /dev/null differ
diff --git a/app/src/main/res/drawable/locked_green.xml b/app/src/main/res/drawable/locked_green.xml
new file mode 100644
index 00000000..68b62c01
--- /dev/null
+++ b/app/src/main/res/drawable/locked_green.xml
@@ -0,0 +1,5 @@
+
+
+
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