Add check for empty string in menu managerbugfix/issue_1623

1 files changed, 4 insertions, 4 deletions

diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseMenuManager.java b/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseMenuManager.java
index a65e44895..86760c889 100644
--- a/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseMenuManager.java
+++ b/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseMenuManager.java
@@ -962,8 +962,8 @@ abstract class BaseMenuManager extends BaseSubManager {
     private AddCommand commandForMenuCell(MenuCell cell, boolean shouldHaveArtwork, int position) {
 
         MenuParams params = new MenuParams(cell.getUniqueTitle());
-        params.setSecondaryText(cell.getSecondaryText());
-        params.setTertiaryText(cell.getTertiaryText());
+        params.setSecondaryText((cell.getSecondaryText() != null && cell.getSecondaryText().length() == 0) ? null : cell.getSecondaryText());
+        params.setTertiaryText((cell.getTertiaryText() != null && cell.getTertiaryText().length() == 0) ? null : cell.getTertiaryText());
         params.setParentID(cell.getParentCellId() != MAX_ID ? cell.getParentCellId() : null);
         params.setPosition(position);
 
@@ -982,8 +982,8 @@ abstract class BaseMenuManager extends BaseSubManager {
 
     private AddSubMenu subMenuCommandForMenuCell(MenuCell cell, boolean shouldHaveArtwork, int position) {
         AddSubMenu subMenu = new AddSubMenu(cell.getCellId(), cell.getUniqueTitle());
-        subMenu.setSecondaryText(cell.getSecondaryText());
-        subMenu.setTertiaryText(cell.getTertiaryText());
+        subMenu.setSecondaryText((cell.getSecondaryText() != null && cell.getSecondaryText().length() == 0) ? null : cell.getSecondaryText());
+        subMenu.setTertiaryText((cell.getTertiaryText() != null && cell.getTertiaryText().length() == 0) ? null : cell.getTertiaryText());
         subMenu.setPosition(position);
         if (cell.getSubMenuLayout() != null) {
             subMenu.setMenuLayout(cell.getSubMenuLayout());