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

Allow null interfaceName in onLinkPropertiesChanged

Browse Source
This commit is contained in:
Mygod
2018-10-10 20:15:57 +08:00
parent e564b262fd
commit 47366b982e
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mobile/src/main/java/be/mygod/vpnhotspot/net/monitor/DefaultNetworkMonitor.kt
View File

@@ -41,7 +41,11 @@ object DefaultNetworkMonitor : UpstreamMonitor() {
if (currentNetwork != network) return if (currentNetwork != network) return
val oldProperties = currentLinkProperties!! val oldProperties = currentLinkProperties!!
currentLinkProperties = properties currentLinkProperties = properties
val ifname = properties.interfaceName!! val ifname = properties.interfaceName
if (ifname == null) {
onLost(network)
return
}
check(ifname == oldProperties.interfaceName) check(ifname == oldProperties.interfaceName)
if (properties.dnsServers != oldProperties.dnsServers) if (properties.dnsServers != oldProperties.dnsServers)
callbacks.forEach { it.onAvailable(ifname, properties.dnsServers) } callbacks.forEach { it.onAvailable(ifname, properties.dnsServers) }

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

@@ -44,7 +44,11 @@ object VpnMonitor : UpstreamMonitor() {
synchronized(this@VpnMonitor) { synchronized(this@VpnMonitor) {
if (currentNetwork != network) return if (currentNetwork != network) return
val oldProperties = available.put(network, properties)!! val oldProperties = available.put(network, properties)!!
val ifname = properties.interfaceName!! val ifname = properties.interfaceName
if (ifname == null) {
onLost(network)
return
}
check(ifname == oldProperties.interfaceName) check(ifname == oldProperties.interfaceName)
if (properties.dnsServers != oldProperties.dnsServers) if (properties.dnsServers != oldProperties.dnsServers)
callbacks.forEach { it.onAvailable(ifname, properties.dnsServers) } callbacks.forEach { it.onAvailable(ifname, properties.dnsServers) }