APPLINK-6464: Change Registration Languages are rejected fixed

diff --git a/src/appMain/hmi_capabilities.json b/src/appMain/hmi_capabilities.json
index 6750ef7..7015e57 100644 (file)
--- a/src/appMain/hmi_capabilities.json
+++ b/src/appMain/hmi_capabilities.json
@@ -2,9 +2,9 @@
        "UI":
        {
                "language":"EN-US",
-           "languages":
-           [
-               "EN-US","ES-MX","FR-CA","DE-DE","ES-ES","EN-GB","RU-RU","TR-TR","PL-PL","FR-FR","IT-IT","SV-SE","PT-PT","NL-NL","ZH-TW","JA-JP","AR-SA","KO-KR","PT-BR","CS-CZ","DA-DK","NO-NO"
+           "languages":[ 
+          "EN_US","ES_MX","FR_CA","DE_DE","ES_ES","EN_GB","RU_RU","TR_TR","PL_PL","FR_FR","IT_IT","SV_SE","PT_PT","NL_NL","ZH_TW",
+"JA_JP","AR_SA","KO_KR","PT_BR","CS_CZ","DA_DK","NO_NO"
            ],
            "displayCapabilities":
                {
@@ -140,18 +140,20 @@
        {
                "capabilities":["TEXT"],
                "language":"EN-US",
-           "languages":
-           [
-               "EN-US","ES-MX","FR-CA","DE-DE","ES-ES","EN-GB","RU-RU","TR-TR","PL-PL","FR-FR","IT-IT","SV-SE","PT-PT","NL-NL","ZH-TW","JA-JP","AR-SA","KO-KR","PT-BR","CS-CZ","DA-DK","NO-NO"
-           ]
-    },
+           "languages":    
+            [ 
+         "EN_US","ES_MX","FR_CA","DE_DE","ES_ES","EN_GB","RU_RU","TR_TR","PL_PL","FR_FR","IT_IT","SV_SE","PT_PT","NL_NL","ZH_TW",
+"JA_JP","AR_SA","KO_KR","PT_BR","CS_CZ","DA_DK","NO_NO"
+            ]      
+},
     "TTS":
        {
                "capabilities":"TEXT",
                "language":"EN-US",
            "languages":
            [
-               "EN-US","ES-MX","FR-CA","DE-DE","ES-ES","EN-GB","RU-RU","TR-TR","PL-PL","FR-FR","IT-IT","SV-SE","PT-PT","NL-NL","ZH-TW","JA-JP","AR-SA","KO-KR","PT-BR","CS-CZ","DA-DK","NO-NO"
+         "EN_US","ES_MX","FR_CA","DE_DE","ES_ES","EN_GB","RU_RU","TR_TR","PL_PL","FR_FR","IT_IT","SV_SE","PT_PT","NL_NL","ZH_TW",
+"JA_JP","AR_SA","KO_KR","PT_BR","CS_CZ","DA_DK","NO_NO"
            ]
     },
     "Buttons":

diff --git a/src/components/HMI/ffw/RPCObserver.js b/src/components/HMI/ffw/RPCObserver.js
index 2f60963..42227d7 100644 (file)
--- a/src/components/HMI/ffw/RPCObserver.js
+++ b/src/components/HMI/ffw/RPCObserver.js
@@ -82,7 +82,7 @@ FFW.RPCObserver = Em.Object
                 var parsedMethod = request.method.split(/[.]/), validateFunc, result;\r
 \r
                 //if (request.params && "appID" in request.params && SDL.SDLModel.registeredApps.filterProperty('appID', request.params.appID).length > 0) {\r
-                if ("appID" in request.params && SDL.SDLModel.registeredApps.filterProperty('appID', request.params.appID).length <= 0) {\r
+                if (request.params && "appID" in request.params && SDL.SDLModel.registeredApps.filterProperty('appID', request.params.appID).length <= 0) {\r
                     Em.Logger.error('No application registered with current appID!');\r
                     return false;\r
                 }\r
@@ -113,4 +113,4 @@ FFW.RPCObserver = Em.Object
                 }\r
             }\r
         }\r
-    });
\ No newline at end of file
+    });\r

