Merge pull request #1749 from smartdevicelink/bugfix/issue_1748

Get loadedCells if developer tries to present a recreated choiceset

Author: bilal-alsharifi

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

@@ -629,9 +629,13 @@ void makeCellsToUploadUnique(ArrayList<ChoiceCell> cellsToUpload) {
 
     private void updateChoiceSet(ChoiceSet choiceSet, HashSet<ChoiceCell> loadedCells, HashSet<ChoiceCell> cellsToUpload) {
         ArrayList<ChoiceCell> choiceSetCells = new ArrayList<>();
+        ArrayList<ChoiceCell> loadedCellsList = new ArrayList<>(loadedCells);
+        ArrayList<ChoiceCell> CellsToUploadList = new ArrayList<>(cellsToUpload);
         for (ChoiceCell cell : choiceSet.getChoices()) {
-            if (loadedCells.contains(cell) || cellsToUpload.contains(cell)) {
-                choiceSetCells.add(cell);
+            if (loadedCells.contains(cell)) {
+                choiceSetCells.add(loadedCellsList.get(loadedCellsList.indexOf(cell)));
+            } else if (cellsToUpload.contains(cell)) {
+                choiceSetCells.add(CellsToUploadList.get(CellsToUploadList.indexOf(cell)));
             }
         }
         this.choiceSet.setChoices((List<ChoiceCell>) choiceSetCells.clone());