[Messaging] removeConversations for sms
authorMaciek Blim <m.blim@samsung.com>
Tue, 13 Jan 2015 10:26:33 +0000 (11:26 +0100)
committerMaciek Blim <m.blim@samsung.com>
Tue, 13 Jan 2015 11:39:03 +0000 (12:39 +0100)
Change-Id: I540ccc275414c65c42803a8ae23c657e80a94afe
Signed-off-by: Maciek Blim <m.blim@samsung.com>
src/messaging/message_storage_short_msg.cc
src/messaging/short_message_manager.cc

index dcb39013c0375360b53e2f18fc1c13355c101c35..51df35970b0f98efa8b2ad469b167d2bc302f61b 100644 (file)
@@ -163,8 +163,7 @@ static gboolean removeConversationsTask(void* data) {
     LoggerD("Entered");
 
     ConversationCallbackData *callback = static_cast<ConversationCallbackData*>(data);
-    // TODO
-    //ShortMsgManager::getInstance().removeConversations(callback);
+    ShortMsgManager::getInstance().removeConversations(callback);
 
     return false;
 }
index 1aa56f9d12db885bc520d3d6ff1a0fc17bef96bf..b0829120e11da76307726489976dd57cca865677 100644 (file)
@@ -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<picojson::object>();
+            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)",