[Messaging] updateMessages for sms
authorMaciek Blim <m.blim@samsung.com>
Tue, 13 Jan 2015 08:47:39 +0000 (09:47 +0100)
committerMaciek Blim <m.blim@samsung.com>
Tue, 13 Jan 2015 11:39:02 +0000 (12:39 +0100)
Change-Id: Ic74697e3d4d7e97eb32e484adba5ee7991b4ca2c
Signed-off-by: Maciek Blim <m.blim@samsung.com>
src/messaging/message_storage_short_msg.cc
src/messaging/short_message_manager.cc

index b66ea6637fcbb1c5011c041d0cbe693330deba1e..78c94cff8db1027038801ddf8562b48656112e72 100644 (file)
@@ -82,8 +82,7 @@ static gboolean updateMessagesTask(void* data) {
     LoggerD("Entered");
 
     MessagesCallbackUserData *callback = static_cast<MessagesCallbackUserData*>(data);
-    // TODO
-    //ShortMsgManager::getInstance().updateMessages(callback);
+    ShortMsgManager::getInstance().updateMessages(callback);
 
     return false;
 }
index 8a9a3794823edcc12baf234d6a6c68e58c8cb608..35a5bc62ee7cd33cbe8b0a30b7861e09b7fd3459 100644 (file)
@@ -842,14 +842,15 @@ void ShortMsgManager::updateMessages(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<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 updateShortMsg callback: %s (%s)",