[MediaController] Added privileges check + cleanup

Change-Id: Ib8bcab1d18a5cbf5426a7bfdc6fe0ed497a76fa0

diff --git a/src/mediacontroller/mediacontroller_client.cc b/src/mediacontroller/mediacontroller_client.cc
index 8c09fb4404d632c5d8fc51974d594b81a5d0629e..0b2532e339bc74a042a85efef578784dbe05c091 100644 (file)
--- a/src/mediacontroller/mediacontroller_client.cc
+++ b/src/mediacontroller/mediacontroller_client.cc
@@ -271,7 +271,6 @@ PlatformResult MediaControllerClient::SetServerStatusChangeListener(
 void MediaControllerClient::OnServerStatusUpdate(const char* server_name,
                                                  mc_server_state_e state,
                                                  void* user_data) {
-  LOGGER(DEBUG) << "entered";
 
   MediaControllerClient* client = static_cast<MediaControllerClient*>(user_data);
 
@@ -484,15 +483,13 @@ PlatformResult MediaControllerClient::SendCommand(
     const picojson::value& data,
     const std::string& reply_id,
     const JsonCallback& reply_cb) {
-  LOGGER(DEBUG) << "entered";
-
-  int ret;
 
   bundle* bundle = bundle_create();
   SCOPE_EXIT {
     bundle_free(bundle);
   };
 
+  int ret;
   ret = bundle_add(bundle, "replyId", reply_id.c_str());
   if (ret != MEDIA_CONTROLLER_ERROR_NONE) {
     LOGGER(ERROR) << "bundle_add(replyId) failed, error: " << ret;
@@ -528,7 +525,6 @@ void MediaControllerClient::OnCommandReply(const char* server_name,
                                            int result_code,
                                            bundle* bundle,
                                            void* user_data) {
-  LOGGER(DEBUG) << "entered";
 
   MediaControllerClient* client = static_cast<MediaControllerClient*>(user_data);
 
@@ -572,9 +568,6 @@ void MediaControllerClient::OnCommandReply(const char* server_name,
 PlatformResult MediaControllerClient::SendPlaybackState(
     const std::string& server_name,
     const std::string& state) {
-  LOGGER(DEBUG) << "entered";
-
-  int ret;
 
   int state_e;
   PlatformResult result = Types::StringToPlatformEnum(
@@ -583,6 +576,7 @@ PlatformResult MediaControllerClient::SendPlaybackState(
     return result;
   }
 
+  int ret;
   ret = mc_client_send_playback_state_command(
       handle_, server_name.c_str(), static_cast<mc_playback_states_e>(state_e));
   if (ret != MEDIA_CONTROLLER_ERROR_NONE) {

diff --git a/src/mediacontroller/mediacontroller_instance.cc b/src/mediacontroller/mediacontroller_instance.cc
index c2075f8aab76e1f84d564bfa8d02c728b157e470..11aa4d4f7d57e76b05d705d9d9f86026b29d8287 100644 (file)
--- a/src/mediacontroller/mediacontroller_instance.cc
+++ b/src/mediacontroller/mediacontroller_instance.cc
@@ -111,7 +111,7 @@ void MediaControllerInstance::MediaControllerManagerCreateServer(
     return;
   }
 
-  // TODO(r.galka) check privileges
+  CHECK_PRIVILEGE_ACCESS(kPrivilegeMediaControllerServer, &out);
 
   server_ = std::make_shared<MediaControllerServer>();
   const PlatformResult& result = server_->Init();
@@ -239,7 +239,6 @@ void MediaControllerInstance::MediaControllerServerUpdateMetadata(
 void MediaControllerInstance::MediaControllerServerAddChangeRequestPlaybackInfoListener(
     const picojson::value& args,
     picojson::object& out) {
-  LOGGER(DEBUG) << "entered";
 
   if (!server_) {
     ReportError(PlatformResult(ErrorCode::INVALID_STATE_ERR,
@@ -270,7 +269,6 @@ void MediaControllerInstance::MediaControllerServerAddChangeRequestPlaybackInfoL
 void MediaControllerInstance::MediaControllerServerRemoveChangeRequestPlaybackInfoListener(
     const picojson::value& args,
     picojson::object& out) {
-  LOGGER(DEBUG) << "entered";
 
   if (!server_) {
     ReportError(PlatformResult(ErrorCode::INVALID_STATE_ERR,
@@ -284,7 +282,6 @@ void MediaControllerInstance::MediaControllerServerRemoveChangeRequestPlaybackIn
 void MediaControllerInstance::MediaControllerServerAddCommandListener(
     const picojson::value& args,
     picojson::object& out) {
-  LOGGER(DEBUG) << "entered";
 
   if (!server_) {
     ReportError(PlatformResult(ErrorCode::INVALID_STATE_ERR,
@@ -293,7 +290,6 @@ void MediaControllerInstance::MediaControllerServerAddCommandListener(
   }
 
   JsonCallback on_command = [this, args](picojson::value* request) -> void {
-    LOGGER(DEBUG) << "entered";
 
     picojson::object& request_o = request->get<picojson::object>();
     request_o["listenerId"] = args.get("listenerId");
@@ -309,7 +305,6 @@ void MediaControllerInstance::MediaControllerServerAddCommandListener(
 void MediaControllerInstance::MediaControllerServerReplyCommand(
     const picojson::value& args,
     picojson::object& out) {
-  LOGGER(DEBUG) << "entered";
 
   if (!server_) {
     ReportError(PlatformResult(ErrorCode::INVALID_STATE_ERR,
@@ -331,7 +326,6 @@ void MediaControllerInstance::MediaControllerServerReplyCommand(
 void MediaControllerInstance::MediaControllerServerRemoveCommandListener(
     const picojson::value& args,
     picojson::object& out) {
-  LOGGER(DEBUG) << "entered";
 
   if (!server_) {
     ReportError(PlatformResult(ErrorCode::INVALID_STATE_ERR,
@@ -353,7 +347,7 @@ void MediaControllerInstance::MediaControllerManagerGetClient(
     return;
   }
 
-  // TODO(r.galka) check privileges
+  CHECK_PRIVILEGE_ACCESS(kPrivilegeMediaControllerClient, &out);
 
   client_ = std::make_shared<MediaControllerClient>();
   const PlatformResult& result = client_->Init();
@@ -614,7 +608,6 @@ void MediaControllerInstance::MediaControllerServerInfoSendCommand(
   CHECK_EXIST(args, "data", out)
 
   JsonCallback reply_cb = [this, args](picojson::value* reply) -> void {
-    LOGGER(DEBUG) << "entered";
 
     picojson::object& reply_obj = reply->get<picojson::object>();
 
@@ -640,7 +633,6 @@ void MediaControllerInstance::MediaControllerServerInfoSendCommand(
 void MediaControllerInstance::MediaControllerServerInfoAddServerStatusChangeListener(
     const picojson::value& args,
     picojson::object& out) {
-  LOGGER(DEBUG) << "entered";
 
   if (!client_) {
     ReportError(PlatformResult(ErrorCode::INVALID_STATE_ERR,
@@ -651,7 +643,6 @@ void MediaControllerInstance::MediaControllerServerInfoAddServerStatusChangeList
   CHECK_EXIST(args, "listenerId", out)
 
   JsonCallback callback = [this, args](picojson::value* data) -> void {
-    LOGGER(DEBUG) << "entered";
 
     if (nullptr == data) {
       LOGGER(ERROR) << "No data passed to json callback";
@@ -672,7 +663,6 @@ void MediaControllerInstance::MediaControllerServerInfoAddServerStatusChangeList
 void MediaControllerInstance::MediaControllerServerInfoRemoveServerStatusChangeListener(
     const picojson::value& args,
     picojson::object& out) {
-  LOGGER(DEBUG) << "entered";
 
   if (!client_) {
     ReportError(PlatformResult(ErrorCode::INVALID_STATE_ERR,

diff --git a/src/mediacontroller/mediacontroller_server.cc b/src/mediacontroller/mediacontroller_server.cc
index 01e1752517d44f94b7b3a94de927209eda0992f6..c9f9dc12aaeb8c89e1dd86321a9bb1f73417aa02 100644 (file)
--- a/src/mediacontroller/mediacontroller_server.cc
+++ b/src/mediacontroller/mediacontroller_server.cc
@@ -258,7 +258,6 @@ PlatformResult MediaControllerServer::CommandReply(
     const std::string& client_name,
     const std::string& reply_id,
     const picojson::value& data) {
-  LOGGER(DEBUG) << "entered";
 
   int ret;