diff options
| author | BrettyWhite <geekman3454@protonmail.com> | 2019-07-30 16:38:10 -0400 |
|---|---|---|
| committer | BrettyWhite <geekman3454@protonmail.com> | 2019-07-30 16:38:10 -0400 |
| commit | a646461cb13d6d8c90f6bec7a5689e1203c9f9ba (patch) | |
| tree | 62fb47b8ae00670d58b4f899ac7a30affc39af3d | |
| parent | e842f9b158f47db37b5aee7700d27f4fc49171d4 (diff) | |
| download | sdl_android-a646461cb13d6d8c90f6bec7a5689e1203c9f9ba.tar.gz | |
add version checks
| -rw-r--r-- | base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseMenuManager.java | 15 |
1 files changed, 15 insertions, 0 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 862d0119f..17aeb3090 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 @@ -54,6 +54,7 @@ import com.smartdevicelink.proxy.rpc.ImageField; import com.smartdevicelink.proxy.rpc.MenuParams; import com.smartdevicelink.proxy.rpc.OnCommand; import com.smartdevicelink.proxy.rpc.OnHMIStatus; +import com.smartdevicelink.proxy.rpc.SdlMsgVersion; import com.smartdevicelink.proxy.rpc.ShowAppMenu; import com.smartdevicelink.proxy.rpc.enums.DisplayType; import com.smartdevicelink.proxy.rpc.enums.HMILevel; @@ -253,6 +254,13 @@ abstract class BaseMenuManager extends BaseSubManager { * Opens the Main Menu */ public void openMenu(){ + + SdlMsgVersion sdlMsgVersion = internalInterface.getSdlMsgVersion(); + + if (sdlMsgVersion.getMajorVersion() < 6){ + DebugTool.logWarning("Menu opening is only supported on head units with RPC spec version 6.0.0 or later. Currently connected head unit RPC spec version is: "+sdlMsgVersion.getMajorVersion() + "." + sdlMsgVersion.getMinorVersion()+ "." +sdlMsgVersion.getPatchVersion()); + return; + } ShowAppMenu showAppMenu = new ShowAppMenu(); showAppMenu.setOnRPCResponseListener(new OnRPCResponseListener() { @@ -279,6 +287,13 @@ abstract class BaseMenuManager extends BaseSubManager { */ public boolean openSubMenu(@NonNull MenuCell cell){ + SdlMsgVersion sdlMsgVersion = internalInterface.getSdlMsgVersion(); + + if (sdlMsgVersion.getMajorVersion() < 6){ + DebugTool.logWarning("Sub menu opening is only supported on head units with RPC spec version 6.0.0 or later. Currently connected head unit RPC spec version is: "+sdlMsgVersion.getMajorVersion() + "." + sdlMsgVersion.getMinorVersion()+ "." +sdlMsgVersion.getPatchVersion()); + return false; + } + if (oldMenuCells == null){ DebugTool.logError("open sub menu called, but no Menu cells have been set"); return false; |