Updte findAllArtworksToBeUploadedFromCells() to check if images are supported

Author: bilal-alsharifi

base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuReplaceOperation.java

@@ -198,7 +198,7 @@ public void onComplete(boolean success) {
     }
 
     private void uploadMenuArtworks(final CompletionListener listener) {
-        List<SdlArtwork> artworksToBeUploaded = new ArrayList<>(findAllArtworksToBeUploadedFromCells(updatedMenu, fileManager.get(), windowCapability));
+        List<SdlArtwork> artworksToBeUploaded = new ArrayList<>(findAllArtworksToBeUploadedFromCells(internalInterface.get(), updatedMenu, fileManager.get(), windowCapability));
         if (artworksToBeUploaded.isEmpty()) {
             listener.onComplete(true);
             return;

base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuReplaceUtilities.java

@@ -118,7 +118,7 @@ static void transferCellListenersFromCells(List<MenuCell> fromCells, List<MenuCe
         }
     }
 
-    static Set<SdlArtwork> findAllArtworksToBeUploadedFromCells(List<MenuCell> cells, FileManager fileManager, WindowCapability windowCapability) {
+    static Set<SdlArtwork> findAllArtworksToBeUploadedFromCells(ISdl internalInterface, List<MenuCell> cells, FileManager fileManager, WindowCapability windowCapability) {
         // Make sure we can use images in the menus
         if (!hasImageFieldOfName(windowCapability, ImageFieldName.cmdIcon)) {
             return new HashSet<>();
@@ -127,15 +127,15 @@ static Set<SdlArtwork> findAllArtworksToBeUploadedFromCells(List<MenuCell> cells
         Set<SdlArtwork> artworks = new HashSet<>();
         for (MenuCell cell : cells) {
             if (fileManager != null) {
-                if (fileManager.fileNeedsUpload(cell.getIcon())) {
+                if (windowCapabilitySupportsPrimaryImage(internalInterface, windowCapability, cell) && fileManager.fileNeedsUpload(cell.getIcon())) {
                     artworks.add(cell.getIcon());
                 }
-                if (hasImageFieldOfName(windowCapability, ImageFieldName.menuCommandSecondaryImage) && fileManager.fileNeedsUpload(cell.getSecondaryArtwork())) {
+                if (windowCapabilitySupportsSecondaryImage(windowCapability, cell) && fileManager.fileNeedsUpload(cell.getSecondaryArtwork())) {
                     artworks.add(cell.getSecondaryArtwork());
                 }
             }
             if (cell.isSubMenuCell() && !cell.getSubCells().isEmpty()) {
-                artworks.addAll(findAllArtworksToBeUploadedFromCells(cell.getSubCells(), fileManager, windowCapability));
+                artworks.addAll(findAllArtworksToBeUploadedFromCells(internalInterface, cell.getSubCells(), fileManager, windowCapability));
             }
         }