From 17df23f74ac47e3c7ee263a918b9bfba850ddee7 Mon Sep 17 00:00:00 2001 From: Pierre-Eric Pelloux-Prayer Date: Fri, 7 Oct 2011 08:48:12 +0200 Subject: [PATCH 1/3] Add missing LinphoneCore function impl --- LinphoneCoreImpl.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/LinphoneCoreImpl.java b/LinphoneCoreImpl.java index 92eb4a43c..4b3f9e99c 100644 --- a/LinphoneCoreImpl.java +++ b/LinphoneCoreImpl.java @@ -541,4 +541,8 @@ class LinphoneCoreImpl implements LinphoneCore { // TODO Auto-generated method stub } + public LinphoneCall findCallFromUri(String uri) { + // TODO Auto-generated method stub + return null; + } } From 70f96ce8e9e871140d938d3c8d05fcccfc130a1c Mon Sep 17 00:00:00 2001 From: Pierre-Eric Pelloux-Prayer Date: Thu, 6 Oct 2011 14:50:38 +0200 Subject: [PATCH 2/3] Enable srtp --- LinphoneCoreImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LinphoneCoreImpl.java b/LinphoneCoreImpl.java index 4b3f9e99c..902ea9f4f 100644 --- a/LinphoneCoreImpl.java +++ b/LinphoneCoreImpl.java @@ -515,7 +515,7 @@ class LinphoneCoreImpl implements LinphoneCore { public boolean isInConference() { // TODO Auto-generated method stub return false; - } + } public void leaveConference() { // TODO Auto-generated method stub From 641354c50f65f6dbb94d7888fb3ae0c65ae066fc Mon Sep 17 00:00:00 2001 From: Pierre-Eric Pelloux-Prayer Date: Mon, 10 Oct 2011 09:26:14 +0200 Subject: [PATCH 3/3] srtp: add Java impl --- LinphoneCallParamsImpl.java | 10 ++++++++++ LinphoneCoreImpl.java | 20 +++++++++++++++++++- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/LinphoneCallParamsImpl.java b/LinphoneCallParamsImpl.java index ef05eb228..c346dcd1f 100644 --- a/LinphoneCallParamsImpl.java +++ b/LinphoneCallParamsImpl.java @@ -28,6 +28,8 @@ public class LinphoneCallParamsImpl implements LinphoneCallParams { private native void enableVideo(long nativePtr, boolean b); private native boolean getVideoEnabled(long nativePtr); private native void audioBandwidth(long nativePtr, int bw); + private native void setMediaEncryption(long nativePtr, String menc); + private native String getMediaEncryption(long nativePtr); private native void destroy(long nativePtr); @@ -48,4 +50,12 @@ public class LinphoneCallParamsImpl implements LinphoneCallParams { public void setAudioBandwidth(int value) { audioBandwidth(nativePtr, value); } + + public String getMediaEncryption() { + return getMediaEncryption(nativePtr); + } + + public void setMediaEnctyption(String menc) { + setMediaEncryption(nativePtr, menc); + } } diff --git a/LinphoneCoreImpl.java b/LinphoneCoreImpl.java index 902ea9f4f..355523d59 100644 --- a/LinphoneCoreImpl.java +++ b/LinphoneCoreImpl.java @@ -104,7 +104,12 @@ class LinphoneCoreImpl implements LinphoneCore { private native void enableEchoLimiter(long nativePtr2, boolean val); private native int setVideoDevice(long nativePtr2, int id); private native int getVideoDevice(long nativePtr2); - + private native String getMediaEncryption(long nativePtr); + private native void setMediaEncryption(long nativePtr, String menc); + private native boolean isMediaEncryptionMandatory(long nativePtr); + private native void setMediaEncryptionMandatory(long nativePtr, boolean yesno); + + LinphoneCoreImpl(LinphoneCoreListener listener, File userConfig,File factoryConfig,Object userdata) throws IOException { mListener=listener; nativePtr = newLinphoneCore(listener,userConfig.getCanonicalPath(),factoryConfig.getCanonicalPath(),userdata); @@ -545,4 +550,17 @@ class LinphoneCoreImpl implements LinphoneCore { // TODO Auto-generated method stub return null; } + + public String getMediaEncryption() { + return getMediaEncryption(nativePtr); + } + public boolean isMediaEncryptionMandatory() { + return isMediaEncryptionMandatory(nativePtr); + } + public void setMediaEncryption(String menc) { + setMediaEncryption(nativePtr, menc); + } + public void setMediaEncryptionMandatory(boolean yesno) { + setMediaEncryptionMandatory(nativePtr, yesno); + } }