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

UnitTC all passed

diff --git a/packaging/wrt-plugins-tizen.spec b/packaging/wrt-plugins-tizen.spec
index 60e6f84..6007f9f 100755 (executable)
--- a/packaging/wrt-plugins-tizen.spec
+++ b/packaging/wrt-plugins-tizen.spec
@@ -1,7 +1,7 @@
 Name:       wrt-plugins-tizen
 Summary:    JavaScript plugins for WebRuntime
 Version:    0.4.23
-Release:    0
+Release:    1
 Group:      Development/Libraries
 License:    Apache License, Version 2.0
 Source0:    %{name}-%{version}.tar.gz

diff --git a/src/Messaging/AttachmentFactory.cpp b/src/Messaging/AttachmentFactory.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/src/Messaging/Attachments.cpp b/src/Messaging/Attachments.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/src/Messaging/BinarySms.cpp b/src/Messaging/BinarySms.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/src/Messaging/CallbackMgr.cpp b/src/Messaging/CallbackMgr.cpp
index fab5a3f..208fd64 100644 (file)
--- a/src/Messaging/CallbackMgr.cpp
+++ b/src/Messaging/CallbackMgr.cpp
@@ -76,14 +76,10 @@ msg_error_t CallbackMgr::registerAndSend(SendingFunction sendingFn,
        {
                if (observer)
                {
-                       msg_list_handle_t addr_list = NULL;
-                       msg_struct_t addr_info = NULL;
-                       
-                       err = msg_get_list_handle(message, MSG_MESSAGE_ADDR_LIST_HND, (void **)&addr_list);
+                       msg_struct_list_s *addr_list = NULL;
+                       err = msg_get_list_handle(message, MSG_MESSAGE_ADDR_LIST_STRUCT, (void **)&addr_list);
                        char strNumber[MAX_ADDRESS_VAL_LEN] = {0,};
-
-                       addr_info = (msg_struct_t)msg_list_nth_data(addr_list, 0);
-                       msg_get_str_value(addr_info, MSG_ADDRESS_INFO_ADDRESS_VALUE_STR, strNumber, MAX_ADDRESS_VAL_LEN);
+                       msg_get_str_value(addr_list->msg_struct_info[0], MSG_ADDRESS_INFO_ADDRESS_VALUE_STR, strNumber, MAX_ADDRESS_VAL_LEN);
 
                        msg_get_int_value(req, MSG_REQUEST_REQUESTID_INT, &tempInt);
                        m_sendRequests[tempInt] = observer;

diff --git a/src/Messaging/CallbackNumber.cpp b/src/Messaging/CallbackNumber.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/src/Messaging/Conversation.cpp b/src/Messaging/Conversation.cpp
index 6e8f753..7850371 100644 (file)
--- a/src/Messaging/Conversation.cpp
+++ b/src/Messaging/Conversation.cpp
@@ -90,8 +90,7 @@ void Conversation::makeConversationFromThread(msg_struct_t msg_thread)
        msg_handle_t handle = MsgGetCommonHandle();
 
        msg_struct_list_s convViewList;
-       msg_list_handle_t addr_list = NULL;
-       msg_struct_t addr_info = NULL;
+       msg_struct_list_s *addr_list = NULL;
 
        msg_struct_t msgInfo = NULL;
        msg_struct_t sendOpt = NULL;
@@ -184,9 +183,9 @@ void Conversation::makeConversationFromThread(msg_struct_t msg_thread)
                msg_get_int_value(convViewList.msg_struct_info[lastMsgIndex], MSG_CONV_MSG_DIRECTION_INT, &tempInt);
                int type = tempInt;
 
-               msg_get_list_handle(msgInfo, MSG_MESSAGE_ADDR_LIST_HND, (void **)&addr_list);
+               msg_get_list_handle(msgInfo, MSG_MESSAGE_ADDR_LIST_STRUCT, (void **)&addr_list);
 
-               nToCnt = msg_list_length(addr_list);
+               nToCnt = addr_list->nCount;
 
                if (type == MSG_DIRECTION_TYPE_MT)
                {
@@ -194,8 +193,7 @@ void Conversation::makeConversationFromThread(msg_struct_t msg_thread)
                        if (nToCnt > 0 && nToCnt < MAX_TO_ADDRESS_CNT )
                        {
                                char strNumber[MAX_ADDRESS_VAL_LEN] = {0,};
-                               addr_info = (msg_struct_t)msg_list_nth_data(addr_list, m_lastMessageId);
-                               msg_get_str_value(addr_info, MSG_ADDRESS_INFO_ADDRESS_VALUE_STR, strNumber, MAX_ADDRESS_VAL_LEN);
+                               msg_get_str_value(addr_list->msg_struct_info[m_lastMessageId], MSG_ADDRESS_INFO_ADDRESS_VALUE_STR, strNumber, MAX_ADDRESS_VAL_LEN);
                                
                                if (strNumber[0] != '\0')
                                {
@@ -232,8 +230,7 @@ void Conversation::makeConversationFromThread(msg_struct_t msg_thread)
                        for (index = 0; index < nToCnt; index++)
                        {
                                char strNumber[MAX_ADDRESS_VAL_LEN] = {0,};
-                               addr_info = (msg_struct_t)msg_list_nth_data(addr_list, index);
-                               msg_get_str_value(addr_info, MSG_ADDRESS_INFO_ADDRESS_VALUE_STR, strNumber, MAX_ADDRESS_VAL_LEN);
+                               msg_get_str_value(addr_list->msg_struct_info[index], MSG_ADDRESS_INFO_ADDRESS_VALUE_STR, strNumber, MAX_ADDRESS_VAL_LEN);
                                tempString = strNumber;
                                if (tempString != NULL)
                                {
@@ -439,8 +436,7 @@ bool Conversation::makeConversationFromMsgId(unsigned int msgId, MessageType msg
        msg_struct_t msg_thread = NULL;
 
        msg_struct_list_s convViewList;
-       msg_list_handle_t addr_list = NULL;
-       msg_struct_t addr_info = NULL;
+       msg_struct_list_s *addr_list = NULL;
        
        msg_error_t err = MSG_SUCCESS;
 
@@ -549,8 +545,8 @@ bool Conversation::makeConversationFromMsgId(unsigned int msgId, MessageType msg
                int type = tempInt;
                LoggerD("direction : " << type);
 
-               msg_get_list_handle(msgInfo, MSG_MESSAGE_ADDR_LIST_HND, (void **)&addr_list);
-               nToCnt = msg_list_length(addr_list);
+               msg_get_list_handle(msgInfo, MSG_MESSAGE_ADDR_LIST_STRUCT, (void **)&addr_list);
+               nToCnt = addr_list->nCount;
 
                if (type == MSG_DIRECTION_TYPE_MT)
                {
@@ -558,8 +554,7 @@ bool Conversation::makeConversationFromMsgId(unsigned int msgId, MessageType msg
                        if (nToCnt > 0 && nToCnt < MAX_TO_ADDRESS_CNT )
                        {
                                char strNumber[MAX_ADDRESS_VAL_LEN] = {0,};
-                               addr_info = (msg_struct_t)msg_list_nth_data(addr_list, nToCnt-1);
-                               msg_get_str_value(addr_info, MSG_ADDRESS_INFO_ADDRESS_VALUE_STR, strNumber, MAX_ADDRESS_VAL_LEN);
+                               msg_get_str_value(addr_list->msg_struct_info[nToCnt-1], MSG_ADDRESS_INFO_ADDRESS_VALUE_STR, strNumber, MAX_ADDRESS_VAL_LEN);
 
                                if (strNumber[0] != '\0')
                                {
@@ -584,9 +579,8 @@ bool Conversation::makeConversationFromMsgId(unsigned int msgId, MessageType msg
                        {
                                for (int index = 0; index < nToCnt; index++)
                                {
-                                       addr_info = (msg_struct_t)msg_list_nth_data(addr_list, index);
                                        char strNumber[MAX_ADDRESS_VAL_LEN] = {0,};
-                                       msg_get_str_value(addr_info, MSG_ADDRESS_INFO_ADDRESS_VALUE_STR, strNumber, MAX_ADDRESS_VAL_LEN);
+                                       msg_get_str_value(addr_list->msg_struct_info[index], MSG_ADDRESS_INFO_ADDRESS_VALUE_STR, strNumber, MAX_ADDRESS_VAL_LEN);
                                        tempString = strNumber;
                                        if (tempString != NULL)
                                        {

diff --git a/src/Messaging/ConversationFilterValidator.cpp b/src/Messaging/ConversationFilterValidator.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/src/Messaging/ConversationQueryGenerator.cpp b/src/Messaging/ConversationQueryGenerator.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/src/Messaging/DBus/Connection.cpp b/src/Messaging/DBus/Connection.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/src/Messaging/EmailUtils.cpp b/src/Messaging/EmailUtils.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/src/Messaging/FolderQueryGenerator.cpp b/src/Messaging/FolderQueryGenerator.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/src/Messaging/IAttachment.cpp b/src/Messaging/IAttachment.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/src/Messaging/IBinarySms.cpp b/src/Messaging/IBinarySms.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/src/Messaging/IEmail.cpp b/src/Messaging/IEmail.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/src/Messaging/IMessage.cpp b/src/Messaging/IMessage.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/src/Messaging/IMessagingService.cpp b/src/Messaging/IMessagingService.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/src/Messaging/IMms.cpp b/src/Messaging/IMms.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/src/Messaging/ISms.cpp b/src/Messaging/ISms.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/src/Messaging/JSConversation.cpp b/src/Messaging/JSConversation.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/src/Messaging/JSMessage.h b/src/Messaging/JSMessage.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/src/Messaging/JSMessagingService.cpp b/src/Messaging/JSMessagingService.cpp
index 6e52be6..0c30fbd 100644 (file)
--- a/src/Messaging/JSMessagingService.cpp
+++ b/src/Messaging/JSMessagingService.cpp
@@ -1017,7 +1017,7 @@ JSValueRef JSMessagingService::stopSync(JSContextRef context, JSObjectRef functi
         int handle = imessagingService->getHandleFromOpId(opId);
         if ( handle < 0 )
         {
-            LogInfo("operation ID is not found : " << opId);
+            LoggerI("operation ID is not found : " << opId);
             return JSValueMakeUndefined(context);
         }
 

diff --git a/src/Messaging/JSMessagingStorage.cpp b/src/Messaging/JSMessagingStorage.cpp
index 89e2ce5..69fd636 100644 (file)
--- a/src/Messaging/JSMessagingStorage.cpp
+++ b/src/Messaging/JSMessagingStorage.cpp
@@ -1344,7 +1344,7 @@ JSValueRef JSMessagingStorage::removeChangeListener(JSContextRef context, JSObje
         }
             catch(const WrtDeviceApis::Commons::NotFoundException& exc)
         {
-            LogError(exc.GetMessage().c_str());
+            LoggerE(exc.GetMessage().c_str());
             return JSValueMakeUndefined(context);
         }
 

diff --git a/src/Messaging/Mms.cpp b/src/Messaging/Mms.cpp
index d1ca3c7..e74aa53 100644 (file)
--- a/src/Messaging/Mms.cpp
+++ b/src/Messaging/Mms.cpp
@@ -303,15 +303,13 @@ void Mms::readRecipientList(msg_struct_t& messageData)
 //     int recipientCount = msg_get_address_count(messageData);
 //     LoggerD("Recipient count " << recipientCount);
 
-       msg_list_handle_t addr_list = NULL;
-       msg_struct_t addr_info = NULL;
-
-       msg_get_list_handle(messageData, MSG_MESSAGE_ADDR_LIST_HND, (void **)&addr_list);
+       msg_struct_list_s *addr_list;
+       msg_get_list_handle(messageData, MSG_MESSAGE_ADDR_LIST_STRUCT, (void **)&addr_list);
 
        int tempInt = 0;
        char strNumber[MAX_ADDRESS_VAL_LEN] = {0,};
 
-       int recipientCount = msg_list_length(addr_list);
+       int recipientCount = addr_list->nCount;
        LoggerD("Recipient count " << recipientCount);
 
        for (int i = 0; i < recipientCount; ++i) 
@@ -323,7 +321,7 @@ void Mms::readRecipientList(msg_struct_t& messageData)
 
                if (MSG_DIRECTION_TYPE_MT == type) 
                {
-                       addr_info = (msg_struct_t)msg_list_nth_data(addr_list, i);
+                       msg_struct_t addr_info = addr_list->msg_struct_info[i];
                        memset(strNumber, 0x00, sizeof(MAX_ADDRESS_VAL_LEN));
                        msg_get_str_value(addr_info, MSG_ADDRESS_INFO_ADDRESS_VALUE_STR, strNumber, MAX_ADDRESS_VAL_LEN);
                        phoneNumber = strNumber;
@@ -337,7 +335,7 @@ void Mms::readRecipientList(msg_struct_t& messageData)
                } 
                else if (MSG_DIRECTION_TYPE_MO == type) 
                {
-                       addr_info = (msg_struct_t)msg_list_nth_data(addr_list, i);
+                       msg_struct_t addr_info = addr_list->msg_struct_info[i];
                        memset(strNumber, 0x00, sizeof(MAX_ADDRESS_VAL_LEN));
                        msg_get_str_value(addr_info, MSG_ADDRESS_INFO_ADDRESS_VALUE_STR, strNumber, MAX_ADDRESS_VAL_LEN);
                        msg_get_int_value(addr_info, MSG_ADDRESS_INFO_RECIPIENT_TYPE_INT, &tempInt);
@@ -597,9 +595,29 @@ void Mms::updateRecipientList()
 
     LoggerI("MMS updating platform recipients");
 
+    // reset addresses in platform structure
+//    msg_reset_address(m_messageData);
+       msg_struct_list_s *addr_list = NULL;
+       msg_get_list_handle(m_messageData, MSG_MESSAGE_ADDR_LIST_STRUCT, (void **)&addr_list);
        int nToCnt = 0;
+       nToCnt = addr_list->nCount;
+
+       LoggerI("addr_list->nCount" << addr_list->nCount);
+       
+       if (nToCnt > 0)         
+       {               
+               for (int i = 0; i < nToCnt; i++) {      
+                       msg_set_str_value(addr_list->msg_struct_info[i], MSG_ADDRESS_INFO_ADDRESS_VALUE_STR, (char *)"", 0);
+                       msg_set_str_value(addr_list->msg_struct_info[i], MSG_ADDRESS_INFO_DISPLAYNAME_STR, (char *)"", 0);
+                       msg_set_int_value(addr_list->msg_struct_info[i], MSG_ADDRESS_INFO_ADDRESS_TYPE_INT, MSG_ADDRESS_TYPE_PLMN);
+                       msg_set_int_value(addr_list->msg_struct_info[i], MSG_ADDRESS_INFO_RECIPIENT_TYPE_INT, MSG_RECIPIENTS_TYPE_UNKNOWN);
+                       msg_set_int_value(addr_list->msg_struct_info[i], MSG_ADDRESS_INFO_CONTACT_ID_INT, 0);
+               }
+               nToCnt = 0;
+               addr_list->nCount = nToCnt;
+       }               
 
-       msg_list_clear(m_messageData, MSG_MESSAGE_ADDR_LIST_HND);
+       LoggerI("addr_list->nCount" << addr_list->nCount);
 
        vector<string> to = getToRecipients().getRecipients();
        vector<string> cc = getCcRecipients().getRecipients();
@@ -611,8 +629,6 @@ void Mms::updateRecipientList()
                LoggerI("updating to");
                for (size_t i = 0; i < to.size(); i++) 
                {
-                       msg_struct_t tmpAddr;
-
                        if (i >= MAX_TO_ADDRESS_CNT) 
                        {
                                LoggerE("max number of recipient exceeded");
@@ -620,18 +636,16 @@ void Mms::updateRecipientList()
                        }
                        LoggerD("adding to[" << i << "]=" << to[i]);
 
-                       msg_list_add_item(m_messageData, MSG_MESSAGE_ADDR_LIST_HND, &tmpAddr);
-
-                       msg_set_int_value(tmpAddr, MSG_ADDRESS_INFO_ADDRESS_TYPE_INT, MSG_ADDRESS_TYPE_PLMN);
+                       msg_set_int_value(addr_list->msg_struct_info[i], MSG_ADDRESS_INFO_ADDRESS_TYPE_INT, MSG_ADDRESS_TYPE_PLMN);
 
-                       if (msg_set_int_value(tmpAddr, MSG_ADDRESS_INFO_RECIPIENT_TYPE_INT, 
+                       if (msg_set_int_value(addr_list->msg_struct_info[i], MSG_ADDRESS_INFO_RECIPIENT_TYPE_INT, 
                                MSG_RECIPIENTS_TYPE_TO) != MSG_SUCCESS) 
                        {
                                LoggerE("problem with adding to address");
                                ThrowMsg(WrtDeviceApis::Commons::PlatformException, "Problem with adding to address");
                        }
                        
-                       if(msg_set_str_value(tmpAddr, MSG_ADDRESS_INFO_ADDRESS_VALUE_STR, 
+                       if(msg_set_str_value(addr_list->msg_struct_info[i], MSG_ADDRESS_INFO_ADDRESS_VALUE_STR, 
                                const_cast<char*>(to[i].c_str()), to[i].size()) != MSG_SUCCESS) 
                        {
                                LoggerE("problem with adding to address");
@@ -639,17 +653,19 @@ void Mms::updateRecipientList()
                        }
                        nToCnt ++;
                }
+               addr_list->nCount = nToCnt;
                LoggerE("nToCnt : " << nToCnt);
+               LoggerE("addr_list->nCount: " <<addr_list->nCount);
+               
        }
        
+       LoggerI("addr_list->nCount" << addr_list->nCount);
 
        if (cc.size()) 
        {
                LoggerI("updating cc");
                for (size_t i = 0; i < cc.size(); i++) 
                {
-                       msg_struct_t tmpAddr;
-
                        if (nToCnt >= MAX_TO_ADDRESS_CNT) 
                        {
                                LoggerE("max number of recipient exceeded");
@@ -657,18 +673,16 @@ void Mms::updateRecipientList()
                        }
                        LoggerD("adding cc[" << i << "]=" << cc[i]);
 
-                       msg_list_add_item(m_messageData, MSG_MESSAGE_ADDR_LIST_HND, &tmpAddr);
+                       msg_set_int_value(addr_list->msg_struct_info[i], MSG_ADDRESS_INFO_ADDRESS_TYPE_INT, MSG_ADDRESS_TYPE_PLMN);
 
-                       msg_set_int_value(tmpAddr, MSG_ADDRESS_INFO_ADDRESS_TYPE_INT, MSG_ADDRESS_TYPE_PLMN);
-
-                       if (msg_set_int_value(tmpAddr, MSG_ADDRESS_INFO_RECIPIENT_TYPE_INT, 
+                       if (msg_set_int_value(addr_list->msg_struct_info[i], MSG_ADDRESS_INFO_RECIPIENT_TYPE_INT, 
                                MSG_RECIPIENTS_TYPE_CC) != MSG_SUCCESS) 
                        {
                                LoggerE("problem with adding cc address");
                                ThrowMsg(WrtDeviceApis::Commons::PlatformException, "Problem with adding cc address");
                        }
                        
-                       if(msg_set_str_value(tmpAddr, MSG_ADDRESS_INFO_ADDRESS_VALUE_STR, 
+                       if(msg_set_str_value(addr_list->msg_struct_info[i], MSG_ADDRESS_INFO_ADDRESS_VALUE_STR, 
                                const_cast<char*>(cc[i].c_str()), cc[i].size()) != MSG_SUCCESS) 
                        {
                                LoggerE("problem with adding cc address");
@@ -676,17 +690,18 @@ void Mms::updateRecipientList()
                        }
                        nToCnt ++;
                }
+               addr_list->nCount = nToCnt;
                LoggerE("nToCnt : " << nToCnt);
+               LoggerE("addr_list->nCount: " <<addr_list->nCount);
        }
 
+       LoggerI("addr_list->nCount" << addr_list->nCount);
 
        if (bcc.size()) 
        {
                LoggerI("updating bcc");
                for (size_t i = 0; i < bcc.size(); i++) 
                {
-                       msg_struct_t tmpAddr;
-
                        if (nToCnt >= MAX_TO_ADDRESS_CNT) 
                        {
                                LoggerE("max number of recipient exceeded");
@@ -694,18 +709,16 @@ void Mms::updateRecipientList()
                        }
                        LoggerD("adding bcc[" << i << "]=" << bcc[i]);
 
-                       msg_list_add_item(m_messageData, MSG_MESSAGE_ADDR_LIST_HND, &tmpAddr);
+                       msg_set_int_value(addr_list->msg_struct_info[i], MSG_ADDRESS_INFO_ADDRESS_TYPE_INT, MSG_ADDRESS_TYPE_PLMN);
 
-                       msg_set_int_value(tmpAddr, MSG_ADDRESS_INFO_ADDRESS_TYPE_INT, MSG_ADDRESS_TYPE_PLMN);
-
-                       if (msg_set_int_value(tmpAddr, MSG_ADDRESS_INFO_RECIPIENT_TYPE_INT, 
+                       if (msg_set_int_value(addr_list->msg_struct_info[i], MSG_ADDRESS_INFO_RECIPIENT_TYPE_INT, 
                                MSG_RECIPIENTS_TYPE_BCC) != MSG_SUCCESS) 
                        {
                                LoggerE("problem with adding bcc address");
                                ThrowMsg(WrtDeviceApis::Commons::PlatformException, "Problem with adding bcc address");
                        }
                        
-                       if(msg_set_str_value(tmpAddr, MSG_ADDRESS_INFO_ADDRESS_VALUE_STR, 
+                       if(msg_set_str_value(addr_list->msg_struct_info[i], MSG_ADDRESS_INFO_ADDRESS_VALUE_STR, 
                                const_cast<char*>(bcc[i].c_str()), bcc[i].size()) != MSG_SUCCESS) 
                        {
                                LoggerE("problem with adding bcc address");
@@ -713,9 +726,12 @@ void Mms::updateRecipientList()
                        }
                        nToCnt ++;
                }
+               addr_list->nCount = nToCnt;
                LoggerE("nToCnt : " << nToCnt);
+               LoggerE("addr_list->nCount: " <<addr_list->nCount);
        }
 
+       LoggerI("addr_list->nCount" << addr_list->nCount);              
        setToValidity(true);
        setCcValidity(true);
        setBccValidity(true);
@@ -799,7 +815,7 @@ void Mms::updateBodyAndAttachments()
                                msg_set_bool_value(mms_struct, MSG_MMS_ROOTLAYOUT_WIDTH_PERCENT_BOOL, true);
                                msg_set_bool_value(mms_struct, MSG_MMS_ROOTLAYOUT_HEIGHT_PERCENT_BOOL, true);
                                
-                               msg_list_add_item(mms_struct, MSG_STRUCT_MMS_REGION, &region[0]);
+                               msg_mms_add_item(mms_struct, MSG_STRUCT_MMS_REGION, &region[0]);
                                msg_set_str_value(region[0], MSG_MMS_REGION_ID_STR, const_cast<char*>(TEXT_AREA), 4);
                                msg_set_int_value(region[0], MSG_MMS_REGION_LENGTH_LEFT_INT, 0);
                                msg_set_int_value(region[0], MSG_MMS_REGION_LENGTH_TOP_INT, 0);
@@ -812,10 +828,10 @@ void Mms::updateBodyAndAttachments()
                                msg_set_bool_value(region[0], MSG_MMS_REGION_LENGTH_WIDTH_PERCENT_BOOL, true);
                                msg_set_bool_value(region[0], MSG_MMS_REGION_LENGTH_HEIGHT_PERCENT_BOOL, true);
 
-                               msg_list_add_item(mms_struct, MSG_STRUCT_MMS_PAGE, &page[0]);
+                               msg_mms_add_item(mms_struct, MSG_STRUCT_MMS_PAGE, &page[0]);
                                msg_set_int_value(page[0], MSG_MMS_PAGE_PAGE_DURATION_INT, 0);
                                
-                               msg_list_add_item(page[0], MSG_STRUCT_MMS_MEDIA, &media[0]);
+                               msg_mms_add_item(page[0], MSG_STRUCT_MMS_MEDIA, &media[0]);
                                msg_set_int_value(media[0], MSG_MMS_MEDIA_TYPE_INT, MMS_SMIL_MEDIA_TEXT);
                                msg_set_str_value(media[0], MSG_MMS_MEDIA_REGION_ID_STR, const_cast<char*>(TEXT_AREA), 4);
                                int error;
@@ -859,7 +875,7 @@ void Mms::updateBodyAndAttachments()
        
                                //this function should return valid pointer
 
-                               msg_list_add_item(mms_struct, MSG_STRUCT_MMS_ATTACH, &attachment[i]);
+                               msg_mms_add_item(mms_struct, MSG_STRUCT_MMS_ATTACH, &attachment[i]);
                                msg_set_str_value(attachment[i], MSG_MMS_ATTACH_FILEPATH_STR, const_cast<char*>(att->getFullPath().c_str()), MSG_FILEPATH_LEN_MAX);
                                
                                LoggerD("Attachment added");
@@ -1341,9 +1357,7 @@ void Mms::setSendingStatusOk()
 {
     //success callback should be executed here
        ReqReceiverMessage *requestReceiver = getRequestReceiver();
-       msg_list_handle_t addr_list = NULL;
-       msg_struct_t addr_info = NULL;
-
+       msg_struct_list_s *addr_list = NULL;
        char strNumber[MAX_ADDRESS_VAL_LEN] = {0,};
        int nToCnt;
        
@@ -1352,14 +1366,13 @@ void Mms::setSendingStatusOk()
                EventMessagingServicePtr event = getMessagingServiceEvent();
                event->setExceptionCode(WrtDeviceApis::Commons::ExceptionCodes::None);
 
-               msg_get_list_handle(m_messageData, MSG_MESSAGE_ADDR_LIST_HND, (void **)&addr_list);
+               msg_get_list_handle(m_messageData, MSG_MESSAGE_ADDR_LIST_STRUCT, (void **)&addr_list);
 
-               nToCnt = msg_list_length(addr_list);
+               nToCnt = addr_list->nCount;
 
                for ( int index=0; index < nToCnt; index++)
                {
-                       addr_info = (msg_struct_t)msg_list_nth_data(addr_list, index);
-                       msg_get_str_value(addr_info, MSG_ADDRESS_INFO_ADDRESS_VALUE_STR, strNumber, MAX_ADDRESS_VAL_LEN);
+                       msg_get_str_value(addr_list->msg_struct_info[0], MSG_ADDRESS_INFO_ADDRESS_VALUE_STR, strNumber, MAX_ADDRESS_VAL_LEN);
                        event->m_successRecipients.push_back(strNumber);
                }
          
@@ -1371,9 +1384,7 @@ void Mms::setSendingStatusFailed()
 {      
     //error callback should be executed here
        EventOnSendingFailedEmitterPtr emitter = getEmitter();
-       msg_list_handle_t addr_list = NULL;
-       msg_struct_t addr_info = NULL;
-
+       msg_struct_list_s *addr_list = NULL;
        char strNumber[MAX_ADDRESS_VAL_LEN] = {0,};
        int nToCnt;
        
@@ -1391,16 +1402,14 @@ void Mms::setSendingStatusFailed()
                {
                        LoggerE("calling JS error callback");
                        event->setExceptionCode(WrtDeviceApis::Commons::ExceptionCodes::UnknownException);
-
-                       msg_get_list_handle(m_messageData, MSG_MESSAGE_ADDR_LIST_HND, (void **)&addr_list);
-                       nToCnt = msg_list_length(addr_list);
+                       msg_get_list_handle(m_messageData, MSG_MESSAGE_ADDR_LIST_STRUCT, (void **)&addr_list);
+                       nToCnt = addr_list->nCount;
 
                        LoggerD("nToCnt : " << nToCnt);
 
                        for ( int index=0; index < nToCnt; index++)
                        {
-                               addr_info = (msg_struct_t)msg_list_nth_data(addr_list, index);
-                               msg_get_str_value(addr_info, MSG_ADDRESS_INFO_ADDRESS_VALUE_STR, strNumber, MAX_ADDRESS_VAL_LEN);
+                               msg_get_str_value(addr_list->msg_struct_info[index], MSG_ADDRESS_INFO_ADDRESS_VALUE_STR, strNumber, MAX_ADDRESS_VAL_LEN);
                                event->m_failRecipients.push_back(strNumber);
                        }
 

diff --git a/src/Messaging/Sms.cpp b/src/Messaging/Sms.cpp
index fd817c4..695b6cb 100644 (file)
--- a/src/Messaging/Sms.cpp
+++ b/src/Messaging/Sms.cpp
@@ -213,40 +213,38 @@ int Sms::send()
     // split the message
        SendRequest req;
 
-       msg_list_handle_t addr_list = NULL;
-       msg_struct_t addr_info = NULL;
-
+       msg_struct_list_s *addr_list = NULL;
+       msg_struct_list_s *new_addr_list = NULL;
        char strNumber[MAX_ADDRESS_VAL_LEN] = {0,};
        int nToCnt;
        int tempInt;
        int tempIdInt;
 
-       msg_get_list_handle(m_messageData, MSG_MESSAGE_ADDR_LIST_HND, (void **)&addr_list);     
+       msg_get_list_handle(m_messageData, MSG_MESSAGE_ADDR_LIST_STRUCT, (void **)&addr_list);  
        msg_get_int_value(m_messageData, MSG_MESSAGE_ID_INT, &tempIdInt);
 
-       nToCnt = msg_list_length(addr_list);
+       nToCnt = addr_list->nCount;
        LoggerD("nToCnt : " << nToCnt);
 
        for (int i = 0; i < nToCnt; ++i) 
        {
-               msg_struct_t tmpAddr;   
                msg_struct_t new_msg = createNewCopyOfPLatformMsg(m_messageData);
                msg_set_int_value(new_msg, MSG_MESSAGE_ID_INT, tempIdInt);
 
-               addr_info = (msg_struct_t)msg_list_nth_data(addr_list, i);
-               msg_get_int_value(addr_info, MSG_ADDRESS_INFO_RECIPIENT_TYPE_INT, &tempInt);
+               msg_get_list_handle(new_msg, MSG_MESSAGE_ADDR_LIST_STRUCT, (void **)&new_addr_list);
+
+               msg_get_int_value(addr_list->msg_struct_info[i], MSG_ADDRESS_INFO_RECIPIENT_TYPE_INT, &tempInt);
                LoggerD("RECIPIENT_TYPE : " << tempInt);
                if(MSG_RECIPIENTS_TYPE_TO != tempInt) 
                {
                        LoggerD("skip");
                        continue;
                }
-               msg_get_str_value(addr_info, MSG_ADDRESS_INFO_ADDRESS_VALUE_STR, strNumber, MAX_ADDRESS_VAL_LEN);
-
-               msg_list_add_item(new_msg, MSG_MESSAGE_ADDR_LIST_HND, &tmpAddr);
                
-               msg_set_str_value(tmpAddr, MSG_ADDRESS_INFO_ADDRESS_VALUE_STR, strNumber, MAX_ADDRESS_VAL_LEN);
-               msg_set_int_value(tmpAddr, MSG_ADDRESS_INFO_RECIPIENT_TYPE_INT, MSG_RECIPIENTS_TYPE_TO);
+               msg_get_str_value(addr_list->msg_struct_info[i], MSG_ADDRESS_INFO_ADDRESS_VALUE_STR, strNumber, MAX_ADDRESS_VAL_LEN);
+               msg_set_str_value(new_addr_list->msg_struct_info[0], MSG_ADDRESS_INFO_ADDRESS_VALUE_STR, strNumber, MAX_ADDRESS_VAL_LEN);
+               msg_set_int_value(new_addr_list->msg_struct_info[0], MSG_ADDRESS_INFO_RECIPIENT_TYPE_INT, MSG_RECIPIENTS_TYPE_TO);              
+               new_addr_list->nCount = 1;
 
                setMessageStatus(MESSAGE_STATUS_SENDING);
 
@@ -369,11 +367,10 @@ void Sms::setSendingStatusOk(const string &recipient)
         event->setExceptionCode(WrtDeviceApis::Commons::ExceptionCodes::None);
         event->m_successRecipients.push_back(recipient);
 
-        msg_list_handle_t addr_list = NULL;
+        msg_struct_list_s *addr_list = NULL;    
+        msg_get_list_handle(m_messageData, MSG_MESSAGE_ADDR_LIST_STRUCT, (void **)&addr_list);
 
-        msg_get_list_handle(m_messageData, MSG_MESSAGE_ADDR_LIST_HND, (void **)&addr_list);
-        
-         if ( event->m_successRecipients.size() + event->m_failRecipients.size() == (unsigned int)msg_list_length(addr_list))
+         if ( event->m_successRecipients.size() + event->m_failRecipients.size() == (unsigned int)addr_list->nCount)
         {
                requestReceiver->WrtDeviceApis::Commons::EventRequestReceiver< EventMessagingService >::ManualAnswer(event);
         }
@@ -408,12 +405,10 @@ void Sms::setSendingStatusFailed(const string &recipient)
             EventMessagingServicePtr event = getMessagingServiceEvent();
             event->setExceptionCode(WrtDeviceApis::Commons::ExceptionCodes::UnknownException);
                event->m_successRecipients.push_back(recipient);
+               msg_struct_list_s *addr_list = NULL;    
+               msg_get_list_handle(m_messageData, MSG_MESSAGE_ADDR_LIST_STRUCT, (void **)&addr_list);
                
-               msg_list_handle_t addr_list = NULL;
-
-               msg_get_list_handle(m_messageData, MSG_MESSAGE_ADDR_LIST_HND, (void **)&addr_list);
-               
-                if ( event->m_successRecipients.size() + event->m_failRecipients.size() == (unsigned int)msg_list_length(addr_list))
+                if ( event->m_successRecipients.size() + event->m_failRecipients.size() == (unsigned int)addr_list->nCount)
                 {
                   requestReceiver->WrtDeviceApis::Commons::EventRequestReceiver< EventMessagingService >::ManualAnswer(event);
                 }
@@ -560,7 +555,24 @@ void Sms::updateTo()
 
        LoggerI("SMS updating platform recipients");
 
-       msg_list_clear(m_messageData, MSG_MESSAGE_ADDR_LIST_HND);
+       msg_struct_list_s *addr_list = NULL;
+       msg_get_list_handle(m_messageData, MSG_MESSAGE_ADDR_LIST_STRUCT, (void **)&addr_list);
+       int nToCnt = addr_list->nCount;
+
+       LogInfo("nToCnt size  " << nToCnt);
+
+       if (nToCnt > 0)
+       {
+               for (int i = 0; i < nToCnt; i++) {
+                       msg_set_str_value(addr_list->msg_struct_info[i], MSG_ADDRESS_INFO_ADDRESS_VALUE_STR, (char *)"", 0);
+                       msg_set_str_value(addr_list->msg_struct_info[i], MSG_ADDRESS_INFO_DISPLAYNAME_STR, (char *)"", 0);
+                       msg_set_int_value(addr_list->msg_struct_info[i], MSG_ADDRESS_INFO_ADDRESS_TYPE_INT, MSG_ADDRESS_TYPE_PLMN);
+                       msg_set_int_value(addr_list->msg_struct_info[i], MSG_ADDRESS_INFO_RECIPIENT_TYPE_INT, MSG_RECIPIENTS_TYPE_UNKNOWN);
+                       msg_set_int_value(addr_list->msg_struct_info[i], MSG_ADDRESS_INFO_CONTACT_ID_INT, 0);
+               }
+               nToCnt = 0;
+               addr_list->nCount = nToCnt;
+       }
 
        vector<string> to = getToRecipients().getRecipients();
 
@@ -580,27 +592,24 @@ void Sms::updateTo()
                                }
                                LoggerD("adding to[" << i << "]=" << to[i]);
 
-                               msg_struct_t newAddr = NULL;
-                               msg_list_add_item(m_messageData, MSG_MESSAGE_ADDR_LIST_HND, &newAddr);
+                               msg_set_int_value(addr_list->msg_struct_info[i], MSG_ADDRESS_INFO_ADDRESS_TYPE_INT, MSG_ADDRESS_TYPE_PLMN);
 
-                               msg_set_int_value(newAddr, MSG_ADDRESS_INFO_ADDRESS_TYPE_INT, MSG_ADDRESS_TYPE_PLMN);
-
-                               if (msg_set_int_value(newAddr, MSG_ADDRESS_INFO_RECIPIENT_TYPE_INT,
+                               if (msg_set_int_value(addr_list->msg_struct_info[i], MSG_ADDRESS_INFO_RECIPIENT_TYPE_INT,
                                MSG_RECIPIENTS_TYPE_TO) != MSG_SUCCESS)
                                {
                                        LoggerE("problem with adding to address");
                                        ThrowMsg(WrtDeviceApis::Commons::PlatformException, "Problem with adding to address");
                                }
 
-                               if(msg_set_str_value(newAddr, MSG_ADDRESS_INFO_ADDRESS_VALUE_STR,
+                               if(msg_set_str_value(addr_list->msg_struct_info[i], MSG_ADDRESS_INFO_ADDRESS_VALUE_STR,
                                const_cast<char*>(to[i].c_str()), to[i].size()) != MSG_SUCCESS)
                                {
                                        LoggerE("problem with adding to address");
                                        ThrowMsg(WrtDeviceApis::Commons::PlatformException, "Problem with adding to address");
                                }
 
-//                             addr_list->nCount ++;
-//                             LoggerD("addr_list->nCount =" << addr_list->nCount);
+                               addr_list->nCount ++;
+                               LoggerD("addr_list->nCount =" << addr_list->nCount);
                        }
                        else
                        {
@@ -893,15 +902,13 @@ void Sms::readRecipientList(msg_struct_t& messageData)
 //     int recipientCount = msg_get_address_count(messageData);
 //     LoggerD("Recipient count " << recipientCount);
 
-       msg_list_handle_t addr_list = NULL;
-       msg_struct_t addr_info = NULL;
-
-       msg_get_list_handle(messageData, MSG_MESSAGE_ADDR_LIST_HND, (void **)&addr_list);
+       msg_struct_list_s *addr_list;
+       msg_get_list_handle(messageData, MSG_MESSAGE_ADDR_LIST_STRUCT, (void **)&addr_list);
 
        int tempInt = 0;
        char strNumber[MAX_ADDRESS_VAL_LEN] = {0,};
 
-       int recipientCount = msg_list_length(addr_list);
+       int recipientCount = addr_list->nCount;
        LoggerD("Recipient count " << recipientCount);
 
        
@@ -912,7 +919,7 @@ void Sms::readRecipientList(msg_struct_t& messageData)
 
                if (MSG_DIRECTION_TYPE_MT == type) 
                {
-                       addr_info = (msg_struct_t)msg_list_nth_data(addr_list, i);
+                       msg_struct_t addr_info = addr_list->msg_struct_info[i];
                        msg_get_str_value(addr_info, MSG_ADDRESS_INFO_ADDRESS_VALUE_STR, strNumber, MAX_ADDRESS_VAL_LEN);
                        phoneNumber = strNumber;
                
@@ -925,7 +932,7 @@ void Sms::readRecipientList(msg_struct_t& messageData)
             }
                else if (MSG_DIRECTION_TYPE_MO == type) 
                {
-                       addr_info = (msg_struct_t)msg_list_nth_data(addr_list, i);
+                       msg_struct_t addr_info = addr_list->msg_struct_info[i];
                        msg_get_str_value(addr_info, MSG_ADDRESS_INFO_ADDRESS_VALUE_STR, strNumber, MAX_ADDRESS_VAL_LEN);
                        LoggerD("MO number: " << strNumber);
                        appendToRecipients(strNumber);
@@ -1096,10 +1103,10 @@ msg_struct_t Sms::createNewCopyOfPLatformMsg(const msg_struct_t src) const
 
 msg_struct_t Sms::createNewCopyOfPLatformMsgWithAddressList(const msg_struct_t src) const
 {
-       int tempInt, nCount;
+       int tempInt;
        bool tempBool;
-       msg_list_handle_t addr_list;
-       msg_list_handle_t new_addr_list;
+       msg_struct_list_s *addr_list;
+       msg_struct_list_s *new_addr_list;
        
        msg_struct_t msg = msg_create_struct(MSG_STRUCT_MESSAGE_INFO);
 
@@ -1150,24 +1157,24 @@ msg_struct_t Sms::createNewCopyOfPLatformMsgWithAddressList(const msg_struct_t s
        msg_set_int_value(msg, MSG_MESSAGE_SRC_PORT_INT,  tempInt);
 
 // copy addr list
-       msg_get_list_handle(src, MSG_MESSAGE_ADDR_LIST_HND, (void **)&addr_list);
-       msg_get_list_handle(msg, MSG_MESSAGE_ADDR_LIST_HND, (void **)&new_addr_list);
+       msg_get_list_handle(src, MSG_MESSAGE_ADDR_LIST_STRUCT, (void **)&addr_list);
+       msg_get_list_handle(msg, MSG_MESSAGE_ADDR_LIST_STRUCT, (void **)&new_addr_list);
 
-       nCount = msg_list_length(addr_list);
+       new_addr_list->nCount = addr_list->nCount;
 
-       for(int i=0; i<nCount; i++)
+       for(int i=0; i<addr_list->nCount; i++)
        {
                msg_struct_t addr_info = NULL;
                msg_struct_t new_addr_info = NULL;
                char addr_value[MAX_ADDRESS_VAL_LEN] = {0,};
                
                //get original address
-               addr_info = (msg_struct_t)msg_list_nth_data(addr_list, i);
+               addr_info = addr_list->msg_struct_info[i];
                msg_get_str_value(addr_info, MSG_ADDRESS_INFO_ADDRESS_VALUE_STR, addr_value, MAX_ADDRESS_VAL_LEN);
                msg_get_int_value(addr_info, MSG_ADDRESS_INFO_RECIPIENT_TYPE_INT, &tempInt);
 
                //copy original address
-               msg_list_add_item(msg, MSG_MESSAGE_ADDR_LIST_HND, &new_addr_info);
+               new_addr_info = new_addr_list->msg_struct_info[i];
                msg_set_str_value(new_addr_info, MSG_ADDRESS_INFO_ADDRESS_VALUE_STR, addr_value, MAX_ADDRESS_VAL_LEN);
                msg_set_int_value(new_addr_info, MSG_ADDRESS_INFO_RECIPIENT_TYPE_INT, tempInt);
        }

diff --git a/src/Messaging/log.h b/src/Messaging/log.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/src/Messaging/messageDB/MessageStorageReader.cpp b/src/Messaging/messageDB/MessageStorageReader.cpp
index c778fea..2756d42 100644 (file)
--- a/src/Messaging/messageDB/MessageStorageReader.cpp
+++ b/src/Messaging/messageDB/MessageStorageReader.cpp
@@ -50,11 +50,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. */
@@ -125,7 +123,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 */
 
@@ -286,9 +283,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);
 
@@ -369,28 +364,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);
@@ -532,9 +505,9 @@ int MessageStorageReader::msg_release_list_struct_private(msg_struct_list_s *msg
        msg_struct_list->msg_struct_info = NULL;
 
 // for private only start
-       msg_struct_list->nCount = 0;
-       malloc_trim(0);
-       MsgReleaseMemoryDB();
+//     msg_struct_list->nCount = 0;
+//     malloc_trim(0);
+//     MsgReleaseMemoryDB();
 // for private only end
 
        LoggerD("end");
@@ -615,10 +588,10 @@ int MessageStorageReader::msg_message_release_private(msg_struct_s **msg_struct)
 
 // for private only start
        // Free GList *addressList
-       if (msg->addressList) {
-               g_list_free_full(msg->addressList, __msg_message_release_address_struct_private);
-               msg->addressList = NULL;
-       }
+//     if (msg->addressList) {
+//             g_list_free_full(msg->addressList, __msg_message_release_address_struct_private);
+//             msg->addressList = NULL;
+//     }
 // for private only end
 
        delete msg;

diff --git a/src/Messaging/plugin_initializer.cpp b/src/Messaging/plugin_initializer.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/src/NetworkBearerSelection/JSNetworkBearerSelection.cpp b/src/NetworkBearerSelection/JSNetworkBearerSelection.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/src/NetworkBearerSelection/JSNetworkBearerSelectionCallbackManager.cpp b/src/NetworkBearerSelection/JSNetworkBearerSelectionCallbackManager.cpp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/src/NetworkBearerSelection/NetworkBearerSelection.cpp b/src/NetworkBearerSelection/NetworkBearerSelection.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 3abbe05..980bd37
--- a/src/NetworkBearerSelection/NetworkBearerSelection.cpp
+++ b/src/NetworkBearerSelection/NetworkBearerSelection.cpp
@@ -33,7 +33,6 @@ namespace NetworkBearerSelection {
     
 static void connection_state_changed_callback(connection_profile_state_e state, void* user_data)
 {
-    LoggerD("enter");
     if(user_data != NULL) {
         LoggerD("Callback registration Succeeded");
         NewtorkBearerSelectionPendingEvent *pendingEvent = (NewtorkBearerSelectionPendingEvent *)user_data;
@@ -54,7 +53,6 @@ static void connection_state_changed_callback(connection_profile_state_e state,
 
 static void connection_opened_callback(connection_error_e result, void* user_data)
 {
-    LoggerD("enter");
        if (result ==  CONNECTION_ERROR_NONE) {
         LoggerD("Connection open Succeeded");
         if(user_data != NULL) {
@@ -73,7 +71,6 @@ static void connection_opened_callback(connection_error_e result, void* user_dat
 
 static void connection_closed_callback(connection_error_e result, void* user_data)
 {
-    LoggerD("enter");
        if (result ==  CONNECTION_ERROR_NONE) {
                LoggerD("Connection close Succeeded");
         if (user_data != NULL) {
@@ -90,18 +87,8 @@ static void connection_closed_callback(connection_error_e result, void* user_dat
     }
 }
 
-static void connection_closed_callback2(connection_error_e result, void* user_data)
-{
-    LoggerD("enter");
-       if (result ==  CONNECTION_ERROR_NONE) {
-               LoggerD("Connection close Succeeded");
-    }
-}
-
-
 static void connection_removed_callback(connection_error_e result, void* user_data)
 {
-    LoggerD("enter");
     if (user_data != NULL) {
         if (result ==  CONNECTION_ERROR_NONE) {
             LoggerD("Connection close Succeeded");
@@ -120,8 +107,7 @@ static void connection_removed_callback(connection_error_e result, void* user_da
 }
 
 NetworkBearerSelection::NetworkBearerSelection() : m_connectionHandle(NULL),
-                                                   m_profileHandle(NULL),
-                                                   m_connectionState(NETWORK_UNKNOWN)
+                                                   m_profileHandle(NULL)
 {
     int ret = connection_create(&m_connectionHandle);
 
@@ -155,9 +141,7 @@ void NetworkBearerSelection::releaseRouteToHost(const EventNetworkBearerReleaseP
 
 void NetworkBearerSelection::OnRequestReceived(const EventNetworkBearerSelectionPtr &event)
 {
-    LoggerD("m_connectionState : " << m_connectionState);
-
-    if (m_connectionState == NETWORK_CONNECTED) {
+    if (checkProfileHandle() == false) {
         reLaunchConnection(event);
         return;
     }
@@ -167,13 +151,11 @@ void NetworkBearerSelection::OnRequestReceived(const EventNetworkBearerSelection
     int ret = connection_get_profile_iterator(m_connectionHandle, CONNECTION_ITERATOR_TYPE_REGISTERED, &profileIter);
        if (ret != CONNECTION_ERROR_NONE) {
         LoggerD("Fail to get profile iterator");
-        makeCallback(event, CONNECTION_STATE_PLATFORM_ERROR);
         return;
     }
     while (connection_profile_iterator_has_next(profileIter)) {
         if (connection_profile_iterator_next(profileIter, &m_profileHandle) != CONNECTION_ERROR_NONE) {
             LoggerD("Fail to get profile handle");
-            makeCallback(event, CONNECTION_STATE_PLATFORM_ERROR);
             return;
        }
     }
@@ -182,7 +164,6 @@ void NetworkBearerSelection::OnRequestReceived(const EventNetworkBearerSelection
 
     if (connection_open_profile(m_connectionHandle, m_profileHandle, connection_opened_callback, pendingEvent) != CONNECTION_ERROR_NONE) {
         LoggerD("Connection open Failed");
-        makeCallback(event, CONNECTION_STATE_PLATFORM_ERROR);
         delete pendingEvent;
         pendingEvent = NULL;
     }
@@ -200,7 +181,7 @@ void NetworkBearerSelection::OnRequestReceived(const EventNetworkBearerReleasePt
         }        
         
         NewtorkBearerReleasePendingEvent *pendingEvent = new NewtorkBearerReleasePendingEvent((void *)this, event);
-
+        
         if (connection_close_profile(m_connectionHandle, m_profileHandle, connection_closed_callback, pendingEvent) != CONNECTION_ERROR_NONE) {
             LoggerD("connection close failed");
             delete pendingEvent;
@@ -218,8 +199,7 @@ void NetworkBearerSelection::reLaunchConnection(const EventNetworkBearerSelectio
     LoggerD("enter");
 
     if (connection_profile_unset_state_changed_cb(m_profileHandle) != CONNECTION_ERROR_NONE) {
-        LoggerD("unset callback is failed");
-        makeCallback(event, CONNECTION_STATE_PLATFORM_ERROR);
+        LoggerD("unset callback is failed");        
         return;
     }
 
@@ -227,7 +207,6 @@ void NetworkBearerSelection::reLaunchConnection(const EventNetworkBearerSelectio
 
     if (connection_close_profile(m_connectionHandle, m_profileHandle, connection_removed_callback, pendingEvent) != CONNECTION_ERROR_NONE) {
         LoggerD("connection close failed");
-        makeCallback(event, CONNECTION_STATE_PLATFORM_ERROR);
         delete pendingEvent;
         pendingEvent = NULL;
     }
@@ -243,13 +222,11 @@ void NetworkBearerSelection::removeStateChangeListener(const EventNetworkBearerS
     int ret = connection_get_profile_iterator(m_connectionHandle, CONNECTION_ITERATOR_TYPE_REGISTERED, &profileIter);
     if (ret != CONNECTION_ERROR_NONE) {
         LoggerD("Fail to get profile iterator");
-        makeCallback(event, CONNECTION_STATE_PLATFORM_ERROR);
         return;
     }
     while (connection_profile_iterator_has_next(profileIter)) {
         if (connection_profile_iterator_next(profileIter, &m_profileHandle) != CONNECTION_ERROR_NONE) {
             LoggerD("Fail to get profile handle");
-            makeCallback(event, CONNECTION_STATE_PLATFORM_ERROR);
             return;
         }
     }
@@ -258,7 +235,6 @@ void NetworkBearerSelection::removeStateChangeListener(const EventNetworkBearerS
 
     if (connection_open_profile(m_connectionHandle, m_profileHandle, connection_opened_callback, pendingEvent) != CONNECTION_ERROR_NONE) {
         LoggerD("Connection open Failed");
-        makeCallback(event, CONNECTION_STATE_PLATFORM_ERROR);
         delete pendingEvent;
         pendingEvent = NULL;
     }
@@ -270,10 +246,11 @@ void NetworkBearerSelection::registStateChangeListener(const EventNetworkBearerS
     char *interfaceName = NULL;
     char *hostAddr = NULL;
     struct hostent *host_entry;
+    int ndx = 0;
+    int ret = 0;
 
        if (connection_profile_get_network_interface_name(m_profileHandle, &interfaceName) != CONNECTION_ERROR_NONE) {
         LoggerD("Fail to get interface name!");
-        makeCallback(event, CONNECTION_STATE_PLATFORM_ERROR);
     }
        else {
         LoggerD("Interface name : " << interfaceName);
@@ -283,13 +260,7 @@ void NetworkBearerSelection::registStateChangeListener(const EventNetworkBearerS
 
     if(!host_entry) {
         LoggerD("gethostbyname is failed");
-        makeCallback(event, CONNECTION_STATE_INVALID_VALUES_ERROR);
-
-        if (connection_close_profile(m_connectionHandle, m_profileHandle, connection_closed_callback2, NULL) != CONNECTION_ERROR_NONE) {
-            LoggerD("connection close failed");
-            makeCallback(event, CONNECTION_STATE_PLATFORM_ERROR);
-        }
-        m_profileHandle = NULL;
+        makeCallback(event, CONNECTION_STATE_ERROR);
         return;
     }
 
@@ -305,30 +276,24 @@ void NetworkBearerSelection::deregistStateChangeListener(const EventNetworkBeare
 {
     LoggerD("enter");
     m_profileHandle = NULL;
-    m_connectionState = NETWORK_DISCONNECTED;
+
        EventRequestReceiver<EventNetworkBearerRelease>::ManualAnswer(event);         
 }
 
 void NetworkBearerSelection::makeCallback(const EventNetworkBearerSelectionPtr &event, connectionStateType state)
 {
-    LoggerD("state : " << state);
+    LoggerD("enter");
     OnNetworkBearerSelectionStateChangedEmitterPtr emitter = event->getEmitter();
        OnNetworkBearerSelectionStateChangedPtr listener(new OnNetworkBearerSelectionStateChanged());    
 
     m_domainName = event->getDomainName();    
+
     listener->setConnectionStateType(state);
 
-    if (state == CONNECTION_STATE_INVALID_VALUES_ERROR) {
-        m_connectionState = NETWORK_CONNECTION_FAILED;
+    if (state == CONNECTION_STATE_ERROR) {
         listener->setExceptionCode(ExceptionCodes::InvalidArgumentException);
-    } else if (state == CONNECTION_STATE_PLATFORM_ERROR) {
-        m_connectionState = NETWORK_CONNECTION_FAILED;
-        listener->setExceptionCode(ExceptionCodes::PlatformException);
-    } else if (state == CONNECTION_STATE_DISCONNECTED) {
-        m_connectionState = NETWORK_DISCONNECTED;
-    } else if (state == CONNECTION_STATE_CONNECTED) {
-        m_connectionState = NETWORK_CONNECTED;
     }
+
     emitter->emit(listener);
 }
 

diff --git a/src/NetworkBearerSelection/NetworkBearerSelection.h b/src/NetworkBearerSelection/NetworkBearerSelection.h
index 40ae3fa..27545c9 100755 (executable)
--- a/src/NetworkBearerSelection/NetworkBearerSelection.h
+++ b/src/NetworkBearerSelection/NetworkBearerSelection.h
@@ -32,13 +32,6 @@
 namespace DeviceAPI {
 namespace NetworkBearerSelection {
 
-enum {
-    NETWORK_UNKNOWN = 0,
-    NETWORK_CONNECTED = 1,
-    NETWORK_DISCONNECTED = 2,
-    NETWORK_CONNECTION_FAILED = 3
-};
-
 class NetworkBearerSelection : public INetworkBearerSelection
 {
     friend class NetworkBearerSelectionFactory;
@@ -66,7 +59,6 @@ class NetworkBearerSelection : public INetworkBearerSelection
     connection_h m_connectionHandle;
     connection_profile_h m_profileHandle;
     std::string m_domainName;
-    long m_connectionState;
 };
 
 class NewtorkBearerSelectionPendingEvent

diff --git a/src/NetworkBearerSelection/NetworkBearerSelectionResponseDispatcher.cpp b/src/NetworkBearerSelection/NetworkBearerSelectionResponseDispatcher.cpp
old mode 100644 (file)
new mode 100755 (executable)
index f78e1cd..8cdfe20
--- a/src/NetworkBearerSelection/NetworkBearerSelectionResponseDispatcher.cpp
+++ b/src/NetworkBearerSelection/NetworkBearerSelectionResponseDispatcher.cpp
@@ -110,7 +110,7 @@ void NetworkBearerSelectionResponseDispatcher::onAnswerReceived(const OnNetworkB
         } else if (event->getConnectionStateType() == CONNECTION_STATE_DISCONNECTED) {
             LoggerD("disconnect callback");  
             callbackManager->callOnDisconnected();
-        } else if (event->getConnectionStateType() == CONNECTION_STATE_INVALID_VALUES_ERROR || event->getConnectionStateType() == CONNECTION_STATE_PLATFORM_ERROR) {
+        } else if (event->getConnectionStateType() == CONNECTION_STATE_ERROR) {
                JSContextRef gContext = callbackManager->getContext();        
             JSValueRef error = NULL;
             

diff --git a/src/NetworkBearerSelection/OnNetworkBearerSelectionStateChanged.h b/src/NetworkBearerSelection/OnNetworkBearerSelectionStateChanged.h
index 02d393d..c29c6fb 100755 (executable)
--- a/src/NetworkBearerSelection/OnNetworkBearerSelectionStateChanged.h
+++ b/src/NetworkBearerSelection/OnNetworkBearerSelectionStateChanged.h
@@ -29,8 +29,7 @@ namespace NetworkBearerSelection {
 enum connectionStateType {
     CONNECTION_STATE_DISCONNECTED = 0,
     CONNECTION_STATE_CONNECTED = 1,
-    CONNECTION_STATE_INVALID_VALUES_ERROR = 2,
-    CONNECTION_STATE_PLATFORM_ERROR = 3
+    CONNECTION_STATE_ERROR = 2
 };
 
 class OnNetworkBearerSelectionStateChanged : public WrtDeviceApis::Commons::ListenerEvent<OnNetworkBearerSelectionStateChanged>

diff --git a/src/NetworkBearerSelection/plugin_initializer.cpp b/src/NetworkBearerSelection/plugin_initializer.cpp
old mode 100644 (file)
new mode 100755 (executable)