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

Improved detecting networks at baresip start

Browse Source
This commit is contained in:
Juha Heinanen
2021-11-09 09:32:09 +02:00
parent 244aebfaa9
commit b79d10770c
1 changed files with 17 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
+17 -23
View File
@@ -104,13 +104,6 @@ class BaresipService: Service() {
} }
cm = getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager cm = getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
if (VERSION.SDK_INT < 31)
@Suppress("DEPRECATION")
allNetworks = cm.allNetworks.toMutableSet()
else
if (cm.activeNetwork != null)
allNetworks.add(cm.activeNetwork!!)
val builder = NetworkRequest.Builder() val builder = NetworkRequest.Builder()
.removeCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VPN) .removeCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VPN)
cm.registerNetworkCallback( cm.registerNetworkCallback(
@@ -120,12 +113,11 @@ class BaresipService: Service() {
override fun onAvailable(network: Network) { override fun onAvailable(network: Network) {
super.onAvailable(network) super.onAvailable(network)
Log.d(TAG, "Network $network is available") Log.d(TAG, "Network $network is available")
if (network !in allNetworks)
allNetworks.add(network)
// If API >= 26, this will be followed by onCapabilitiesChanged // If API >= 26, this will be followed by onCapabilitiesChanged
if (isServiceRunning && VERSION.SDK_INT < 26) { if (isServiceRunning && VERSION.SDK_INT < 26)
if (network !in allNetworks)
allNetworks.add(network)
updateNetwork() updateNetwork()
}
} }
override fun onLosing(network: Network, maxMsToLive: Int) { override fun onLosing(network: Network, maxMsToLive: Int) {
@@ -136,31 +128,28 @@ class BaresipService: Service() {
override fun onLost(network: Network) { override fun onLost(network: Network) {
super.onLost(network) super.onLost(network)
Log.d(TAG, "Network $network is lost") Log.d(TAG, "Network $network is lost")
if (isServiceRunning) { if (network in allNetworks)
if (network in allNetworks) allNetworks.remove(network)
allNetworks.remove(network) if (isServiceRunning)
updateNetwork() updateNetwork()
}
} }
override fun onCapabilitiesChanged(network: Network, caps: NetworkCapabilities) { override fun onCapabilitiesChanged(network: Network, caps: NetworkCapabilities) {
super.onCapabilitiesChanged(network, caps) super.onCapabilitiesChanged(network, caps)
Log.d(TAG, "Network $network capabilities changed: $caps") Log.d(TAG, "Network $network capabilities changed: $caps")
if (isServiceRunning) { if (network !in allNetworks)
if (network !in allNetworks) allNetworks.add(network)
allNetworks.add(network) if (isServiceRunning)
updateNetwork() updateNetwork()
}
} }
override fun onLinkPropertiesChanged(network: Network, props: LinkProperties) { override fun onLinkPropertiesChanged(network: Network, props: LinkProperties) {
super.onLinkPropertiesChanged(network, props) super.onLinkPropertiesChanged(network, props)
Log.d(TAG, "Network $network link properties changed: $props") Log.d(TAG, "Network $network link properties changed: $props")
if (isServiceRunning) { if (network !in allNetworks)
if (network !in allNetworks) allNetworks.add(network)
allNetworks.add(network) if (isServiceRunning)
updateNetwork() updateNetwork()
}
} }
} }
@@ -325,6 +314,11 @@ class BaresipService: Service() {
"Start" -> { "Start" -> {
if (VERSION.SDK_INT < 31) {
@Suppress("DEPRECATION")
allNetworks = cm.allNetworks.toMutableSet()
}
updateDnsServers() updateDnsServers()
val assets = arrayOf("accounts", "config", "contacts") val assets = arrayOf("accounts", "config", "contacts")