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

- call secure event is now generated also when media encoding is srtp*

Browse Source 
allowing security button color change to yellow
- removed some debug code
This commit is contained in:
Juha Heinanen
2019-02-19 08:02:49 +02:00
parent c74124702a
commit ad2dec94e7
4 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
-1
View File
@@ -339,7 +339,6 @@ class BaresipService: Service() {
Log.d("Baresip", "AoR $aor call $callp established")
call.status = "connected"
call.onhold = false
call.security = R.drawable.box_red
CallHistory.add(CallHistory(aor, call.peerURI, call.dir, true))
CallHistory.save(filesPath)
call.hasHistory = true
app/src/main/kotlin/com/tutpro/baresip/Call.kt
+4
View File
@@ -11,6 +11,10 @@ class Call(val callp: String, val ua: UserAgent, val peerURI: String, val dir: S
var zid = ""
var hasHistory = false
init {
if (ua.account.mediaEnc != "") security = R.drawable.box_red
}
companion object {
fun calls(): ArrayList<Call> {
app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
+5 -12
View File
@@ -512,13 +512,8 @@ class MainActivity : AppCompatActivity() {
if (acc.mediaEnc == "") {
securityButton.visibility = View.INVISIBLE
} else {
if ((acc.mediaEnc == "srtp-mand") || (acc.mediaEnc == "srtp-mandf")) {
securityButton.setImageResource(R.drawable.box_yellow)
securityButton.tag = "yellow"
} else {
securityButton.setImageResource(R.drawable.box_red)
securityButton.tag = "red"
}
securityButton.setImageResource(call.security)
setSecurityButtonTag(securityButton, call.security)
securityButton.visibility = View.VISIBLE
}
callButton.visibility = View.INVISIBLE
@@ -595,7 +590,6 @@ class MainActivity : AppCompatActivity() {
if (ua == UserAgent.uas()[aorSpinner.selectedItemPosition]) {
securityButton.setImageResource(call.security)
securityButton.tag = tag
securityButton.visibility = View.VISIBLE
}
}
"call transfer" -> {
@@ -875,7 +869,6 @@ class MainActivity : AppCompatActivity() {
return true
}
R.id.about -> {
Api.cmd_exec("audio_debug")
i = Intent(this, AboutActivity::class.java)
startActivityForResult(i, ABOUT_CODE)
return true
@@ -1122,10 +1115,10 @@ class MainActivity : AppCompatActivity() {
"connected" -> {
securityButton.setImageResource(call.security)
setSecurityButtonTag(securityButton, call.security)
if ((ua.account.mediaEnc == "zrtp") || (ua.account.mediaEnc == "dtls_srtpf"))
securityButton.visibility = View.VISIBLE
else
if (ua.account.mediaEnc == "")
securityButton.visibility = View.INVISIBLE
else
securityButton.visibility = View.VISIBLE
callButton.visibility = View.INVISIBLE
hangupButton.visibility = View.VISIBLE
hangupButton.isEnabled = true