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

Support cancelling RootCommand

Browse Source
This commit is contained in:
Mygod
2020-07-04 07:48:56 +08:00
parent 255b4698b9
commit 562a9f26f1
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -420,14 +420,20 @@ class RootServer @JvmOverloads constructor(private val warnLogger: (String) -> U
Log.e(command.javaClass.simpleName, "Unexpected exception in RootCommandOneWay", e) Log.e(command.javaClass.simpleName, "Unexpected exception in RootCommandOneWay", e)
} }
} }
is RootCommand<*> -> defaultWorker.launch { is RootCommand<*> -> {
val result = try { val commandJob = Job()
val result = command.execute(); cancellables[callback] = { commandJob.cancel() }
{ output.pushResult(callback, result) } defaultWorker.launch(commandJob) {
} catch (e: Throwable) { val result = try {
{ output.pushThrowable(callback, e) } val result = command.execute();
{ output.pushResult(callback, result) }
} catch (e: Throwable) {
{ output.pushThrowable(callback, e) }
} finally {
cancellables.remove(callback)
}
withContext(callbackWorker) { result() }
} }
withContext(callbackWorker) { result() }
} }
is RootCommandChannel<*> -> defaultWorker.launch { is RootCommandChannel<*> -> defaultWorker.launch {
val result = try { val result = try {