diff options
author | Andrey Oleynik <aoleynik@luxoft.com> | 2017-08-21 15:01:37 +0300 |
---|---|---|
committer | Andrey Oleynik <aoleynik@luxoft.com> | 2017-08-21 16:02:16 +0300 |
commit | 029cc20b415269b002fe1905c1b692301c7226ec (patch) | |
tree | d024dd168026783a487bc1e9c63d98527975bf9a /src/components/remote_control/src | |
parent | 08789ae20c7105cbac527c4b044fb2fff9284d07 (diff) | |
download | sdl_core-029cc20b415269b002fe1905c1b692301c7226ec.tar.gz |
Replace CheckAccess with CheckModule for BaseCommandRequest
Removed unused code after that
Diffstat (limited to 'src/components/remote_control/src')
-rw-r--r-- | src/components/remote_control/src/commands/base_command_request.cc | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/components/remote_control/src/commands/base_command_request.cc b/src/components/remote_control/src/commands/base_command_request.cc index 150d79d18b..3961b79688 100644 --- a/src/components/remote_control/src/commands/base_command_request.cc +++ b/src/components/remote_control/src/commands/base_command_request.cc @@ -362,13 +362,15 @@ bool BaseCommandRequest::CheckPolicyPermissions() { return true; } -application_manager::TypeAccess BaseCommandRequest::CheckAccess( +application_manager::TypeAccess BaseCommandRequest::CheckModule( const Json::Value& message) { const std::string& module = ModuleType(message); - return service_->CheckAccess(app_->app_id(), module); + return service_->CheckModule(app_->app_id(), module) + ? application_manager::TypeAccess::kAllowed + : application_manager::TypeAccess::kDisallowed; } -bool BaseCommandRequest:: CheckDriverConsent() { +bool BaseCommandRequest::CheckDriverConsent() { LOG4CXX_AUTO_TRACE(logger_); RCAppExtensionPtr extension = GetAppExtension(app_); if (!extension) { @@ -379,7 +381,7 @@ bool BaseCommandRequest:: CheckDriverConsent() { LOG4CXX_DEBUG(logger_, "Request: " << message_->json_message()); reader.parse(message_->json_message(), value); - application_manager::TypeAccess access = CheckAccess(value); + application_manager::TypeAccess access = CheckModule(value); if (IsAutoAllowed(access)) { set_auto_allowed(true); @@ -449,9 +451,6 @@ void BaseCommandRequest::SendDisallowed( ? "The RPC is disallowed by vehicle settings" : disallowed_info_; break; - case application_manager::kNone: - info = "Internal issue"; - break; default: info = "Unknown issue"; } @@ -572,7 +571,6 @@ void BaseCommandRequest::CheckHMILevel(application_manager::TypeAccess access, } break; case application_manager::kDisallowed: - case application_manager::kNone: default: LOG4CXX_DEBUG(logger_, "No access information or disallowed: " |