diff options
| author | Frank Elias <francois.elias@livio.io> | 2021-03-04 15:39:31 -0500 |
|---|---|---|
| committer | Frank Elias <francois.elias@livio.io> | 2021-03-04 15:39:31 -0500 |
| commit | 142b92072f47eeebc0686a44c5cafacb8706b02e (patch) | |
| tree | 21278769f8fffe5ced90dd5d597c16acfad5ed65 | |
| parent | 3baa380fc9dd7f1945f2126671cf4e931e45e71e (diff) | |
| download | sdl_ios-142b92072f47eeebc0686a44c5cafacb8706b02e.tar.gz | |
Checks to handsl secondary and tertiary texts
| -rw-r--r-- | SmartDeviceLink/private/SDLMenuManager.m | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/SmartDeviceLink/private/SDLMenuManager.m b/SmartDeviceLink/private/SDLMenuManager.m index 383b3f220..86665e2b5 100644 --- a/SmartDeviceLink/private/SDLMenuManager.m +++ b/SmartDeviceLink/private/SDLMenuManager.m @@ -724,8 +724,8 @@ UInt32 const MenuCellIdMin = 1; params.menuName = cell.uniqueTitle; params.parentID = cell.parentCellId != UINT32_MAX ? @(cell.parentCellId) : nil; params.position = @(position); - params.secondaryText = (cell.secondaryText.length == 0) ? nil : cell.secondaryText; - params.tertiaryText = (cell.tertiaryText.length == 0) ? nil : cell.tertiaryText; + params.secondaryText = (cell.secondaryText.length == 0 || ![self.windowCapability hasTextFieldOfName:SDLTextFieldNameMenuCommandSecondaryText]) ? nil : cell.secondaryText; + params.tertiaryText = (cell.tertiaryText.length == 0 || ![self.windowCapability hasTextFieldOfName:SDLTextFieldNameMenuCommandTertiaryText]) ? nil : cell.tertiaryText; command.menuParams = params; command.vrCommands = (cell.voiceCommands.count == 0) ? nil : cell.voiceCommands; @@ -747,8 +747,8 @@ UInt32 const MenuCellIdMin = 1; submenuLayout = self.menuConfiguration.defaultSubmenuLayout; } - NSString *secondaryText = (cell.secondaryText.length == 0) ? nil : cell.secondaryText; - NSString *tertiaryText = (cell.tertiaryText.length == 0) ? nil : cell.tertiaryText; + NSString *secondaryText = (cell.secondaryText.length == 0 || ![self.windowCapability hasTextFieldOfName:SDLTextFieldNameMenuSubMenuSecondaryText]) ? nil : cell.secondaryText; + NSString *tertiaryText = (cell.tertiaryText.length == 0 || ![self.windowCapability hasTextFieldOfName:SDLTextFieldNameMenuSubMenuTertiaryText]) ? nil : cell.tertiaryText; return [[SDLAddSubMenu alloc] initWithMenuID:cell.cellId menuName:cell.uniqueTitle position:@(position) menuIcon:icon menuLayout:submenuLayout parentID:nil secondaryText:secondaryText tertiaryText:tertiaryText secondaryImage:secondaryImage]; } |