FIX: UI input module null-checking wrong action (#906).

Author: Rene Damm

Packages/com.unity.inputsystem/InputSystem/Plugins/UI/InputSystemUIInputModule.cs

@@ -861,82 +861,17 @@ private void HookActions()
             if (m_OnActionDelegate == null)
                 m_OnActionDelegate = OnAction;
 
-            var pointAction = m_PointAction?.action;
-            if (pointAction != null)
-            {
-                pointAction.performed += m_OnActionDelegate;
-                pointAction.canceled += m_OnActionDelegate;
-            }
-
-            var moveAction = m_MoveAction?.action;
-            if (moveAction != null)
-            {
-                moveAction.performed += m_OnActionDelegate;
-                moveAction.canceled += m_OnActionDelegate;
-            }
-
-            var leftClickAction = m_LeftClickAction?.action;
-            if (leftClickAction != null)
-            {
-                leftClickAction.performed += m_OnActionDelegate;
-                leftClickAction.canceled += m_OnActionDelegate;
-            }
-
-            var rightClickAction = m_RightClickAction?.action;
-            if (rightClickAction != null)
-            {
-                rightClickAction.performed += m_OnActionDelegate;
-                rightClickAction.canceled += m_OnActionDelegate;
-            }
-
-            var middleClickAction = m_MiddleClickAction?.action;
-            if (middleClickAction != null)
-            {
-                middleClickAction.performed += m_OnActionDelegate;
-                middleClickAction.canceled += m_OnActionDelegate;
-            }
-
-            var submitAction = m_SubmitAction?.action;
-            if (submitAction != null)
-            {
-                submitAction.performed += m_OnActionDelegate;
-                submitAction.canceled += m_OnActionDelegate;
-            }
-
-            var cancelAction = m_CancelAction?.action;
-            if (cancelAction != null)
-            {
-                cancelAction.performed += m_OnActionDelegate;
-                cancelAction.canceled += m_OnActionDelegate;
-            }
-
-            var scrollAction = m_ScrollWheelAction?.action;
-            if (scrollAction != null)
-            {
-                scrollAction.performed += m_OnActionDelegate;
-                scrollAction.canceled += m_OnActionDelegate;
-            }
-
-            var trackedDeviceOrientationAction = m_TrackedDeviceOrientationAction?.action;
-            if (trackedDeviceOrientationAction != null)
-            {
-                trackedDeviceOrientationAction.performed += m_OnActionDelegate;
-                trackedDeviceOrientationAction.canceled += m_OnActionDelegate;
-            }
-
-            var trackedDevicePositionAction = m_TrackedDevicePositionAction?.action;
-            if (trackedDeviceOrientationAction != null)
-            {
-                trackedDevicePositionAction.performed += m_OnActionDelegate;
-                trackedDevicePositionAction.canceled += m_OnActionDelegate;
-            }
-
-            var trackedDeviceSelectAction = m_TrackedDeviceSelectAction?.action;
-            if (trackedDeviceSelectAction != null)
-            {
-                trackedDeviceSelectAction.performed += m_OnActionDelegate;
-                trackedDeviceSelectAction.canceled += m_OnActionDelegate;
-            }
+            SetActionCallback(m_PointAction, true);
+            SetActionCallback(m_MoveAction, true);
+            SetActionCallback(m_LeftClickAction, true);
+            SetActionCallback(m_RightClickAction, true);
+            SetActionCallback(m_MiddleClickAction, true);
+            SetActionCallback(m_SubmitAction, true);
+            SetActionCallback(m_CancelAction, true);
+            SetActionCallback(m_ScrollWheelAction, true);
+            SetActionCallback(m_TrackedDeviceOrientationAction, true);
+            SetActionCallback(m_TrackedDevicePositionAction, true);
+            SetActionCallback(m_TrackedDeviceSelectAction, true);
         }
 
         private void UnhookActions()
@@ -946,81 +881,37 @@ private void UnhookActions()
 
             m_ActionsHooked = false;
 
