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

show yellow security button at SECURE mediaenc event

Browse Source
This commit is contained in:
Juha Heinanen
2018-06-18 08:24:24 +03:00
parent a56f25faa1
commit af386a89eb
1 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
+19 -11
View File
@@ -57,6 +57,7 @@ class MainActivity : AppCompatActivity() {
window.addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED or window.addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED or
WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON or WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON or
WindowManager.LayoutParams.FLAG_IGNORE_CHEEK_PRESSES) WindowManager.LayoutParams.FLAG_IGNORE_CHEEK_PRESSES)
setContentView(R.layout.activity_main) setContentView(R.layout.activity_main)
appContext = applicationContext appContext = applicationContext
@@ -129,10 +130,10 @@ class MainActivity : AppCompatActivity() {
holdButton.visibility = View.VISIBLE holdButton.visibility = View.VISIBLE
securityButton.setImageResource(callsOut[0].security) securityButton.setImageResource(callsOut[0].security)
setSecurityButtonTag(securityButton, callsOut[0].security) setSecurityButtonTag(securityButton, callsOut[0].security)
if (acc.mediaenc == "") if ((acc.mediaenc == "zrtp") || (acc.mediaenc == "dtls_srtp"))
securityButton.visibility = View.INVISIBLE
else
securityButton.visibility = View.VISIBLE securityButton.visibility = View.VISIBLE
else
securityButton.visibility = View.INVISIBLE
dtmf.visibility = View.VISIBLE dtmf.visibility = View.VISIBLE
dtmf.requestFocus() dtmf.requestFocus()
} else { } else {
@@ -573,7 +574,7 @@ class MainActivity : AppCompatActivity() {
val security_button_params = LinearLayout.LayoutParams(dp24px, dp24px, 0.0f) val security_button_params = LinearLayout.LayoutParams(dp24px, dp24px, 0.0f)
security_button_params.gravity = Gravity.CENTER_VERTICAL security_button_params.gravity = Gravity.CENTER_VERTICAL
security_button.layoutParams = security_button_params security_button.layoutParams = security_button_params
if ((call.security != 0) && (acc.mediaenc != "")) { if ((call.security != 0) && ((acc.mediaenc == "zrtp") || (acc.mediaenc == "dtls_srtp"))) {
security_button.setImageResource(call.security) security_button.setImageResource(call.security)
setSecurityButtonTag(securityButton, call.security) setSecurityButtonTag(securityButton, call.security)
security_button.visibility = View.VISIBLE security_button.visibility = View.VISIBLE
@@ -928,19 +929,26 @@ class MainActivity : AppCompatActivity() {
verifyDialog.create().show() verifyDialog.create().show()
} }
} }
"call verified" -> { "call verified", "call secure" -> {
val call = Call.find(calls, callp) val call = Call.find(calls, callp)
if (call == null) { if (call == null) {
Log.e("Baresip", "Call $callp that is verified is not found") Log.e("Baresip", "Call $callp that is verified is not found")
return return
} }
call.security = R.drawable.box_green val tag: String
call.zid = ev[1] if (ev[0] == "call secure") {
call.security = R.drawable.box_yellow
tag = "yellow"
} else {
call.security = R.drawable.box_green
tag = "green"
call.zid = ev[1]
}
if (call.dir == "out") { if (call.dir == "out") {
this@MainActivity.runOnUiThread { this@MainActivity.runOnUiThread {
if (ua == uas[aorSpinner.selectedItemPosition]) { if (ua == uas[aorSpinner.selectedItemPosition]) {
securityButton.setImageResource(R.drawable.box_green) securityButton.setImageResource(call.security)
securityButton.tag = "green" securityButton.tag = tag
securityButton.visibility = View.VISIBLE securityButton.visibility = View.VISIBLE
} }
} }
@@ -949,8 +957,8 @@ class MainActivity : AppCompatActivity() {
if (ua == uas[aorSpinner.selectedItemPosition]) { if (ua == uas[aorSpinner.selectedItemPosition]) {
val view_id = (Call.uaCallIndex(calls, ua, call, "in") + 1) * 10 + 3 val view_id = (Call.uaCallIndex(calls, ua, call, "in") + 1) * 10 + 3
val securityButton = layout.findViewById(view_id) as ImageButton val securityButton = layout.findViewById(view_id) as ImageButton
securityButton.setImageResource(R.drawable.box_green) securityButton.setImageResource(call.security)
securityButton.tag = "green" securityButton.tag = tag
securityButton.visibility = View.VISIBLE securityButton.visibility = View.VISIBLE
} }
} }