From c678fa72a9c2c9144ef7ca45fc3a8ef370ea24cd Mon Sep 17 00:00:00 2001
From: PiX <69745008+pixincreate@users.noreply.github.com>
Date: Mon, 1 Jun 2026 16:51:09 +0530
Subject: [PATCH 1/2] Hide direct install and uninstall when bootloader is
 locked

On devices with locked bootloaders and integrated Magisk root
(e.g. GrapheneOS with Magisk), direct install to boot partition and
uninstall operations present a softbrick risk. Only allow patching
a file (which the user handles externally) in such environments.

- Add isBootloaderLocked detection via ro.boot.vbmeta.device_state
- apk-ng: Hide Direct Install and Install to Inactive Slot when locked
- apk-ng: Hide Uninstall button when locked
- apk (legacy): Same changes for the older UI
---
 .../java/com/topjohnwu/magisk/ui/home/HomeScreen.kt    | 10 ++++++----
 .../topjohnwu/magisk/ui/install/InstallBottomSheet.kt  |  2 +-
 .../topjohnwu/magisk/ui/install/InstallViewModel.kt    |  3 ++-
 .../topjohnwu/magisk/ui/install/InstallViewModel.kt    |  3 ++-
 app/apk/src/main/res/layout/fragment_home_md2.xml      |  2 +-
 app/apk/src/main/res/layout/fragment_install_md2.xml   |  2 +-
 .../src/main/java/com/topjohnwu/magisk/core/Info.kt    |  7 +++++++
 7 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/app/apk-ng/src/main/java/com/topjohnwu/magisk/ui/home/HomeScreen.kt b/app/apk-ng/src/main/java/com/topjohnwu/magisk/ui/home/HomeScreen.kt
index 18d5247daac2e..d5e96857f10bd 100644
--- a/app/apk-ng/src/main/java/com/topjohnwu/magisk/ui/home/HomeScreen.kt
+++ b/app/apk-ng/src/main/java/com/topjohnwu/magisk/ui/home/HomeScreen.kt
@@ -230,10 +230,12 @@ fun HomeScreen(viewModel: HomeViewModel, installVm: InstallViewModel) {
                 onHideRestorePressed = viewModel::onHideRestorePressed,
             )
 
-            UninstallButton(
-                onClick = { viewModel.onDeletePressed() },
-                enabled = Info.env.isActive
-            )
+            if (!Info.isBootloaderLocked) {
+                UninstallButton(
+                    onClick = { viewModel.onDeletePressed() },
+                    enabled = Info.env.isActive
+                )
+            }
 
             Text(
                 text = stringResource(CoreR.string.home_support_title),
diff --git a/app/apk-ng/src/main/java/com/topjohnwu/magisk/ui/install/InstallBottomSheet.kt b/app/apk-ng/src/main/java/com/topjohnwu/magisk/ui/install/InstallBottomSheet.kt
index 5854df2730a59..eaf07a23c214c 100644
--- a/app/apk-ng/src/main/java/com/topjohnwu/magisk/ui/install/InstallBottomSheet.kt
+++ b/app/apk-ng/src/main/java/com/topjohnwu/magisk/ui/install/InstallBottomSheet.kt
@@ -129,7 +129,7 @@ fun InstallBottomSheet(
                     },
                 )
 
