refactor: move permission checks for phone call and bluetooth actions…

… to ActionUtils
keymapperorg · Dec 21, 2024 · ffa0926 · ffa0926
1 parent 8fd8f66
commit ffa0926
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/app/src/main/java/io/github/sds100/keymapper/actions/ActionUtils.kt b/app/src/main/java/io/github/sds100/keymapper/actions/ActionUtils.kt
@@ -565,6 +565,13 @@ object ActionUtils {
             ActionId.END_PHONE_CALL,
             -> return listOf(Permission.ANSWER_PHONE_CALL)
 
+            ActionId.PHONE_CALL -> return listOf(Permission.CALL_PHONE)
+
+            ActionId.ENABLE_BLUETOOTH, ActionId.DISABLE_BLUETOOTH, ActionId.TOGGLE_BLUETOOTH ->
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+                    return listOf(Permission.FIND_NEARBY_DEVICES)
+                }
+
             else -> Unit
         }
 

diff --git a/app/src/main/java/io/github/sds100/keymapper/actions/GetActionErrorUseCase.kt b/app/src/main/java/io/github/sds100/keymapper/actions/GetActionErrorUseCase.kt
@@ -100,11 +100,6 @@ class GetActionErrorUseCaseImpl(
                     return Error.SdkVersionTooLow(Build.VERSION_CODES.N)
                 }
 
-            is ActionData.PhoneCall ->
-                if (!permissionAdapter.isGranted(Permission.CALL_PHONE)) {
-                    return Error.PermissionDenied(Permission.CALL_PHONE)
-                }
-
             is ActionData.Sound -> {
                 soundsManager.getSound(action.soundUid).onFailure { error ->
                     return error
@@ -130,13 +125,6 @@ class GetActionErrorUseCaseImpl(
                     return it
                 }
 
-            is ActionData.Bluetooth ->
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S &&
-                    !permissionAdapter.isGranted(Permission.FIND_NEARBY_DEVICES)
-                ) {
-                    return Error.PermissionDenied(Permission.FIND_NEARBY_DEVICES)
-                }
-
             else -> Unit
         }