From 6725a9ac9a253e8784587853eaf48fd82dbb0e77 Mon Sep 17 00:00:00 2001 From: Maciek Blim Date: Tue, 13 Jan 2015 09:31:38 +0100 Subject: [PATCH] [Messaging] removeMesssages for sms Change-Id: I80987c6e82b138c6e19f70aff4c01c9594734c0d Signed-off-by: Maciek Blim --- src/messaging/message_storage_short_msg.cc | 3 +-- src/messaging/short_message_manager.cc | 12 ++++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/messaging/message_storage_short_msg.cc b/src/messaging/message_storage_short_msg.cc index 7ccb1287..b66ea663 100644 --- a/src/messaging/message_storage_short_msg.cc +++ b/src/messaging/message_storage_short_msg.cc @@ -55,8 +55,7 @@ static gboolean removeMessagesTask(void* data) { LoggerD("Entered"); MessagesCallbackUserData *callback = static_cast(data); - // TODO - //ShortMsgManager::getInstance().removeMessages(callback); + ShortMsgManager::getInstance().removeMessages(callback); return false; } diff --git a/src/messaging/short_message_manager.cc b/src/messaging/short_message_manager.cc index 04b4c5e2..8a9a3794 100644 --- a/src/messaging/short_message_manager.cc +++ b/src/messaging/short_message_manager.cc @@ -771,14 +771,14 @@ void ShortMsgManager::removeMessages(MessagesCallbackUserData* 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 removeShortMsg callback: %s (%s)", -- 2.34.1