TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-04-22 21:01:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Wait for root service to bind

Browse Source
This commit is contained in:
topjohnwu 2022-12-30 15:52:02 -08:00 committed by John Wu
parent 37b81ad1f6
commit 78a444d601
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/com/topjohnwu/magisk/core/utils/RootUtils.kt
View File

@ -111,15 +111,23 @@ class RootUtils(stub: Any?) : RootService() {
} }
fun await() { fun await() {
// We cannot await on the main thread if (!Info.isRooted)
if (Info.isRooted && !ShellUtils.onMainThread()) return
if (!ShellUtils.onMainThread()) {
acquireSharedInterruptibly(1) acquireSharedInterruptibly(1)
} else if (state != 0) {
throw IllegalStateException("Cannot await on the main thread")
}
} }
} }
companion object { companion object {
var bindTask: Shell.Task? = null var bindTask: Shell.Task? = null
var fs = FileSystemManager.getLocal() var fs: FileSystemManager = FileSystemManager.getLocal()
get() {
Connection.await()
return field
}
private set private set
var obj: IRootUtils? = null var obj: IRootUtils? = null
get() { get() {

5
app/src/main/java/com/topjohnwu/magisk/ui/module/ModuleViewModel.kt
View File

@ -35,7 +35,7 @@ class ModuleViewModel : AsyncLoadViewModel() {
var loading = true var loading = true
private set(value) = set(value, field, { field = it }, BR.loading) private set(value) = set(value, field, { field = it }, BR.loading)
init { private suspend fun init() = withContext(Dispatchers.IO) {
if (Info.env.isActive && LocalModule.loaded()) { if (Info.env.isActive && LocalModule.loaded()) {
items.insertItem(InstallModule) items.insertItem(InstallModule)
.insertList(itemsInstalled) .insertList(itemsInstalled)
@ -44,6 +44,9 @@ class ModuleViewModel : AsyncLoadViewModel() {
override suspend fun doLoadWork() { override suspend fun doLoadWork() {
loading = true loading = true
if (items.isEmpty()) {
init()
}
loadInstalled() loadInstalled()
loading = false loading = false
loadUpdateInfo() loadUpdateInfo()