From cf06d2af7bd0291026eb9f07fca4fb9546522f63 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Mon, 29 Nov 2010 10:53:03 +0100 Subject: [PATCH] fix bad merges and rename some methods --- src/org/linphone/LinphoneService.java | 2 +- src/org/linphone/NetworkManager.java | 4 ++-- src/org/linphone/core/LinphoneCoreImpl.java | 15 +++++++++------ submodules/linphone | 2 +- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/org/linphone/LinphoneService.java b/src/org/linphone/LinphoneService.java index 2ba80da49..87dc646f7 100644 --- a/src/org/linphone/LinphoneService.java +++ b/src/org/linphone/LinphoneService.java @@ -393,7 +393,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 f0f4dc15d..c67c18dc9 100644 --- a/src/org/linphone/core/LinphoneCoreImpl.java +++ b/src/org/linphone/core/LinphoneCoreImpl.java @@ -385,9 +385,6 @@ class LinphoneCoreImpl implements LinphoneCore { return updateCall(nativePtr, ptrCall, ptrParams); } -<<<<<<< HEAD - - public void setUploadBandwidth(int bw) { setUploadBandwidth(nativePtr, bw); } @@ -406,14 +403,20 @@ class LinphoneCoreImpl implements LinphoneCore { VideoSize vSize = new VideoSize(); vSize.setWidth(nativeSize[0]); vSize.setHeight(nativeSize[1]); - return vSize; -======= + } public void setRing(String path) { setRing(nativePtr, path); } public String getRing() { return getRing(nativePtr); ->>>>>>> c95431295dc09c5558d38c6de49fa071c957d926 + } + public boolean isNetworkReachable() { + // TODO Auto-generated method stub + return false; + } + public void setNetworkReachable(boolean isReachable) { + // TODO Auto-generated method stub + } } diff --git a/submodules/linphone b/submodules/linphone index a9db49b15..a5d821c32 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit a9db49b15aee38098d23086fd574adb99a1afda3 +Subproject commit a5d821c32ea57fa44d8cec86ca0d9b805a3b3f4a