Skip to content

Commit 94b77f2

Browse files
committed
#1871 fix saving ModifySettings action
1 parent 0f168ad commit 94b77f2

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

base/src/main/java/io/github/sds100/keymapper/base/actions/ActionDataEntityMapper.kt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import io.github.sds100.keymapper.system.camera.CameraLens
2222
import io.github.sds100.keymapper.system.intents.IntentExtraModel
2323
import io.github.sds100.keymapper.system.intents.IntentTarget
2424
import io.github.sds100.keymapper.system.network.HttpMethod
25+
import io.github.sds100.keymapper.system.settings.SettingType
2526
import io.github.sds100.keymapper.system.volume.DndMode
2627
import io.github.sds100.keymapper.system.volume.RingerMode
2728
import io.github.sds100.keymapper.system.volume.VolumeStream
@@ -50,6 +51,7 @@ object ActionDataEntityMapper {
5051

5152
ActionEntity.Type.INTERACT_UI_ELEMENT -> ActionId.INTERACT_UI_ELEMENT
5253
ActionEntity.Type.SHELL_COMMAND -> ActionId.SHELL_COMMAND
54+
ActionEntity.Type.MODIFY_SETTING -> ActionId.MODIFY_SETTING
5355
}
5456

5557
return when (actionId) {
@@ -732,11 +734,9 @@ object ActionDataEntityMapper {
732734
.valueOrNull() ?: "SYSTEM" // Default to SYSTEM for backward compatibility
733735

734736
val settingType = try {
735-
io.github.sds100.keymapper.system.settings.SettingType.valueOf(
736-
settingTypeString,
737-
)
738-
} catch (e: IllegalArgumentException) {
739-
io.github.sds100.keymapper.system.settings.SettingType.SYSTEM
737+
SettingType.valueOf(settingTypeString)
738+
} catch (_: IllegalArgumentException) {
739+
SettingType.SYSTEM
740740
}
741741

742742
ActionData.ModifySetting(
@@ -771,6 +771,7 @@ object ActionDataEntityMapper {
771771
is ActionData.Sound -> ActionEntity.Type.SOUND
772772
is ActionData.InteractUiElement -> ActionEntity.Type.INTERACT_UI_ELEMENT
773773
is ActionData.ShellCommand -> ActionEntity.Type.SHELL_COMMAND
774+
is ActionData.ModifySetting -> ActionEntity.Type.MODIFY_SETTING
774775
else -> ActionEntity.Type.SYSTEM_ACTION
775776
}
776777

data/src/main/java/io/github/sds100/keymapper/data/entities/ActionEntity.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,7 @@ data class ActionEntity(
185185
SOUND,
186186
INTERACT_UI_ELEMENT,
187187
SHELL_COMMAND,
188+
MODIFY_SETTING,
188189
}
189190

190191
constructor(

0 commit comments

Comments
 (0)