-            var pointAction = m_PointAction?.action;
-            if (pointAction != null)
-            {
-                pointAction.performed -= m_OnActionDelegate;
-                pointAction.canceled -= m_OnActionDelegate;
-            }
-
-            var moveAction = m_MoveAction?.action;
-            if (moveAction != null)
-            {
-                moveAction.performed -= m_OnActionDelegate;
-                moveAction.canceled -= m_OnActionDelegate;
-            }
-
-            var leftClickAction = m_LeftClickAction?.action;
-            if (leftClickAction != null)
-            {
-                leftClickAction.performed -= m_OnActionDelegate;
-                leftClickAction.canceled -= m_OnActionDelegate;
-            }
-
-            var rightClickAction = m_RightClickAction?.action;
-            if (rightClickAction != null)
-            {
-                rightClickAction.performed -= m_OnActionDelegate;
-                rightClickAction.canceled -= m_OnActionDelegate;
-            }
-
-            var middleClickAction = m_MiddleClickAction?.action;
-            if (middleClickAction != null)
-            {
-                middleClickAction.performed -= m_OnActionDelegate;
-                middleClickAction.canceled -= m_OnActionDelegate;
-            }
-
-            var submitAction = m_SubmitAction?.action;
-            if (submitAction != null)
-            {
-                submitAction.performed -= m_OnActionDelegate;
-                submitAction.canceled -= m_OnActionDelegate;
-            }
-
-            var cancelAction = m_CancelAction?.action;
-            if (cancelAction != null)
-            {
-                cancelAction.performed -= m_OnActionDelegate;
-                cancelAction.canceled -= m_OnActionDelegate;
-            }
+            SetActionCallback(m_PointAction, false);
+            SetActionCallback(m_MoveAction, false);
+            SetActionCallback(m_LeftClickAction, false);
+            SetActionCallback(m_RightClickAction, false);
+            SetActionCallback(m_MiddleClickAction, false);
+            SetActionCallback(m_SubmitAction, false);
+            SetActionCallback(m_CancelAction, false);
+            SetActionCallback(m_ScrollWheelAction, false);
+            SetActionCallback(m_TrackedDeviceOrientationAction, false);
+            SetActionCallback(m_TrackedDevicePositionAction, false);
+            SetActionCallback(m_TrackedDeviceSelectAction, false);
+        }
 
-            var scrollAction = m_ScrollWheelAction?.action;
-            if (scrollAction != null)
-            {
-                scrollAction.performed -= m_OnActionDelegate;
-                scrollAction.canceled -= m_OnActionDelegate;
-            }
+        private void SetActionCallback(InputActionReference actionReference, bool install)
+        {
+            if (actionReference == null)
+                return;
 
-            var trackedDeviceOrientationAction = m_TrackedDeviceOrientationAction?.action;
-            if (trackedDeviceOrientationAction != null)
-            {
-                trackedDeviceOrientationAction.performed -= m_OnActionDelegate;
-                trackedDeviceOrientationAction.canceled -= m_OnActionDelegate;
-            }
+            var action = actionReference.action;
+            if (action == null)
+                return;
 
-            var trackedDevicePositionAction = m_TrackedDevicePositionAction?.action;
-            if (trackedDeviceOrientationAction != null)
+            if (install)
             {
-                trackedDevicePositionAction.performed -= m_OnActionDelegate;
-                trackedDevicePositionAction.canceled -= m_OnActionDelegate;
+                action.performed += m_OnActionDelegate;
+                action.canceled += m_OnActionDelegate;
             }
-
-            var trackedDeviceSelectAction = m_TrackedDeviceSelectAction?.action;
-            if (trackedDeviceSelectAction != null)
+            else
             {
-                trackedDeviceSelectAction.performed -= m_OnActionDelegate;
-                trackedDeviceSelectAction.canceled -= m_OnActionDelegate;
+                action.performed -= m_OnActionDelegate;
+                action.canceled -= m_OnActionDelegate;
             }
         }