#1577 Move unsupported actions to the bottom of the list and do not allow selecting root actions if root permission is not granted.

Author: sds100

CHANGELOG.md

@@ -8,6 +8,10 @@ _See the changes from previous 3.0 Beta releases as well._
 
 - #1560 Action to change flashlight brightness and also set a custom brightness when enabling the flashlight. 
 
+## Changed
+
+- #1577 Move unsupported actions to the bottom of the list and do not allow selecting root actions if root permission is not granted.
+
 ## Bug fixes
 
 - #1585 Track changes when editing key maps and only prompt to discard changes if there were indeed changes.

app/src/main/java/io/github/sds100/keymapper/UseCases.kt

@@ -195,6 +195,7 @@ object UseCases {
         ServiceLocator.inputMethodAdapter(ctx),
         ServiceLocator.systemFeatureAdapter(ctx),
         ServiceLocator.cameraAdapter(ctx),
+        ServiceLocator.permissionAdapter(ctx),
     )
 
     private fun keyMapperImeMessenger(

app/src/main/java/io/github/sds100/keymapper/actions/ActionErrorSnapshot.kt

@@ -23,7 +23,11 @@ class LazyActionErrorSnapshot(
     private val soundsManager: SoundsManager,
     shizukuAdapter: ShizukuAdapter,
 ) : ActionErrorSnapshot,
-    IsActionSupportedUseCase by IsActionSupportedUseCaseImpl(systemFeatureAdapter, cameraAdapter) {
+    IsActionSupportedUseCase by IsActionSupportedUseCaseImpl(
+        systemFeatureAdapter,
+        cameraAdapter,
+        permissionAdapter,
+    ) {
     private val keyMapperImeHelper = KeyMapperImeHelper(inputMethodAdapter)
 
     private val isCompatibleImeEnabled by lazy { keyMapperImeHelper.isCompatibleImeEnabled() }

app/src/main/java/io/github/sds100/keymapper/actions/ChooseActionViewModel.kt

@@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.viewModelScope
 import io.github.sds100.keymapper.R
 import io.github.sds100.keymapper.system.permissions.Permission
+import io.github.sds100.keymapper.util.Error
 import io.github.sds100.keymapper.util.State
 import io.github.sds100.keymapper.util.containsQuery
 import io.github.sds100.keymapper.util.getFullMessage
@@ -99,14 +100,26 @@ class ChooseActionViewModel(
     }
 
     private fun buildListGroups(): List<SimpleListItemGroup> = buildList {
-        CATEGORY_ORDER.forEach { category ->
+        val listItems = buildListItems(ActionId.entries)
 
+        for (category in CATEGORY_ORDER) {
             val header = getString(ActionUtils.getCategoryLabel(category))
 
-            val actionIds = ActionId.entries.filter { ActionUtils.getCategory(it) == category }
-
-            add(SimpleListItemGroup(header, buildListItems(actionIds)))
+            val group = SimpleListItemGroup(
+                header,
+                items = listItems.filter {
+                    it.isEnabled &&
+                        ActionUtils.getCategory(ActionId.valueOf(it.id)) == category
+                },
+            )
+            add(group)
         }
+
+        val unsupportedGroup = SimpleListItemGroup(
+            header = getString(R.string.choose_action_group_unsupported),
+            items = listItems.filter { !it.isEnabled },
+        )
+        add(unsupportedGroup)
     }
 
     private fun buildListItems(
@@ -119,12 +132,9 @@ class ChooseActionViewModel(
             val title = getString(ActionUtils.getTitle(actionId))
             val icon = ActionUtils.getComposeIcon(actionId)
 
-            val requiresRoot = ActionUtils.getRequiredPermissions(actionId)
-                .contains(Permission.ROOT)
-
             val subtitle = when {
+                error == Error.PermissionDenied(Permission.ROOT) -> getString(R.string.choose_action_warning_requires_root)
                 error != null -> error.getFullMessage(this@ChooseActionViewModel)
-                requiresRoot -> getString(R.string.choose_action_warning_requires_root)
                 else -> null
             }
 

app/src/main/java/io/github/sds100/keymapper/actions/CreateActionUseCase.kt

@@ -5,6 +5,7 @@ import io.github.sds100.keymapper.system.camera.CameraFlashInfo
 import io.github.sds100.keymapper.system.camera.CameraLens
 import io.github.sds100.keymapper.system.inputmethod.ImeInfo
 import io.github.sds100.keymapper.system.inputmethod.InputMethodAdapter
+import io.github.sds100.keymapper.system.permissions.PermissionAdapter
 import io.github.sds100.keymapper.system.permissions.SystemFeatureAdapter
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.first
@@ -18,8 +19,13 @@ class CreateActionUseCaseImpl(
     private val inputMethodAdapter: InputMethodAdapter,
     private val systemFeatureAdapter: SystemFeatureAdapter,
     private val cameraAdapter: CameraAdapter,
+    private val permissionAdapter: PermissionAdapter,
 ) : CreateActionUseCase,
-    IsActionSupportedUseCase by IsActionSupportedUseCaseImpl(systemFeatureAdapter, cameraAdapter) {
+    IsActionSupportedUseCase by IsActionSupportedUseCaseImpl(
+        systemFeatureAdapter,
+        cameraAdapter,
+        permissionAdapter,
+    ) {
     override suspend fun getInputMethods(): List<ImeInfo> = inputMethodAdapter.inputMethods.first()
 
     override fun getFlashlightLenses(): Set<CameraLens> {

app/src/main/java/io/github/sds100/keymapper/actions/IsActionSupportedUseCase.kt

@@ -4,12 +4,15 @@ import android.content.pm.PackageManager
 import android.os.Build
 import io.github.sds100.keymapper.system.camera.CameraAdapter
 import io.github.sds100.keymapper.system.camera.CameraLens
+import io.github.sds100.keymapper.system.permissions.Permission
+import io.github.sds100.keymapper.system.permissions.PermissionAdapter
 import io.github.sds100.keymapper.system.permissions.SystemFeatureAdapter
 import io.github.sds100.keymapper.util.Error
 
 class IsActionSupportedUseCaseImpl(
     private val adapter: SystemFeatureAdapter,
     private val cameraAdapter: CameraAdapter,
+    private val permissionAdapter: PermissionAdapter,
 ) : IsActionSupportedUseCase {
 
     override fun isSupported(id: ActionId): Error? {
@@ -49,6 +52,13 @@ class IsActionSupportedUseCaseImpl(
             }
         }
 
+        if (ActionUtils.getRequiredPermissions(id)
+                .contains(Permission.ROOT) &&
+            !permissionAdapter.isGranted(Permission.ROOT)
+        ) {
+            return Error.PermissionDenied(Permission.ROOT)
+        }
+
         return null
     }
 }

app/src/main/res/values/strings.xml

@@ -1402,6 +1402,8 @@
     <string name="action_config_flashlight_brightness_unsupported">This flash does not let you change the brightness.</string>
     <string name="action_config_flashlight_brightness_factor">Brightness change</string>
 
+    <string name="choose_action_group_unsupported">Unsupported</string>
+
     <!--  Constraint screen  -->
     <string name="constraints_recyclerview_placeholder">Add constraints if you want key maps to only work in some situations.</string>
     <string name="recently_used_constraints">Recently used constraints</string>