Fix uniqueness behavior

Author: Henigan

android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSetManagerTests.java

@@ -154,12 +154,6 @@ public void onError(String error) {
         ChoiceSet choiceSet1 = new ChoiceSet("test", Collections.<ChoiceCell>emptyList(), choiceSetSelectionListener);
         assertFalse(csm.setUpChoiceSet(choiceSet1));
 
-        // Identical cells will not be allowed
-        ChoiceCell cell1 = new ChoiceCell("test");
-        ChoiceCell cell2 = new ChoiceCell("test");
-        ChoiceSet choiceSet2 = new ChoiceSet("test", Arrays.asList(cell1, cell2), choiceSetSelectionListener);
-        assertFalse(csm.setUpChoiceSet(choiceSet2));
-
         // cells that have duplicate text will be allowed if there is another property to make them unique because a unique name will be assigned and used
         ChoiceCell cell3 = new ChoiceCell("test");
         cell3.setSecondaryText("text 1");

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

@@ -589,13 +589,11 @@ boolean setUpChoiceSet(ChoiceSet choiceSet) {
             }
         }
 
-        HashSet<ChoiceCell> uniqueChoiceCells = new HashSet<>();
         HashSet<String> uniqueVoiceCommands = new HashSet<>();
         int allVoiceCommandsCount = 0;
         int choiceCellWithVoiceCommandCount = 0;
 
         for (ChoiceCell cell : choices) {
-            uniqueChoiceCells.add(cell);
             // Not using cloned cell here because we set the clone's VoiceCommands to null for visual check only
             if (cell.getVoiceCommands() != null) {
                 uniqueVoiceCommands.addAll(cell.getVoiceCommands());
@@ -604,11 +602,6 @@ boolean setUpChoiceSet(ChoiceSet choiceSet) {
             }
         }
 
-        if (uniqueChoiceCells.size() != choices.size()) {
-            DebugTool.logError(TAG, "Attempted to create a choice set with a duplicate cell. Cell must have a unique value other than its primary text. The choice set will not be set.");
-            return false;
-        }
-
         // All or none of the choices MUST have VR Commands
         if (choiceCellWithVoiceCommandCount > 0 && choiceCellWithVoiceCommandCount < choices.size()) {
             DebugTool.logError(TAG, "If using voice recognition commands, all of the choice set cells must have unique VR commands. There are " + uniqueVoiceCommands.size() + " cells with unique voice commands and " + choices.size() + " total cells. The choice set will not be set.");

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

@@ -617,7 +617,7 @@ void makeCellsToUploadUnique() {
 
         ArrayList<ChoiceCell> strippedCellsToUpload = cloneChoiceCellList(this.cellsToUpload);
         ArrayList<ChoiceCell> strippedLoadedCells = cloneChoiceCellList(new ArrayList<>(loadedCells));
-        boolean supportsChoiceUniqueness = !(sdlMsgVersion.getMinorVersion() < 7 || (sdlMsgVersion.getMajorVersion() == 7 && sdlMsgVersion.getMinorVersion() == 0));
+        boolean supportsChoiceUniqueness = !(sdlMsgVersion.getMajorVersion() < 7 || (sdlMsgVersion.getMajorVersion() == 7 && sdlMsgVersion.getMinorVersion() == 0));
         if (supportsChoiceUniqueness) {
             removeUnusedProperties(strippedCellsToUpload);
             removeUnusedProperties(strippedLoadedCells);