Skip to content

Add error logging when removing empty voice commands and voice command strings #1799

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 25, 2022
Merged

Add error logging when removing empty voice commands and voice command strings #1799

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f741b46
Add error logging when removing empty commands
noah-livio Mar 24, 2022
c8195fd
Switch from logging error to logging warnings
noah-livio Mar 25, 2022
36eb638
Update warning messages based on PR suggestions
noah-livio Mar 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseVoiceCommandManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,21 +217,27 @@ List<VoiceCommand> removeEmptyVoiceCommands(List<VoiceCommand> voiceCommands) {
List<VoiceCommand> validatedVoiceCommands = new ArrayList<>();
for (VoiceCommand voiceCommand : voiceCommands) {
if (voiceCommand == null) {
DebugTool.logWarning(TAG, "Voice command is null, it will not be uploaded");
continue;
}
List<String> voiceCommandStrings = new ArrayList<>();
for (String voiceCommandString : voiceCommand.getVoiceCommands()) {
if (voiceCommandString == null) {
DebugTool.logWarning(TAG, "Removing null string from voice command");
continue;
}
String trimmedString = voiceCommandString.trim();
if (trimmedString.length() > 0) {
voiceCommandStrings.add(trimmedString);
} else {
DebugTool.logWarning(TAG, "Empty string removed from voice command");
}
}
if (voiceCommandStrings.size() > 0) {
voiceCommand.setVoiceCommands(voiceCommandStrings);
validatedVoiceCommands.add(voiceCommand);
} else {
DebugTool.logWarning(TAG, "Voice command will not be uploaded as it contained no valid strings");
}
}
return validatedVoiceCommands;
Expand Down