Use set in findAllArtworksToBeUploadedFromCells() to prevent duplicates

2 files changed, 6 insertions, 4 deletions

diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuReplaceOperation.java b/base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuReplaceOperation.java
index 3a597acbf..7db1a85b9 100644
--- a/base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuReplaceOperation.java
+++ b/base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuReplaceOperation.java
@@ -198,7 +198,7 @@ class MenuReplaceOperation extends Task {
     }
 
     private void uploadMenuArtworks(final CompletionListener listener) {
-        List<SdlArtwork> artworksToBeUploaded = findAllArtworksToBeUploadedFromCells(updatedMenu, fileManager.get(), windowCapability);
+        List<SdlArtwork> artworksToBeUploaded = new ArrayList<>(findAllArtworksToBeUploadedFromCells(updatedMenu, fileManager.get(), windowCapability));
         if (artworksToBeUploaded.isEmpty()) {
             listener.onComplete(true);
             return;
diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuReplaceUtilities.java b/base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuReplaceUtilities.java
index 46daf1620..f274130d3 100644
--- a/base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuReplaceUtilities.java
+++ b/base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuReplaceUtilities.java
@@ -55,8 +55,10 @@ import com.smartdevicelink.proxy.rpc.listeners.OnMultipleRequestListener;
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * Created by Bilal Alsharifi on 1/25/21.
@@ -115,13 +117,13 @@ class MenuReplaceUtilities {
         }
     }
 
-    static List<SdlArtwork> findAllArtworksToBeUploadedFromCells(List<MenuCell> cells, FileManager fileManager, WindowCapability windowCapability) {
+    static Set<SdlArtwork> findAllArtworksToBeUploadedFromCells(List<MenuCell> cells, FileManager fileManager, WindowCapability windowCapability) {
         // Make sure we can use images in the menus
         if (!hasImageFieldOfName(windowCapability, ImageFieldName.cmdIcon)) {
-            return new ArrayList<>();
+            return new HashSet<>();
         }
 
-        List<SdlArtwork> artworks = new ArrayList<>();
+        Set<SdlArtwork> artworks = new HashSet<>();
         for (MenuCell cell : cells) {
             if (fileManager != null) {
                 if (fileManager.fileNeedsUpload(cell.getIcon())) {