jp/baresip-studio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added isNetworkActive utility function

Browse Source
This commit is contained in:
Juha Heinanen
2020-11-15 18:28:01 +02:00
parent f809e8ac29
commit 7226e5cfe0
1 changed files with 62 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
+11 -16
View File
@@ -1029,23 +1029,11 @@ class BaresipService: Service() {
} }
private fun updateNetwork() { private fun updateNetwork() {
if (Build.VERSION.SDK_INT >= 23) {
for (n in cm.allNetworks) {
val caps = cm.getNetworkCapabilities(n) ?: continue
val props = cm.getLinkProperties(n) ?: continue
Log.i(LOG_TAG, "Network $n ${n == cm.activeNetwork}" +
" is available with caps: $caps, props: $props")
}
// Use VPN network if available // Use VPN network if available
for (n in cm.allNetworks) { for (n in cm.allNetworks) {
val caps = cm.getNetworkCapabilities(n) ?: continue val caps = cm.getNetworkCapabilities(n) ?: continue
val props = cm.getLinkProperties(n) ?: continue val props = cm.getLinkProperties(n) ?: continue
if (n == cm.activeNetwork) if (isNetworkActive(n) && caps.hasTransport(NetworkCapabilities.TRANSPORT_VPN)) {
Log.i("Baresip", "Network $n is active")
else
Log.i("Baresip", "Network $n is NOT active")
if (caps.hasTransport(NetworkCapabilities.TRANSPORT_VPN) &&
(n == cm.activeNetwork)) {
Log.i(LOG_TAG, "Active VPN network $n is available with caps: " + Log.i(LOG_TAG, "Active VPN network $n is available with caps: " +
"$caps, props: $props") "$caps, props: $props")
activeNetwork = "$n" activeNetwork = "$n"
@@ -1068,8 +1056,7 @@ class BaresipService: Service() {
for (n in cm.allNetworks) { for (n in cm.allNetworks) {
val caps = cm.getNetworkCapabilities(n) ?: continue val caps = cm.getNetworkCapabilities(n) ?: continue
val props = cm.getLinkProperties(n) ?: continue val props = cm.getLinkProperties(n) ?: continue
if ((n == cm.activeNetwork) && if (isNetworkActive(n) && caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)) {
caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)) {
Log.i(LOG_TAG, "Active Internet network $n is available with caps: " + Log.i(LOG_TAG, "Active Internet network $n is available with caps: " +
"$caps, props: $props") "$caps, props: $props")
activeNetwork = "$n" activeNetwork = "$n"
@@ -1086,7 +1073,7 @@ class BaresipService: Service() {
for (n in cm.allNetworks) { for (n in cm.allNetworks) {
val caps = cm.getNetworkCapabilities(n) ?: continue val caps = cm.getNetworkCapabilities(n) ?: continue
val props = cm.getLinkProperties(n) ?: continue val props = cm.getLinkProperties(n) ?: continue
if (n == cm.activeNetwork) { if (isNetworkActive(n)) {
Log.i(LOG_TAG, "Active network $n is available with caps: " + Log.i(LOG_TAG, "Active network $n is available with caps: " +
"$caps, props: $props") "$caps, props: $props")
activeNetwork = "$n" activeNetwork = "$n"
@@ -1100,6 +1087,14 @@ class BaresipService: Service() {
} }
} }
} }
private fun isNetworkActive(network: Network): Boolean {
if (Build.VERSION.SDK_INT >= 23)
return network == cm.activeNetwork
if (Build.VERSION.SDK_INT < 23)
if ((cm.activeNetworkInfo != null) && (cm.getNetworkInfo(network) != null))
return cm.activeNetworkInfo!!.toString() == cm.getNetworkInfo(network)!!.toString()
return false
} }
private fun cleanService() { private fun cleanService() {