[Convergence] - fixed TODOs of Payload, errors and removing commented code

Change-Id: I1db470c4fa50fe1c63acf6fe219baf3cb03513dd
Signed-off-by: Andrzej Popowski <a.popowski@samsung.com>

diff --git a/src/convergence/convergence_app_communication_service.cc b/src/convergence/convergence_app_communication_service.cc
index 8124bde09b09ee4952891eb5b1de60348d9fab61..afd5a1e04fa8085d8f97030966f53d678b3832a2 100644 (file)
--- a/src/convergence/convergence_app_communication_service.cc
+++ b/src/convergence/convergence_app_communication_service.cc
@@ -36,9 +36,6 @@ using common::TizenSuccess;
 
 namespace {
 static const std::string kChannel = "channel";
-
-// Payload data keys and some values
-static const std::string kPayload = "payload"; // ---
 } // namespace
 
 ConvergenceAppCommunicationService::ConvergenceAppCommunicationService()
@@ -337,17 +334,6 @@ common::TizenResult ConvergenceAppCommunicationService::RemoveListener() {
   return TizenSuccess();
 }
 
-picojson::value ConvergenceAppCommunicationService::PayloadToJson(conv_payload_h payload) {
-  ScopeLogger();
-  picojson::value payload_json;
-
-  // TODO convert payload to array of ApplicationControlData
-
-  return payload_json;
-}
-
-
-
 ConvergenceAppCommunicationServerService::ConvergenceAppCommunicationServerService()
  : ConvergenceAppCommunicationService() {
   ScopeLogger();
@@ -414,8 +400,9 @@ common::TizenResult ConvergenceAppCommunicationServerService::Start(
 
   common::TizenResult result = ConvergenceAppCommunicationService::Start(
     channel, cur_listener_id);
-
-  // TODO check if result value is OK
+  if (!result) {
+    return result;
+  }
 
   convergence_plugin_->ReplyAsync(kAppCommunicationListenerCallback,
     cur_listener_id, true, param);
@@ -441,8 +428,9 @@ common::TizenResult ConvergenceAppCommunicationServerService::Stop(
 
   common::TizenResult result = ConvergenceAppCommunicationService::Stop(
     channel, cur_listener_id);
-
-  // TODO check if result value is OK
+  if (!result) {
+    return result;
+  }
 
   convergence_plugin_->ReplyAsync(kAppCommunicationListenerCallback,
     cur_listener_id, true, param);
@@ -475,7 +463,7 @@ void ConvergenceAppCommunicationClientService::ServiceConnectedCb(conv_service_h
   }
 
   picojson::object param;
-  param[kPayload] = ConvergenceAppCommunicationService::PayloadToJson(result);
+  param[kPayload] = ConvergencePayloadArray::ToJson(result);
   param[kServiceResultType] = picojson::value("Connected");
 
   if (CONV_ERROR_NONE == error) {

diff --git a/src/convergence/convergence_app_communication_service.h b/src/convergence/convergence_app_communication_service.h
index 49ad8e690d9aa3ae7b500083ca575cda436ee17a..df35762c7d3861fcaa769030bf988653f7e30c4f 100644 (file)
--- a/src/convergence/convergence_app_communication_service.h
+++ b/src/convergence/convergence_app_communication_service.h
@@ -52,8 +52,6 @@ class ConvergenceAppCommunicationService : public ConvergenceService {
    const int cur_listener_id);
   common::TizenResult SetListener(const int cur_listener_id);
   common::TizenResult RemoveListener();
- protected:
-  static picojson::value PayloadToJson(conv_payload_h payload);
  private:
   void UpdateListener(const int cur_listener_id);
   static void ServiceListenerCb(conv_service_h service_handle,

diff --git a/src/convergence/convergence_payload.h b/src/convergence/convergence_payload.h
index fc439c7882e5aaf6d38e678ca29376fa31dc6ef4..cb55d6b9006905b1e636adf2f618c36a02fd7e13 100644 (file)
--- a/src/convergence/convergence_payload.h
+++ b/src/convergence/convergence_payload.h
@@ -28,6 +28,9 @@
 namespace extension {
 namespace convergence {
 
+namespace {
+static const std::string kPayload = "payload";
+} // namespace
 
 /*enum ConvergencePayloadType {
   kUnknownPayload = -1,

diff --git a/src/convergence/convergence_remote_app_control_service.cc b/src/convergence/convergence_remote_app_control_service.cc
index a6bb89fd5a4d1c42794ee15da742ac4c1ba7528d..0b4c86abfc36a141200a26d801299b0355e85468 100644 (file)
--- a/src/convergence/convergence_remote_app_control_service.cc
+++ b/src/convergence/convergence_remote_app_control_service.cc
@@ -69,7 +69,7 @@ void ConvergenceRemoteAppControlService::ServiceConnectedCb(conv_service_h servi
 
   picojson::object param;
   param[kServiceResultType] = picojson::value("Connected");
-  //param[kPayload] = ConvergenceRemoteAppControlService::PayloadToJson(result);
+  param[kPayload] = ConvergencePayloadArray::ToJson(result);
 
   if (CONV_ERROR_NONE == error) {
     param[kServiceConnectionStatus] = picojson::value(kServiceConnectionStatusConnected);
@@ -248,19 +248,6 @@ common::TizenResult ConvergenceRemoteAppControlService::Launch(const char *appId
     LoggerI("---- SEEMS APP CONTROL WAS LAUNCHED ----");
   }
 
-/*
-       conv_service_start(service_handle, NULL, NULL);
-       conv_payload_h payload_handle;
-       conv_payload_create(&payload_handle);
-       app_control_h app_control = NULL;
-       app_control_create(&app_control);
-       app_control_set_app_id(app_control, "org.example.d2d_test");
-       app_control_set_operation(app_control, APP_CONTROL_OPERATION_MAIN);
-       conv_payload_set_app_control(payload_handle, "app_control", app_control);
-       conv_payload_set_string(payload_handle, "reply", "0");
-       conv_service_publish(service_handle, NULL, payload_handle);
-*/
-
   conv_payload_destroy(payload);
   return TizenSuccess();
 }
@@ -311,14 +298,5 @@ conv_payload_h ConvergenceRemoteAppControlService::CreateAppIdPayload(const char
   return payload;
 }
 
-picojson::value ConvergenceRemoteAppControlService::PayloadToJson(conv_payload_h payload) {
-  ScopeLogger();
-  picojson::value payload_json;
-
-  // TODO convert payload to array of ApplicationControlData
-
-  return payload_json;
-}
-
 } // namespace convergence
 }  // namespace extension

diff --git a/src/convergence/convergence_remote_app_control_service.h b/src/convergence/convergence_remote_app_control_service.h
index 67e752a45c36ba2f30b6936defd613f82229cacf..b82092ba69111ac01fabec5643f3e8e27941a5ab 100644 (file)
--- a/src/convergence/convergence_remote_app_control_service.h
+++ b/src/convergence/convergence_remote_app_control_service.h
@@ -46,7 +46,6 @@ class ConvergenceRemoteAppControlService : public ConvergenceService {
   common::TizenResult Launch(const char *appId, bool reply, const int cur_listener_id);
  private:
   conv_payload_h CreateAppIdPayload(const char *appId, bool reply) const;
-  static picojson::value PayloadToJson(conv_payload_h payload);
   void UpdateListener(const int cur_listener_id);
   void EnsureStarted();
   static void ServiceConnectedCb(conv_service_h service_handle,