add msg id field for cb message

Change-Id: I9da895a168147545127a8a839153e0093bd01e24
Signed-off-by: Kyeonghun Lee <kh9090.lee@samsung.com>

diff --git a/framework/transaction-manager/MsgCmdHandlerTransport.cpp b/framework/transaction-manager/MsgCmdHandlerTransport.cpp
index 90ffdc0..63c5feb 100755 (executable)
--- a/framework/transaction-manager/MsgCmdHandlerTransport.cpp
+++ b/framework/transaction-manager/MsgCmdHandlerTransport.cpp
@@ -866,6 +866,8 @@ int MsgIncomingCBMsgHandler(const MSG_CMD_S *pCmd, char **ppEvent)
                MSG_DEBUG("MsgStoAddCBMsg is fail");
        }
 
+       cbMsg.msgId = msgInfo.msgId;
+
        if (msgInfo.msgType.classType == MSG_CLASS_0) {
                MsgLaunchClass0(msgInfo.msgId);
                MsgSoundPlayStart(&(msgInfo.addressList[0]), MSG_SOUND_PLAY_USER);

diff --git a/include/common/MsgInternalTypes.h b/include/common/MsgInternalTypes.h
index 1c695d9..32108ae 100755 (executable)
--- a/include/common/MsgInternalTypes.h
+++ b/include/common/MsgInternalTypes.h
@@ -492,6 +492,8 @@ typedef struct {
        unsigned short                  etwsWarningType;
        unsigned char                   etwsWarningSecurityInfo[MAX_ETWS_WARNING_SECURITY_INFO_LEN];
        unsigned char                   language_type[MAX_CB_MSG_LANGUAGE_TYPE_LEN];
+
+       msg_message_id_t                msgId;  /* Message Id of MSG_MESSAGE_TABLE */
 } MSG_CB_MSG_S;
 
 #ifdef FEATURE_SMS_CDMA

diff --git a/include/mapi/msg_types.h b/include/mapi/msg_types.h
index 83b1928..c1bff4f 100755 (executable)
--- a/include/mapi/msg_types.h
+++ b/include/mapi/msg_types.h
@@ -1136,6 +1136,7 @@ enum MSG_CB_MSG_E {
        MSG_CB_MSG_ETWS_WARNING_TYPE_INT,               /**< Warning type of ETWS Primary Noti. : 2 bytes binary data */
        MSG_CB_MSG_ETWS_WARNING_SECU_INFO_STR,          /**< Warning security information of ETWS Primary Noti. : 50 bytes binary data */
        MSG_CB_MSG_LANGUAGE_TYPE_STR,                   /**< Language type of CB message data */
+       MSG_CB_MSG_INTERNAL_MSG_ID_INT,                 /**< Message identifier of message service's DB */
 };
 
 /**

diff --git a/mapi/msg_message.cpp b/mapi/msg_message.cpp
index 1a179da..50d60d9 100755 (executable)
--- a/mapi/msg_message.cpp
+++ b/mapi/msg_message.cpp
@@ -701,6 +701,9 @@ int msg_cb_message_get_int_value(void *data, int field, int *value)
        case MSG_CB_MSG_ETWS_WARNING_TYPE_INT:
                *value = cb_msg->etwsWarningType;
                break;
+       case MSG_CB_MSG_INTERNAL_MSG_ID_INT:
+               *value = cb_msg->msgId;
+               break;
        default:
                ret = MSG_ERR_INVALID_PARAMETER;
                break;