Fix to avoid deleting and setting identical voice commands, Updates in BaseVoiceCommandManger and VoiceCommandUpdateOperation

Author: Julian Kast

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

@@ -182,7 +182,7 @@ private void updatePendingOperations(List<VoiceCommand> newCurrentVoiceCommands)
                 continue;
             }
             VoiceCommandUpdateOperation vcOperation = (VoiceCommandUpdateOperation) operation;
-            vcOperation.oldVoiceCommands = newCurrentVoiceCommands;
+            vcOperation.setOldVoiceCommands(newCurrentVoiceCommands);
         }
     }
 
@@ -217,8 +217,8 @@ public void onNotified(RPCNotification notification) {
             @Override
             public void onNotified(RPCNotification notification) {
                 OnCommand onCommand = (OnCommand) notification;
-                if (voiceCommands != null && voiceCommands.size() > 0) {
-                    for (VoiceCommand command : voiceCommands) {
+                if (currentVoiceCommands != null && currentVoiceCommands.size() > 0) {
+                    for (VoiceCommand command : currentVoiceCommands) {
                         if (onCommand.getCmdID() == command.getCommandId()) {
                             if (command.getVoiceCommandSelectionListener() != null) {
                                 command.getVoiceCommandSelectionListener().onVoiceCommandSelected();

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

@@ -82,14 +82,23 @@ public void onComplete(boolean success2) {
 
     private void sendDeleteCurrentVoiceCommands(final CompletionListener listener) {
 
-        if (oldVoiceCommands == null || oldVoiceCommands.isEmpty()) {
+        if (oldVoiceCommands == null || oldVoiceCommands.size() == 0) {
             if (listener != null) {
                 listener.onComplete(true);
             }
             return;
         }
 
-        deleteVoiceCommands = deleteCommandsForVoiceCommands(oldVoiceCommands);
+        List<VoiceCommand> voiceCommandsToDelete = voiceCommandsInListNotInSecondList(oldVoiceCommands, pendingVoiceCommands);
+
+        if (voiceCommandsToDelete.size() == 0) {
+            if (listener != null) {
+                listener.onComplete(true);
+            }
+            return;
+        }
+
+        deleteVoiceCommands = deleteCommandsForVoiceCommands(voiceCommandsToDelete);
 
         internalInterface.get().sendRPCs(deleteVoiceCommands, new OnMultipleRequestListener() {
             @Override
@@ -156,14 +165,16 @@ private void removeCurrentVoiceCommand(Integer commandId) {
 
     private void sendCurrentVoiceCommands(final CompletionListener listener) {
 
-        if (pendingVoiceCommands == null || pendingVoiceCommands.size() == 0) {
+        List<VoiceCommand> voiceCommandsToAdd  = voiceCommandsInListNotInSecondList(pendingVoiceCommands, oldVoiceCommands);
+
+        if (voiceCommandsToAdd.size() == 0) {
             if (listener != null) {
                 listener.onComplete(true); // no voice commands to send doesnt mean that its an error
             }
             return;
         }
 
-        addCommandsToSend = addCommandsForVoiceCommands(pendingVoiceCommands);
+        addCommandsToSend = addCommandsForVoiceCommands(voiceCommandsToAdd);
 
         internalInterface.get().sendRPCs(addCommandsToSend, new OnMultipleRequestListener() {
             @Override
@@ -207,6 +218,20 @@ public void onResponse(int correlationId, RPCResponse response) {
         });
     }
 
+    List<VoiceCommand> voiceCommandsInListNotInSecondList(List<VoiceCommand> firstList, List<VoiceCommand> secondList) {
+        if (secondList == null || secondList.size() == 0) {
+            return firstList;
+        }
+        List<VoiceCommand> differencesList = new ArrayList<>(firstList);
+        differencesList.removeAll(secondList);
+        return differencesList;
+    }
+
+    public void setOldVoiceCommands(List<VoiceCommand> oldVoiceCommands) {
+        this.oldVoiceCommands = oldVoiceCommands;
+        this.currentVoiceCommands = new ArrayList<>(oldVoiceCommands);
+    }
+
     // Create AddCommand List
 
     List<AddCommand> addCommandsForVoiceCommands(List<VoiceCommand> voiceCommands) {