Merge pull request #1 from ValeriiMalkov/fix/expandable_design_for_pr…

…oprietary_data_exchange Bugfix error at the OnSystemRequest method and
smartdevicelink · Apr 19, 2018 · fff7cf6 · fff7cf6
2 parents a5209ce + f4bd986
commit fff7cf6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/view/sdl/SystemRequestView.js b/app/view/sdl/SystemRequestView.js
@@ -106,7 +106,7 @@ SDL.SystemRequest = Em.ContainerView.create(
       {
         elementId: 'systemRequestLabel',
         classNames: 'systemRequestLabel',
-        content: 'System Request'
+        content: 'requestSubType'
       }
     ),
     /**

diff --git a/ffw/BasicCommunicationRPC.js b/ffw/BasicCommunicationRPC.js
@@ -1143,7 +1143,7 @@ FFW.BasicCommunication = FFW.RPCObserver
         if (appID) {
           JSONMessage.params.appID = appID;
         }
-         if(subType.length > 0){
+         if(subType && subType.length > 0){
           if (type == 'OEM_SPECIFIC'|| 
             type == 'HTTP'|| 
             type == 'PROPRIETARY') {