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

Fix a missing synchronized

Browse Source
This commit is contained in:
Mygod
2019-07-16 09:40:05 +08:00
parent 2adf3221b8
commit 983e80596b
1 changed files with 34 additions and 30 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

@@ -23,6 +23,7 @@ object DefaultNetworkMonitor : UpstreamMonitor() {
override fun onAvailable(network: Network) { override fun onAvailable(network: Network) {
val properties = app.connectivity.getLinkProperties(network) val properties = app.connectivity.getLinkProperties(network)
val ifname = properties?.interfaceName ?: return val ifname = properties?.interfaceName ?: return
synchronized(this@DefaultNetworkMonitor) {
when (currentNetwork) { when (currentNetwork) {
null -> { } null -> { }
network -> { network -> {
@@ -36,8 +37,10 @@ object DefaultNetworkMonitor : UpstreamMonitor() {
currentLinkProperties = properties currentLinkProperties = properties
callbacks.forEach { it.onAvailable(ifname, properties.dnsServers) } callbacks.forEach { it.onAvailable(ifname, properties.dnsServers) }
} }
}
override fun onLinkPropertiesChanged(network: Network, properties: LinkProperties) { override fun onLinkPropertiesChanged(network: Network, properties: LinkProperties) {
synchronized(this@DefaultNetworkMonitor) {
if (currentNetwork == null) { if (currentNetwork == null) {
onAvailable(network) onAvailable(network)
return return
@@ -63,8 +66,9 @@ object DefaultNetworkMonitor : UpstreamMonitor() {
} }
} }
} }
}
override fun onLost(network: Network) { override fun onLost(network: Network) = synchronized(this@DefaultNetworkMonitor) {
if (currentNetwork != network) return if (currentNetwork != network) return
callbacks.forEach { it.onLost() } callbacks.forEach { it.onLost() }
currentNetwork = null currentNetwork = null