Merge branch 'bool_mwi' with new account API function

This commit is contained in:
Juha Heinanen
2022-12-14 12:09:05 +02:00
3 changed files with 6 additions and 11 deletions

View File

@ -908,13 +908,9 @@ Java_com_tutpro_baresip_Api_account_1set_1stun_1pass(JNIEnv *env, jobject thiz,
}
JNIEXPORT jint JNICALL
Java_com_tutpro_baresip_Api_account_1set_1mwi(JNIEnv *env, jobject thiz, jlong acc, jstring jValue)
Java_com_tutpro_baresip_Api_account_1set_1mwi(JNIEnv *env, jobject thiz, jlong acc, jboolean value)
{
const char *value = (*env)->GetStringUTFChars(env, jValue, 0);
LOGD("setting account mwi '%s'\n", value);
int res = account_set_mwi((struct account *)acc, value);
(*env)->ReleaseStringUTFChars(env, jValue, value);
return res;
return account_set_mwi((struct account *)acc, value);
}
JNIEXPORT jstring JNICALL
@ -955,8 +951,7 @@ Java_com_tutpro_baresip_Api_account_1rtcp_1mux(JNIEnv *env, jobject thiz, jlong
}
JNIEXPORT jint JNICALL
Java_com_tutpro_baresip_Api_account_1set_1rtcp_1mux(JNIEnv *env, jobject thiz, jlong acc,
jboolean value)
Java_com_tutpro_baresip_Api_account_1set_1rtcp_1mux(JNIEnv *env, jobject thiz, jlong acc, jboolean value)
{
return account_set_rtcp_mux((struct account *)acc, value);
}

View File

@ -622,9 +622,9 @@ class AccountActivity : AppCompatActivity() {
String.format(getString(R.string.invalid_sip_or_tel_uri), tVmUri))
return false
}
Api.account_set_mwi(acc.accp, "yes")
Api.account_set_mwi(acc.accp, true)
} else {
Api.account_set_mwi(acc.accp, "no")
Api.account_set_mwi(acc.accp, false)
}
acc.vmUri = tVmUri
save = true

View File

@ -42,7 +42,7 @@ object Api {
external fun account_set_medianat(acc: Long, medianat: String): Int
external fun account_set_audio_codecs(acc: Long, codecs: String): Int
external fun account_set_video_codecs(acc: Long, codecs: String): Int
external fun account_set_mwi(acc: Long, value: String): Int
external fun account_set_mwi(acc: Long, value: Boolean): Int
external fun account_vm_uri(acc: Long): String
external fun account_answermode(acc: Long): Int
external fun account_set_answermode(acc: Long, mode: Int): Int