BaseChoiceSetManager, Strip away unsupported textFields from choices

Author: Julian Kast

base/src/main/java/com/smartdevicelink/managers/screen/choiceset/BaseChoiceSetManager.java

@@ -42,6 +42,7 @@
 import com.smartdevicelink.managers.BaseSubManager;
 import com.smartdevicelink.managers.CompletionListener;
 import com.smartdevicelink.managers.ISdl;
+import com.smartdevicelink.managers.ManagerUtility;
 import com.smartdevicelink.managers.file.FileManager;
 import com.smartdevicelink.managers.lifecycle.OnSystemCapabilityListener;
 import com.smartdevicelink.managers.lifecycle.SystemCapabilityManager;
@@ -61,6 +62,7 @@
 import com.smartdevicelink.proxy.rpc.enums.PredefinedWindows;
 import com.smartdevicelink.proxy.rpc.enums.SystemCapabilityType;
 import com.smartdevicelink.proxy.rpc.enums.SystemContext;
+import com.smartdevicelink.proxy.rpc.enums.TextFieldName;
 import com.smartdevicelink.proxy.rpc.enums.TriggerSource;
 import com.smartdevicelink.proxy.rpc.listeners.OnRPCNotificationListener;
 import com.smartdevicelink.util.DebugTool;
@@ -672,6 +674,18 @@ public void onNotified(RPCNotification notification) {
 
     // ADDITIONAL HELPERS
 
+    boolean shouldSendChoiceSecondaryText() {
+        return templateSupportsTextField(TextFieldName.secondaryText);
+    }
+
+    boolean shouldSendChoiceTertiaryText() {
+        return templateSupportsTextField(TextFieldName.tertiaryText);
+    }
+
+    boolean templateSupportsTextField(TextFieldName name) {
+        return defaultMainWindowCapability == null || ManagerUtility.WindowCapabilityUtility.hasTextFieldOfName(defaultMainWindowCapability, name);
+    }
+
     boolean setUpChoiceSet(ChoiceSet choiceSet) {
 
         List<ChoiceCell> choices = choiceSet.getChoices();
@@ -695,6 +709,13 @@ boolean setUpChoiceSet(ChoiceSet choiceSet) {
         int choiceCellWithVoiceCommandCount = 0;
 
         for (ChoiceCell cell : choices) {
+            if (!shouldSendChoiceSecondaryText() && cell.getSecondaryText() != null) {
+                cell.setSecondaryText(null);
+            }
+
+            if (!shouldSendChoiceTertiaryText() && cell.getTertiaryText() != null) {
+                cell.setSecondaryText(null);
+            }
 
             uniqueChoiceCells.add(cell);