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

3
app/src/main/cpp/baresip.c
View File

@ -1259,9 +1259,6 @@ JNIEXPORT jint JNICALL
Java_com_tutpro_baresip_Api_cmd_1exec(JNIEnv *env, jobject thiz, jstring javaCmd) {
const char *native_cmd = (*env)->GetStringUTFChars(env, javaCmd, 0);
LOGD("processing command '%s'\n", native_cmd);
if (strcmp(native_cmd, "audio_debug") == 0) {
re_printf("Baresip audio debug '%H\n", audio_debug, call_audio(ua_call(uag_current())));
}
int res = cmd_process_long(baresip_commands(), native_cmd, strlen(native_cmd), &pf_null, NULL);
(*env)->ReleaseStringUTFChars(env, javaCmd, native_cmd);
return res;

1
app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
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

4
app/src/main/kotlin/com/tutpro/baresip/Call.kt
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> {

17
app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
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