diff --git a/manager/app/src/main/java/me/weishu/kernelsu/ui/screen/Module.kt b/manager/app/src/main/java/me/weishu/kernelsu/ui/screen/Module.kt index bfe04932..cab5557e 100644 --- a/manager/app/src/main/java/me/weishu/kernelsu/ui/screen/Module.kt +++ b/manager/app/src/main/java/me/weishu/kernelsu/ui/screen/Module.kt @@ -53,10 +53,13 @@ fun ModuleScreen(navigator: DestinationsNavigator) { } val isSafeMode = Natives.isSafeMode() + val hasMagisk = hasMagisk() + + val showInstallButton = !(isSafeMode || hasMagisk) Scaffold(topBar = { TopBar() - }, floatingActionButton = if (isSafeMode) { + }, floatingActionButton = if (showInstallButton) { { /* Empty */ } } else { { @@ -103,8 +106,8 @@ fun ModuleScreen(navigator: DestinationsNavigator) { } return@Scaffold } - if (hasMagisk()) { - Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) { + if (hasMagisk) { + Box(modifier = Modifier.fillMaxSize().padding(24.dp), contentAlignment = Alignment.Center) { Text(stringResource(R.string.module_magisk_conflict)) } return@Scaffold diff --git a/manager/app/src/main/java/me/weishu/kernelsu/ui/util/KsuCli.kt b/manager/app/src/main/java/me/weishu/kernelsu/ui/util/KsuCli.kt index 66fec64d..6b803c74 100644 --- a/manager/app/src/main/java/me/weishu/kernelsu/ui/util/KsuCli.kt +++ b/manager/app/src/main/java/me/weishu/kernelsu/ui/util/KsuCli.kt @@ -113,5 +113,6 @@ fun overlayFsAvailable(): Boolean { fun hasMagisk(): Boolean { val shell = createRootShell() val result = shell.newJob().add("nsenter --mount=/proc/1/ns/mnt which magisk").exec() + Log.i(TAG, "has magisk: ${result.isSuccess}") return result.isSuccess } \ No newline at end of file