Fix duplicate click actions

BimmerGestalt · Oct 12, 2023 · 4ede74a · 4ede74a
1 parent b06d337
commit 4ede74a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/app/lib/rhmi.dart b/app/lib/rhmi.dart
@@ -161,6 +161,7 @@ class RHMIAction {
     final action = switch (type) {
       "combinedAction" => RHMICombinedAction(id, type, attributes),
       "hmiAction" => RHMIHmiAction(id, type, attributes),
+      "raAction" => RHMIRaAction(id, type, attributes),
       _ => RHMIAction(id, type, attributes),
     };
     if (action is RHMICombinedAction) {
@@ -184,13 +185,13 @@ class RHMIAction {
 class RHMICombinedAction extends RHMIAction {
   RHMICombinedAction(super.id, super.type, super.attributes);
 
-  RHMIAction? raAction;
+  RHMIRaAction? raAction;
   RHMIHmiAction? hmiAction;
 
   void loadChildren(XmlNode combinedActionNode) {
     combinedActionNode.getElement("actions")?.childElements.forEach((element) {
       final action = RHMIAction.loadXml(element);
-      if (action.type == "raAction") {
+      if (action is RHMIRaAction && action.type == "raAction") {
         raAction = action;
       }
       if (action is RHMIHmiAction && action.type == "hmiAction") {
@@ -204,6 +205,10 @@ class RHMICombinedAction extends RHMIAction {
   }
 }
 
+class RHMIRaAction extends RHMIAction {
+  RHMIRaAction(super.id, super.type, super.attributes);
+}
+
 class RHMIHmiAction extends RHMIAction {
   RHMIHmiAction(super.id, super.type, super.attributes):
       target = int.tryParse(attributes['target'] ?? '', radix: 10),

diff --git a/app/lib/rhmi_widgets.dart b/app/lib/rhmi_widgets.dart
@@ -56,7 +56,7 @@ class RHMICallbacks {
   void action(RHMIComponent component, {Map<int, Object?>? args}) async {
     final action = component.actions['action'];
 
-    if (action is RHMIAction) {
+    if (action is RHMIRaAction) {
       dispatchAction(action.id, args: args);
     }
     if (action is RHMIHmiAction) {