updates from testing

4 files changed, 11 insertions, 12 deletions

diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/cells/MenuCellTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/cells/MenuCellTests.java
index b8d8eda13..7f25c2ad7 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/cells/MenuCellTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/cells/MenuCellTests.java
@@ -85,7 +85,7 @@ public class MenuCellTests extends AndroidTestCase2 {
 		assertEquals(menuCell2.getIcon(), Test.GENERAL_ARTWORK);
 		assertEquals(menuCell2.getSubCells(), Test.GENERAL_MENUCELL_LIST);
 
-		MenuCell menuCell3 =new MenuCell(Test.GENERAL_STRING, menuSelectionListener, Test.GENERAL_ARTWORK, Test.GENERAL_STRING_LIST);
+		MenuCell menuCell3 =new MenuCell(Test.GENERAL_STRING, Test.GENERAL_ARTWORK, Test.GENERAL_STRING_LIST, menuSelectionListener);
 		assertEquals(menuCell3.getTitle(), Test.GENERAL_STRING);
 		assertEquals(menuCell3.getIcon(), Test.GENERAL_ARTWORK);
 		assertEquals(menuCell3.getVoiceCommands(), Test.GENERAL_STRING_LIST);
diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseMenuManager.java b/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseMenuManager.java
index b7621c2df..5ff20e278 100644
--- a/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseMenuManager.java
+++ b/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseMenuManager.java
@@ -314,7 +314,8 @@ abstract class BaseMenuManager extends BaseSubManager {
 		if (menuCells.size() == 0){
 			DebugTool.logInfo("No main menu to send, returning");
 			if (listener != null){
-				listener.onComplete(false);
+				// This can be considered a success if the user was clearing out their menu
+				listener.onComplete(true);
 			}
 			return;
 		}
@@ -331,7 +332,6 @@ abstract class BaseMenuManager extends BaseSubManager {
 			subMenuCommands = subMenuCommandsForCells(menuCells, true);
 		}
 
-
 		// add all built commands to inProgressUpdate
 		inProgressUpdate = mainMenuCommands;
 		inProgressUpdate.addAll(subMenuCommands);
@@ -346,10 +346,12 @@ abstract class BaseMenuManager extends BaseSubManager {
 			public void onFinished() {
 
 				oldMenuCells = menuCells;
-				sendSubMenuCommands(subMenuCommands, listener);
-
-				DebugTool.logInfo("Finished sending main menu commands. Sending sub menu commands.");
-
+				if (subMenuCommands.size() > 0) {
+					sendSubMenuCommands(subMenuCommands, listener);
+					DebugTool.logInfo("Finished sending main menu commands. Sending sub menu commands.");
+				}else{
+					DebugTool.logInfo("Finished sending main menu commands.");
+				}
 			}
 
 			@Override
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 3a334daa8..ec346bd37 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
@@ -231,7 +231,7 @@ abstract class BaseVoiceCommandManager extends BaseSubManager {
 
 		if (voiceCommands == null || voiceCommands.size() == 0){
 			if (listener != null){
-				listener.onComplete(false);
+				listener.onComplete(true); // no voice commands to send doesnt mean that its an error
 			}
 			DebugTool.logInfo("No Voice Commands to Send");
 			return;
@@ -264,9 +264,6 @@ abstract class BaseVoiceCommandManager extends BaseSubManager {
 
 			@Override
 			public void onResponse(int correlationId, RPCResponse response) {
-				if (response != null && !response.getSuccess()){
-					DebugTool.logError("Error sending voice commands: "+ response.getInfo());
-				}
 			}
 		});
 	}
diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/menu/cells/MenuCell.java b/base/src/main/java/com/smartdevicelink/managers/screen/menu/cells/MenuCell.java
index c9c9a85b7..8a36e5672 100644
--- a/base/src/main/java/com/smartdevicelink/managers/screen/menu/cells/MenuCell.java
+++ b/base/src/main/java/com/smartdevicelink/managers/screen/menu/cells/MenuCell.java
@@ -116,7 +116,7 @@ public class MenuCell {
 	 * @param voiceCommands Voice commands that will activate the menu cell
 	 * @param listener Calls the code that will be run when the menu cell is selected
 	 */
-	public MenuCell(@NonNull String title, @Nullable MenuSelectionListener listener, @Nullable SdlArtwork icon, @Nullable List<String> voiceCommands) {
+	public MenuCell(@NonNull String title, @Nullable SdlArtwork icon, @Nullable List<String> voiceCommands, @Nullable MenuSelectionListener listener) {
 		setTitle(title); // title is the only required param
 		setIcon(icon);
 		setVoiceCommands(voiceCommands);