brianhansonxyz/vpnhotspotmod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix IllegalStateException in VpnMonitor

Browse Source
This commit is contained in:
Mygod
2018-03-14 22:04:29 -07:00
parent d0d78520da
commit 049a781031
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mobile/src/main/java/be/mygod/vpnhotspot/net/VpnMonitor.kt
View File

@@ -51,13 +51,19 @@ object VpnMonitor : ConnectivityManager.NetworkCallback() {
val ifname = available.remove(network) ?: return val ifname = available.remove(network) ?: return
debugLog(TAG, "onLost: $ifname") debugLog(TAG, "onLost: $ifname")
if (currentNetwork != network) return if (currentNetwork != network) return
val next = available.entries.firstOrNull()
currentNetwork = next?.key
callbacks.forEach { it.onLost(ifname) } callbacks.forEach { it.onLost(ifname) }
if (next == null) return while (available.isNotEmpty()) {
debugLog(TAG, "Switching to ${next.value} as VPN interface") val next = available.entries.first()
currentNetwork = next.key
val properties = manager.getLinkProperties(next.key) val properties = manager.getLinkProperties(next.key)
if (properties != null) {
debugLog(TAG, "Switching to ${next.value} as VPN interface")
callbacks.forEach { it.onAvailable(next.value, properties.dnsServers) } callbacks.forEach { it.onAvailable(next.value, properties.dnsServers) }
return
}
available.remove(next.key)
}
currentNetwork = null
} }
fun registerCallback(callback: Callback, failfast: (() -> Unit)? = null) { fun registerCallback(callback: Callback, failfast: (() -> Unit)? = null) {