remove MEDIA template from non-media app capabilities #419
Conversation
src/js/Controllers/UIController.js
Outdated
| var showApp = store.getState().appList.find((app) => { | ||
| return app.appID === rpc.params.appID; | ||
| }); | ||
| var showAppIsMedia = showApp.appType.includes('MEDIA'); |
There was a problem hiding this comment.
HMIApplicationStruct has an additional (redundant) parameter to identify an app type. isMediaApplication
| var showAppIsMedia = showApp.appType.includes('MEDIA'); | |
| var showAppIsMedia = showApp.appType.includes('MEDIA') || showApp.isMediaApplication; |
untested ^
There was a problem hiding this comment.
This param is only in the OnAppRegistered notification and the app list state is only updated by the UpdateAppList notification, the isMediaApplication value is not stored anywhere in the state.
I thought this value was redundant as well, do you think it is worth adding this to the state? It wouldn't be straight forward to do because the OnAppRegistered arrives before UpdateAppList.
There was a problem hiding this comment.
I am seeing isMediaApplication sent in the UpdateAppList rpc
There was a problem hiding this comment.
Ah I was mistaken about that. That is the proper value to check, I have changed the appType checks in 0bcbcf1
| @@ -311,7 +314,9 @@ class RpcFactory { | |||
| "id": rpc.id, | |||
| "error": { | |||
| "code": 1, | |||
| "message": "The requested layout is not supported on this HMI", | |||
| "message": (templateConfiguration.template === 'MEDIA' | |||
| ? 'Only MEDIA apps may use the MEDIA template' | |||
There was a problem hiding this comment.
Same logic should be applied to SetDisplayLayout
…ut, check isMediaApplication instead of appType
Fixes #182
Summary
When sending OnSystemCapabilityUpdated, only include MEDIA template in templatesAvailable if an app is media type.
When receiving Show request, do not allow non-media app to use template MEDIA.
SetDisplayLayout is unmodified as it is deprecated.
The issue also incorrectly requests changes to the RAI response, the capabilities in the RAI response are not App specific and should not be influenced by the app type. The capabilities in the RAI response are unchanged by this PR.
CLA