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
+62 -67
View File
@@ -1029,77 +1029,72 @@ class BaresipService: Service() {
} }
private fun updateNetwork() { private fun updateNetwork() {
if (Build.VERSION.SDK_INT >= 23) { // 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
Log.i(LOG_TAG, "Network $n ${n == cm.activeNetwork}" + if (isNetworkActive(n) && caps.hasTransport(NetworkCapabilities.TRANSPORT_VPN)) {
" is available with caps: $caps, props: $props") Log.i(LOG_TAG, "Active VPN network $n is available with caps: " +
} "$caps, props: $props")
// Use VPN network if available activeNetwork = "$n"
for (n in cm.allNetworks) { if (!isConfigInitialized)
val caps = cm.getNetworkCapabilities(n) ?: continue Log.i("Baresip", "Config is NOT initialized")
val props = cm.getLinkProperties(n) ?: continue
if (n == cm.activeNetwork)
Log.i("Baresip", "Network $n is active")
else else
Log.i("Baresip", "Network $n is NOT active") Log.i("Baresip", "Config is initialized")
if (caps.hasTransport(NetworkCapabilities.TRANSPORT_VPN) && if (isConfigInitialized) {
(n == cm.activeNetwork)) { Utils.updateLinkProperties(props)
Log.i(LOG_TAG, "Active VPN network $n is available with caps: " + } else {
"$caps, props: $props") for (s in props.dnsServers)
activeNetwork = "$n" Log.i(LOG_TAG, "DNS Server ${s.hostAddress}")
if (!isConfigInitialized) dnsServers = props.dnsServers
Log.i("Baresip", "Config is NOT initialized") linkAddresses = props.linkAddresses
else
Log.i("Baresip", "Config is initialized")
if (isConfigInitialized) {
Utils.updateLinkProperties(props)
} else {
for (s in props.dnsServers)
Log.i(LOG_TAG, "DNS Server ${s.hostAddress}")
dnsServers = props.dnsServers
linkAddresses = props.linkAddresses
}
return
}
}
// Otherwise, use active network with Internet access
for (n in cm.allNetworks) {
val caps = cm.getNetworkCapabilities(n) ?: continue
val props = cm.getLinkProperties(n) ?: continue
if ((n == cm.activeNetwork) &&
caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)) {
Log.i(LOG_TAG, "Active Internet network $n is available with caps: " +
"$caps, props: $props")
activeNetwork = "$n"
if (isServiceRunning) {
Utils.updateLinkProperties(props)
} else {
dnsServers = props.dnsServers
linkAddresses = props.linkAddresses
}
return
}
}
// Otherwise, use an active network
for (n in cm.allNetworks) {
val caps = cm.getNetworkCapabilities(n) ?: continue
val props = cm.getLinkProperties(n) ?: continue
if (n == cm.activeNetwork) {
Log.i(LOG_TAG, "Active network $n is available with caps: " +
"$caps, props: $props")
activeNetwork = "$n"
if (isServiceRunning) {
Utils.updateLinkProperties(props)
} else {
dnsServers = props.dnsServers
linkAddresses = props.linkAddresses
}
return
} }
return
} }
} }
// Otherwise, use active network with Internet access
for (n in cm.allNetworks) {
val caps = cm.getNetworkCapabilities(n) ?: continue
val props = cm.getLinkProperties(n) ?: continue
if (isNetworkActive(n) && caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)) {
Log.i(LOG_TAG, "Active Internet network $n is available with caps: " +
"$caps, props: $props")
activeNetwork = "$n"
if (isServiceRunning) {
Utils.updateLinkProperties(props)
} else {
dnsServers = props.dnsServers
linkAddresses = props.linkAddresses
}
return
}
}
// Otherwise, use an active network
for (n in cm.allNetworks) {
val caps = cm.getNetworkCapabilities(n) ?: continue
val props = cm.getLinkProperties(n) ?: continue
if (isNetworkActive(n)) {
Log.i(LOG_TAG, "Active network $n is available with caps: " +
"$caps, props: $props")
activeNetwork = "$n"
if (isServiceRunning) {
Utils.updateLinkProperties(props)
} else {
dnsServers = props.dnsServers
linkAddresses = props.linkAddresses
}
return
}
}
}
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() {