From: Maciek Blim Date: Tue, 13 Jan 2015 10:26:33 +0000 (+0100) Subject: [Messaging] removeConversations for sms X-Git-Tag: submit/tizen_tv/20150603.064601~1^2~604^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ca6df74782ca74dcc8a0bea8224012e676186ceb;p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git [Messaging] removeConversations for sms Change-Id: I540ccc275414c65c42803a8ae23c657e80a94afe Signed-off-by: Maciek Blim --- diff --git a/src/messaging/message_storage_short_msg.cc b/src/messaging/message_storage_short_msg.cc index dcb39013..51df3597 100644 --- a/src/messaging/message_storage_short_msg.cc +++ b/src/messaging/message_storage_short_msg.cc @@ -163,8 +163,7 @@ static gboolean removeConversationsTask(void* data) { LoggerD("Entered"); ConversationCallbackData *callback = static_cast(data); - // TODO - //ShortMsgManager::getInstance().removeConversations(callback); + ShortMsgManager::getInstance().removeConversations(callback); return false; } diff --git a/src/messaging/short_message_manager.cc b/src/messaging/short_message_manager.cc index 1aa56f9d..b0829120 100644 --- a/src/messaging/short_message_manager.cc +++ b/src/messaging/short_message_manager.cc @@ -1161,14 +1161,15 @@ void ShortMsgManager::removeConversations(ConversationCallbackData* callback) try { if (callback->isError()) { LoggerD("Calling error callback"); - // TODO call error - //JSObjectRef errobj = JSWebAPIErrorFactory::makeErrorObject(context, - //callback->getErrorName(), callback->getErrorMessage()); - //callback->callErrorCallback(errobj); + MessagingInstance::getInstance().PostMessage( + callback->getJson()->serialize().c_str()); } else { LoggerD("Calling success callback"); - // TODO call success - //callback->callSuccessCallback(); + + auto json = callback->getJson(); + picojson::object& obj = json->get(); + obj[JSON_ACTION] = picojson::value(JSON_CALLBACK_SUCCCESS); + MessagingInstance::getInstance().PostMessage(json->serialize().c_str()); } } catch (const common::PlatformException& err) { LoggerE("Error while calling removeConversations callback: %s (%s)",