Merge branch 'tizen_3.0' into tizen

[platform/core/api/webapi-plugins.git] / src / convergence / convergence_instance.cc

diff --git a/src/convergence/convergence_instance.cc b/src/convergence/convergence_instance.cc
index cd14512..c00109b 100644 (file)
--- a/src/convergence/convergence_instance.cc
+++ b/src/convergence/convergence_instance.cc
@@ -343,7 +343,6 @@ common::TizenResult ConvergenceInstance::RemoteAppControlServiceLaunch(const pic
 
   CHECK_EXIST(args, kJSArgumentDeviceId);
   CHECK_EXIST(args, kJSArgumentAppId);
-  CHECK_EXIST(args, kJSArgumentReply);
   CHECK_EXIST(args, kJSCurrentListenerId);
 
   auto launch = [this, args](const common::AsyncToken& token) -> void {
@@ -360,10 +359,12 @@ common::TizenResult ConvergenceInstance::RemoteAppControlServiceLaunch(const pic
       result = LogAndCreateTizenError(AbortError, "Can not find the service type = 1",
         ("Can not find the service type = 1"));
     } else {
-      result = service->Launch(
-                  ConvergenceUtils::GetArg(args, kJSArgumentAppId).to_str().c_str(),
-                  static_cast<bool>(ConvergenceUtils::GetArg(args, kJSArgumentReply).get<bool>()),
-                  static_cast<int>(ConvergenceUtils::GetArg(args, kJSCurrentListenerId).get<double>()));
+      std::string id = ConvergenceUtils::GetArg(args, kJSArgumentAppId).to_str();
+      if (id.empty()) {
+        result = LogAndCreateTizenError(InvalidValuesError, "Invalid app id", ("Invalid app id"));
+      } else {
+        result = service->Launch(id.c_str(), static_cast<int>(ConvergenceUtils::GetArg(args, kJSCurrentListenerId).get<double>()));
+      }
     }
 
     //only in case of failure call callback