#include "SmsPluginDSHandler.h"
/*==================================================================================================
- IMPLEMENTATION OF SmsPluginCbMsgHandler - Member Functions
+ IMPLEMENTATION OF SmsPluginCbMsgHandler - Member Functions
==================================================================================================*/
SmsPluginCbMsgHandler* SmsPluginCbMsgHandler::pInstance = NULL;
SmsPluginCbMsgHandler::~SmsPluginCbMsgHandler()
{
-
}
SMS_CB_NETWORK_TYPE_T type = pCbMsg->EtwsMsgType;
SMS_CBMSG_PAGE_S CbMsgPage = {0};
- switch (type)
- {
- case SMS_CB_NETWORK_TYPE_2G_GSM :
- Decode2gCbMsg((TelSmsCbMsg_t *)pCbMsg, &CbMsgPage);
+ switch (type) {
+ case SMS_CB_NETWORK_TYPE_2G_GSM :
+ Decode2gCbMsg((TelSmsCbMsg_t *)pCbMsg, &CbMsgPage);
break;
- case SMS_CB_NETWORK_TYPE_3G_UMTS :
- Decode3gCbMsg((TelSmsCbMsg_t *)pCbMsg, &CbMsgPage);
+ case SMS_CB_NETWORK_TYPE_3G_UMTS :
+ Decode3gCbMsg((TelSmsCbMsg_t *)pCbMsg, &CbMsgPage);
break;
-
}
#else
SMS_CB_NETWORK_TYPE_T type = pCbMsg->CbMsgType;
SMS_CBMSG_PAGE_S CbMsgPage = {0};
- switch (type)
- {
- case SMS_CB_NETWORK_TYPE_2G_GSM :
- Decode2gCbMsg(pCbMsg, &CbMsgPage);
+ switch (type) {
+ case SMS_CB_NETWORK_TYPE_2G_GSM :
+ Decode2gCbMsg(pCbMsg, &CbMsgPage);
break;
- case SMS_CB_NETWORK_TYPE_3G_UMTS :
- Decode3gCbMsg(pCbMsg, &CbMsgPage);
+ case SMS_CB_NETWORK_TYPE_3G_UMTS :
+ Decode3gCbMsg(pCbMsg, &CbMsgPage);
break;
-
}
#endif
- // Check CB Msg Options
+ /* Check CB Msg Options */
bool bJavaMsg = false;
int simIndex = SmsPluginDSHandler::instance()->getSimIndex(handle);
- if (!checkCbOpt(&CbMsgPage, &bJavaMsg, simIndex))
- {
+ if (!checkCbOpt(&CbMsgPage, &bJavaMsg, simIndex)) {
MSG_DEBUG("The CB Msg is not supported by option.");
return;
}
- if (bJavaMsg == true)
- {
+ if (bJavaMsg == true) {
MSG_DEBUG("JAVA CB Msg.");
CbMsgPage.cbMsgType = SMS_CBMSG_TYPE_JAVACBS;
}
- // Check CB Pages
+ /* Check CB Pages */
unsigned char pageCnt = checkCbPage(&CbMsgPage);
- if (pageCnt == CbMsgPage.pageHeader.totalPages)
- {
+ if (pageCnt == CbMsgPage.pageHeader.totalPages) {
MSG_DEBUG("RECEIVED LAST MSG : %d", pageCnt);
SMS_CBMSG_S *cbMsg = NULL;
msgInfo.addressList = NULL;
unique_ptr<MSG_ADDRESS_INFO_S*, void(*)(MSG_ADDRESS_INFO_S**)> addressListBuf(&msgInfo.addressList, unique_ptr_deleter);
- // Make CB Msg Structure
+ /* Make CB Msg Structure */
MakeCbMsg(&CbMsgPage, cbMsg);
- // Convert to MSG_MESSAGE_INFO_S
+ /* Convert to MSG_MESSAGE_INFO_S */
convertCbMsgToMsginfo(cbMsg, &msgInfo, simIndex);
- // Add CB Msg into DB
+ /* Add CB Msg into DB */
msg_error_t err = MSG_SUCCESS;
err = SmsPluginStorage::instance()->checkMessage(&msgInfo);
- if (err == MSG_SUCCESS)
- {
- MSG_CB_MSG_S cbOutMsg = {0, };
-
- cbOutMsg.type = MSG_CB_SMS;
- cbOutMsg.receivedTime = cbMsg->recvTime;
- cbOutMsg.serialNum = encodeCbSerialNum (CbMsgPage.pageHeader.serialNum);
- cbOutMsg.messageId = cbMsg->msgId;
- cbOutMsg.dcs = CbMsgPage.pageHeader.dcs.rawData;
- memset (cbOutMsg.cbText, 0x00, sizeof(cbOutMsg.cbText));
-
- cbOutMsg.cbTextLen= convertTextToUtf8((unsigned char*)cbOutMsg.cbText, sizeof(cbOutMsg.cbText), cbMsg);
- memset(cbOutMsg.language_type, 0x00, sizeof(cbOutMsg.language_type));
- memcpy(cbOutMsg.language_type, CbMsgPage.pageHeader.dcs.iso639Lang, 3);
- err = SmsPluginEventHandler::instance()->callbackCBMsgIncoming(&cbOutMsg, &msgInfo);
- if (err != MSG_SUCCESS)
- {
- MSG_DEBUG("callbackMsgIncoming() Error !! [%d]", err);
+ if (err == MSG_SUCCESS) {
+ bool is_duplicated = SmsPluginStorage::instance()->isDuplicatedCBMsg(&msgInfo);
+ if (is_duplicated == false) {
+ MSG_CB_MSG_S cbOutMsg = {0, };
+
+ /*cbOutMsg.type = MSG_CB_SMS; */
+ cbOutMsg.type = msgInfo.msgType.subType;
+ cbOutMsg.receivedTime = cbMsg->recvTime;
+ cbOutMsg.serialNum = cbMsg->serialNum;
+ cbOutMsg.messageId = cbMsg->msgId;
+ cbOutMsg.dcs = CbMsgPage.pageHeader.dcs.rawData;
+ memset (cbOutMsg.cbText, 0x00, sizeof(cbOutMsg.cbText));
+
+ cbOutMsg.cbTextLen = convertTextToUtf8((unsigned char*)cbOutMsg.cbText, sizeof(cbOutMsg.cbText), cbMsg);
+ memset(cbOutMsg.language_type, 0x00, sizeof(cbOutMsg.language_type));
+ memcpy(cbOutMsg.language_type, CbMsgPage.pageHeader.dcs.iso639Lang, 3);
+ err = SmsPluginEventHandler::instance()->callbackCBMsgIncoming(&cbOutMsg, &msgInfo);
+ if (err != MSG_SUCCESS)
+ MSG_WARN("callbackMsgIncoming() Error !! [%d]", err);
+ } else {
+ MSG_DEBUG("This cb message is duplicated");
}
- }
- else
- {
- MSG_DEBUG("checkMessage() Error !! [%d]", err);
+ } else {
+ MSG_WARN("checkMessage() Error !! [%d]", err);
}
#if 0
- // insert message-id to internal CB message table
+ /* insert message-id to internal CB message table */
SmsPluginStorage *storageHandler = SmsPluginStorage::instance();
err = storageHandler->insertReceivedCBMessage(CbMsgPage);
- if (err != MSG_SUCCESS)
- {
+ if (err != MSG_SUCCESS) {
MSG_DEBUG("insertReceivedCBMessage() Error !! [%d]", err);
}
#endif
- // Remove From List
+ /* Remove From List */
removeFromPageList(&CbMsgPage);
}
MSG_END();
MSG_BEGIN();
msg_error_t err = MSG_SUCCESS;
TelSmsEtwsMsgType_t type = pEtwsMsg->EtwsMsgType;
- //MSG_MESSAGE_INFO_S msgInfo = {};
SMS_ETWS_PRIMARY_S etwsPn = {0, };
MSG_CB_MSG_S cbOutMsg = {0, };
- if(type != TAPI_NETTEXT_ETWS_PRIMARY)
- {
+ if (type != TAPI_NETTEXT_ETWS_PRIMARY) {
MSG_DEBUG("The Etws secondary Message");
handleCbMsg(handle, (TelSmsCbMsg_t *)pEtwsMsg);
return;
}
DecodeEtwsMsg(pEtwsMsg, &etwsPn);
- //convertEtwsMsgToMsginfo(&CbMsgPage, &msgInfo, simIndex);
cbOutMsg.type = MSG_ETWS_SMS;
cbOutMsg.receivedTime = etwsPn.recvTime;
- cbOutMsg.serialNum = encodeCbSerialNum (etwsPn.serialNum);
+ cbOutMsg.serialNum = encodeCbSerialNum(etwsPn.serialNum);
cbOutMsg.messageId = etwsPn.msgId;
cbOutMsg.etwsWarningType = etwsPn.warningType;
memcpy (cbOutMsg.etwsWarningSecurityInfo, etwsPn.warningSecurityInfo, sizeof(cbOutMsg.etwsWarningSecurityInfo));
err = SmsPluginEventHandler::instance()->callbackCBMsgIncoming(&cbOutMsg, NULL);
if (err != MSG_SUCCESS)
- {
MSG_DEBUG("callbackMsgIncoming() Error !! [%d]", err);
- }
MSG_END();
}
void SmsPluginCbMsgHandler::Decode2gCbMsg(TelSmsCbMsg_t *pCbMsg, SMS_CBMSG_PAGE_S *pCbPage)
{
- unsigned char cbData[pCbMsg->Length+1];
-
- memset(cbData, 0x00, sizeof(cbData));
+ unsigned char cbData[pCbMsg->Length+1] = {0};
memcpy(cbData, pCbMsg->szMsgData, pCbMsg->Length);
cbData[pCbMsg->Length] = '\0';
- // print cb data
+ /* print cb data */
MSG_INFO("Received CB length:%d", pCbMsg->Length);
char cbDataTmp[(pCbMsg->Length*2)+1];
memset(cbDataTmp, 0x00, sizeof(cbDataTmp));
pCbPage->cbMsgType = SMS_CBMSG_TYPE_CBS;
- // Serial Number
+ /* Serial Number */
pCbPage->pageHeader.serialNum.geoScope = (cbData[0] & 0xC0) >> 6;
pCbPage->pageHeader.serialNum.msgCode = (cbData[0] & 0x3F) << 4;
MSG_DEBUG("MSG ID : [%d]", pCbPage->pageHeader.msgId);
- // DCS
+ /* DCS */
decodeCbMsgDCS(cbData[4], (unsigned char*)cbData + 6, &(pCbPage->pageHeader.dcs));
- // Page Parameter
+ /* Page Parameter */
pCbPage->pageHeader.totalPages = cbData[5] & 0x0F;
pCbPage->pageHeader.page = (cbData[5] & 0xF0) >> 4;
MSG_DEBUG("Total Page : [%d], Page : [%d]", pCbPage->pageHeader.totalPages, pCbPage->pageHeader.page);
- // Convert Language Type
+ /* Convert Language Type */
convertLangType(pCbPage->pageHeader.dcs.langType, &(pCbPage->pageHeader.langType));
MSG_DEBUG("In Language Type : [%d], Out Language Type : [%d]", pCbPage->pageHeader.dcs.langType, pCbPage->pageHeader.langType);
MSG_DEBUG("iso639Lang : [%s]", pCbPage->pageHeader.dcs.iso639Lang);
- // Get Receive Time
+ /* Get Receive Time */
pCbPage->pageHeader.recvTime = getRecvTime();
- // Decode CB Data
+ /* Decode CB Data */
int dataLen = pCbMsg->Length - 6;
MSG_DEBUG("codingScheme:[%d]", pCbPage->pageHeader.dcs.codingScheme);
- switch (pCbPage->pageHeader.dcs.codingScheme)
- {
- case SMS_CHARSET_7BIT :
- {
- MSG_DEBUG("GSM 7 BIT");
+ switch (pCbPage->pageHeader.dcs.codingScheme) {
+ case SMS_CHARSET_7BIT: {
+ MSG_DEBUG("GSM 7 BIT");
- dataLen = (dataLen*8) / 7;
+ dataLen = (dataLen*8) / 7;
- SmsPluginUDCodec udCodec;
- char pageData[MAX_CBMSG_PAGE_SIZE+1];
- int unpackLen = udCodec.unpack7bitChar(&cbData[6], dataLen, 0, pageData);
-
- if(pCbPage->pageHeader.dcs.iso639Lang[0])
- {
- unpackLen = unpackLen - 3;
- if (unpackLen > 0)
- memcpy(pCbPage->pageData, &pageData[3], unpackLen);
- else
- unpackLen = 0;
- } else {
- memcpy(pCbPage->pageData, &pageData, unpackLen);
- }
-
- MSG_DEBUG("unpackLen : [%d]", unpackLen);
+ SmsPluginUDCodec udCodec;
+ char pageData[MAX_CBMSG_PAGE_SIZE*8/7] = {0};
+ int unpackLen = udCodec.unpack7bitChar(&cbData[6], dataLen, 0, pageData);
- pCbPage->pageLength = unpackLen;
- pCbPage->pageData[unpackLen] = '\0';
+ if (pCbPage->pageHeader.dcs.iso639Lang[0]) {
+ unpackLen = unpackLen - 3;
+ if (unpackLen > 0)
+ memcpy(pCbPage->pageData, &pageData[3], unpackLen);
+ else
+ unpackLen = 0;
+ } else {
+ memcpy(pCbPage->pageData, &pageData, unpackLen);
}
- break;
- case SMS_CHARSET_8BIT :
- case SMS_CHARSET_UCS2 :
- {
- MSG_DEBUG("UCS2 or 8BIT");
+ MSG_DEBUG("unpackLen : [%d]", unpackLen);
- if(pCbPage->pageHeader.dcs.iso639Lang[0])
- {
- memcpy(pCbPage->pageData, &cbData[8], dataLen - 2);
- pCbPage->pageLength = dataLen - 2;
- } else {
- memcpy(pCbPage->pageData, &cbData[6], dataLen);
- pCbPage->pageLength = dataLen;
- }
+ pCbPage->pageLength = unpackLen;
+ pCbPage->pageData[unpackLen] = '\0';
+ }
+ break;
+
+ case SMS_CHARSET_8BIT:
+ case SMS_CHARSET_UCS2: {
+ MSG_DEBUG("UCS2 or 8BIT");
+
+ if (pCbPage->pageHeader.dcs.iso639Lang[0]) {
+ memcpy(pCbPage->pageData, &cbData[8], dataLen - 2);
+ pCbPage->pageLength = dataLen - 2;
+ } else {
+ memcpy(pCbPage->pageData, &cbData[6], dataLen);
+ pCbPage->pageLength = dataLen;
}
- break;
+ }
+ break;
}
MSG_DEBUG("Page Length : [%d], Page Data : [%s]", pCbPage->pageLength, pCbPage->pageData);
memcpy(EtwsData, pEtwsMsg->szMsgData, pEtwsMsg->Length);
EtwsData[pEtwsMsg->Length] = '\0';
- // print received msg data
+ /* print received msg data */
MSG_INFO("Received Etws length:%d", pEtwsMsg->Length);
char EtwsDataTmp[(pEtwsMsg->Length*2)+1];
memset(EtwsDataTmp, 0x00, sizeof(EtwsDataTmp));
}
MSG_INFO("[%s]", EtwsDataTmp);
- // received time
+ /* received time */
pEtwsPn->recvTime = getRecvTime();
- // Serial Number
+ /* Serial Number */
pEtwsPn->serialNum.geoScope = (EtwsData[0] & 0xC0) >> 6;
pEtwsPn->serialNum.msgCode = (EtwsData[0] & 0x3F) << 4;
pEtwsPn->serialNum.msgCode |= (EtwsData[1] & 0xF0) >> 4;
MSG_DEBUG("geoScope : [%d], msgCode : [%d], updateNum : [%d]", pEtwsPn->serialNum.geoScope, pEtwsPn->serialNum.msgCode, pEtwsPn->serialNum.updateNum);
- // Message Identifier
+ /* Message Identifier */
pEtwsPn->msgId = (EtwsData[2] << 8) | EtwsData[3];
MSG_DEBUG("MSG ID : [%d]", pEtwsPn->msgId);
- // warning type
+ /* warning type */
pEtwsPn->warningType = (EtwsData[4] << 8) | EtwsData[5];
MSG_DEBUG("warningType : [0x%04x]", pEtwsPn->msgId);
- // warning security information
- memcpy(pEtwsPn->warningSecurityInfo, &EtwsData[6], sizeof(pEtwsPn->warningSecurityInfo)); // 50bytes
- for (unsigned int i = 0; i < sizeof(pEtwsPn->warningSecurityInfo); i++)
- {
- MSG_DEBUG("warning secu info [%02x]", pEtwsPn->warningSecurityInfo[i] );
+ /* warning security information */
+ memcpy(pEtwsPn->warningSecurityInfo, &EtwsData[6], sizeof(pEtwsPn->warningSecurityInfo)); /* 50bytes */
+ for (unsigned int i = 0; i < sizeof(pEtwsPn->warningSecurityInfo); i++) {
+ MSG_DEBUG("warning secu info [%02x]", pEtwsPn->warningSecurityInfo[i]);
}
}
void SmsPluginCbMsgHandler::Decode3gCbMsg(TelSmsCbMsg_t *pCbMsg, SMS_CBMSG_PAGE_S *pCbPage)
{
- unsigned char cbData[(MAX_CBMSG_PAGE_SIZE*MAX_CBMSG_PAGE_NUM)+1];
-
- memset(cbData, 0x00, sizeof(cbData));
+ unsigned char cbData[MAX_CBMSG_TOTAL_PAGE_SIZE + 1] = {0};
memcpy(cbData, pCbMsg->szMsgData, pCbMsg->Length);
cbData[pCbMsg->Length] = '\0';
- // print cb data
+ /* print cb data */
MSG_INFO("Received CB length:%d", pCbMsg->Length);
char cbDataTmp[(pCbMsg->Length*2)+1];
memset(cbDataTmp, 0x00, sizeof(cbDataTmp));
MSG_DEBUG("MSG ID : [%d]", pCbPage->pageHeader.msgId);
- // Serial Number
+ /* Serial Number */
pCbPage->pageHeader.serialNum.geoScope = (cbData[3] & 0xC0) >> 6;
pCbPage->pageHeader.serialNum.msgCode = (cbData[3] & 0x3F) << 4;
MSG_DEBUG("geoScope : [%d], msgCode : [%d], updateNum : [%d]", pCbPage->pageHeader.serialNum.geoScope, pCbPage->pageHeader.serialNum.msgCode, pCbPage->pageHeader.serialNum.updateNum);
- // DCS
+ /* DCS */
decodeCbMsgDCS(cbData[5], (unsigned char*)cbData + 6, &(pCbPage->pageHeader.dcs));
- // Convert Language Type
+ /* Convert Language Type */
convertLangType(pCbPage->pageHeader.dcs.langType, &(pCbPage->pageHeader.langType));
MSG_DEBUG("In Language Type : [%d], Out Language Type : [%d]", pCbPage->pageHeader.dcs.langType, pCbPage->pageHeader.langType);
- // Get Receive Time
+ /* Get Receive Time */
pCbPage->pageHeader.recvTime = getRecvTime();
pCbPage->pageHeader.totalPages = cbData[6];
- // Decode CB Data
+ /* Decode CB Data */
int dataLen = 0;
int offset = 0;
- switch (pCbPage->pageHeader.dcs.codingScheme)
- {
- case SMS_CHARSET_7BIT :
- {
- for(int i = 0; i < pCbPage->pageHeader.totalPages; ++i)
- {
- char cbMessage[MAX_CBMSG_PAGE_SIZE]= {0,};
- dataLen = cbData[7+(i+1)*82 + i];
- memcpy(cbMessage, &cbData[7+(i*82)+ i], dataLen);
+ switch (pCbPage->pageHeader.dcs.codingScheme) {
+ case SMS_CHARSET_7BIT: {
+ for (int i = 0; i < pCbPage->pageHeader.totalPages; ++i) {
+ unsigned char cbMessage[MAX_CBMSG_PAGE_SIZE] = {0};
+ dataLen = cbData[7 + (i + 1) * MAX_CBMSG_PAGE_SIZE + i];
- dataLen = (dataLen*8) / 7;
+ if (dataLen > MAX_CBMSG_PAGE_SIZE)
+ THROW(MsgException::SMS_PLG_ERROR, "CB Msg Size is over MAX [%d]", dataLen);
- if (dataLen > MAX_CBMSG_PAGE_SIZE)
- THROW(MsgException::SMS_PLG_ERROR, "CB Msg Size is over MAX [%d]", dataLen);
+ memcpy(cbMessage, &cbData[7+(i*MAX_CBMSG_PAGE_SIZE)+ i], dataLen);
+ dataLen = (dataLen*8) / 7;
- SmsPluginUDCodec udCodec;
- int unpackLen = udCodec.unpack7bitChar((const unsigned char *)cbMessage, dataLen, 0, pCbPage->pageData + offset);
- offset += unpackLen;
- }
- pCbPage->pageLength = offset;
+ SmsPluginUDCodec udCodec;
+ int unpackLen = udCodec.unpack7bitChar((const unsigned char *)cbMessage, dataLen, 0, pCbPage->pageData + offset);
+ offset += unpackLen;
}
- break;
+ pCbPage->pageLength = offset;
+ }
+ break;
- case SMS_CHARSET_8BIT :
- case SMS_CHARSET_UCS2 :
- {
+ case SMS_CHARSET_8BIT:
+ case SMS_CHARSET_UCS2: {
#if 0
- char cbMessage[MAX_CBMSG_PAGE_SIZE]= {0,};
+ char cbMessage[MAX_CBMSG_PAGE_SIZE]= {0, };
- for(int i = 0; i < pCbPage->pageHeader.totalPages; ++i)
- {
- dataLen = cbData[7+(i+1)*82 + i];
- memcpy(cbMessage + offset, &cbData[7+(i*82)+ i], dataLen);
- offset += dataLen;
- }
- dataLen = offset;
+ for (int i = 0; i < pCbPage->pageHeader.totalPages; ++i) {
+ dataLen = cbData[7+(i+1)*MAX_CBMSG_PAGE_SIZE + i];
+ memcpy(cbMessage + offset, &cbData[7+(i*MAX_CBMSG_PAGE_SIZE)+ i], dataLen);
+ offset += dataLen;
+ }
+ dataLen = offset;
- if(pCbPage->pageHeader.dcs.iso639Lang[0])
- {
- int tmpDataLen = (dataLen > 2)?(dataLen - 2):0;
- memcpy(pCbPage->pageData, cbMessage + 2, tmpDataLen);
- pCbPage->pageLength = tmpDataLen;
- } else {
- memcpy(pCbPage->pageData, cbMessage, dataLen);
- pCbPage->pageLength = dataLen;
- }
+ if (pCbPage->pageHeader.dcs.iso639Lang[0]) {
+ int tmpDataLen = (dataLen > 2)?(dataLen - 2):0;
+ memcpy(pCbPage->pageData, cbMessage + 2, tmpDataLen);
+ pCbPage->pageLength = tmpDataLen;
+ } else {
+ memcpy(pCbPage->pageData, cbMessage, dataLen);
+ pCbPage->pageLength = dataLen;
+ }
#else
- char cbMessage[MAX_CBMSG_PAGE_SIZE]= {0,};
-
- for(int i = 0; i < pCbPage->pageHeader.totalPages; ++i)
- {
- if(pCbPage->pageHeader.dcs.iso639Lang[0])
- {
- dataLen = cbData[7+(i+1)*82 + i] - 2;
- memcpy(cbMessage + offset, &cbData[7+(i*82)+ i + 2], dataLen);
+ char cbMessage[MAX_CBMSG_PAGE_SIZE*MAX_CBMSG_PAGE_NUM+1] = {0, };
+
+ for (int i = 0; i < pCbPage->pageHeader.totalPages; ++i) {
+ if (pCbPage->pageHeader.dcs.iso639Lang[0]) {
+ dataLen = cbData[7+(i+1)*MAX_CBMSG_PAGE_SIZE + i] - 2;
+ if (dataLen > 0) {
+ memcpy(cbMessage + offset, &cbData[7+(i*MAX_CBMSG_PAGE_SIZE)+ i + 2], dataLen);
offset += dataLen;
- } else {
- dataLen = cbData[7+(i+1)*82 + i];
- memcpy(cbMessage + offset, &cbData[7+(i*82)+ i], dataLen);
+ }
+ } else {
+ dataLen = cbData[7+(i+1)*MAX_CBMSG_PAGE_SIZE + i];
+ if (dataLen > 0) {
+ memcpy(cbMessage + offset, &cbData[7+(i*MAX_CBMSG_PAGE_SIZE)+ i], dataLen);
offset += dataLen;
}
}
- dataLen = offset;
- memcpy(pCbPage->pageData, cbMessage, dataLen);
- pCbPage->pageLength = dataLen;
-#endif
}
- break;
+ dataLen = offset;
+ memcpy(pCbPage->pageData, cbMessage, dataLen);
+ pCbPage->pageLength = dataLen;
+#endif
+ }
+ break;
}
pCbPage->pageHeader.totalPages = 1;
MSG_DEBUG("Page Length : [%d], Page Data : [%s]", pCbPage->pageLength, pCbPage->pageData);
}
-unsigned short SmsPluginCbMsgHandler::encodeCbSerialNum ( SMS_CBMSG_SERIAL_NUM_S snFields )
+unsigned short SmsPluginCbMsgHandler::encodeCbSerialNum(SMS_CBMSG_SERIAL_NUM_S snFields)
{
unsigned short serialNum = 0;
serialNum = ((snFields.geoScope & 0x03) << 14) | ((snFields.msgCode&0x03FF) << 4) | (snFields.updateNum&0x0F);
- MSG_DEBUG ("serialNum (%x), geo(%x), mc(%x), un(%x)\n", serialNum, snFields.geoScope, snFields.msgCode, snFields.updateNum);
+ MSG_DEBUG("serialNum (%x), geo(%x), mc(%x), un(%x)\n", serialNum, snFields.geoScope, snFields.msgCode, snFields.updateNum);
return serialNum;
}
{
int ret = 0;
- switch (message_id)
- {
- case 4370 :
- case 4383 :
- ret = MSG_CMAS_PRESIDENTIAL;
- break;
- case 4371 :
- case 4372 :
- case 4384 :
- case 4385 :
- ret = MSG_CMAS_EXTREME;
- break;
- case 4373 :
- case 4374 :
- case 4375 :
- case 4376 :
- case 4377 :
- case 4378 :
- case 4386 :
- case 4387 :
- case 4388 :
- case 4389 :
- case 4390 :
- case 4391 :
- ret = MSG_CMAS_SEVERE;
- break;
- case 4379 :
- case 4392 :
- ret = MSG_CMAS_AMBER;
- break;
- case 4380 :
- case 4381 :
- case 4393 :
- case 4394 :
- ret = MSG_CMAS_TEST;
- break;
- case 4382 :
- case 4395 :
- ret = MSG_CMAS_OPERATOR_DEFINED;
- break;
- default :
- break;
+ switch (message_id) {
+ case 4370:
+ case 4383:
+ ret = MSG_CMAS_PRESIDENTIAL;
+ break;
+ case 4371:
+ case 4372:
+ case 4384:
+ case 4385:
+ ret = MSG_CMAS_EXTREME;
+ break;
+ case 4373:
+ case 4374:
+ case 4375:
+ case 4376:
+ case 4377:
+ case 4378:
+ case 4386:
+ case 4387:
+ case 4388:
+ case 4389:
+ case 4390:
+ case 4391:
+ ret = MSG_CMAS_SEVERE;
+ break;
+ case 4379:
+ case 4392:
+ ret = MSG_CMAS_AMBER;
+ break;
+ case 4380:
+ case 4393:
+ ret = MSG_CMAS_TEST;
+ break;
+ case 4381:
+ case 4394:
+ ret = MSG_CMAS_EXERCISE;
+ break;
+ case 4382:
+ case 4395:
+ ret = MSG_CMAS_OPERATOR_DEFINED;
+ break;
+ default:
+ break;
}
return ret;
char keyName[MAX_VCONFKEY_NAME_LEN];
memset(keyName, 0x00, sizeof(keyName));
snprintf(keyName, sizeof(keyName), "%s/%d", CB_RECEIVE, simIndex);
- MsgSettingGetBool(keyName, &bReceive);
+ if (MsgSettingGetBool(keyName, &bReceive) != MSG_SUCCESS)
+ MSG_INFO("MsgSettingGetBool() is failed");
- // Receive CB Msg = FALSE
- if (!bReceive)
- {
+ /* Receive CB Msg = FALSE */
+ if (!bReceive) {
MSG_DEBUG("RECEIVE CB = FALSE");
return false;
}
#if 0
char keyname[128];
- // check Language
+ /* check Language */
memset(keyName, 0x00, sizeof(keyName));
snprintf(keyName, sizeof(keyname), "%s/%d", CB_LANGUAGE, MSG_CBLANG_TYPE_ALL);
bool bAllLang = false;
- MsgSettingGetBool(keyName, &bAllLang);
+ if (MsgSettingGetBool(keyName, &bAllLang) != MSG_SUCCESS)
+ MSG_INFO("MsgSettingGetBool() is failed");
- if (!bAllLang)
- {
+ if (!bAllLang) {
MSG_DEBUG("ALL LANGUAGE = FALSE");
memset(keyName, 0x00, sizeof(keyName));
bool bLang = false;
- MsgSettingGetBool(keyName, &bLang);
+ if (MsgSettingGetBool(keyName, &bLang) != MSG_SUCCESS)
+ MSG_INFO("MsgSettingGetBool() is failed");
- if (!bLang || CbPage.pageHeader.langType == MSG_CBLANG_TYPE_MAX)
- {
+ if (!bLang || CbPage.pageHeader.langType == MSG_CBLANG_TYPE_MAX) {
MSG_DEBUG("LANGUAGE [%d] = FALSE", CbPage.pageHeader.langType);
return false;
}
bool bActivate = false;
int MsgId_from = 0, MsgId_to = 0;
- MSG_CB_CHANNEL_S cbChannelInfo = {0,};
+ MSG_CB_CHANNEL_S cbChannelInfo = {0, };
msg_error_t err = MSG_SUCCESS;
MsgDbHandler *dbHandle = getDbHandle();
if (err != MSG_SUCCESS)
MSG_ERR("Error value of MsgStoGetCBChannelInfo [%d]", err);
- for (int i = 0; i < cbChannelInfo.channelCnt; i++)
- {
+ for (int i = 0; i < cbChannelInfo.channelCnt; i++) {
bActivate = cbChannelInfo.channelInfo[i].bActivate;
MsgId_from = cbChannelInfo.channelInfo[i].from;
MsgId_to = cbChannelInfo.channelInfo[i].to;
- if (bActivate == true && CbPage->pageHeader.msgId >= MsgId_from && CbPage->pageHeader.msgId <= MsgId_to)
- {
+ if (bActivate == true && CbPage->pageHeader.msgId >= MsgId_from && CbPage->pageHeader.msgId <= MsgId_to) {
MSG_DEBUG("FIND CHANNEL = [%d]", CbPage->pageHeader.msgId);
return true;
}
SmsPluginStorage *storageHandler = SmsPluginStorage::instance();
err = storageHandler->isReceivedCBMessage(CbPage);
- // check existing message with cb internal table;
- if(err != MSG_ERR_DB_NORECORD)
- {
+
+ /* check existing message with cb internal table; */
+ if (err != MSG_ERR_DB_NORECORD) {
MSG_DEBUG("already received message: [%d]", CbPage.pageHeader.msgId);
return 0;
}
#endif
- if (CbPage->pageHeader.totalPages > 0)
- {
- for (unsigned int i = 0; i < pageList.size(); i++)
- {
- if (pageList[i].geoScope == CbPage->pageHeader.serialNum.geoScope && pageList[i].msgCode == CbPage->pageHeader.serialNum.msgCode)
- {
+ if (CbPage->pageHeader.totalPages > 0) {
+ for (unsigned int i = 0; i < pageList.size(); i++) {
+ if (pageList[i].geoScope == CbPage->pageHeader.serialNum.geoScope && pageList[i].msgCode == CbPage->pageHeader.serialNum.msgCode) {
MSG_DEBUG("geoScope [%d], msgCode [%d]", pageList[i].geoScope, pageList[i].msgCode);
- if (pageList[i].msgId == CbPage->pageHeader.msgId)
- {
+ if (pageList[i].msgId == CbPage->pageHeader.msgId) {
int updateNum = CbPage->pageHeader.serialNum.updateNum - pageList[i].updateNum;
- if (updateNum > 0) // New Message Content
- {
+ if (updateNum > 0) { /* New Message Content */
break;
- }
- else if (updateNum == 0) // Same Message Content
- {
- if (pageList[i].data.count(CbPage->pageHeader.page) != 0)
- {
+ } else if (updateNum == 0) { /* Same Message Content */
+ if (pageList[i].data.count(CbPage->pageHeader.page) != 0) {
MSG_DEBUG("The Page Number already exists [%d]", CbPage->pageHeader.page);
return 0;
}
bFind = true;
break;
- }
- else // Old Message Content
- {
+ } else { /* Old Message Content */
return 0;
}
}
}
}
- if (bFind == false || CbPage->pageHeader.totalPages == 1)
- {
+ if (bFind == false || CbPage->pageHeader.totalPages == 1) {
addToPageList(CbPage);
return 1;
}
pCbMsg->classType = CbPage->pageHeader.dcs.classType;
pCbMsg->codingScheme = CbPage->pageHeader.dcs.codingScheme;
pCbMsg->recvTime = CbPage->pageHeader.recvTime;
+ pCbMsg->serialNum = encodeCbSerialNum(CbPage->pageHeader.serialNum);
cbPageMap::iterator it;
int offset = 0;
- for (unsigned int i = 0; i < pageList.size(); i++)
- {
- if (pageList[i].geoScope == CbPage->pageHeader.serialNum.geoScope && pageList[i].msgCode == CbPage->pageHeader.serialNum.msgCode)
- {
+ for (unsigned int i = 0; i < pageList.size(); i++) {
+ if (pageList[i].geoScope == CbPage->pageHeader.serialNum.geoScope && pageList[i].msgCode == CbPage->pageHeader.serialNum.msgCode) {
MSG_DEBUG("geoScope [%d], msgCode [%d]", pageList[i].geoScope, pageList[i].msgCode);
- if (pageList[i].msgId == CbPage->pageHeader.msgId)
- {
-
- for (it = pageList[i].data.begin(); it != pageList[i].data.end(); it++)
- {
+ if (pageList[i].msgId == CbPage->pageHeader.msgId) {
+ for (it = pageList[i].data.begin(); it != pageList[i].data.end(); it++) {
memcpy(pCbMsg->msgData + offset, it->second.pageData, it->second.pageLength);
pCbMsg->msgLength += it->second.pageLength;
offset = pCbMsg->msgLength;
void SmsPluginCbMsgHandler::convertCbMsgToMsginfo(SMS_CBMSG_S *pCbMsg, MSG_MESSAGE_INFO_S *pMsgInfo, msg_sim_slot_id_t simIndex)
{
pMsgInfo->msgId = (msg_message_id_t)pCbMsg->msgId;
+ pMsgInfo->serialNum = pCbMsg->serialNum;
pMsgInfo->folderId = MSG_CBMSGBOX_ID;
- // Convert Type values
+ /* Convert Type values */
pMsgInfo->msgType.mainType = MSG_SMS_TYPE;
if (pCbMsg->cbMsgType == SMS_CBMSG_TYPE_CBS) {
pMsgInfo->msgType.subType = MSG_CB_SMS;
else
pMsgInfo->msgType.subType = (MSG_SUB_TYPE_T)cmas_class;
- }
- else if (pCbMsg->cbMsgType == SMS_CBMSG_TYPE_JAVACBS) {
+ } else if (pCbMsg->cbMsgType == SMS_CBMSG_TYPE_JAVACBS) {
pMsgInfo->msgType.subType = MSG_JAVACB_SMS;
}
- switch(pCbMsg->classType)
- {
- case SMS_MSG_CLASS_0:
- pMsgInfo->msgType.classType = MSG_CLASS_0;
- break;
- case SMS_MSG_CLASS_1:
- pMsgInfo->msgType.classType = MSG_CLASS_1;
- break;
- case SMS_MSG_CLASS_2:
- pMsgInfo->msgType.classType = MSG_CLASS_2;
- break;
- case SMS_MSG_CLASS_3:
- pMsgInfo->msgType.classType = MSG_CLASS_3;
- break;
- default:
- pMsgInfo->msgType.classType = MSG_CLASS_NONE;
- break;
+ switch (pCbMsg->classType) {
+ case SMS_MSG_CLASS_0:
+ pMsgInfo->msgType.classType = MSG_CLASS_0;
+ break;
+ case SMS_MSG_CLASS_1:
+ pMsgInfo->msgType.classType = MSG_CLASS_1;
+ break;
+ case SMS_MSG_CLASS_2:
+ pMsgInfo->msgType.classType = MSG_CLASS_2;
+ break;
+ case SMS_MSG_CLASS_3:
+ pMsgInfo->msgType.classType = MSG_CLASS_3;
+ break;
+ default:
+ pMsgInfo->msgType.classType = MSG_CLASS_NONE;
+ break;
}
pMsgInfo->storageId = MSG_STORAGE_PHONE;
pMsgInfo->priority = MSG_MESSAGE_PRIORITY_NORMAL;
pMsgInfo->direction = MSG_DIRECTION_TYPE_MT;
- // Temporary
+ /* Temporary */
pMsgInfo->nAddressCnt = 1;
pMsgInfo->addressList = (MSG_ADDRESS_INFO_S *)new char[sizeof(MSG_ADDRESS_INFO_S)];
pMsgInfo->addressList[0].recipientType = MSG_RECIPIENTS_TYPE_UNKNOWN;
pMsgInfo->sim_idx = simIndex;
- // TODO :: MSG ID should be used to get CB message type
+ /* TODO :: MSG ID should be used to get CB message type */
getDisplayName(pCbMsg->msgId, pMsgInfo->addressList[0].addressVal, simIndex);
MSG_SEC_DEBUG("%s", pMsgInfo->addressList[0].addressVal);
pCbMsg->msgData[pCbMsg->msgLength-1] == '\r' ||
pCbMsg->msgData[pCbMsg->msgLength-1] == '\n') {
pCbMsg->msgLength--;
- }
- else {
+ } else {
break;
}
}
MSG_DEBUG("LENGTH %d CB MSG %s", pCbMsg->msgLength, pCbMsg->msgData);
- // Convert Data values
+ /* Convert Data values */
pMsgInfo->dataSize = convertTextToUtf8((unsigned char*)tmpBuf, bufSize, pCbMsg);
- if (pMsgInfo->dataSize > MAX_MSG_TEXT_LEN)
- {
+ if (pMsgInfo->dataSize > MAX_MSG_TEXT_LEN) {
pMsgInfo->bTextSms = false;
- // Save Message Data into File
+ /* Save Message Data into File */
char fileName[MSG_FILENAME_LEN_MAX+1];
memset(fileName, 0x00, sizeof(fileName));
THROW(MsgException::FILE_ERROR, "MsgWriteIpcFile error");
strncpy(pMsgInfo->msgData, fileName, MAX_MSG_DATA_LEN);
- }
- else
- {
+ } else {
pMsgInfo->bTextSms = true;
memset(pMsgInfo->msgText, 0x00, sizeof(pMsgInfo->msgText));
pMsgInfo->folderId = MSG_CBMSGBOX_ID;
- // Convert Type values
+ /* Convert Type values */
pMsgInfo->msgType.mainType = MSG_SMS_TYPE;
if (EtwsMsg->cbMsgType == SMS_CBMSG_TYPE_ETWS)
pMsgInfo->priority = MSG_MESSAGE_PRIORITY_NORMAL;
pMsgInfo->direction = MSG_DIRECTION_TYPE_MT;
- // Temporary
+ /* Temporary */
pMsgInfo->nAddressCnt = 1;
pMsgInfo->addressList[0].addressType = MSG_ADDRESS_TYPE_UNKNOWN;
memcpy(pMsgInfo->msgData, EtwsMsg->pageData, pMsgInfo->dataSize);
}
-int SmsPluginCbMsgHandler::convertTextToUtf8 (unsigned char* outBuf, int outBufSize, SMS_CBMSG_S* pCbMsg)
+int SmsPluginCbMsgHandler::convertTextToUtf8(unsigned char* outBuf, int outBufSize, SMS_CBMSG_S* pCbMsg)
{
int convertedTextSize = 0;
- MSG_LANG_INFO_S langInfo = {0,};
+ MSG_LANG_INFO_S langInfo = {0, };
MsgTextConvert *textCvt = MsgTextConvert::instance();
- if (!outBuf || !pCbMsg)
- {
- MSG_DEBUG ("invalid param.\n");
+ if (!outBuf || !pCbMsg) {
+ MSG_DEBUG("invalid param.\n");
return 0;
}
langInfo.bLockingShift = false;
- // Convert Data values
+ /* Convert Data values */
if (pCbMsg->codingScheme == SMS_CHARSET_7BIT)
convertedTextSize = textCvt->convertGSM7bitToUTF8(outBuf, outBufSize, (unsigned char*)pCbMsg->msgData, pCbMsg->msgLength, &langInfo);
else if (pCbMsg->codingScheme == SMS_CHARSET_UCS2)
{
unsigned int index;
- for (index = 0; index < pageList.size(); index++)
- {
- if (pageList[index].geoScope == CbPage->pageHeader.serialNum.geoScope && pageList[index].msgCode == CbPage->pageHeader.serialNum.msgCode)
- {
+ for (index = 0; index < pageList.size(); index++) {
+ if (pageList[index].geoScope == CbPage->pageHeader.serialNum.geoScope && pageList[index].msgCode == CbPage->pageHeader.serialNum.msgCode) {
MSG_DEBUG("geoScope [%d], msgCode [%d]", pageList[index].geoScope, pageList[index].msgCode);
- if (pageList[index].msgId == CbPage->pageHeader.msgId) break;
+ if (pageList[index].msgId == CbPage->pageHeader.msgId)
+ break;
}
}
unsigned char codingGrp = (dcsData & 0xF0) >> 4;
- switch (codingGrp)
- {
- case 0x00 :
- case 0x02 :
- case 0x03 :
- {
- pDcs->codingGroup = SMS_CBMSG_CODGRP_GENERAL_DCS;
- pDcs->langType = (SMS_CBMSG_LANG_TYPE_T)dcsData;
- }
- break;
+ switch (codingGrp) {
+ case 0x00:
+ case 0x02:
+ case 0x03: {
+ pDcs->codingGroup = SMS_CBMSG_CODGRP_GENERAL_DCS;
+ pDcs->langType = (SMS_CBMSG_LANG_TYPE_T)dcsData;
+ }
+ break;
- case 0x01 :
- {
- if (dcsData == 0x10 || dcsData == 0x11)
- {
- pDcs->codingGroup = SMS_CBMSG_CODGRP_GENERAL_DCS;
- pDcs->codingScheme = (dcsData & 0x01) ? SMS_CHARSET_UCS2 : SMS_CHARSET_7BIT;
- pDcs->langType = SMS_CBMSG_LANG_ISO639;
- MSG_DEBUG("codingScheme: [%d]", pDcs->codingScheme);
- if (pMsgData[0] && pMsgData[1])
- {
- pDcs->iso639Lang[0] = pMsgData[0] & 0x7F;
- pDcs->iso639Lang[1] = (pMsgData[0] & 0X80) >> 7;
- pDcs->iso639Lang[1] |= (pMsgData[1] & 0X3F) << 1;
- pDcs->iso639Lang[2] = 0x13; /* CR */
- }
- else
- {
- /* Default it to English if pMsgData is NULL */
- pDcs->iso639Lang[0] = 0x45; /* E */
- pDcs->iso639Lang[1] = 0x4E; /* N */
- pDcs->iso639Lang[2] = 0x13; /* CR */
- }
+ case 0x01: {
+ if (dcsData == 0x10 || dcsData == 0x11) {
+ pDcs->codingGroup = SMS_CBMSG_CODGRP_GENERAL_DCS;
+ pDcs->codingScheme = (dcsData & 0x01) ? SMS_CHARSET_UCS2 : SMS_CHARSET_7BIT;
+ pDcs->langType = SMS_CBMSG_LANG_ISO639;
+ MSG_DEBUG("codingScheme: [%d]", pDcs->codingScheme);
+ if (pMsgData[0] && pMsgData[1]) {
+ pDcs->iso639Lang[0] = pMsgData[0] & 0x7F;
+ pDcs->iso639Lang[1] = (pMsgData[0] & 0X80) >> 7;
+ pDcs->iso639Lang[1] |= (pMsgData[1] & 0X3F) << 1;
+ pDcs->iso639Lang[2] = 0x13; /* CR */
+ } else {
+ /* Default it to English if pMsgData is NULL */
+ pDcs->iso639Lang[0] = 0x45; /* E */
+ pDcs->iso639Lang[1] = 0x4E; /* N */
+ pDcs->iso639Lang[2] = 0x13; /* CR */
}
}
- break;
+ }
+ break;
- case 0x04 :
- case 0x05 :
- case 0x06 :
- case 0x07 :
- {
- pDcs->codingGroup = SMS_CBMSG_CODGRP_GENERAL_DCS;
+ case 0x04:
+ case 0x05:
+ case 0x06:
+ case 0x07: {
+ pDcs->codingGroup = SMS_CBMSG_CODGRP_GENERAL_DCS;
- pDcs->bCompressed = (dcsData & 0x20) ? true : false;
-
- if (dcsData & 0x10)
- pDcs->classType = (SMS_MSG_CLASS_T)(dcsData & 0x03);
-
- unsigned char tmpScheme = (dcsData & 0x0C) >> 2;
-
- switch (tmpScheme) {
- case 0x00:
- pDcs->codingScheme = SMS_CHARSET_7BIT;
- break;
- case 0x01:
- pDcs->codingScheme = SMS_CHARSET_8BIT;
- break;
- case 0x02:
- pDcs->codingScheme = SMS_CHARSET_UCS2;
- break;
- default:
- MSG_DEBUG("tmpScheme: [%d]", tmpScheme);
- break;
- }
- }
- break;
+ pDcs->bCompressed = (dcsData & 0x20) ? true : false;
- case 0x09 :
- {
- pDcs->bUDH = true;
- pDcs->classType = (MSG_CLASS_TYPE_T)(dcsData & 0x03);
- pDcs->codingScheme = (SMS_CODING_SCHEME_T)((dcsData & 0x0C) >> 2);
- }
- break;
+ if (dcsData & 0x10)
+ pDcs->classType = (SMS_MSG_CLASS_T)(dcsData & 0x03);
- case 0x0E :
- {
- pDcs->codingGroup = SMS_CBMSG_CODGRP_WAP;
- }
- break;
+ unsigned char tmpScheme = (dcsData & 0x0C) >> 2;
- case 0x0F :
- {
- pDcs->codingGroup = SMS_CBMSG_CODGRP_CLASS_CODING;
- pDcs->codingScheme = (dcsData & 0x04) ? SMS_CHARSET_8BIT : SMS_CHARSET_7BIT;
- pDcs->classType = (MSG_CLASS_TYPE_T)(dcsData & 0x03);
- }
- break;
+ switch (tmpScheme) {
+ case 0x00:
+ pDcs->codingScheme = SMS_CHARSET_7BIT;
+ break;
+ case 0x01:
+ pDcs->codingScheme = SMS_CHARSET_8BIT;
+ break;
+ case 0x02:
+ pDcs->codingScheme = SMS_CHARSET_UCS2;
+ break;
default:
- MSG_DEBUG("codingGrp: [0x%x]", codingGrp);
+ MSG_DEBUG("tmpScheme: [%d]", tmpScheme);
+ break;
+ }
+ }
+ break;
+
+ case 0x09: {
+ pDcs->bUDH = true;
+ pDcs->classType = (MSG_CLASS_TYPE_T)(dcsData & 0x03);
+ pDcs->codingScheme = (SMS_CODING_SCHEME_T)((dcsData & 0x0C) >> 2);
+ }
+ break;
+
+ case 0x0E: {
+ pDcs->codingGroup = SMS_CBMSG_CODGRP_WAP;
+ }
+ break;
+
+ case 0x0F: {
+ pDcs->codingGroup = SMS_CBMSG_CODGRP_CLASS_CODING;
+ pDcs->codingScheme = (dcsData & 0x04) ? SMS_CHARSET_8BIT : SMS_CHARSET_7BIT;
+ pDcs->classType = (MSG_CLASS_TYPE_T)(dcsData & 0x03);
+ }
+ break;
+ default:
+ MSG_DEBUG("codingGrp: [0x%x]", codingGrp);
break;
}
}
void SmsPluginCbMsgHandler::convertLangType(SMS_CBMSG_LANG_TYPE_T InType , MSG_CB_LANGUAGE_TYPE_T *pOutType)
{
- switch (InType)
- {
- case SMS_CBMSG_LANG_GERMAN :
- *pOutType = MSG_CBLANG_TYPE_GER;
+ switch (InType) {
+ case SMS_CBMSG_LANG_GERMAN :
+ *pOutType = MSG_CBLANG_TYPE_GER;
break;
- case SMS_CBMSG_LANG_ENGLISH :
- *pOutType = MSG_CBLANG_TYPE_ENG;
+ case SMS_CBMSG_LANG_ENGLISH :
+ *pOutType = MSG_CBLANG_TYPE_ENG;
break;
- case SMS_CBMSG_LANG_ITALIAN :
- *pOutType = MSG_CBLANG_TYPE_ITA;
+ case SMS_CBMSG_LANG_ITALIAN :
+ *pOutType = MSG_CBLANG_TYPE_ITA;
break;
- case SMS_CBMSG_LANG_FRENCH :
- *pOutType = MSG_CBLANG_TYPE_FRE;
+ case SMS_CBMSG_LANG_FRENCH :
+ *pOutType = MSG_CBLANG_TYPE_FRE;
break;
- case SMS_CBMSG_LANG_SPANISH :
- *pOutType = MSG_CBLANG_TYPE_SPA;
+ case SMS_CBMSG_LANG_SPANISH :
+ *pOutType = MSG_CBLANG_TYPE_SPA;
break;
- case SMS_CBMSG_LANG_DUTCH :
- *pOutType = MSG_CBLANG_TYPE_NED;
+ case SMS_CBMSG_LANG_DUTCH :
+ *pOutType = MSG_CBLANG_TYPE_NED;
break;
- case SMS_CBMSG_LANG_SWEDISH :
- *pOutType = MSG_CBLANG_TYPE_SWE;
+ case SMS_CBMSG_LANG_SWEDISH :
+ *pOutType = MSG_CBLANG_TYPE_SWE;
break;
- case SMS_CBMSG_LANG_PORTUGUESE :
- *pOutType = MSG_CBLANG_TYPE_POR;
+ case SMS_CBMSG_LANG_PORTUGUESE :
+ *pOutType = MSG_CBLANG_TYPE_POR;
break;
- case SMS_CBMSG_LANG_TURKISH :
- *pOutType = MSG_CBLANG_TYPE_TUR;
+ case SMS_CBMSG_LANG_TURKISH :
+ *pOutType = MSG_CBLANG_TYPE_TUR;
break;
- default :
- *pOutType = MSG_CBLANG_TYPE_MAX;
+ default :
+ *pOutType = MSG_CBLANG_TYPE_MAX;
break;
}
}
void SmsPluginCbMsgHandler::getDisplayName(unsigned short MsgId, char *pDisplayName, msg_sim_slot_id_t simIndex)
{
- MSG_CB_CHANNEL_S cbChannelInfo = {0,};
+ MSG_CB_CHANNEL_S cbChannelInfo = {0, };
msg_error_t err = MSG_SUCCESS;
MsgDbHandler *dbHandle = getDbHandle();
err = MsgStoGetCBChannelInfo(dbHandle, &cbChannelInfo, simIndex);
MSG_DEBUG("MsgStoGetCBChannelInfo [err = %d]", err);
- for (int i = 0; i < cbChannelInfo.channelCnt; i++)
- {
- if (MsgId >= cbChannelInfo.channelInfo[i].from && MsgId <= cbChannelInfo.channelInfo[i].to)
- {
+ for (int i = 0; i < cbChannelInfo.channelCnt; i++) {
+ if (MsgId >= cbChannelInfo.channelInfo[i].from && MsgId <= cbChannelInfo.channelInfo[i].to) {
MSG_DEBUG("FIND MSG ID = [%d]", MsgId);
#if 0
char strTmp[CB_CHANNEL_NAME_MAX + 1];
#endif
#endif
-
return;
}
}
snprintf(pDisplayName, MAX_ADDRESS_VAL_LEN + 1, "[%d]", MsgId);
}
-
projects / platform / core / messaging / msg-service.git / blobdiff