add setHttpProxy wrapper

diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc
index 4393e3a3b6b8ae116e42689292838ba82f75b20d..5d0b61b704afefca100609b59bcf0fdb6969cad2 100644 (file)
--- a/coreapi/linphonecore_jni.cc
+++ b/coreapi/linphonecore_jni.cc
@@ -1685,33 +1685,42 @@ extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setMaxCalls(JNIEnv *env,
 
 extern "C" void Java_org_linphone_core_LinphoneCoreImpl_tunnelAddServerAndMirror(JNIEnv *env,jobject thiz,jlong pCore,
                jstring jHost, jint port, jint mirror, jint delay) {
-#ifdef TUNNEL_ENABLED
-       LinphoneTunnel *tunnel=((LinphoneCore *) pCore)->tunnel; if (!tunnel) return;
+       LinphoneTunnel *tunnel=((LinphoneCore *) pCore)->tunnel;
+       if (!tunnel) return;
        const char* cHost=env->GetStringUTFChars(jHost, NULL);
        linphone_tunnel_add_server_and_mirror(tunnel, cHost, port, mirror, delay);
        env->ReleaseStringUTFChars(jHost, cHost);
-#endif
 }
 
+extern "C" void Java_org_linphone_core_LinphoneCoreImpl_tunnelSetHttpProxy(JNIEnv *env,jobject thiz,jlong pCore,
+               jstring jHost, jint port, jstring username, jstring password) {
+
+       LinphoneTunnel *tunnel=((LinphoneCore *) pCore)->tunnel;
+       if (!tunnel) return;
+       const char* cHost=(jHost!=NULL) ? env->GetStringUTFChars(jHost, NULL) : NULL;
+       const char* cUsername= (username!=NULL) ? env->GetStringUTFChars(username, NULL) : NULL;
+       const char* cPassword= (password!=NULL) ? env->GetStringUTFChars(password, NULL) : NULL;
+       linphone_tunnel_set_http_proxy(tunnel,cHost, port,cUsername,cPassword);
+       if (cHost) env->ReleaseStringUTFChars(jHost, cHost);
+       if (cUsername) env->ReleaseStringUTFChars(username, cUsername);
+       if (cPassword) env->ReleaseStringUTFChars(password, cPassword);
+}
+
+
 extern "C" void Java_org_linphone_core_LinphoneCoreImpl_tunnelAutoDetect(JNIEnv *env,jobject thiz,jlong pCore) {
-#ifdef TUNNEL_ENABLED
        LinphoneTunnel *tunnel=((LinphoneCore *) pCore)->tunnel; if (!tunnel) return;
        linphone_tunnel_auto_detect(tunnel);
-#endif
+
 }
 
 extern "C" void Java_org_linphone_core_LinphoneCoreImpl_tunnelCleanServers(JNIEnv *env,jobject thiz,jlong pCore) {
-#ifdef TUNNEL_ENABLED
        LinphoneTunnel *tunnel=((LinphoneCore *) pCore)->tunnel; if (!tunnel) return;
        linphone_tunnel_clean_servers(tunnel);
-#endif
 }
 
 extern "C" void Java_org_linphone_core_LinphoneCoreImpl_tunnelEnable(JNIEnv *env,jobject thiz,jlong pCore, jboolean enable) {
-#ifdef TUNNEL_ENABLED
        LinphoneTunnel *tunnel=((LinphoneCore *) pCore)->tunnel; if (!tunnel) return;
        linphone_tunnel_enable(tunnel, enable);
-#endif
 }
 
 

diff --git a/java/common/org/linphone/core/LinphoneCallLog.java b/java/common/org/linphone/core/LinphoneCallLog.java
index 98bf40c50e640ef71ed8813468c5645caaee9df0..40299e6d95bdc3c129aeadb85702469ca4348371 100644 (file)
--- a/java/common/org/linphone/core/LinphoneCallLog.java
+++ b/java/common/org/linphone/core/LinphoneCallLog.java
@@ -95,8 +95,6 @@ public interface LinphoneCallLog {
         */
        public CallStatus getStatus();
        
-       public long getNativePtr();
-       
        /**
         * @return a human readble String with the start date/time of the call
         */

diff --git a/java/common/org/linphone/core/LinphoneCore.java b/java/common/org/linphone/core/LinphoneCore.java
index 86559f43fa72f62430a5a7f4182b2f8c29a76d3c..f4bcc7ef8e6b91e2976f554c3cd4bc490333fd2b 100644 (file)
--- a/java/common/org/linphone/core/LinphoneCore.java
+++ b/java/common/org/linphone/core/LinphoneCore.java
@@ -743,6 +743,7 @@ public interface LinphoneCore {
        void tunnelEnable(boolean enable);
        void tunnelAutoDetect();
        void tunnelCleanServers();
+       void tunnelSetHttpProxy(String proxy_host, int port, String username, String password);
        /**
         * @param host tunnel server ip address
         * @param port tunnel server tls port, recommended value is 443