diff options
| author | Frank Elias <francois.elias@livio.io> | 2021-02-26 10:34:48 -0500 |
|---|---|---|
| committer | Frank Elias <francois.elias@livio.io> | 2021-02-26 10:34:48 -0500 |
| commit | 42c626a45efde5a4925bcc4cd8bbe176e434974a (patch) | |
| tree | 0b2095ce0ace3e3a20df5e0dc3802170e2330a28 | |
| parent | c9db35d11bc18c8f7a341f0f4231a381f9e3be2e (diff) | |
| download | sdl_ios-42c626a45efde5a4925bcc4cd8bbe176e434974a.tar.gz | |
Fix for empty string bug
| -rw-r--r-- | SmartDeviceLink/private/SDLMenuManager.m | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/SmartDeviceLink/private/SDLMenuManager.m b/SmartDeviceLink/private/SDLMenuManager.m index a01861d6f..87f933e35 100644 --- a/SmartDeviceLink/private/SDLMenuManager.m +++ b/SmartDeviceLink/private/SDLMenuManager.m @@ -673,8 +673,8 @@ UInt32 const MenuCellIdMin = 1; params.menuName = cell.title; params.parentID = cell.parentCellId != UINT32_MAX ? @(cell.parentCellId) : nil; params.position = @(position); - params.tertiaryText = cell.tertiaryText; - params.secondaryText = cell.secondaryText; + params.secondaryText = ([cell.secondaryText isEqualToString:@""]) ? nil : cell.secondaryText; + params.tertiaryText = ([cell.tertiaryText isEqualToString:@""]) ? nil : cell.tertiaryText; command.menuParams = params; command.vrCommands = (cell.voiceCommands.count == 0) ? nil : cell.voiceCommands; @@ -695,7 +695,11 @@ UInt32 const MenuCellIdMin = 1; } else { submenuLayout = self.menuConfiguration.defaultSubmenuLayout; } - return [[SDLAddSubMenu alloc] initWithMenuID:cell.cellId menuName:cell.title position:@(position) menuIcon:icon menuLayout:submenuLayout parentID:nil secondaryText:cell.secondaryText tertiaryText:cell.tertiaryText secondaryImage:secondaryImage]; + + NSString *secondaryText = ([cell.secondaryText isEqualToString:@""]) ? nil : cell.secondaryText; + NSString *tertiaryText = ([cell.tertiaryText isEqualToString:@""]) ? nil : cell.tertiaryText; + + return [[SDLAddSubMenu alloc] initWithMenuID:cell.cellId menuName:cell.title position:@(position) menuIcon:icon menuLayout:submenuLayout parentID:nil secondaryText:secondaryText tertiaryText:tertiaryText secondaryImage:secondaryImage]; } #pragma mark - Calling handlers |