diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c index 328671adf..fc9fef5f1 100644 --- a/coreapi/linphonecore.c +++ b/coreapi/linphonecore.c @@ -672,6 +672,7 @@ static void sip_config_read(LinphoneCore *lc) lc->sip_conf.register_only_when_network_is_up= lp_config_get_int(lc->config,"sip","register_only_when_network_is_up",1); lc->sip_conf.ping_with_options=lp_config_get_int(lc->config,"sip","ping_with_options",1); + lc->sip_conf.auto_net_state_mon=lp_config_get_int(lc->config,"sip","auto_net_state_mon",1); } static void rtp_config_read(LinphoneCore *lc) @@ -1059,7 +1060,7 @@ static void linphone_core_init (LinphoneCore * lc, const LinphoneCoreVTable *vta ui_config_read(lc); lc->vtable.display_status(lc,_("Ready")); gstate_new_state(lc, GSTATE_POWER_ON, NULL); - lc->auto_net_state_mon=TRUE; + lc->auto_net_state_mon=lc->sip_conf.auto_net_state_mon; lc->ready=TRUE; } diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc index 41b514546..556c0e54d 100644 --- a/coreapi/linphonecore_jni.cc +++ b/coreapi/linphonecore_jni.cc @@ -150,6 +150,9 @@ extern "C" jlong Java_org_linphone_core_LinphoneCoreImpl_newLinphoneCore(JNIEnv* const char* userConfig = env->GetStringUTFChars(juserConfig, NULL); const char* factoryConfig = env->GetStringUTFChars(jfactoryConfig, NULL); LinphoneCoreData* ldata = new LinphoneCoreData(env,thiz,jlistener,juserdata); +#ifdef ANDROID + ms_andsnd_register_card(jvm); +#endif /*ANDROID*/ jlong nativePtr = (jlong)linphone_core_new( &ldata->vTable ,userConfig ,factoryConfig @@ -307,6 +310,18 @@ extern "C" jlong Java_org_linphone_core_LinphoneCoreImpl_interpretUrl( JNIEnv* env->ReleaseStringUTFChars(jurl, url); return result; } +extern "C" void Java_org_linphone_core_LinphoneCoreImpl_sendDtmf( JNIEnv* env + ,jobject thiz + ,jlong lc + ,jchar dtmf) { + linphone_core_send_dtmf((LinphoneCore*)lc,dtmf); +} +extern "C" void Java_org_linphone_core_LinphoneCoreImpl_clearCallLogs(JNIEnv* env + ,jobject thiz + ,jlong lc) { + linphone_core_clear_call_logs((LinphoneCore*)lc); +} + //ProxyConfig @@ -458,7 +473,7 @@ extern "C" jstring Java_org_linphone_core_LinphoneAddressImpl_getDomain(JNIEnv* } } -extern "C" jstring Java_org_linphone_core_LinphoneAddressImpl_toUri(JNIEnv* env +extern "C" jstring Java_org_linphone_core_LinphoneAddressImpl_toString(JNIEnv* env ,jobject thiz ,jlong ptr) { char* uri = linphone_address_as_string((LinphoneAddress*)ptr); @@ -466,6 +481,14 @@ extern "C" jstring Java_org_linphone_core_LinphoneAddressImpl_toUri(JNIEnv* env ms_free(uri); return juri; } +extern "C" jstring Java_org_linphone_core_LinphoneAddressImpl_toUri(JNIEnv* env + ,jobject thiz + ,jlong ptr) { + char* uri = linphone_address_as_string_uri_only((LinphoneAddress*)ptr); + jstring juri =env->NewStringUTF(uri); + ms_free(uri); + return juri; +} extern "C" void Java_org_linphone_core_LinphoneAddressImpl_setDisplayName(JNIEnv* env ,jobject thiz ,jlong address diff --git a/coreapi/private.h b/coreapi/private.h index 133fd1dcc..50de9c9c6 100644 --- a/coreapi/private.h +++ b/coreapi/private.h @@ -258,6 +258,7 @@ typedef struct sip_config bool_t only_one_codec; /*in SDP answers*/ bool_t register_only_when_network_is_up; bool_t ping_with_options; + bool_t auto_net_state_mon; } sip_config_t; typedef struct rtp_config