Fix Review feedback, error logs and delete error

Author: Henigan

base/src/main/java/com/smartdevicelink/managers/screen/choiceset/BaseChoiceSetManager.java

@@ -301,8 +301,8 @@ public void onError(String error) {
                         choiceSet.getChoiceSetSelectionListener().onError("Incorrect State");
                     } else {
                         DebugTool.logError(TAG, "Present finished but an unhandled state occurred and callback failed");
+                        choiceSet.getChoiceSetSelectionListener().onError("callback failed");
                     }
-                    choiceSet.getChoiceSetSelectionListener().onError(error);
                 }
             }
         };

base/src/main/java/com/smartdevicelink/managers/screen/choiceset/DeleteChoicesOperation.java

@@ -53,6 +53,7 @@ class DeleteChoicesOperation extends Task {
     private HashSet<ChoiceCell> cellsToDelete;
     private final BaseChoiceSetManager.ChoicesOperationCompletionListener completionListener;
     private HashSet<ChoiceCell> loadedCells;
+    private List<DeleteInteractionChoiceSet> deleteChoices;
     private boolean completionSuccess = false;
 
     DeleteChoicesOperation(ISdl internalInterface, HashSet<ChoiceCell> cellsToDelete, HashSet<ChoiceCell> loadedCells, BaseChoiceSetManager.ChoicesOperationCompletionListener completionListener) {
@@ -79,7 +80,7 @@ public void onExecute() {
 
     private void sendDeletions() {
 
-        List<DeleteInteractionChoiceSet> deleteChoices = createDeleteSets();
+        deleteChoices = createDeleteSets();
 
         if (deleteChoices.size() > 0) {
 
@@ -110,7 +111,7 @@ public void onResponse(int correlationId, RPCResponse response) {
                             DeleteChoicesOperation.super.onFinished();
                         } else {
                             if (loadedCells != null) {
-                                loadedCells.remove(loadedCellFromChoiceId(correlationId));
+                                loadedCells.remove(loadedCellFromCorrelationId(deleteChoices, correlationId));
                             }
                         }
                     }
@@ -144,7 +145,20 @@ private void updateCellsToDelete() {
         this.cellsToDelete = updatedCellsToDelete;
     }
 
-    private ChoiceCell loadedCellFromChoiceId(int choiceId) {
+    private ChoiceCell loadedCellFromCorrelationId(List<DeleteInteractionChoiceSet> deleteRpcs, int correlationId) {
+
+        Integer choiceId = null;
+
+        for (DeleteInteractionChoiceSet rpc : deleteRpcs) {
+            if (rpc.getCorrelationID() == correlationId) {
+                choiceId = rpc.getInteractionChoiceSetID();
+            }
+        }
+
+        if (choiceId == null) {
+            return null;
+        }
+
         for (ChoiceCell cell : this.loadedCells) {
             if (cell.getChoiceId() == choiceId) {
                 return cell;