Fix errors found in unit test dealing with null check and fix unit test to test new logic correctly

2 files changed, 8 insertions, 1 deletions

diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/VoiceCommandManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/VoiceCommandManagerTests.java
index 9aeb0504b..4d5786899 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/VoiceCommandManagerTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/VoiceCommandManagerTests.java
@@ -182,7 +182,7 @@ public class VoiceCommandManagerTests {
 
         // Fake onCommand - we want to make sure that we can pass back onCommand events to our VoiceCommand Objects
         OnCommand onCommand = new OnCommand();
-        onCommand.setCmdID(command3.getCommandId());
+        onCommand.setCmdID(voiceCommandManager.getVoiceCommands().get(voiceCommandManager.getVoiceCommands().indexOf(command3)).getCommandId());
         onCommand.setTriggerSource(TriggerSource.TS_VR); // these are voice commands
         commandListener.onNotified(onCommand); // send off the notification
 
diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseVoiceCommandManager.java b/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseVoiceCommandManager.java
index 4ef146fb1..9c5c39c21 100644
--- a/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseVoiceCommandManager.java
+++ b/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseVoiceCommandManager.java
@@ -140,6 +140,9 @@ abstract class BaseVoiceCommandManager extends BaseSubManager {
         // Clone voice commands
         this.voiceCommands = new ArrayList<>();
         for (VoiceCommand voiceCommand : voiceCommands) {
+            if (voiceCommand == null) {
+                continue;
+            }
             this.voiceCommands.add(voiceCommand.clone());
         }
 
@@ -147,14 +150,18 @@ abstract class BaseVoiceCommandManager extends BaseSubManager {
 
         if (validatedVoiceCommands.size() == 0 && voiceCommands.size() > 0) {
             DebugTool.logError(TAG, "New voice commands are invalid, skipping...");
+            this.voiceCommands = null;
             return;
         }
 
         if (!isVoiceCommandsUnique(validatedVoiceCommands)) {
             DebugTool.logError(TAG, "Not all voice command strings are unique across all voice commands. Voice commands will not be set.");
+            this.voiceCommands = null;
             return;
         }
 
+        this.voiceCommands = validatedVoiceCommands;
+
         updateIdsOnVoiceCommands(this.voiceCommands);
 
         cleanTransactionQueue();