-                if (installVm.isRooted) {
+                if (installVm.isRooted && !installVm.isBootloaderLocked) {
                     SettingsArrow(
                         title = stringResource(CoreR.string.direct_install),
                         onClick = {
diff --git a/app/apk-ng/src/main/java/com/topjohnwu/magisk/ui/install/InstallViewModel.kt b/app/apk-ng/src/main/java/com/topjohnwu/magisk/ui/install/InstallViewModel.kt
index 0605c90ef724e..921fc7c9efe17 100644
--- a/app/apk-ng/src/main/java/com/topjohnwu/magisk/ui/install/InstallViewModel.kt
+++ b/app/apk-ng/src/main/java/com/topjohnwu/magisk/ui/install/InstallViewModel.kt
@@ -38,8 +38,9 @@ class InstallViewModel(svc: NetworkService) : BaseViewModel() {
     )
 
     val isRooted get() = Info.isRooted
+    val isBootloaderLocked get() = Info.isBootloaderLocked
     val skipOptions = Info.isEmulator || (Info.isSAR && !Info.isFDE && Info.ramdisk)
-    val noSecondSlot = !isRooted || !Info.isAB || Info.isEmulator
+    val noSecondSlot = !isRooted || !Info.isAB || Info.isEmulator || isBootloaderLocked
 
     private val _uiState = MutableStateFlow(UiState(step = if (skipOptions) 1 else 0))
     val uiState: StateFlow<UiState> = _uiState.asStateFlow()
diff --git a/app/apk/src/main/java/com/topjohnwu/magisk/ui/install/InstallViewModel.kt b/app/apk/src/main/java/com/topjohnwu/magisk/ui/install/InstallViewModel.kt
index b6a64dffd3470..f897dca037aeb 100644
--- a/app/apk/src/main/java/com/topjohnwu/magisk/ui/install/InstallViewModel.kt
+++ b/app/apk/src/main/java/com/topjohnwu/magisk/ui/install/InstallViewModel.kt
@@ -38,8 +38,9 @@ import com.topjohnwu.magisk.core.R as CoreR
 class InstallViewModel(svc: NetworkService, markwon: Markwon) : BaseViewModel() {
 
     val isRooted get() = Info.isRooted
+    val isBootloaderLocked get() = Info.isBootloaderLocked
     val skipOptions = Info.isEmulator || (Info.isSAR && !Info.isFDE && Info.ramdisk)
-    val noSecondSlot = !isRooted || !Info.isAB || Info.isEmulator
+    val noSecondSlot = !isRooted || !Info.isAB || Info.isEmulator || isBootloaderLocked
 
     @get:Bindable
     var step = if (skipOptions) 1 else 0
diff --git a/app/apk/src/main/res/layout/fragment_home_md2.xml b/app/apk/src/main/res/layout/fragment_home_md2.xml
index a3d2c60cd5618..dd885a4964fd2 100644
--- a/app/apk/src/main/res/layout/fragment_home_md2.xml
+++ b/app/apk/src/main/res/layout/fragment_home_md2.xml
@@ -114,7 +114,7 @@
 
             <Button
                 style="@style/WidgetFoundation.Button.Outlined.Error"
-                goneUnless="@{Info.env.isActive}"
+                gone="@{!Info.env.isActive || Info.isBootloaderLocked}"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="@dimen/l1"
diff --git a/app/apk/src/main/res/layout/fragment_install_md2.xml b/app/apk/src/main/res/layout/fragment_install_md2.xml
index 0999f025d7d38..9e72b152c7719 100644
--- a/app/apk/src/main/res/layout/fragment_install_md2.xml
+++ b/app/apk/src/main/res/layout/fragment_install_md2.xml
@@ -200,7 +200,7 @@
                         <RadioButton
                             android:id="@+id/method_direct"
                             style="@style/WidgetFoundation.RadioButton"
-                            gone="@{!viewModel.rooted}"
+                            gone="@{!viewModel.rooted || Info.isBootloaderLocked}"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:text="@string/direct_install" />
diff --git a/app/core/src/main/java/com/topjohnwu/magisk/core/Info.kt b/app/core/src/main/java/com/topjohnwu/magisk/core/Info.kt
index 8aa8df54057de..99e57c9dc58c9 100644
--- a/app/core/src/main/java/com/topjohnwu/magisk/core/Info.kt
+++ b/app/core/src/main/java/com/topjohnwu/magisk/core/Info.kt
@@ -60,6 +60,13 @@ object Info {
             || getProperty("ro.kernel.qemu", "0") == "1"
             || getProperty("ro.boot.qemu", "0") == "1"
 
+    @JvmStatic val isBootloaderLocked: Boolean
+        get() {
+            val state = getProperty("ro.boot.vbmeta.device_state", "")
+            if (state.isNotEmpty()) return state == "locked"
+            return getProperty("ro.boot.flash.locked", "0") == "1"
+        }
+
     val isConnected = MutableLiveData(false)
 
     val showSuperUser: Boolean get() {

From 575fa8a235c49818ca904d1133f7929dd602d5b7 Mon Sep 17 00:00:00 2001
From: PiX <69745008+pixincreate@users.noreply.github.com>
Date: Mon, 1 Jun 2026 22:45:23 +0530
Subject: [PATCH 2/2] fix(app): address review feedback - cache bootloader
 prop, add hard guards, fix spacer

- Cache isBootloaderLocked as eager val with case-insensitive comparison
- Add hard guard in install() for locked-incompatible methods
- Sanitize methodId on state restore in legacy ViewModel
- Fix spacer visibility gap when bootloader locked + env active
---
 .../com/topjohnwu/magisk/ui/install/InstallViewModel.kt  | 3 +++
 .../com/topjohnwu/magisk/ui/install/InstallViewModel.kt  | 7 ++++++-
 app/apk/src/main/res/layout/fragment_home_md2.xml        | 2 +-
 app/core/src/main/java/com/topjohnwu/magisk/core/Info.kt | 9 ++++-----
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/app/apk-ng/src/main/java/com/topjohnwu/magisk/ui/install/InstallViewModel.kt b/app/apk-ng/src/main/java/com/topjohnwu/magisk/ui/install/InstallViewModel.kt
index 921fc7c9efe17..7a32d3aa8fb89 100644
--- a/app/apk-ng/src/main/java/com/topjohnwu/magisk/ui/install/InstallViewModel.kt
+++ b/app/apk-ng/src/main/java/com/topjohnwu/magisk/ui/install/InstallViewModel.kt
@@ -115,6 +115,9 @@ class InstallViewModel(svc: NetworkService) : BaseViewModel() {
     }
 
     fun install() {
+        if (isBootloaderLocked &&
+            (_uiState.value.method == Method.DIRECT || _uiState.value.method == Method.INACTIVE_SLOT)
+        ) return
         when (_uiState.value.method) {
             Method.PATCH -> navigateTo(Route.Flash(
                 action = Const.Value.PATCH_FILE,
diff --git a/app/apk/src/main/java/com/topjohnwu/magisk/ui/install/InstallViewModel.kt b/app/apk/src/main/java/com/topjohnwu/magisk/ui/install/InstallViewModel.kt
index f897dca037aeb..53cf32f80784f 100644
--- a/app/apk/src/main/java/com/topjohnwu/magisk/ui/install/InstallViewModel.kt
+++ b/app/apk/src/main/java/com/topjohnwu/magisk/ui/install/InstallViewModel.kt
@@ -95,6 +95,9 @@ class InstallViewModel(svc: NetworkService, markwon: Markwon) : BaseViewModel()
     }
 
     fun install() {
+        if (Info.isBootloaderLocked &&
+            (method == R.id.method_direct || method == R.id.method_inactive_slot)
+        ) return
         when (method) {
             R.id.method_patch -> FlashFragment.patch(data.value!!).navigate(true)
             R.id.method_download -> FlashFragment.download(data.value!!).navigate(true)
@@ -118,7 +121,9 @@ class InstallViewModel(svc: NetworkService, markwon: Markwon) : BaseViewModel()
 
     override fun onRestoreState(state: Bundle) {
         state.getParcelable<InstallState>(INSTALL_STATE_KEY)?.let {
-            methodId = it.method
+            methodId = if (Info.isBootloaderLocked &&
+                (it.method == R.id.method_direct || it.method == R.id.method_inactive_slot)
+            ) -1 else it.method
             step = it.step
             Config.keepVerity = it.keepVerity
             Config.keepEnc = it.keepEnc
diff --git a/app/apk/src/main/res/layout/fragment_home_md2.xml b/app/apk/src/main/res/layout/fragment_home_md2.xml
index dd885a4964fd2..8ad19c65c74d0 100644
--- a/app/apk/src/main/res/layout/fragment_home_md2.xml
+++ b/app/apk/src/main/res/layout/fragment_home_md2.xml
@@ -108,7 +108,7 @@
                 app:layout_constraintTop_toBottomOf="@+id/home_magisk_wrapper" />
 
             <Space
-                goneUnless="@{Info.env.isActive}"
+                gone="@{!Info.env.isActive || Info.isBootloaderLocked}"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/l1" />
 
diff --git a/app/core/src/main/java/com/topjohnwu/magisk/core/Info.kt b/app/core/src/main/java/com/topjohnwu/magisk/core/Info.kt
index 99e57c9dc58c9..2d5d2be774f32 100644
--- a/app/core/src/main/java/com/topjohnwu/magisk/core/Info.kt
+++ b/app/core/src/main/java/com/topjohnwu/magisk/core/Info.kt
@@ -60,11 +60,10 @@ object Info {
             || getProperty("ro.kernel.qemu", "0") == "1"
             || getProperty("ro.boot.qemu", "0") == "1"
 
-    @JvmStatic val isBootloaderLocked: Boolean
-        get() {
-            val state = getProperty("ro.boot.vbmeta.device_state", "")
-            if (state.isNotEmpty()) return state == "locked"
-            return getProperty("ro.boot.flash.locked", "0") == "1"
+    @JvmStatic val isBootloaderLocked: Boolean =
+        getProperty("ro.boot.vbmeta.device_state", "").let { state ->
+            if (state.isNotEmpty()) state.equals("locked", ignoreCase = true)
+            else getProperty("ro.boot.flash.locked", "0") == "1"
         }
 
     val isConnected = MutableLiveData(false)