Merge pull request #2913 from StephenHodgson/vNEXT-SpeechInputHandlerUpdate

Fixed a few issues with speech input handler

Author: keveleigh

Assets/MixedRealityToolkit-SDK/Inspectors/Input/Handlers/SpeechInputHandlerInspector.cs

@@ -49,6 +49,12 @@ public override void OnInspectorGUI()
                 return;
             }
 
+            if (MixedRealityToolkit.Instance.ActiveProfile.InputSystemProfile.SpeechCommandsProfile == null)
+            {
+                EditorGUILayout.HelpBox("No Speech Commands Profile Found, be sure to specify a profile in the Input System's configuration profile.", MessageType.Error);
+                return;
+            }
+
             if (registeredKeywords == null || registeredKeywords.Length == 0)
             {
                 registeredKeywords = RegisteredKeywords().Distinct().ToArray();
@@ -99,9 +105,9 @@ private void ShowList(SerializedProperty list)
             for (int index = 0; index < list.arraySize; index++)
             {
                 // the element
-                SerializedProperty elementProperty = list.GetArrayElementAtIndex(index);
+                SerializedProperty speechCommandProperty = list.GetArrayElementAtIndex(index);
                 EditorGUILayout.BeginHorizontal();
-                bool elementExpanded = EditorGUILayout.PropertyField(elementProperty);
+                bool elementExpanded = EditorGUILayout.PropertyField(speechCommandProperty);
                 GUILayout.FlexibleSpace();
                 // the remove element button
                 bool elementRemoved = GUILayout.Button(RemoveButtonContent, EditorStyles.miniButton, MiniButtonWidth);
@@ -113,9 +119,25 @@ private void ShowList(SerializedProperty list)
 
                 EditorGUILayout.EndHorizontal();
 
+                SerializedProperty keywordProperty = speechCommandProperty.FindPropertyRelative("keyword");
+
+                bool invalidKeyword = true;
+                foreach (string keyword in registeredKeywords)
+                {
+                    if (keyword == keywordProperty.stringValue)
+                    {
+                        invalidKeyword = false;
+                        break;
+                    }
+                }
+
+                if (invalidKeyword)
+                {
+                    EditorGUILayout.HelpBox("Registered keyword is not recognized in the speech command profile!", MessageType.Error);
+                }
+
                 if (!elementRemoved && elementExpanded)
                 {
-                    SerializedProperty keywordProperty = elementProperty.FindPropertyRelative("keyword");
                     string[] keywords = availableKeywords.Concat(new[] { keywordProperty.stringValue }).OrderBy(keyword => keyword).ToArray();
                     int previousSelection = ArrayUtility.IndexOf(keywords, keywordProperty.stringValue);
                     int currentSelection = EditorGUILayout.Popup("keyword", previousSelection, keywords);
@@ -125,7 +147,7 @@ private void ShowList(SerializedProperty list)
                         keywordProperty.stringValue = keywords[currentSelection];
                     }
 
-                    SerializedProperty responseProperty = elementProperty.FindPropertyRelative("response");
+                    SerializedProperty responseProperty = speechCommandProperty.FindPropertyRelative("response");
                     EditorGUILayout.PropertyField(responseProperty, true);
                 }
             }
@@ -151,8 +173,8 @@ private void ShowList(SerializedProperty list)
         private static IEnumerable<string> RegisteredKeywords()
         {
             if (!MixedRealityToolkit.Instance.ActiveProfile.IsInputSystemEnabled ||
-                !MixedRealityToolkit.Instance.ActiveProfile.InputSystemProfile.IsSpeechCommandsEnabled ||
-                 MixedRealityToolkit.Instance.ActiveProfile.InputSystemProfile.SpeechCommandsProfile.SpeechCommands.Length == 0)
+                MixedRealityToolkit.Instance.ActiveProfile.InputSystemProfile.SpeechCommandsProfile == null ||
+                MixedRealityToolkit.Instance.ActiveProfile.InputSystemProfile.SpeechCommandsProfile.SpeechCommands.Length == 0)
             {
                 yield break;
             }