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
{
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;
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;
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)
{
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')
{
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)
{
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;
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)
{
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')
{
{
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)
{
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);
}
}
catch(const WrtDeviceApis::Commons::NotFoundException& exc)
{
- LogError(exc.GetMessage().c_str());
+ LoggerE(exc.GetMessage().c_str());
return JSValueMakeUndefined(context);
}
// 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)
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;
}
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);
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();
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");
}
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");
}
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");
}
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");
}
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");
}
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");
}
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);
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, ®ion[0]);
+ msg_mms_add_item(mms_struct, MSG_STRUCT_MMS_REGION, ®ion[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);
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;
//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");
{
//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;
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);
}
{
//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;
{
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);
}
// 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);
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);
}
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);
}
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();
}
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
{
// 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);
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;
}
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);
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);
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);
}
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. */
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 */
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);
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);
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");
// 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;
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;
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) {
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) {
}
}
-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");
}
NetworkBearerSelection::NetworkBearerSelection() : m_connectionHandle(NULL),
- m_profileHandle(NULL),
- m_connectionState(NETWORK_UNKNOWN)
+ m_profileHandle(NULL)
{
int ret = connection_create(&m_connectionHandle);
void NetworkBearerSelection::OnRequestReceived(const EventNetworkBearerSelectionPtr &event)
{
- LoggerD("m_connectionState : " << m_connectionState);
-
- if (m_connectionState == NETWORK_CONNECTED) {
+ if (checkProfileHandle() == false) {
reLaunchConnection(event);
return;
}
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;
}
}
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;
}
}
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;
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;
}
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;
}
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;
}
}
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;
}
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);
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;
}
{
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);
}
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;
connection_h m_connectionHandle;
connection_profile_h m_profileHandle;
std::string m_domainName;
- long m_connectionState;
};
class NewtorkBearerSelectionPendingEvent
} 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;
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>