From fa7e3ee6dbda59eaec352eeed8fb82dc2e721400 Mon Sep 17 00:00:00 2001 From: Tomasz Marciniak Date: Fri, 2 Dec 2016 19:20:04 +0900 Subject: [PATCH] [Convergence] Return InvalidValuesError if id is empty. [Verification] Code compiles. Proper error is returned in error callback. Change-Id: I55c6c7fbb786022bdbe882bd9ee99cae0654242b Signed-off-by: Tomasz Marciniak --- src/convergence/convergence_instance.cc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/convergence/convergence_instance.cc b/src/convergence/convergence_instance.cc index 622d8505..4ad3807b 100644 --- a/src/convergence/convergence_instance.cc +++ b/src/convergence/convergence_instance.cc @@ -359,9 +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(ConvergenceUtils::GetArg(args, kJSCurrentListenerId).get())); + 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(ConvergenceUtils::GetArg(args, kJSCurrentListenerId).get())); + } } //only in case of failure call callback -- 2.34.1