diff --git a/libs/armeabi-v7a/liblinphone.so b/libs/armeabi-v7a/liblinphone.so index 5ceae487f..86e77e8bc 100755 Binary files a/libs/armeabi-v7a/liblinphone.so and b/libs/armeabi-v7a/liblinphone.so differ diff --git a/libs/armeabi/liblinphone.so b/libs/armeabi/liblinphone.so index 34bdb431d..45642237f 100755 Binary files a/libs/armeabi/liblinphone.so and b/libs/armeabi/liblinphone.so differ diff --git a/src/org/linphone/LinphoneService.java b/src/org/linphone/LinphoneService.java index e59cd8818..488004313 100644 --- a/src/org/linphone/LinphoneService.java +++ b/src/org/linphone/LinphoneService.java @@ -385,7 +385,7 @@ public class LinphoneService extends Service implements LinphoneCoreListener { //init network state ConnectivityManager lConnectivityManager = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE); NetworkInfo lInfo = lConnectivityManager.getActiveNetworkInfo(); - mLinphoneCore.setNetworkStateReachable( lInfo !=null? lConnectivityManager.getActiveNetworkInfo().getState() ==NetworkInfo.State.CONNECTED:false); + mLinphoneCore.setNetworkReachable( lInfo !=null? lConnectivityManager.getActiveNetworkInfo().getState() ==NetworkInfo.State.CONNECTED:false); } catch (LinphoneCoreException e) { throw new LinphoneConfigException(getString(R.string.wrong_settings),e); diff --git a/src/org/linphone/NetworkManager.java b/src/org/linphone/NetworkManager.java index faefe57cf..b5b598c75 100644 --- a/src/org/linphone/NetworkManager.java +++ b/src/org/linphone/NetworkManager.java @@ -40,9 +40,9 @@ public class NetworkManager extends BroadcastReceiver { return; } if (lNoConnectivity| ((lNetworkInfo.getState() == NetworkInfo.State.DISCONNECTED) /*&& !lIsFailOver*/)) { - LinphoneService.instance().getLinphoneCore().setNetworkStateReachable(false); + LinphoneService.instance().getLinphoneCore().setNetworkReachable(false); } else if (lNetworkInfo.getState() == NetworkInfo.State.CONNECTED){ - LinphoneService.instance().getLinphoneCore().setNetworkStateReachable(true); + LinphoneService.instance().getLinphoneCore().setNetworkReachable(true); } else { //unhandled event } diff --git a/src/org/linphone/core/LinphoneCoreImpl.java b/src/org/linphone/core/LinphoneCoreImpl.java index 01b98bda4..5aa6a1ce0 100644 --- a/src/org/linphone/core/LinphoneCoreImpl.java +++ b/src/org/linphone/core/LinphoneCoreImpl.java @@ -179,7 +179,7 @@ class LinphoneCoreImpl implements LinphoneCore { throw new RuntimeException("object already destroyed"); } } - public void setNetworkStateReachable(boolean isReachable) { + public void setNetworkReachable(boolean isReachable) { setNetworkStateReachable(nativePtr,isReachable); } public void setPlaybackGain(float gain) { @@ -344,6 +344,21 @@ class LinphoneCoreImpl implements LinphoneCore { public LinphoneCallParams createDefaultCallParameters() { throw new RuntimeException("Not Implemenetd yet"); } + public boolean isNetworkReachable() { + throw new RuntimeException("Not Implemenetd yet"); + } + public void setUploadBandwidth(int bw) { + throw new RuntimeException("Not Implemenetd yet"); + } + public void setDownloadBandwidth(int bw) { + throw new RuntimeException("Not Implemenetd yet"); + } + public void setPreferredVideoSize(VideoSize vSize) { + throw new RuntimeException("Not Implemenetd yet"); + } + public VideoSize getPreferredVideoSize() { + throw new RuntimeException("Not Implemenetd yet"); + } } diff --git a/src/org/linphone/core/LinphoneProxyConfigImpl.java b/src/org/linphone/core/LinphoneProxyConfigImpl.java index f1dcb70a4..1b718d5a7 100644 --- a/src/org/linphone/core/LinphoneProxyConfigImpl.java +++ b/src/org/linphone/core/LinphoneProxyConfigImpl.java @@ -67,6 +67,9 @@ class LinphoneProxyConfigImpl implements LinphoneProxyConfig { private native String getRoute(long ptr); private native int setRoute(long ptr,String uri); + private native void enablePublish(long ptr,boolean enable); + private native boolean publishEnabled(long ptr); + public void enableRegister(boolean value) { enableRegister(nativePtr,value); @@ -121,4 +124,11 @@ class LinphoneProxyConfigImpl implements LinphoneProxyConfig { throw new LinphoneCoreException("cannot set route ["+routeUri+"]"); } } + public void enablePublish(boolean enable) { + enablePublish(nativePtr,enable); + + } + public boolean publishEnabled() { + return publishEnabled(nativePtr); + } } diff --git a/submodules/linphone b/submodules/linphone index e559cf6de..b75917753 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit e559cf6defcc5e517f8116b314b399e8cec9a26d +Subproject commit b75917753c938bf3df327dc6acee2618e8d57076