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

Improved call auto-rejection

Browse Source
This commit is contained in:
Juha Heinanen
2023-04-29 10:55:35 +03:00
parent 6858e9dc9d
commit aa393f0e43
4 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/cpp/baresip.c
+5 -2
View File
@@ -1058,13 +1058,16 @@ Java_com_tutpro_baresip_Api_ua_1hangup(JNIEnv *env, jobject thiz, jlong ua, jlon
{ {
const uint16_t native_code = code; const uint16_t native_code = code;
const char *native_reason = (*env)->GetStringUTFChars(env, reason, 0); const char *native_reason = (*env)->GetStringUTFChars(env, reason, 0);
const int thread_check = re_thread_check();
LOGD("hanging up call %ld/%ld\n", (long)ua, (long)call); LOGD("hanging up call %ld/%ld\n", (long)ua, (long)call);
// re_thread_enter(); if (thread_check != 0)
re_thread_enter();
if (strlen(native_reason) == 0) if (strlen(native_reason) == 0)
ua_hangup((struct ua *)ua, (struct call *)call, native_code, NULL); ua_hangup((struct ua *)ua, (struct call *)call, native_code, NULL);
else else
ua_hangup((struct ua *)ua, (struct call *)call, native_code, native_reason); ua_hangup((struct ua *)ua, (struct call *)call, native_code, native_reason);
// re_thread_leave(); if (thread_check != 0)
re_thread_leave();
(*env)->ReleaseStringUTFChars(env, reason, native_reason); (*env)->ReleaseStringUTFChars(env, reason, native_reason);
} }
app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
+3
View File
@@ -688,6 +688,9 @@ class BaresipService: Service() {
else if (!requestAudioFocus(applicationContext)) else if (!requestAudioFocus(applicationContext))
// request fails if there is an active telephony call // request fails if there is an active telephony call
getString(R.string.audio_focus_denied) getString(R.string.audio_focus_denied)
else if (Call.inCall())
String.format(getString(R.string.call_auto_rejected),
Utils.friendlyUri(this, peerUri, ua.account))
else else
"" ""
if (toastMsg != "") { if (toastMsg != "") {
app/src/main/res/values-fi/strings.xml
+1
View File
@@ -247,6 +247,7 @@
<string name="missed_calls_count">%1$d vastaamatonta puhelua</string> <string name="missed_calls_count">%1$d vastaamatonta puhelua</string>
<string name="transfer_request_to">Puhelun siirtopyyntö kohteeseen</string> <string name="transfer_request_to">Puhelun siirtopyyntö kohteeseen</string>
<string name="message_from">Viesti lähettäjältä</string> <string name="message_from">Viesti lähettäjältä</string>
<string name="call_auto_rejected">Automaattisesti hylätty puhelu soittajalta \`%1$s\`</string>
<!-- Boot Completed Receiver --> <!-- Boot Completed Receiver -->
<string name="tap_to_start">Kosketa käynnistääksesi sovelluksen</string> <string name="tap_to_start">Kosketa käynnistääksesi sovelluksen</string>
<!-- Calls Activity --> <!-- Calls Activity -->
app/src/main/res/values/strings.xml
+1
View File
@@ -238,6 +238,7 @@
<string name="missed_calls_count">%1$d missed calls</string> <string name="missed_calls_count">%1$d missed calls</string>
<string name="transfer_request_to">Call transfer request to</string> <string name="transfer_request_to">Call transfer request to</string>
<string name="message_from">Message from</string> <string name="message_from">Message from</string>
<string name="call_auto_rejected">Auto-rejected call from \`%1$s\`</string>
<!-- Boot Completed Receiver --> <!-- Boot Completed Receiver -->
<string name="tap_to_start">Tap to start application</string> <string name="tap_to_start">Tap to start application</string>
<!-- Calls Activity --> <!-- Calls Activity -->