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

Support regex in iface

Browse Source
This commit is contained in:
Mygod
2020-09-11 15:18:19 -04:00
parent b675bdda09
commit b5ae2fb5d2
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mobile/src/main/java/be/mygod/vpnhotspot/net/monitor/InterfaceMonitor.kt
View File

@@ -10,7 +10,8 @@ import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import timber.log.Timber import timber.log.Timber
class InterfaceMonitor(val iface: String) : UpstreamMonitor() { class InterfaceMonitor(ifaceRegex: String) : UpstreamMonitor() {
private val iface = ifaceRegex.toRegex()
private val request = networkRequestBuilder().apply { private val request = networkRequestBuilder().apply {
removeCapability(NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED) removeCapability(NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED)
removeCapability(NetworkCapabilities.NET_CAPABILITY_TRUSTED) removeCapability(NetworkCapabilities.NET_CAPABILITY_TRUSTED)
@@ -24,7 +25,7 @@ class InterfaceMonitor(val iface: String) : UpstreamMonitor() {
private val networkCallback = object : ConnectivityManager.NetworkCallback() { private val networkCallback = object : ConnectivityManager.NetworkCallback() {
override fun onAvailable(network: Network) { override fun onAvailable(network: Network) {
val properties = Services.connectivity.getLinkProperties(network) val properties = Services.connectivity.getLinkProperties(network)
if (properties?.allInterfaceNames?.contains(iface) != true) return if (properties?.allInterfaceNames?.any(iface::matches) != true) return
synchronized(this@InterfaceMonitor) { synchronized(this@InterfaceMonitor) {
available[network] = properties available[network] = properties
currentNetwork = network currentNetwork = network
@@ -33,7 +34,7 @@ class InterfaceMonitor(val iface: String) : UpstreamMonitor() {
} }
override fun onLinkPropertiesChanged(network: Network, properties: LinkProperties) { override fun onLinkPropertiesChanged(network: Network, properties: LinkProperties) {
val matched = properties.allInterfaceNames.contains(iface) val matched = properties.allInterfaceNames.any(iface::matches)
synchronized(this@InterfaceMonitor) { synchronized(this@InterfaceMonitor) {
if (!matched) { if (!matched) {
if (currentNetwork == network) currentNetwork = null if (currentNetwork == network) currentNetwork = null