Merge pull request #1681 from smartdevicelink/bugfix/issue_1677

Fix for Two voiceCommands contains the same string

Author: bilal-alsharifi

android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/VoiceCommandManagerTests.java

@@ -52,6 +52,7 @@
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -192,4 +193,21 @@ private void sendFakeCoreOnHMIFullNotifications() {
         onHMIStatusListener.onNotified(onHMIStatusFakeNotification);
     }
 
+    /**
+     * Test If voice commands do not have unique strings, they will not be uploaded
+     */
+    @Test
+    public void testUniqueStrings() {
+        List<VoiceCommand> voiceCommandList = new ArrayList<>();
+        VoiceCommand command1 = new VoiceCommand(Arrays.asList("Command one", "Command two"), null);
+        VoiceCommand command2 = new VoiceCommand(Arrays.asList("Command one", "Command two"), null);
+
+        voiceCommandList.add(command1);
+        voiceCommandList.add(command2);
+        voiceCommandManager.currentHMILevel = HMILevel.HMI_NONE;
+        voiceCommandManager.setVoiceCommands(voiceCommandList);
+
+        assertNull(voiceCommandManager.voiceCommands);
+    }
+
 }

base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseVoiceCommandManager.java

@@ -51,6 +51,7 @@
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 
 abstract class BaseVoiceCommandManager extends BaseSubManager {
@@ -136,6 +137,11 @@ public void setVoiceCommands(List<VoiceCommand> voiceCommands) {
             return;
         }
 
+        if (!isVoiceCommandsUnique(voiceCommands)) {
+            DebugTool.logError(TAG, "Not all voice command strings are unique across all voice commands. Voice commands will not be set.");
+            return;
+        }
+
         updateIdsOnVoiceCommands(voiceCommands);
         this.voiceCommands = new ArrayList<>(voiceCommands);
 
@@ -225,4 +231,21 @@ public void onNotified(RPCNotification notification) {
         };
         internalInterface.addOnRPCNotificationListener(FunctionID.ON_COMMAND, commandListener);
     }
+
+    /**
+     * Boolean method that checks to see if all VoiceCommands in a given list are unique
+     *
+     * @param voiceCommands - list of VoiceCommands
+     * @return - true if VoiceCommands are unique, false if not
+     */
+    private boolean isVoiceCommandsUnique(List<VoiceCommand> voiceCommands) {
+        HashSet<String> voiceCommandHashSet = new HashSet<>();
+        int voiceCommandCount = 0;
+
+        for (VoiceCommand voiceCommand : voiceCommands) {
+            voiceCommandHashSet.addAll(voiceCommand.getVoiceCommands());
+            voiceCommandCount += voiceCommand.getVoiceCommands().size();
+        }
+        return (voiceCommandHashSet.size() == voiceCommandCount);
+    }
 }