Remove onError from MenuManager

2 files changed, 29 insertions, 59 deletions

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 0fcfc2c4c..2c17a6d94 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
@@ -285,11 +285,6 @@ abstract class BaseMenuManager extends BaseSubManager {
                     DebugTool.logError(TAG, "Open Main Menu Request Failed");
                 }
             }
-
-            @Override
-            public void onError(int correlationId, Result resultCode, String info){
-                DebugTool.logError(TAG, "Open Main Menu onError: "+ resultCode+ " | Info: "+ info);
-            }
         });
         internalInterface.sendRPC(showAppMenu);
         return true;
@@ -334,11 +329,6 @@ abstract class BaseMenuManager extends BaseSubManager {
                     DebugTool.logError(TAG, "Open Sub Menu Request Failed");
                 }
             }
-
-            @Override
-            public void onError(int correlationId, Result resultCode, String info){
-                DebugTool.logError(TAG, "Open Sub Menu onError: "+ resultCode+ " | Info: "+ info);
-            }
         });
 
         internalInterface.sendRPC(showAppMenu);
@@ -381,13 +371,10 @@ abstract class BaseMenuManager extends BaseSubManager {
 				public void onResponse(int correlationId, RPCResponse response) {
 					if (response.getSuccess()) {
 						DebugTool.logInfo(TAG, "Menu Configuration successfully set: " + menuConfiguration.toString());
+					} else {
+						DebugTool.logError(TAG, "onError: " + response.getResultCode() + " | Info: " + response.getInfo());
 					}
 				}
-
-				@Override
-				public void onError(int correlationId, Result resultCode, String info) {
-					DebugTool.logError(TAG, "onError: " + resultCode + " | Info: " + info);
-				}
 			});
 			internalInterface.sendRPC(setGlobalProperties);
 		} else {
@@ -1175,16 +1162,15 @@ abstract class BaseMenuManager extends BaseSubManager {
 			}
 
 			@Override
-			public void onError(int correlationId, Result resultCode, String info) {
-				DebugTool.logError(TAG, "Result: " + resultCode.toString() + " Info: " + info);
-			}
-
-			@Override
 			public void onResponse(int correlationId, RPCResponse response) {
-				try {
-					DebugTool.logInfo(TAG, "Main Menu response: " + response.serializeJSON().toString());
-				} catch (JSONException e) {
-					e.printStackTrace();
+				if (response.getSuccess()) {
+					try {
+						DebugTool.logInfo(TAG, "Main Menu response: " + response.serializeJSON().toString());
+					} catch (JSONException e) {
+						e.printStackTrace();
+					}
+				} else {
+					DebugTool.logError(TAG, "Result: " + response.getResultCode() + " Info: " + response.getInfo());
 				}
 			}
 		});
@@ -1214,19 +1200,18 @@ abstract class BaseMenuManager extends BaseSubManager {
 			}
 
 			@Override
-			public void onError(int correlationId, Result resultCode, String info) {
-				DebugTool.logError(TAG, "Failed to send sub menu commands: "+ info);
-				if (listener != null){
-					listener.onComplete(false);
-				}
-			}
-
-			@Override
 			public void onResponse(int correlationId, RPCResponse response) {
-				try {
-					DebugTool.logInfo(TAG, "Sub Menu response: "+ response.serializeJSON().toString());
-				} catch (JSONException e) {
-					e.printStackTrace();
+				if (response.getSuccess()) {
+					try {
+						DebugTool.logInfo(TAG, "Sub Menu response: " + response.serializeJSON().toString());
+					} catch (JSONException e) {
+						e.printStackTrace();
+					}
+				} else {
+					DebugTool.logError(TAG, "Failed to send sub menu commands: "+ response.getInfo());
+					if (listener != null){
+						listener.onComplete(false);
+					}
 				}
 			}
 		});
@@ -1267,16 +1252,15 @@ abstract class BaseMenuManager extends BaseSubManager {
 			}
 
 			@Override
-			public void onError(int correlationId, Result resultCode, String info) {
-				DebugTool.logError(TAG, "Result: " + resultCode.toString() + " Info: " + info);
-			}
-
-			@Override
 			public void onResponse(int correlationId, RPCResponse response) {
-				try {
-					DebugTool.logInfo(TAG, "Dynamic Sub Menu response: " + response.serializeJSON().toString());
-				} catch (JSONException e) {
-					e.printStackTrace();
+				if (response.getSuccess()) {
+					try {
+						DebugTool.logInfo(TAG, "Dynamic Sub Menu response: " + response.serializeJSON().toString());
+					} catch (JSONException e) {
+						e.printStackTrace();
+					}
+				} else {
+					DebugTool.logError(TAG, "Result: " + response.getResultCode() + " Info: " + response.getInfo());
 				}
 			}
 		});
@@ -1331,10 +1315,6 @@ abstract class BaseMenuManager extends BaseSubManager {
 			}
 
 			@Override
-			public void onError(int correlationId, Result resultCode, String info) {
-			}
-
-			@Override
 			public void onResponse(int correlationId, RPCResponse response) {
 
 			}
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 c615408fd..a31a3d02b 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
@@ -206,11 +206,6 @@ abstract class BaseVoiceCommandManager extends BaseSubManager {
 			}
 
 			@Override
-			public void onError(int correlationId, Result resultCode, String info) {
-
-			}
-
-			@Override
 			public void onResponse(int correlationId, RPCResponse response) {}
 		});
 
@@ -245,11 +240,6 @@ abstract class BaseVoiceCommandManager extends BaseSubManager {
 			}
 
 			@Override
-			public void onError(int correlationId, Result resultCode, String info) {
-
-			}
-
-			@Override
 			public void onResponse(int correlationId, RPCResponse response) {
 			}
 		});