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

Make sure unregistering callback is not cancelled

Browse Source
This commit is contained in:
Mygod
2020-07-18 03:28:14 +08:00
parent 0f16210c80
commit 6bef518ac0
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mobile/src/main/java/be/mygod/librootkotlinx/RootServer.kt
View File

@@ -480,10 +480,9 @@ class RootServer @JvmOverloads constructor(private val warnLogger: (String) -> U
{ output.pushResult(callback, result) }
} catch (e: Throwable) {
{ output.pushThrowable(callback, e) }
} finally {
cancellables.remove(callback)
}
withContext(callbackWorker) { result() }
cancellables.remove(callback)
withContext(callbackWorker + NonCancellable) { result() }
}
}
is RootCommandChannel<*> -> defaultWorker.launch {
@@ -502,10 +501,9 @@ class RootServer @JvmOverloads constructor(private val warnLogger: (String) -> U
}
} catch (e: Throwable) {
{ output.pushThrowable(callback, e) }
} finally {
cancellables.remove(callback)
}
withContext(callbackWorker) { result() }
cancellables.remove(callback)
withContext(callbackWorker + NonCancellable) { result() }
}
is Shutdown -> break@loop
else -> throw IllegalArgumentException("Unrecognized input: $command")