Update change log and spec for wrt-plugins-tizen_0.4.12

[framework/web/wrt-plugins-tizen.git] / src / Messaging / messageDB / MessageStorageReader.cpp

diff --git a/src/Messaging/messageDB/MessageStorageReader.cpp b/src/Messaging/messageDB/MessageStorageReader.cpp
index 1907be2..39a85f8 100644 (file)
--- a/src/Messaging/messageDB/MessageStorageReader.cpp
+++ b/src/Messaging/messageDB/MessageStorageReader.cpp
@@ -55,11 +55,9 @@ namespace{
                MSG_CLASS_TYPE_T                classType;                                                              /**< Message class type. See enum _MSG_CLASS_TYPE_E */
                msg_storage_id_t                storageId;                                                              /**< Indicates where the message is saved. see enum _MSG_FOLDER_TYPE_E*/
                msg_struct_list_s               *addr_list;
-               GList                                   *addressList;
                char                                    replyAddress[MAX_PHONE_NUMBER_LEN+1];   /**< Indicates the reply address. */
                char                                    subject[MAX_SUBJECT_LEN+1];                                     /**< Indicates the message subject. */
                time_t                                  displayTime;                                                                                                    /**< Indicates the display time related to the specific operation. */
-               time_t                                  scheduledTime;                                                                                          /**< Indicates the time to send scheduled message. */
                msg_network_status_t    networkStatus;                                                  /**< Indicates the network status of the message. */
                msg_encode_type_t               encodeType;                                                     /**< Indicates the string encoding type. */
                bool                                    bRead;                                                                                                                          /**< Indicates whether the message is read or not. */
@@ -75,7 +73,7 @@ namespace{
                size_t                                  dataSize;                                                                                                                       /**< Indicates the data size. The unit is byte. */
                void                                    *pData;                                                                                                                         /**< Indicates the message payload information as a body. default character encoding is UTF-8*/
                void                                    *pMmsData;                                                                                                              /**< Indicates the message payload information as a body. default character encoding is UTF-8*/
-               size_t                                  mmsDataSize;            
+               size_t                          mmsDataSize;
        } MSG_MESSAGE_HIDDEN_S;
 
 
@@ -130,7 +128,6 @@ enum _MSG_SUB_TYPE_E
        MSG_STATUS_REPORT_SMS,          /**< SMS-STATUS-REPORT */
        MSG_SYNCML_CP,                          /**< SyncML Message CP */
        MSG_LBS_SMS,                                    /**< LBS Message */
-       MSG_SOS_SMS,                                    /**< SOS Message */
        MSG_REJECT_SMS,                         /**< Reject Message */
        MSG_CONCAT_SIM_SMS,                     /**< Concatenated Message in SIM */
 
@@ -291,9 +288,7 @@ FROM " << MSGFW_MESSAGE_TABLE_NAME << " A, " << MSGFW_ADDRESS_TABLE_NAME << " B
                pTmp->bBackup = dbHandle.getColumnToInt(index++);
                pTmp->priority = dbHandle.getColumnToInt(index++);
                pTmp->direction= dbHandle.getColumnToInt(index++);
-               pTmp->addressList = NULL;
-
-               pTmp->scheduledTime = (time_t)dbHandle.getColumnToInt(index++);
+               index++; // This field is reserved.
 
                dbHandle.getColumnToString(index++, MAX_SUBJECT_LEN, pTmp->subject);
 
@@ -374,28 +369,6 @@ FROM " << MSGFW_MESSAGE_TABLE_NAME << " A, " << MSGFW_ADDRESS_TABLE_NAME << " B
 
                pTmp->addr_list = addr_list;
 
-               // For GList *addressList
-               msg_struct_s *addrStruct = NULL;
-               MSG_ADDRESS_INFO_S *addrInfo = NULL;
-
-               addrStruct = new msg_struct_s;
-               memset(addrStruct, 0x00, sizeof(msg_struct_s));
-
-               addrStruct->type = MSG_STRUCT_ADDRESS_INFO;
-               addrStruct->data = new MSG_ADDRESS_INFO_S;
-               memset(addrStruct->data, 0x00, sizeof(MSG_ADDRESS_INFO_S));
-
-               addrInfo = (MSG_ADDRESS_INFO_S *)addrStruct->data;
-
-               addrInfo->addressType = address->addressType;
-               addrInfo->recipientType = address->recipientType;
-               addrInfo->contactId = address->contactId;
-               strncpy(addrInfo->addressVal, address->addressVal, MAX_ADDRESS_VAL_LEN);
-               strncpy(addrInfo->displayName, address->displayName, MAX_DISPLAY_NAME_LEN);
-               addrInfo->displayName[MAX_DISPLAY_NAME_LEN] = '\0';
-
-               pTmp->addressList = g_list_append(pTmp->addressList, addrStruct);
-
                pTmp->attachCount = dbHandle.getColumnToInt(index++);
 
                dbHandle.getColumnToString(index++, MSG_FILEPATH_LEN_MAX, pTmp->thumbPath);