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

Fix another concurrent modification

Browse Source
This commit is contained in:
Mygod
2019-07-18 14:10:39 +08:00
parent 96fbb7ddf9
commit 81979aad38
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mobile/src/main/java/be/mygod/vpnhotspot/net/monitor/IpLinkMonitor.kt
View File

@@ -10,7 +10,7 @@ class IpLinkMonitor private constructor() : IpMonitor() {
private val callbacks = HashMap<Any, Pair<String, (Boolean) -> Unit>>()
private var instance: IpLinkMonitor? = null
fun registerCallback(owner: Any, iface: String, callback: (Boolean) -> Unit) {
fun registerCallback(owner: Any, iface: String, callback: (Boolean) -> Unit) = synchronized(this) {
check(callbacks.put(owner, Pair(iface, callback)) == null)
var monitor = instance
if (monitor == null) {
@@ -19,8 +19,8 @@ class IpLinkMonitor private constructor() : IpMonitor() {
}
monitor.flush()
}
fun unregisterCallback(owner: Any) {
if (callbacks.remove(owner) == null || callbacks.isNotEmpty()) return
fun unregisterCallback(owner: Any) = synchronized(this) {
if (callbacks.remove(owner) == null || callbacks.isNotEmpty()) return@synchronized
instance?.destroy()
instance = null
}
@@ -32,12 +32,14 @@ class IpLinkMonitor private constructor() : IpMonitor() {
val match = parser.find(line) ?: return
val iface = match.groupValues[2]
val present = match.groupValues[1].isEmpty()
for ((target, callback) in callbacks.values) if (target == iface) callback(present)
synchronized(IpLinkMonitor) {
for ((target, callback) in callbacks.values) if (target == iface) callback(present)
}
}
override fun processLines(lines: Sequence<String>) {
val present = HashSet<String>()
for (it in lines) present.add((parser.find(it) ?: continue).groupValues[2])
callbacks.values.forEach { (iface, callback) -> callback(present.contains(iface)) }
synchronized(IpLinkMonitor) { for ((iface, callback) in callbacks.values) callback(present.contains(iface)) }
}
}