Fix for SDLArtwork overwrite

4 files changed, 15 insertions, 15 deletions

diff --git a/SmartDeviceLink/private/SDLMenuManager.m b/SmartDeviceLink/private/SDLMenuManager.m
index bf5b59290..c68c3222f 100644
--- a/SmartDeviceLink/private/SDLMenuManager.m
+++ b/SmartDeviceLink/private/SDLMenuManager.m
@@ -472,7 +472,7 @@ UInt32 const MenuCellIdMin = 1;
     NSArray<SDLRPCRequest *> *mainMenuCommands = nil;
     NSArray<SDLRPCRequest *> *subMenuCommands = nil;
 
-    if ([self sdl_allArtworksUploaded:self.menuCells] || ![self.windowCapability hasImageFieldOfName:SDLImageFieldNameCommandIcon]) {
+    if (![self sdl_allArtworksUploaded:self.menuCells] || ![self.windowCapability hasImageFieldOfName:SDLImageFieldNameCommandIcon]) {
         // Send artwork-less menu
         mainMenuCommands = [self sdl_mainMenuCommandsForCells:updatedMenu withArtwork:NO usingIndexesFrom:menu];
         subMenuCommands =  [self sdl_subMenuCommandsForCells:updatedMenu withArtwork:NO];
@@ -554,32 +554,32 @@ UInt32 const MenuCellIdMin = 1;
 - (BOOL)sdl_artworkNeedsUpload:(SDLArtwork *)artwork {
     if (artwork != nil) {
         if (artwork.isStaticIcon) {
-            return false;
+            return NO;
         } else {
-            return artwork.overwrite || (self.fileManager != nil && ![self.fileManager hasUploadedFile:artwork]);
+            return (artwork.overwrite || (self.fileManager != nil && ![self.fileManager hasUploadedFile:artwork]));
         }
     }
-    return false;
+    return NO;
 }
 
 - (BOOL) sdl_allArtworksUploaded:(NSArray<SDLMenuCell *> *)cells {
     for (SDLMenuCell *cell in cells) {
         if (![self sdl_artworkUploaded:cell.icon]) {
-            return false;
+            return NO;
         }
-        if (cell.subCells != nil && [cell.subCells count]> 0) {
+        if (cell.subCells != nil && (cell.subCells.count) > 0) {
             return [self sdl_allArtworksUploaded:cell.subCells];
         }
     }
 
-    return true;
+    return YES;
 }
 
 - (BOOL) sdl_artworkUploaded:(SDLArtwork *)artwork {
     if (artwork != nil) {
         return artwork.isStaticIcon || (self.fileManager != nil && [self.fileManager hasUploadedFile:artwork]);
     }
-    return true;
+    return YES;
 }
 
 #pragma mark IDs
diff --git a/SmartDeviceLink/private/SDLPreloadChoicesOperation.m b/SmartDeviceLink/private/SDLPreloadChoicesOperation.m
index 8dd0e9704..d84cc1acf 100644
--- a/SmartDeviceLink/private/SDLPreloadChoicesOperation.m
+++ b/SmartDeviceLink/private/SDLPreloadChoicesOperation.m
@@ -116,12 +116,12 @@ NS_ASSUME_NONNULL_BEGIN
 - (BOOL)sdl_artworkNeedsUpload:(SDLArtwork *)artwork {
     if (artwork != nil) {
         if (artwork.isStaticIcon) {
-            return false;
+            return NO;
         } else {
             return artwork.overwrite || (self.fileManager != nil && ![self.fileManager hasUploadedFile:artwork]);
         }
     }
-    return false;
+    return NO;
 }
 
 - (void)sdl_preloadCells {
diff --git a/SmartDeviceLink/private/SDLSoftButtonReplaceOperation.m b/SmartDeviceLink/private/SDLSoftButtonReplaceOperation.m
index 12d17c5f2..f702efb43 100644
--- a/SmartDeviceLink/private/SDLSoftButtonReplaceOperation.m
+++ b/SmartDeviceLink/private/SDLSoftButtonReplaceOperation.m
@@ -230,12 +230,12 @@ NS_ASSUME_NONNULL_BEGIN
 - (BOOL)sdl_artworkNeedsUpload:(SDLArtwork *)artwork {
     if (artwork != nil && self.softButtonCapabilities.imageSupported) {
         if (artwork.isStaticIcon) {
-            return false;
+            return NO;
         } else {
             return artwork.overwrite || (self.fileManager != nil && ![self.fileManager hasUploadedFile:artwork]);
         }
     }
-    return false;
+    return NO;
 }
 
 /// Checks all the button states for images that need to be uploaded.
diff --git a/SmartDeviceLink/private/SDLTextAndGraphicUpdateOperation.m b/SmartDeviceLink/private/SDLTextAndGraphicUpdateOperation.m
index 9ac06fded..0c842dd2b 100644
--- a/SmartDeviceLink/private/SDLTextAndGraphicUpdateOperation.m
+++ b/SmartDeviceLink/private/SDLTextAndGraphicUpdateOperation.m
@@ -518,19 +518,19 @@ NS_ASSUME_NONNULL_BEGIN
 - (BOOL)sdl_artworkNeedsUpload:(SDLArtwork *)artwork {
     if (artwork != nil) {
         if (artwork.isStaticIcon) {
-            return false;
+            return NO;
         } else {
             return (artwork.overwrite || (![self.fileManager hasUploadedFile:artwork]));
         }
     }
-    return true;
+    return NO;
 }
 
 - (BOOL) sdl_artworkUploaded:(SDLArtwork *)artwork {
     if (artwork != nil) {
         return artwork.isStaticIcon || (self.fileManager != nil && [self.fileManager hasUploadedFile:artwork]);
     }
-    return true;
+    return NO;
 }
 
 - (BOOL)sdl_shouldUpdatePrimaryImage {