From 9af91c6e26e3c7c2866ec336f9e53e7591abe8b6 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Fri, 3 Feb 2017 22:48:51 +0100 Subject: [PATCH] update submodules, attempt to workaround a problem on a phone where data is said to be available but this is not the case. --- src/org/linphone/LinphoneManager.java | 12 ++++++------ submodules/bctoolbox | 2 +- submodules/belle-sip | 2 +- submodules/linphone | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java index a69abd887..2de2e24c8 100644 --- a/src/org/linphone/LinphoneManager.java +++ b/src/org/linphone/LinphoneManager.java @@ -892,24 +892,24 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag public void updateNetworkReachability() { ConnectivityManager cm = (ConnectivityManager) mServiceContext.getSystemService(Context.CONNECTIVITY_SERVICE); - NetworkInfo eventInfo = cm.getActiveNetworkInfo(); + NetworkInfo networkInfo = cm.getActiveNetworkInfo(); - if (eventInfo == null || eventInfo.getState() == NetworkInfo.State.DISCONNECTED || dozeModeEnabled) { + if (networkInfo == null || !networkInfo.isConnected() || dozeModeEnabled) { Log.i("No connectivity: setting network unreachable"); mLc.setNetworkReachable(false); - } else if (eventInfo.getState() == NetworkInfo.State.CONNECTED){ - manageTunnelServer(eventInfo); + } else if (networkInfo.isConnected()){ + manageTunnelServer(networkInfo); boolean wifiOnly = LinphonePreferences.instance().isWifiOnlyEnabled(); if (wifiOnly){ - if (eventInfo.getType()==ConnectivityManager.TYPE_WIFI) + if (networkInfo.getType()==ConnectivityManager.TYPE_WIFI) mLc.setNetworkReachable(true); else { Log.i("Wifi-only mode, setting network not reachable"); mLc.setNetworkReachable(false); } }else{ - int curtype=eventInfo.getType(); + int curtype=networkInfo.getType(); if (curtype!=mLastNetworkType){ //if kind of network has changed, we need to notify network_reachable(false) to make sure all current connections are destroyed. diff --git a/submodules/bctoolbox b/submodules/bctoolbox index b2a91b1f5..b9121e2f8 160000 --- a/submodules/bctoolbox +++ b/submodules/bctoolbox @@ -1 +1 @@ -Subproject commit b2a91b1f58ecf0941b3c599a0926a2940fd236b6 +Subproject commit b9121e2f8a6d7cad1d621e279d49adf1d3d1e8ed diff --git a/submodules/belle-sip b/submodules/belle-sip index c099ab1dd..bcb9b2389 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit c099ab1ddff6f217f462c2a2fddb1dd32432baf8 +Subproject commit bcb9b2389c2e7f55813c59306bf42f58b3a6b633 diff --git a/submodules/linphone b/submodules/linphone index 01e990259..285ee7aec 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 01e990259d88ce8893cc4284d25d7986c75e38a4 +Subproject commit 285ee7aec730144ce04083199e1c4e7ccd9f02cf