diff options
author | Jacob Keeler <jacob.keeler@livioradio.com> | 2018-03-06 16:07:27 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-06 16:07:27 -0500 |
commit | 4c4326c2d81ad03ad1b0ca806ddf13eb1ba24da4 (patch) | |
tree | 609f6ee2b3c173277dc3cf4cb9c517b40d2f9338 /src/components/application_manager/src | |
parent | 79818b88f20a4da7cbbe333fffa2f4e0a4972fff (diff) | |
parent | 603340696e61ef213224c267a65a0c0683a21bb9 (diff) | |
download | sdl_core-4c4326c2d81ad03ad1b0ca806ddf13eb1ba24da4.tar.gz |
Merge pull request #2044 from smartdevicelink/fix/subscriptions_typo
Fix all misspellings of `subscriptions` in the project
Diffstat (limited to 'src/components/application_manager/src')
7 files changed, 67 insertions, 41 deletions
diff --git a/src/components/application_manager/src/commands/mobile/subscribe_vehicle_data_request.cc b/src/components/application_manager/src/commands/mobile/subscribe_vehicle_data_request.cc index 28cf4c754c..15ba7999bd 100644 --- a/src/components/application_manager/src/commands/mobile/subscribe_vehicle_data_request.cc +++ b/src/components/application_manager/src/commands/mobile/subscribe_vehicle_data_request.cc @@ -3,6 +3,9 @@ Copyright (c) 2013, Ford Motor Company All rights reserved. + Copyright (c) 2017, Livio, Inc. + All rights reserved. + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -116,7 +119,7 @@ void SubscribeVehicleDataRequest::Run() { smart_objects::SmartObject response_params = smart_objects::SmartObject(smart_objects::SmartType_Map); bool result = false; - CheckVISubscribtions( + CheckVISubscriptions( app, info, result_code, response_params, msg_params, result); if (mobile_apis::Result::INVALID_ENUM != result_code) { @@ -365,6 +368,21 @@ void SubscribeVehicleDataRequest::CheckVISubscribtions( smart_objects::SmartObject& out_response_params, smart_objects::SmartObject& out_request_params, bool& out_result) { + CheckVISubscriptions(app, + out_info, + out_result_code, + out_response_params, + out_request_params, + out_result); +} + +void SubscribeVehicleDataRequest::CheckVISubscriptions( + ApplicationSharedPtr app, + std::string& out_info, + mobile_apis::Result::eType& out_result_code, + smart_objects::SmartObject& out_response_params, + smart_objects::SmartObject& out_request_params, + bool& out_result) { // counter for items to subscribe VehicleInfoSubscriptions::size_type items_to_subscribe = 0; // counter for subscribed items by application diff --git a/src/components/application_manager/src/message_helper/message_helper.cc b/src/components/application_manager/src/message_helper/message_helper.cc index cd1dead88a..61012224b6 100644 --- a/src/components/application_manager/src/message_helper/message_helper.cc +++ b/src/components/application_manager/src/message_helper/message_helper.cc @@ -2,6 +2,9 @@ Copyright (c) 2013, Ford Motor Company All rights reserved. + Copyright (c) 2017, Livio, Inc. + All rights reserved. + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -1058,6 +1061,11 @@ smart_objects::SmartObjectSPtr MessageHelper::CreateSetAppIcon( bool MessageHelper::SendIVISubscribtions(const uint32_t app_id, ApplicationManager& app_mngr) { + return SendIVISubscriptions(app_id, app_mngr); +} + +bool MessageHelper::SendIVISubscriptions(const uint32_t app_id, + ApplicationManager& app_mngr) { LOG4CXX_AUTO_TRACE(logger_); bool result = true; diff --git a/src/components/application_manager/src/resumption/resume_ctrl_impl.cc b/src/components/application_manager/src/resumption/resume_ctrl_impl.cc index 72f2246e7c..e3fd423970 100644 --- a/src/components/application_manager/src/resumption/resume_ctrl_impl.cc +++ b/src/components/application_manager/src/resumption/resume_ctrl_impl.cc @@ -606,30 +606,30 @@ void ResumeCtrlImpl::AddSubscriptions( ApplicationSharedPtr application, const smart_objects::SmartObject& saved_app) { LOG4CXX_AUTO_TRACE(logger_); - if (saved_app.keyExists(strings::application_subscribtions)) { - const smart_objects::SmartObject& subscribtions = - saved_app[strings::application_subscribtions]; + if (saved_app.keyExists(strings::application_subscriptions)) { + const smart_objects::SmartObject& subscriptions = + saved_app[strings::application_subscriptions]; - if (subscribtions.keyExists(strings::application_buttons)) { - const smart_objects::SmartObject& subscribtions_buttons = - subscribtions[strings::application_buttons]; + if (subscriptions.keyExists(strings::application_buttons)) { + const smart_objects::SmartObject& subscriptions_buttons = + subscriptions[strings::application_buttons]; mobile_apis::ButtonName::eType btn; - for (size_t i = 0; i < subscribtions_buttons.length(); ++i) { + for (size_t i = 0; i < subscriptions_buttons.length(); ++i) { btn = static_cast<mobile_apis::ButtonName::eType>( - (subscribtions_buttons[i]).asInt()); + (subscriptions_buttons[i]).asInt()); application->SubscribeToButton(btn); } } MessageHelper::SendAllOnButtonSubscriptionNotificationsForApp( application, application_manager_); - if (subscribtions.keyExists(strings::application_vehicle_info)) { - const smart_objects::SmartObject& subscribtions_ivi = - subscribtions[strings::application_vehicle_info]; + if (subscriptions.keyExists(strings::application_vehicle_info)) { + const smart_objects::SmartObject& subscriptions_ivi = + subscriptions[strings::application_vehicle_info]; mobile_apis::VehicleDataType::eType ivi; - for (size_t i = 0; i < subscribtions_ivi.length(); ++i) { + for (size_t i = 0; i < subscriptions_ivi.length(); ++i) { ivi = static_cast<mobile_apis::VehicleDataType::eType>( - (subscribtions_ivi[i]).asInt()); + (subscriptions_ivi[i]).asInt()); application->SubscribeToIVI(ivi); } ProcessHMIRequests(MessageHelper::GetIVISubscriptionRequests( diff --git a/src/components/application_manager/src/resumption/resumption_data_db.cc b/src/components/application_manager/src/resumption/resumption_data_db.cc index b031fd0afd..2fe7330a9c 100644 --- a/src/components/application_manager/src/resumption/resumption_data_db.cc +++ b/src/components/application_manager/src/resumption/resumption_data_db.cc @@ -953,7 +953,7 @@ bool ResumptionDataDB::SelectSubscriptionsData( return false; } - saved_app[strings::application_subscribtions] = SmartObject(SmartType_Map); + saved_app[strings::application_subscriptions] = SmartObject(SmartType_Map); if (0 == count_item) { LOG4CXX_INFO(logger_, "Application does not contain subscriptions data"); @@ -972,8 +972,8 @@ bool ResumptionDataDB::SelectSubscriptionsData( size_t buttons_idx = 0; size_t vi_idx = 0; /* Position of data in "select_subscriptions" : - field "vehicleValue" from table "applicationSubscribtionsArray" = 0 - field "ButtonNameValue" from table "applicationSubscribtionsArray" = 1*/ + field "vehicleValue" from table "applicationSubscriptionsArray" = 0 + field "ButtonNameValue" from table "applicationSubscriptionsArray" = 1*/ while (select_subscriptions.Next()) { if (!select_subscriptions.IsNull(0)) { application_vehicle_info[vi_idx++] = select_subscriptions.GetInteger(0); @@ -983,12 +983,12 @@ bool ResumptionDataDB::SelectSubscriptionsData( } } if (!application_buttons.empty()) { - saved_app[strings::application_subscribtions] + saved_app[strings::application_subscriptions] [strings::application_buttons] = application_buttons; } if (!application_vehicle_info.empty()) { - saved_app[strings::application_subscribtions] + saved_app[strings::application_subscriptions] [strings::application_vehicle_info] = application_vehicle_info; } LOG4CXX_INFO(logger_, "Subscriptions were restored from DB successfully"); @@ -1504,9 +1504,9 @@ bool ResumptionDataDB::DeleteSavedSubscriptions( LOG4CXX_AUTO_TRACE(logger_); if (!ExecQueryToDeleteData( - policy_app_id, device_id, kDeleteApplicationSubscribtionsArray)) { + policy_app_id, device_id, kDeleteApplicationSubscriptionsArray)) { LOG4CXX_WARN(logger_, - "Incorrect delete from applicationSubscribtionsArray."); + "Incorrect delete from applicationSubscriptionsArray."); return false; } return true; @@ -1899,7 +1899,7 @@ bool ResumptionDataDB::SaveApplicationToDB( } if (!InsertSubscriptionsData(GetApplicationSubscriptions(application), application_primary_key)) { - LOG4CXX_WARN(logger_, "Incorrect insert subscribtions data to DB."); + LOG4CXX_WARN(logger_, "Incorrect insert subscriptions data to DB."); db_->RollbackTransaction(); return false; } @@ -1956,9 +1956,9 @@ bool ResumptionDataDB::SaveApplicationToDB( db_->RollbackTransaction(); return false; } - if (!InsertSubscriptionsData(application["subscribtions"], + if (!InsertSubscriptionsData(application["subscriptions"], application_primary_key)) { - LOG4CXX_WARN(logger_, "Incorrect insert subscribtions data to DB."); + LOG4CXX_WARN(logger_, "Incorrect insert subscriptions data to DB."); db_->RollbackTransaction(); return false; } @@ -2164,9 +2164,9 @@ bool ResumptionDataDB::InsertSubscriptionsData( return false; } /* Positions of binding data for "insert_subscriptions": - field "idApplication" from table "applicationSubscribtionsArray" = 0 - field "vehicleValue" from table "applicationSubscribtionsArray" = 1 - field "ButtonNameValue" from table "applicationSubscribtionsArray" = 2*/ + field "idApplication" from table "applicationSubscriptionsArray" = 0 + field "vehicleValue" from table "applicationSubscriptionsArray" = 1 + field "ButtonNameValue" from table "applicationSubscriptionsArray" = 2*/ for (size_t i = 0; i < max_length; ++i) { insert_subscriptions.Bind(0, application_primary_key); if (i < vi_sub_length) { diff --git a/src/components/application_manager/src/resumption/resumption_data_json.cc b/src/components/application_manager/src/resumption/resumption_data_json.cc index b8ce6a76c4..b6a50fd5de 100644 --- a/src/components/application_manager/src/resumption/resumption_data_json.cc +++ b/src/components/application_manager/src/resumption/resumption_data_json.cc @@ -95,7 +95,7 @@ void ResumptionDataJson::SaveApplication( json_app[strings::application_global_properties] = tmp; Formatters::CFormatterJsonBase::objToJsonValue( GetApplicationSubscriptions(application), tmp); - json_app[strings::application_subscribtions] = tmp; + json_app[strings::application_subscriptions] = tmp; Formatters::CFormatterJsonBase::objToJsonValue( GetApplicationFiles(application), tmp); json_app[strings::application_files] = tmp; @@ -473,7 +473,7 @@ bool ResumptionDataJson::DropAppDataResumption(const std::string& device_id, application[strings::application_submenus].clear(); application[strings::application_choice_sets].clear(); application[strings::application_global_properties].clear(); - application[strings::application_subscribtions].clear(); + application[strings::application_subscriptions].clear(); application[strings::application_files].clear(); application.removeMember(strings::grammar_id); LOG4CXX_DEBUG(logger_, diff --git a/src/components/application_manager/src/resumption/resumption_sql_queries.cc b/src/components/application_manager/src/resumption/resumption_sql_queries.cc index 7a5008542c..9ca91e859a 100644 --- a/src/components/application_manager/src/resumption/resumption_sql_queries.cc +++ b/src/components/application_manager/src/resumption/resumption_sql_queries.cc @@ -298,8 +298,8 @@ const std::string kCreateSchema = "CREATE INDEX IF NOT EXISTS " "`applicationSubMenuArray.fk_Application_idx` " " ON `applicationSubMenuArray`(`idApplication`); " - "CREATE TABLE IF NOT EXISTS `applicationSubscribtionsArray`( " - " `idapplicationSubscribtionsArray` INTEGER PRIMARY KEY NOT NULL, " + "CREATE TABLE IF NOT EXISTS `applicationSubscriptionsArray`( " + " `idapplicationSubscriptionsArray` INTEGER PRIMARY KEY NOT NULL, " " `vehicleValue` INTEGER, " " `ButtonNameValue` INTEGER, " " `idApplication` INTEGER, " @@ -308,8 +308,8 @@ const std::string kCreateSchema = " REFERENCES `application`(`idApplication`) " " ); " "CREATE INDEX IF NOT EXISTS " - "`applicationSubscribtionsArray.fk_Application_idx` " - " ON `applicationSubscribtionsArray`(`idApplication`); " + "`applicationSubscriptionsArray.fk_Application_idx` " + " ON `applicationSubscriptionsArray`(`idApplication`); " "CREATE TABLE IF NOT EXISTS `_internal_data`( " " `db_version_hash` INTEGER " " ); " @@ -365,8 +365,8 @@ const std::string kDropSchema = "DROP TABLE IF EXISTS `applicationSubMenuArray`; " "DROP INDEX IF EXISTS `applicationSubMenuArray.fk_subMenu_idx`; " "DROP INDEX IF EXISTS `applicationSubMenuArray.fk_Application_idx`; " - "DROP TABLE IF EXISTS `applicationSubscribtionsArray`; " - "DROP INDEX IF EXISTS `applicationSubscribtionsArray.fk_Application_idx`; " + "DROP TABLE IF EXISTS `applicationSubscriptionsArray`; " + "DROP INDEX IF EXISTS `applicationSubscriptionsArray.fk_Application_idx`; " "DROP TABLE IF EXISTS `_internal_data`; " "COMMIT; " "VACUUM;"; @@ -477,8 +477,8 @@ const std::string kDeleteApplicationSubMenuArray = "FROM `application` " "WHERE `appID` = ? AND `deviceID` = ?)"; -const std::string kDeleteApplicationSubscribtionsArray = - "DELETE FROM `applicationSubscribtionsArray` " +const std::string kDeleteApplicationSubscriptionsArray = + "DELETE FROM `applicationSubscriptionsArray` " "WHERE `idApplication` = (SELECT `idApplication` " "FROM `application` " "WHERE `appID` = ? AND `deviceID` = ?)"; @@ -713,7 +713,7 @@ const std::string kInsertVrCommand = "(?, ?, ?);"; const std::string kInsertSubscriptions = - "INSERT INTO `applicationSubscribtionsArray` " + "INSERT INTO `applicationSubscriptionsArray` " "(`idApplication`, `vehicleValue`, `ButtonNameValue`) " "VALUES " "(?, ?, ?);"; @@ -851,14 +851,14 @@ const std::string kSelectCommands = const std::string kSelectCountSubscriptions = "SELECT COUNT (`idApplication`) " - "FROM `applicationSubscribtionsArray` " + "FROM `applicationSubscriptionsArray` " "WHERE `idApplication` = (SELECT `idApplication` " "FROM `application` " "WHERE `appID` = ? AND `deviceID` = ?);"; const std::string kSelectSubscriptions = "SELECT `vehicleValue`, `ButtonNameValue` " - "FROM `applicationSubscribtionsArray` " + "FROM `applicationSubscriptionsArray` " "WHERE `idApplication` = (SELECT `idApplication` " "FROM `application` " "WHERE `appID` = ? AND `deviceID` = ?);"; diff --git a/src/components/application_manager/src/smart_object_keys.cc b/src/components/application_manager/src/smart_object_keys.cc index 0bf3287e42..c3aba90dd5 100644 --- a/src/components/application_manager/src/smart_object_keys.cc +++ b/src/components/application_manager/src/smart_object_keys.cc @@ -246,7 +246,7 @@ const char* application_choice_sets = "applicationChoiceSets"; const char* application_global_properties = "globalProperties"; const char* application_vehicle_info = "vehicleInfo"; const char* application_buttons = "buttons"; -const char* application_subscribtions = "subscribtions"; +const char* application_subscriptions = "subscriptions"; const char* application_files = "applicationFiles"; const char* application_show = "applicationShow"; const char* resumption = "resumption"; |