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

Add failfast for VpnMonitor.registerCallback

Browse Source
This commit is contained in:
Mygod
2018-02-11 02:56:18 -08:00
parent 2bdf90a922
commit 2b03bff1a3
2 changed files with 52 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,9 +41,21 @@ object VpnMonitor : ConnectivityManager.NetworkCallback() {
callbacks.forEach { it.onLost(ifname) }
}
fun registerCallback(callback: Callback) {
fun registerCallback(callback: Callback, failfast: (() -> Unit)? = null) {
if (!callbacks.add(callback)) return
if (registered) available.forEach { callback.onAvailable(it.value) } else {
if (registered) {
if (failfast != null && available.isEmpty()) {
callbacks.remove(callback)
failfast()
} else available.forEach { callback.onAvailable(it.value) }
} else if (failfast != null && manager.allNetworks.all {
val cap = manager.getNetworkCapabilities(it)
!cap.hasTransport(NetworkCapabilities.TRANSPORT_VPN) ||
cap.hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VPN)
}) {
callbacks.remove(callback)
failfast()
} else {
manager.registerNetworkCallback(request, this)
registered = true
}