diff --git a/src/components/application_manager/src/hmi_capabilities.cc b/src/components/application_manager/src/hmi_capabilities.cc
index be6eb94..1087a5e 100644 (file)
--- a/src/components/application_manager/src/hmi_capabilities.cc
+++ b/src/components/application_manager/src/hmi_capabilities.cc
@@ -56,14 +56,14 @@ std::map<std::string, hmi_apis::Common_Language::eType> languages_enum_values =
     {"DE_DE", hmi_apis::Common_Language::DE_DE},
     {"ES_ES", hmi_apis::Common_Language::ES_ES},
     {"EN_GB", hmi_apis::Common_Language::EN_GB},
-    {"TR_TR", hmi_apis::Common_Language::RU_RU},
+    {"RU_RU", hmi_apis::Common_Language::RU_RU},
     {"TR_TR", hmi_apis::Common_Language::TR_TR},
     {"PL_PL", hmi_apis::Common_Language::PL_PL},
     {"FR_FR", hmi_apis::Common_Language::FR_FR},
     {"IT_IT", hmi_apis::Common_Language::IT_IT},
     {"SV_SE", hmi_apis::Common_Language::SV_SE},
     {"PT_PT", hmi_apis::Common_Language::PT_PT},
-    {"EN_AU", hmi_apis::Common_Language::NL_NL},
+    {"NL_NL", hmi_apis::Common_Language::NL_NL},
     {"EN_AU", hmi_apis::Common_Language::EN_AU},
     {"ZH_CN", hmi_apis::Common_Language::ZH_CN},
     {"ZH_TW", hmi_apis::Common_Language::ZH_TW},
@@ -556,9 +556,12 @@ bool HMICapabilities::load_capabilities_from_file() {
     Json::Value languages = ui.get("languages", "");
     smart_objects::SmartObject ui_languages =
         smart_objects::SmartObject(smart_objects::SmartType_Array);
-    for (int32_t i = 0; i < languages.size(); i++) {
-      ui_languages[i] =
-          languages_enum_values.find(languages[i].asString())->second;
+    for (int32_t i = 0, j = 0; i < languages.size(); i++) {
+      std::map<std::string, hmi_apis::Common_Language::eType>::const_iterator it =
+          languages_enum_values.find(languages[i].asString());
+      if (languages_enum_values.end() != it) {
+        ui_languages[j++] =  it->second;
+      }
     }
     set_ui_supported_languages(ui_languages);
 
@@ -699,11 +702,14 @@ bool HMICapabilities::load_capabilities_from_file() {
     languages = vr.get("languages", "");
     smart_objects::SmartObject vr_languages =
         smart_objects::SmartObject(smart_objects::SmartType_Array);
-    for (int32_t i = 0; i < languages.size(); i++) {
-      vr_languages[i] =
-          languages_enum_values.find(languages[i].asString())->second;
+    for (int32_t i = 0, j = 0; i < languages.size(); i++) {
+      std::map<std::string, hmi_apis::Common_Language::eType>::const_iterator it =
+          languages_enum_values.find(languages[i].asString());
+      if (languages_enum_values.end() != it) {
+        vr_languages[j++] = it->second;
+      }
     }
-    set_vr_supported_languages(ui_languages);
+    set_vr_supported_languages(vr_languages);
 
     Json::Value capabilities = vr.get("capabilities", "");
     smart_objects::SmartObject vr_capabilities =
@@ -722,11 +728,15 @@ bool HMICapabilities::load_capabilities_from_file() {
     languages = tts.get("languages", "");
     smart_objects::SmartObject tts_languages =
         smart_objects::SmartObject(smart_objects::SmartType_Array);
-    for (int32_t i = 0; i < languages.size(); i++) {
-      tts_languages[i] =
-          languages_enum_values.find(languages[i].asString())->second;
+    for (int32_t i = 0, j = 0; i < languages.size(); i++) {
+      std::map<std::string, hmi_apis::Common_Language::eType>::const_iterator it =
+          languages_enum_values.find(languages[i].asString());
+      if (languages_enum_values.end() != it) {
+        tts_languages[j++] =  it->second;
+      }
     }
-    set_tts_supported_languages(ui_languages);
+    set_tts_supported_languages(tts_languages);
+
     set_speech_capabilities(
         smart_objects::SmartObject(tts.get("capabilities", "").asString()));