diff options
author | Frank Elias <francois.elias@livio.io> | 2020-11-25 11:04:26 -0500 |
---|---|---|
committer | Frank Elias <francois.elias@livio.io> | 2020-11-25 11:04:26 -0500 |
commit | 25d39f9e7b458b6869c46d7d3bd422715a3654e4 (patch) | |
tree | 15e9141b865e55c1df689baa0da73f8b937faf9b | |
parent | 38e42ef7092edf96038adf2e96da1abeb35db322 (diff) | |
download | sdl_ios-25d39f9e7b458b6869c46d7d3bd422715a3654e4.tar.gz |
Comment fixes
-rw-r--r-- | SmartDeviceLink/private/SDLMenuManager.m | 11 | ||||
-rw-r--r-- | SmartDeviceLink/private/SDLTextAndGraphicUpdateOperation.m | 6 |
2 files changed, 9 insertions, 8 deletions
diff --git a/SmartDeviceLink/private/SDLMenuManager.m b/SmartDeviceLink/private/SDLMenuManager.m index e5fe5c4bd..74cb7b1b0 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_areAllCellArtworksUploaded: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]; @@ -559,22 +559,23 @@ UInt32 const MenuCellIdMin = 1; return NO; } -- (BOOL) sdl_areAllCellArtworksUploaded:(NSArray<SDLMenuCell *> *)cells { +- (BOOL)sdl_areAllCellArtworksUploaded:(NSArray<SDLMenuCell *> *)cells { for (SDLMenuCell *cell in cells) { - if (![self sdl_artworkUploaded:cell.icon]) { + if (![self sdl_isArtworkUploaded:cell.icon]) { return NO; } else if (cell.subCells != nil && (cell.subCells.count) > 0) { - return [self sdl_allArtworksUploaded:cell.subCells]; + return [self sdl_areAllCellArtworksUploaded:cell.subCells]; } } return YES; } -- (BOOL) sdl_isArtworkUploaded:(nullable SDLArtwork *)artwork { +- (BOOL)sdl_isArtworkUploaded:(nullable SDLArtwork *)artwork { if (artwork != nil) { return artwork.isStaticIcon || (self.fileManager != nil && [self.fileManager hasUploadedFile:artwork]); } + return YES; } diff --git a/SmartDeviceLink/private/SDLTextAndGraphicUpdateOperation.m b/SmartDeviceLink/private/SDLTextAndGraphicUpdateOperation.m index a7df9fb63..874b998ac 100644 --- a/SmartDeviceLink/private/SDLTextAndGraphicUpdateOperation.m +++ b/SmartDeviceLink/private/SDLTextAndGraphicUpdateOperation.m @@ -263,8 +263,8 @@ NS_ASSUME_NONNULL_BEGIN - (nullable SDLShow *)sdl_createImageOnlyShowWithPrimaryArtwork:(nullable SDLArtwork *)primaryArtwork secondaryArtwork:(nullable SDLArtwork *)secondaryArtwork { SDLShow *newShow = [[SDLShow alloc] init]; - newShow.graphic = [self sdl_artworkUploaded:primaryArtwork] ? primaryArtwork.imageRPC : nil; - newShow.secondaryGraphic = [self sdl_artworkUploaded:secondaryArtwork] ? secondaryArtwork.imageRPC : nil; + newShow.graphic = [self sdl_isArtworkUploaded:primaryArtwork] ? primaryArtwork.imageRPC : nil; + newShow.secondaryGraphic = [self sdl_isArtworkUploaded:secondaryArtwork] ? secondaryArtwork.imageRPC : nil; if (newShow.graphic == nil && newShow.secondaryGraphic == nil) { SDLLogV(@"No graphics to upload"); @@ -523,7 +523,7 @@ NS_ASSUME_NONNULL_BEGIN return NO; } -- (BOOL)sdl_artworkIsUploaded:(nullable SDLArtwork *)artwork { +- (BOOL)sdl_isArtworkUploaded:(nullable SDLArtwork *)artwork { if (artwork != nil) { return artwork.isStaticIcon || (self.fileManager != nil && [self.fileManager hasUploadedFile:artwork]); } |