diff options
Diffstat (limited to 'base/src/main/java/com/smartdevicelink/managers/screen/choiceset/CheckChoiceVROptionalOperation.java')
-rw-r--r-- | base/src/main/java/com/smartdevicelink/managers/screen/choiceset/CheckChoiceVROptionalOperation.java | 43 |
1 files changed, 9 insertions, 34 deletions
diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/CheckChoiceVROptionalOperation.java b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/CheckChoiceVROptionalOperation.java index 6e606b62d..6cc0283d9 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/CheckChoiceVROptionalOperation.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/CheckChoiceVROptionalOperation.java @@ -41,7 +41,6 @@ import com.smartdevicelink.proxy.interfaces.ISdl; import com.smartdevicelink.proxy.rpc.Choice; import com.smartdevicelink.proxy.rpc.CreateInteractionChoiceSet; import com.smartdevicelink.proxy.rpc.DeleteInteractionChoiceSet; -import com.smartdevicelink.proxy.rpc.enums.Result; import com.smartdevicelink.proxy.rpc.listeners.OnRPCResponseListener; import com.smartdevicelink.util.DebugTool; @@ -86,12 +85,6 @@ class CheckChoiceVROptionalOperation extends Task { sendTestChoiceWithVR(); } } - - @Override - public void onError(int correlationId, Result resultCode, String info){ - DebugTool.logWarning(TAG, "Head unit doesn't support choices with no VR. Error: " + info + " resultCode: " + resultCode); - sendTestChoiceWithVR(); - } }); if (internalInterface.get() != null) { @@ -123,17 +116,6 @@ class CheckChoiceVROptionalOperation extends Task { CheckChoiceVROptionalOperation.super.onFinished(); } } - - @Override - public void onError(int correlationId, Result resultCode, String info){ - DebugTool.logError(TAG, "There was an error in the check choice vr optional operation. Send test choice with VR failed. Error: " + info + " resultCode: " + resultCode); - isVROptional = false; - if (checkChoiceVROptionalInterface != null){ - checkChoiceVROptionalInterface.onError(info); - } - - CheckChoiceVROptionalOperation.super.onFinished(); - } }); if (internalInterface.get() != null) { @@ -146,24 +128,17 @@ class CheckChoiceVROptionalOperation extends Task { delete.setOnRPCResponseListener(new OnRPCResponseListener() { @Override public void onResponse(int correlationId, RPCResponse response) { - if (response.getSuccess() != null){ + if (response.getSuccess()){ DebugTool.logInfo(TAG, "Delete choice test set: "+ response.getSuccess()); + if (checkChoiceVROptionalInterface != null){ + checkChoiceVROptionalInterface.onCheckChoiceVROperationComplete(isVROptional); + } + } else { + DebugTool.logError(TAG, "There was an error presenting the keyboard. Finishing operation - choice set manager - . Error: " + response.getInfo() + " resultCode: " + response.getResultCode()); + if (checkChoiceVROptionalInterface != null){ + checkChoiceVROptionalInterface.onError(response.getInfo()); + } } - - if (checkChoiceVROptionalInterface != null){ - checkChoiceVROptionalInterface.onCheckChoiceVROperationComplete(isVROptional); - } - - CheckChoiceVROptionalOperation.super.onFinished(); - } - - @Override - public void onError(int correlationId, Result resultCode, String info){ - DebugTool.logError(TAG, "There was an error presenting the keyboard. Finishing operation - choice set manager - . Error: " + info + " resultCode: " + resultCode); - if (checkChoiceVROptionalInterface != null){ - checkChoiceVROptionalInterface.onError(info); - } - CheckChoiceVROptionalOperation.super.onFinished(); } }); |