From 1b420098d6a47b133e139dd5902072f3ade42e26 Mon Sep 17 00:00:00 2001 From: Sameer Prakash Pradhan Date: Mon, 18 Feb 2019 18:46:14 +0530 Subject: [PATCH] Adding support for CMAS other lang types and implmenet CMAS public safety, CMAS State/Local WEA.MPR-1373, MPR-1374 Signed-off-by: Sameer Prakash Pradhan Change-Id: I3f7fdf37244f271709044e43280a82fdfc10abc5 --- framework/storage-handler/MsgStorageMessage.cpp | 2 +- include/common/MsgInternalTypes.h | 12 + include/mapi/msg_storage_types.h | 93 +-- include/mapi/msg_transport_types.h | 221 +++---- include/mapi/msg_types.h | 707 ++++++++++++++-------- mapi/msg_message.cpp | 226 ++++--- mapi/msg_storage.cpp | 2 +- plugin/sms_plugin/SmsPluginCbMsgHandler.cpp | 48 +- plugin/sms_plugin/include/SmsPluginCbMsgHandler.h | 2 +- 9 files changed, 811 insertions(+), 502 deletions(-) diff --git a/framework/storage-handler/MsgStorageMessage.cpp b/framework/storage-handler/MsgStorageMessage.cpp index 477d4b6..9750c04 100755 --- a/framework/storage-handler/MsgStorageMessage.cpp +++ b/framework/storage-handler/MsgStorageMessage.cpp @@ -845,7 +845,7 @@ msg_error_t MsgStoDeleteMessage(msg_message_id_t msgId, bool bCheckIndication) } if (msgType.subType == MSG_CB_SMS || msgType.subType == MSG_JAVACB_SMS - || (msgType.subType >= MSG_CMAS_PRESIDENTIAL && msgType.subType <= MSG_CMAS_OPERATOR_DEFINED)) { + || (msgType.subType >= MSG_CMAS_PRESIDENTIAL && msgType.subType <= MSG_CMAS_STATE_LOCAL_TEST_OTHER_LANG)) { memset(sqlQuery, 0x00, sizeof(sqlQuery)); snprintf(sqlQuery, sizeof(sqlQuery), "DELETE FROM %s WHERE MSG_ID = %d;", MSGFW_CB_MSG_TABLE_NAME, msgId); diff --git a/include/common/MsgInternalTypes.h b/include/common/MsgInternalTypes.h index 57f2774..875505c 100755 --- a/include/common/MsgInternalTypes.h +++ b/include/common/MsgInternalTypes.h @@ -592,6 +592,18 @@ enum _MSG_SUB_TYPE_E { MSG_CMAS_TEST, MSG_CMAS_EXERCISE, MSG_CMAS_OPERATOR_DEFINED, + MSG_CMAS_PUBLIC_SAFETY, + MSG_CMAS_STATE_LOCAL_TEST, + + MSG_CMAS_PRESIDENTIAL_OTHER_LANG, + MSG_CMAS_EXTREME_OTHER_LANG, + MSG_CMAS_SEVERE_OTHER_LANG, + MSG_CMAS_AMBER_OTHER_LANG, + MSG_CMAS_TEST_OTHER_LANG, + MSG_CMAS_EXERCISE_OTHER_LANG, + MSG_CMAS_OPERATOR_DEFINED_OTHER_LANG, + MSG_CMAS_PUBLIC_SAFETY_OTHER_LANG, + MSG_CMAS_STATE_LOCAL_TEST_OTHER_LANG, }; diff --git a/include/mapi/msg_storage_types.h b/include/mapi/msg_storage_types.h index b9cf2de..fca3a67 100755 --- a/include/mapi/msg_storage_types.h +++ b/include/mapi/msg_storage_types.h @@ -34,7 +34,8 @@ /** - * @brief The structure type that represents message ID list. + * @brief The structure type that represents message ID list. + * @since_tizen 2.3 */ typedef struct { int nCount; /**< The count of message ID information */ @@ -47,61 +48,71 @@ typedef struct { ==================================================================================================*/ /** - * @brief The structure type that represents a folder type. \n - * The values for this type SHOULD be in @ref _MSG_FOLDER_TYPE_E. + * @brief The structure type that represents a folder type. \n + * The values for this type SHOULD be in @ref _MSG_FOLDER_TYPE_E. + * @since_tizen 2.3 */ typedef unsigned char msg_folder_type_t; /** - * @brief The structure type that represents a sort type. \n - * The values for this type SHOULD be in @ref _MSG_SORT_TYPE_E. + * @brief The structure type that represents a sort type. \n + * The values for this type SHOULD be in @ref _MSG_SORT_TYPE_E. + * @since_tizen 2.3 */ typedef unsigned char msg_sort_type_t; /** - * @brief The structure type that represents a saved SIM message ID. + * @brief The structure type that represents a saved SIM message ID. + * @since_tizen 2.3 */ typedef signed short msg_sim_id_t; /** - * @brief The structure type that represents a Saved SIM slot ID. + * @brief The structure type that represents a Saved SIM slot ID. + * @since_tizen 2.3 */ typedef int msg_sim_slot_id_t; /** - * @brief The structure type that represents a message type for quick panel. \n - * The values for this type SHOULD be in @ref _MSG_QUICKPANEL_TYPE_E. + * @brief The structure type that represents a message type for quick panel. \n + * The values for this type SHOULD be in @ref _MSG_QUICKPANEL_TYPE_E. + * @since_tizen 2.3 */ typedef unsigned char msg_quickpanel_type_t; /** - * @brief The structure type that represents a storage change CB type. \n - * The values for this type SHOULD be in @ref _MSG_STORAGE_CHANGE_TYPE_E. + * @brief The structure type that represents a storage change CB type. \n + * The values for this type SHOULD be in @ref _MSG_STORAGE_CHANGE_TYPE_E. + * @since_tizen 2.3 */ typedef unsigned char msg_storage_change_type_t; -/** @brief Called when the database of message framework is changed. - * Applications SHOULD implement this callback function and register it into Message handle. - * For how to register this callback function, please refer to msg_reg_storage_change_callback(). - * The callback function runs in the application process, not in the framework process. - * @param[in] handle The Message handle. - * @param[in] user_param A pointer to user data - */ +/** + * @brief Called when the database of message framework is changed. + * Applications SHOULD implement this callback function and register it into Message handle. + * For how to register this callback function, please refer to msg_reg_storage_change_callback(). + * The callback function runs in the application process, not in the framework process. + * @since_tizen 2.3 + * @param[in] handle The Message handle. + * @param[in] user_param A pointer to user data + */ typedef void (*msg_storage_change_cb)(msg_handle_t handle, msg_storage_change_type_t storageChangeType, msg_id_list_s *pMsgIdList, void *user_param); -/** @brief Called when the threads of message framework is changed. - * Applications SHOULD implement this callback function and register it into Message handle. +/** + * @brief Called when the threads of message framework is changed. + * Applications SHOULD implement this callback function and register it into Message handle. * For how to register this callback function, please refer to msg_reg_thread_change_callback(). * The callback function runs in the application process, not in the framework process. - * @param[in] handle The Message handle. - * @param[in] user_param A pointer to user data - */ + * @since_tizen 3.0 + * @param[in] handle The Message handle. + * @param[in] user_param A pointer to user data + */ typedef void (*msg_thread_change_cb)(msg_handle_t handle, msg_storage_change_type_t storageChangeType, msg_thread_id_t threadId, void *user_param); @@ -110,8 +121,9 @@ typedef void (*msg_thread_change_cb)(msg_handle_t handle, msg_storage_change_typ ==================================================================================================*/ /** - * @brief Enumeration for the values of a storage type. \n - * This enum is used as the value of msg_storage_id_t. + * @brief Enumeration for the values of a storage type. \n + * This enum is used as the value of msg_storage_id_t. + * @since_tizen 2.3 */ enum _MSG_STORAGE_ID_E { MSG_STORAGE_UNKNOWN = 0, /**< Storage ID is unknown. */ @@ -122,8 +134,9 @@ enum _MSG_STORAGE_ID_E { /** - * @brief Enumeration for the values of a storage type. \n - * This enum is used as the value of msg_folder_id_t. + * @brief Enumeration for the values of a storage type. \n + * This enum is used as the value of msg_folder_id_t. + * @since_tizen 2.3 */ enum _MSG_FOLDER_ID_E { MSG_IOSBOX_ID = -1, /**< Indicates INBOX, OUTBOX and SENTBOX group folder ID. (Only for search option.) */ @@ -139,8 +152,9 @@ enum _MSG_FOLDER_ID_E { /** - * @brief Enumeration for the values of a folder type. \n - * This enum is used as the value of msg_folder_type_t. + * @brief Enumeration for the values of a folder type. \n + * This enum is used as the value of msg_folder_type_t. + * @since_tizen 2.3 */ enum _MSG_FOLDER_TYPE_E { MSG_FOLDER_TYPE_INBOX = 1, /**< Inbox folder */ @@ -152,8 +166,9 @@ enum _MSG_FOLDER_TYPE_E { /** - * @brief Enumeration for the values of a sort type. \n - * This enum is used as the value of msg_sort_type_t. + * @brief Enumeration for the values of a sort type. \n + * This enum is used as the value of msg_sort_type_t. + * @since_tizen 2.3 */ enum _MSG_SORT_TYPE_E { MSG_SORT_BY_UNKNOWN = 0, /**< Unknown sort type */ @@ -170,8 +185,9 @@ enum _MSG_SORT_TYPE_E { /** - * @brief Enumeration for the values of a message type for quick panel. \n - * This enum is used as the value of msg_quickpanel_type_t. + * @brief Enumeration for the values of a message type for quick panel. \n + * This enum is used as the value of msg_quickpanel_type_t. + * @since_tizen 2.3 */ enum _MSG_QUICKPANEL_TYPE_E { MSG_QUICKPANEL_SMS = 0, /**< Quickpanel SMS */ @@ -184,7 +200,8 @@ enum _MSG_QUICKPANEL_TYPE_E { /** - * @brief Enumeration for the values of a count limit for each mailbox. + * @brief Enumeration for the values of a count limit for each mailbox. + * @since_tizen 2.3 */ enum _MSG_COUNT_LIMIT_MAILBOX_TYPE_E { MSG_COUNT_LIMIT_INBOX_TYPE, /**< Message count limit of inbox folder*/ @@ -197,7 +214,8 @@ enum _MSG_COUNT_LIMIT_MAILBOX_TYPE_E { /** - * @brief Enumeration for the values of a count limit for each message type. + * @brief Enumeration for the values of a count limit for each message type. + * @since_tizen 2.3 */ enum _MSG_COUNT_LIMIT_MSG_TYPE_E { MSG_COUNT_LIMIT_SMS_TYPE, /**< Message count limit for SMS */ @@ -210,8 +228,9 @@ enum _MSG_COUNT_LIMIT_MSG_TYPE_E { /** - * @brief Enumeration for the values of a storage change type. \n - * This enum is used with storage change callback functions. + * @brief Enumeration for the values of a storage change type. \n + * This enum is used with storage change callback functions. + * @since_tizen 2.3 */ enum _MSG_STORAGE_CHANGE_TYPE_E { /* msg data */ diff --git a/include/mapi/msg_transport_types.h b/include/mapi/msg_transport_types.h index 21a90aa..4deaeed 100755 --- a/include/mapi/msg_transport_types.h +++ b/include/mapi/msg_transport_types.h @@ -34,148 +34,157 @@ DEFINES ==================================================================================================*/ -/** @brief Called when the status of the message which is already sent is changed. - * Applications SHOULD implement this callback function and register it into Message handle. - * For how to register this callback function, please refer to msg_reg_sent_status_callback(). - * If the application sends a message, this callback function will be called to report its sending status. - * The application can get the request ID from sent_status to know which request is bound. - * The callback function runs in the application process, not in the framework process. - * The memory of @a sent_status is managed by MAPI, when the callback function is finished. - * - * @param[in] handle The Message handle - * @param[in] sent_status A pointer to #msg_struct_t structure for sent status - * @param[in] user_param The user data +/** + * @brief Called when the status of the message which is already sent is changed. + * Applications SHOULD implement this callback function and register it into Message handle. + * For how to register this callback function, please refer to msg_reg_sent_status_callback(). + * If the application sends a message, this callback function will be called to report its sending status. + * The application can get the request ID from sent_status to know which request is bound. + * The callback function runs in the application process, not in the framework process. + * The memory of @a sent_status is managed by MAPI, when the callback function is finished. + * @since_tizen 2.3 + * @param[in] handle The Message handle + * @param[in] sent_status A pointer to #msg_struct_t structure for sent status + * @param[in] user_param The user data */ typedef void (*msg_sent_status_cb)(msg_handle_t handle, msg_struct_t sent_status, void *user_param); -/** @brief Called when the status of the message which is already sent is changed. - * Applications SHOULD implement this callback function and register it into Message handle. - * For how to register this callback function, please refer to msg_reg_sent_status_callback(). - * If the application sends a message, this callback function will be called to report its sending status. - * The application can get the request ID from sent_status to know which request is bound. - * The callback function runs in the application process, not in the framework process. - * The memory of @a sent_status is managed by MAPI, when the callback function is finished. - * - * @param[in] sent_status A pointer to #msg_struct_t structure for sent status - * @param[in] user_param The pointer to user data +/** + * @brief Called when the status of the message which is already sent is changed. + * Applications SHOULD implement this callback function and register it into Message handle. + * For how to register this callback function, please refer to msg_reg_sent_status_callback(). + * If the application sends a message, this callback function will be called to report its sending status. + * The application can get the request ID from sent_status to know which request is bound. + * The callback function runs in the application process, not in the framework process. + * The memory of @a sent_status is managed by MAPI, when the callback function is finished. + * @since_tizen 2.3 + * @param[in] sent_status A pointer to #msg_struct_t structure for sent status + * @param[in] user_param The pointer to user data */ typedef void (*msg_simple_sent_status_cb)(msg_struct_t sent_status, void *user_param); -/** @brief Called when a new message is received. - * Applications SHOULD implement this callback function and register it into Message handle. - * For how to register this callback function, please refer to msg_reg_sms_message_callback(). - * This callback function will be called when a new message is received and the message satisfies the filter list. - * The callback function runs in the application process, not in the framework process. - * The memory for msg is managed by MAPI, when the callback function is finished. - * - * @param[in] handle The Message handle - * @param[in] msg A pointer to #msg_struct_t structure for message details - * @param[in] user_param The user data +/** + * @brief Called when a new message is received. + * Applications SHOULD implement this callback function and register it into Message handle. + * For how to register this callback function, please refer to msg_reg_sms_message_callback(). + * This callback function will be called when a new message is received and the message satisfies the filter list. + * The callback function runs in the application process, not in the framework process. + * The memory for msg is managed by MAPI, when the callback function is finished. + * @since_tizen 2.3 + * @param[in] handle The Message handle + * @param[in] msg A pointer to #msg_struct_t structure for message details + * @param[in] user_param The user data */ typedef void (*msg_sms_incoming_cb)(msg_handle_t handle, msg_struct_t msg, void *user_param); -/** @brief Called when a new MMS message is received. - * Applications SHOULD implement this callback function and register it into Message handle. - * For how to register this callback function, please refer to msg_reg_mms_conf_message_callback(). - * This callback function will be called when a new MMS message is received and the message satisfies the filter list. - * The callback function runs in the application process, not in the framework process. - * The memory for @a msg is managed by MAPI, when the callback function is finished. - * - * @param[in] handle The Message handle - * @param[in] msg A pointer to #msg_struct_t structure for message details - * @param[in] user_param The user data +/** + * @brief Called when a new MMS message is received. + * Applications SHOULD implement this callback function and register it into Message handle. + * For how to register this callback function, please refer to msg_reg_mms_conf_message_callback(). + * This callback function will be called when a new MMS message is received and the message satisfies the filter list. + * The callback function runs in the application process, not in the framework process. + * The memory for @a msg is managed by MAPI, when the callback function is finished. + * @since_tizen 2.3 + * @param[in] handle The Message handle + * @param[in] msg A pointer to #msg_struct_t structure for message details + * @param[in] user_param The user data */ typedef void (*msg_mms_conf_msg_incoming_cb)(msg_handle_t handle, msg_struct_t msg, void *user_param); -/** @brief Called when a new SyncML message is received. - * Applications SHOULD implement this callback function and register it into Message handle. - * For how to register this callback function, please refer to msg_reg_syncml_message_callback(). - * This callback function will be called when a new message is received and the message satisfies the filter list. - * The callback function runs in the application process, not in the framework process. - * - * @param[in] handle The Message handle - * @param[in] msg_type The #msg_syncml_message_type_t structure - * @param[in] push_body The WAP Push body data - * @param[in] push_body_len The length of WAP Push body data - * @param[in] sim_index The index of the sim on which message is received. - * @param[in] user_param The user data +/** + * @brief Called when a new SyncML message is received. + * Applications SHOULD implement this callback function and register it into Message handle. + * For how to register this callback function, please refer to msg_reg_syncml_message_callback(). + * This callback function will be called when a new message is received and the message satisfies the filter list. + * The callback function runs in the application process, not in the framework process. + * @since_tizen 2.3 + * @param[in] handle The Message handle + * @param[in] msg_type The #msg_syncml_message_type_t structure + * @param[in] push_body The WAP Push body data + * @param[in] push_body_len The length of WAP Push body data + * @param[in] sim_index The index of the sim on which message is received. */ typedef void (*msg_syncml_msg_incoming_cb)(msg_handle_t handle, msg_syncml_message_type_t msg_type, const char *push_body, int push_body_len, const char* wsp_header, int wsp_header_len, int sim_index, void *user_param); -/** @brief Called when a new LBS message is received. - * Applications SHOULD implement this callback function and register it into Message handle. - * For how to register this callback function, please refer to msg_reg_lbs_message_callback(). - * This callback function will be called when a new message is received and the message satisfies the filter list. - * The callback function runs in the application process, not in the framework process. - * - * @param[in] hMsgHandle The Message handle - * @param[in] push_header The push message header data - * @param[in] push_body The push message body data - * @param[in] push_body_len The push message body length - * @param[in] user_param The user data +/** + * @brief Called when a new LBS message is received. + * Applications SHOULD implement this callback function and register it into Message handle. + * For how to register this callback function, please refer to msg_reg_lbs_message_callback(). + * This callback function will be called when a new message is received and the message satisfies the filter list. + * The callback function runs in the application process, not in the framework process. + * @since_tizen 2.3 + * @param[in] hMsgHandle The Message handle + * @param[in] push_header The push message header data + * @param[in] push_body The push message body data + * @param[in] push_body_len The push message body length + * @param[in] user_param The user data */ typedef void (*msg_lbs_msg_incoming_cb)(msg_handle_t handle, const char *push_header, const char *push_body, int push_body_len, void *user_param); -/** @brief Called when a new SyncML message is received. - * Applications SHOULD implement this callback function and register it into Message handle. - * For how to register this callback function, please refer to msg_reg_syncml_message_callback(). - * This callback function will be called when a new message is received and the message satisfies the filter list. - * The callback function runs in the application process, not in the framework process. - * - * @param[in] handle The Message handle - * @param[in] msgId The message ID - * @param[in] extId The external ID - * @param[in] user_param The user data +/** + * @brief Called when a new SyncML message is received. + * Applications SHOULD implement this callback function and register it into Message handle. + * For how to register this callback function, please refer to msg_reg_syncml_message_callback(). + * This callback function will be called when a new message is received and the message satisfies the filter list. + * The callback function runs in the application process, not in the framework process. + * @since_tizen 2.3 + * @param[in] handle The Message handle + * @param[in] msgId The message ID + * @param[in] extId The external ID + * @param[in] user_param The user data */ typedef void (*msg_syncml_msg_operation_cb)(msg_handle_t handle, int msgId, int extId, void *user_param); -/** @brief Called when a new push message is received. - * Applications SHOULD implement this callback function and register it into Message handle. - * For how to register this callback function, please refer to msg_reg_push_message_callback(). - * This callback function will be called when a new message is received and the message satisfies the filter list. - * The callback function runs in the application process, not in the framework process. - * - * @param[in] handle The Message handle - * @param[in] push_header The push message header data - * @param[in] push_body The push message body data - * @param[in] push_body_len The push message body length - * @param[in] user_param The user data +/** + * @brief Called when a new push message is received. + * Applications SHOULD implement this callback function and register it into Message handle. + * For how to register this callback function, please refer to msg_reg_push_message_callback(). + * This callback function will be called when a new message is received and the message satisfies the filter list. + * The callback function runs in the application process, not in the framework process. + * @since_tizen 2.3 + * @param[in] handle The Message handle + * @param[in] push_header The push message header data + * @param[in] push_body The push message body data + * @param[in] push_body_len The push message body length + * @param[in] user_param The user data */ typedef void (*msg_push_msg_incoming_cb)(msg_handle_t handle, const char *push_header, const char *push_body, int push_body_len, void *user_param); -/** @brief Called when a new CB message is received. - * Applications SHOULD implement this callback function and register it into Message handle. - * For how to register this callback function, please refer to msg_reg_cb_message_callback(). - * This callback function will be called when a new message is received and the message satisfies the filter list. - * The callback function runs in the application process, not in the framework process. - * - * @param[in] handle The Message handle - * @param[in] msg A pointer to #msg_struct_t structure for message details - * @param[in] user_param The user data +/** + * @brief Called when a new CB message is received. + * Applications SHOULD implement this callback function and register it into Message handle. + * For how to register this callback function, please refer to msg_reg_cb_message_callback(). + * This callback function will be called when a new message is received and the message satisfies the filter list. + * The callback function runs in the application process, not in the framework process. + * @since_tizen 2.3 + * @param[in] handle The Message handle + * @param[in] msg A pointer to #msg_struct_t structure for message details + * @param[in] user_param The user data */ typedef void (*msg_cb_incoming_cb)(msg_handle_t handle, msg_struct_t msg, void *user_param); -/** @brief Called when a report message is received. - * Applications SHOULD implement this callback function and register it into Message handle. - * For how to register this callback function, please refer to msg_reg_report_message_callback(). - * This callback function will be called when a new message is received and the message satisfies the filter list. - * The callback function runs in the application process, not in the framework process. - * - * @param[in] handle The Message handle - * @param[in] reportMsgType The message type of incoming report message - * @param[in] MsgId The message ID of reported message - * @param[in] addr_len The incoming report message's address length - * @param[in] addr_val The incoming report message's address value - * @param[in] user_param The user data +/** + * @brief Called when a report message is received. + * Applications SHOULD implement this callback function and register it into Message handle. + * For how to register this callback function, please refer to msg_reg_report_message_callback(). + * This callback function will be called when a new message is received and the message satisfies the filter list. + * The callback function runs in the application process, not in the framework process. + * @since_tizen 2.3 + * @param[in] handle The Message handle + * @param[in] reportMsgType The message type of incoming report message + * @param[in] MsgId The message ID of reported message + * @param[in] addr_len The incoming report message's address length + * @param[in] addr_val The incoming report message's address value + * @param[in] user_param The user data */ typedef void (*msg_report_msg_incoming_cb)(msg_handle_t handle, msg_report_type_t reportMsgType, msg_message_id_t MsgId, int addr_len, const char *addr_val, void *user_param); diff --git a/include/mapi/msg_types.h b/include/mapi/msg_types.h index d402931..511f5ba 100755 --- a/include/mapi/msg_types.h +++ b/include/mapi/msg_types.h @@ -31,244 +31,292 @@ */ /** - * @brief Definition for maximum address count + * @brief Definition for maximum address count + * @since_tizen 2.3 */ #define MAX_TO_ADDRESS_CNT 10 /** - * @brief Definition for maximum phone number length + * @brief Definition for maximum phone number length + * @since_tizen 2.3 */ #define MAX_PHONE_NUMBER_LEN 20 /** - * @brief Definition for maximum XDN alpha ID length + * @brief Definition for maximum XDN alpha ID length + * @since_tizen 2.3 */ #define MAX_SIM_XDN_ALPHA_ID_LEN 30 /** - * @brief Definition for maximum address value length + * @brief Definition for maximum address value length + * @since_tizen 2.3 */ #define MAX_ADDRESS_VAL_LEN 254 /** - * @brief Definition for maximum subject length + * @brief Definition for maximum subject length + * @since_tizen 2.3 */ #define MAX_SUBJECT_LEN 120 /** - * @brief Definition for maximum display length length + * @brief Definition for maximum display length length + * @since_tizen 2.3 */ #define MAX_DISPLAY_NAME_LEN 195 /** - * @brief Definition for maximum image path length + * @brief Definition for maximum image path length + * @since_tizen 2.3 */ #define MAX_IMAGE_PATH_LEN 1024 /** - * @brief Definition for maximum message data length + * @brief Definition for maximum message data length + * @since_tizen 2.3 */ #define MAX_MSG_DATA_LEN 320 /** - * @brief Definition for maximum message text length + * @brief Definition for maximum message text length + * @since_tizen 2.3 */ #define MAX_MSG_TEXT_LEN 1530 /** - * @brief Definition for maximum filter value length + * @brief Definition for maximum filter value length + * @since_tizen 2.3 */ #define MAX_FILTER_VALUE_LEN 128 /** - * @brief Definition for maximum command length + * @brief Definition for maximum command length + * @since_tizen 2.3 */ #define MAX_COMMAND_LEN 1024 /** - * @brief Definition for maximum folder name size + * @brief Definition for maximum folder name size + * @since_tizen 2.3 */ #define MAX_FOLDER_NAME_SIZE 20 /** - * @brief Definition for maximum ID length of push message + * @brief Definition for maximum ID length of push message + * @since_tizen 2.3 */ #define MAX_WAPPUSH_ID_LEN 100 /** - * @brief Definition for maximum content type length of push message + * @brief Definition for maximum content type length of push message + * @since_tizen 2.3 */ #define MAX_WAPPUSH_CONTENT_TYPE_LEN 100 /** - * @brief Definition for maximum href length of push message + * @brief Definition for maximum href length of push message + * @since_tizen 2.3 */ #define MAX_WAPPUSH_HREF_LEN 300 /** - * @brief Definition for maximum contents length of push message + * @brief Definition for maximum contents length of push message + * @since_tizen 2.3 */ #define MAX_WAPPUSH_CONTENTS_LEN 2048 /** - * @brief Definition for maximum invalid object count of push message(CO) + * @brief Definition for maximum invalid object count of push message(CO) + * @since_tizen 2.3 */ #define MAX_PUSH_CACHEOP_INVALID_OBJECT_MAX 5 /** - * @brief Definition for maximum invalid service count of push message(CO) + * @brief Definition for maximum invalid service count of push message(CO) + * @since_tizen 2.3 */ #define MAX_PUSH_CACHEOP_INVALID_SERVICE_MAX 5 /** - * @brief Definition for maximum URL length of push message(CO) + * @brief Definition for maximum URL length of push message(CO) + * @since_tizen 2.3 */ #define MAX_PUSH_CACHEOP_MAX_URL_LEN 200 /** - * @brief Definition for maximum segment count + * @brief Definition for maximum segment count + * @since_tizen 2.3 */ #define MAX_SEGMENT_NUM 15 /** - * @brief Definition for maximum file path length + * @brief Definition for maximum file path length + * @since_tizen 2.3 */ #define MSG_FILEPATH_LEN_MAX 1024 /* setting */ /** - * @brief Definition for maximum SMSC name length + * @brief Definition for maximum SMSC name length + * @since_tizen 2.3 */ #define SMSC_NAME_MAX 127 /** - * @brief Definition for maximum SMSC address length + * @brief Definition for maximum SMSC address length + * @since_tizen 2.3 */ #define SMSC_ADDR_MAX 21 /** - * @brief Definition for maximum SMSC list count + * @brief Definiton for maximum SMSC list count + * @since_tizen 2.3 */ #define SMSC_LIST_MAX 5 /** - * @brief Definition for maximum CB channel name length + * @brief Definition for maximum CB channel name length + * @since_tizen 2.3 */ -#define CB_CHANNEL_NAME_MAX 32 +#define CB_CHANNEL_NAME_MAX 64 /** - * @brief Definition for maximum CB channel count + * @brief Definition for maximum CB channel count + * @since_tizen 2.3 */ #define CB_CHANNEL_MAX 30 /** - * @brief Definition for maximum CB language type count + * @brief Definition for maximum CB language type count + * @since_tizen 2.3 */ #define CB_LANG_TYPE_MAX 10 /** - * @brief Definition for maximum file name length + * @brief Definition for maximum file name length + * @since_tizen 2.3 */ #define MSG_FILENAME_LEN_MAX 1024 /** - * @brief Definition for maximum message id length + * @brief Definition for maximum message id length + * @since_tizen 2.3 */ #define MSG_MSG_ID_LEN 1024 /** - * @brief Definition for maximum in transition id length + * @brief Definition for maximum in transition id length + * @since_tizen 2.3 */ #define MAX_SMIL_TRANSIN_ID 100 /** - * @brief Definition for maximum out transition id length + * @brief Definition for maximum out transition id length + * @since_tizen 2.3 */ #define MAX_SMIL_TRANSOUT_ID 100 /** - * @brief Definition for maximum region id length + * @brief Definition for maximum region id length + * @since_tizen 2.3 */ #define MAX_SMIL_REGION_ID 151 /** - * @brief Definition for maximum transition id length + * @brief Definition for maximum transition id length + * @since_tizen 2.3 */ #define MAX_SMIL_TRANSITION_ID 151 /** - * @brief Definition for maximum meta id length + * @brief Definition for maximum meta id length + * @since_tizen 2.3 */ #define MAX_SMIL_META_ID 151 /** - * @brief Definition for maximum meta name length + * @brief Definition for maximum meta name length + * @since_tizen 2.3 */ #define MAX_SMIL_META_NAME 100 /** - * @brief Definition for maximum meta content length + * @brief Definition for maximum meta content length + * @since_tizen 2.3 */ #define MAX_SMIL_META_CONTENT 255 /** - * @brief Definition for maximum fit size + * @brief Definition for maximum fit size + * @since_tizen 2.3 */ #define MAX_SMIL_FIT_SIZE 31 /** - * @brief Definition for maximum pages in a MMS + * @brief Definition for maximum pages in a MMS + * @since_tizen 2.3 */ #define MMS_PAGE_MAX 20 /** - * @brief Definition for maximum media in a MMS + * @brief Definition for maximum media in a MMS + * @since_tizen 2.3 */ #define MMS_MEDIA_MAX 60 /** - * @brief Definition for maximum alternate text length + * @brief Definition for maximum alternate text length + * @since_tizen 2.3 */ #define MAX_SMIL_ALT_LEN 255 /*font size */ /** - * @brief Definition for small font size + * @brief Definition for small font size + * @since_tizen 2.3 */ #define MMS_SMIL_FONT_SIZE_SMALL 24 /** - * @brief Definition for normal font size + * @brief Definition for normal font size + * @since_tizen 2.3 */ #define MMS_SMIL_FONT_SIZE_NORMAL 30 /** - * @brief Definition for large font size + * @brief Definition for large font size + * @since_tizen 2.3 */ #define MMS_SMIL_FONT_SIZE_LARGE 36 /** - * @brief Definition for maximum length of java app ID + * @brief Definition for maximum length of java app ID + * @since_tizen 2.3 */ #define MAX_MMS_JAVA_APPID_LEN 32 /** - * @brief Definition for maximum length of MMS transaction ID + * @brief Definition for maximum length of MMS transaction ID + * @since_tizen 2.3 */ #define MMS_TR_ID_LEN 40 /** - * @brief Definition for maximum length of MMS message ID + * @brief Definition for maximum length of MMS message ID + * @since_tizen 2.3 */ #define MMS_MSG_ID_LEN 40 /** - * @brief Definition for maximum length of MMS contents location + * @brief Definition for maximum length of MMS contents location + * @since_tizen 2.3 */ #define MMS_LOCATION_LEN 100 /** - * @brief Definition for maximum mimeType length + * @brief Definition for maximum mimeType length + * @since_tizen 2.3 */ #define MAX_MIME_TYPE_LEN 64 @@ -277,22 +325,26 @@ ==================================================================================================*/ /** - * @brief The structure type representing an opaque pointer to message handle. + * @brief The structure type representing an opaque pointer to message handle. + * @since_tizen 2.3 */ typedef struct opq_msg_svc_s *msg_handle_t; /** - * @brief The structure type representing an opaque pointer to message structure type. + * @brief The structure type representing an opaque pointer to message structure type. + * @since_tizen 2.3 */ typedef struct opq_struct_s *msg_struct_t; /** - * @brief The structure type representing a pointer to message list handle. + * @brief The structure type representing a pointer to message list handle. + * @since_tizen 2.3 */ typedef struct msg_list_handle *msg_list_handle_t; /** - * @brief The structure type representing a message structure list. + * @brief The structure type representing a message structure list. + * @since_tizen 2.3 */ typedef struct { int nCount; /**< The count of #msg_struct_t */ @@ -301,147 +353,169 @@ typedef struct { /** - * @brief The message ID. + * @brief The message ID. + * @since_tizen 2.3 */ typedef unsigned int msg_message_id_t; /** - * @brief The storage type. - * See enum _MSG_STORAGE_ID_E. + * @brief The storage type. + * See enum _MSG_STORAGE_ID_E. + * @since_tizen 2.3 */ typedef unsigned char msg_storage_id_t; /** - * @brief The folder ID. - * See enum _MSG_FOLDER_ID_E. + * @brief The folder ID. + * See enum _MSG_FOLDER_ID_E. + * @since_tizen 2.3 */ typedef char msg_folder_id_t; /** * @brief The request ID, which is unique for each request. + * @since_tizen 2.3 */ typedef unsigned int msg_request_id_t; /** - * @brief The message priority. \n - * The values for this type SHOULD be in _MSG_PRIORITY_TYPE_E. + * @brief The message priority. \n + * The values for this type SHOULD be in _MSG_PRIORITY_TYPE_E. + * @since_tizen 2.3 */ typedef unsigned char msg_priority_type_t; /** - * @brief The network status of a message. \n - * The values for this type SHOULD be in _MSG_NETWORK_STATUS_E. + * @brief The network status of a message. \n + * The values for this type SHOULD be in _MSG_NETWORK_STATUS_E. + * @since_tizen 2.3 */ typedef unsigned char msg_network_status_t; /** - * @brief The address type. \n - * The values for this type SHOULD be in _MSG_ADDRESS_TYPE_E. + * @brief The address type. \n + * The values for this type SHOULD be in _MSG_ADDRESS_TYPE_E. + * @since_tizen 2.3 */ typedef unsigned char msg_address_type_t; /** - * @brief The recipient type. \n - * The values for this type SHOULD be in _MSG_RECIPIENT_TYPE_E. + * @brief The recipient type. \n + * The values for this type SHOULD be in _MSG_RECIPIENT_TYPE_E. + * @since_tizen 2.3 */ typedef unsigned char msg_recipient_type_t; /** - * @brief The type of a message direction. \n - * The values for this type SHOULD be in _MSG_DIRECTION_TYPE_E. + * @brief The type of a message direction. \n + * The values for this type SHOULD be in _MSG_DIRECTION_TYPE_E. + * @since_tizen 2.3 */ typedef unsigned char msg_direction_type_t; /** - * @brief The encoding type. \n + * @brief The encoding type. \n * The values for this type SHOULD be in _MSG_ENCODE_TYPE_E. + * @since_tizen 2.3 */ typedef unsigned char msg_encode_type_t; /** - * @brief The error code. \n - * The values for this type SHOULD be in _MSG_ERROR_E. + * @brief The error code. \n + * The values for this type SHOULD be in _MSG_ERROR_E. + * @since_tizen 2.3 */ typedef int msg_error_t; /** * @brief The WAP Push App Code. +* @since_tizen 2.3 */ typedef unsigned char msg_push_action_t; /** * @brief The SyncML Message Type. +* @since_tizen 2.3 */ typedef unsigned short msg_syncml_message_type_t; /** * @brief The Contact ID. + * @since_tizen 2.3 */ typedef unsigned int msg_contact_id_t; /** - * @brief The Report Type. \n - * The values for this type SHOULD be in _MSG_REPORT_TYPE_E. + * @brief The Report Type. \n + * The values for this type SHOULD be in _MSG_REPORT_TYPE_E. + * @since_tizen 2.3 */ typedef int msg_report_type_t; /** - * @brief The Delivery Report Status. \n - * The values for this type SHOULD be in _MSG_DELIVERY_REPORT_STATUS_E. + * @brief The Delivery Report Status. \n + * The values for this type SHOULD be in _MSG_DELIVERY_REPORT_STATUS_E. + * @since_tizen 2.3 */ typedef int msg_delivery_report_status_t; /** - * @brief The Read Report Status.\n - * The values for this type SHOULD be in _MSG_READ_REPORT_STATUS_E + * @brief The Read Report Status.\n + * The values for this type SHOULD be in _MSG_READ_REPORT_STATUS_E + * @since_tizen 2.3 */ typedef int msg_read_report_status_t; /** - * @brief The Message Type. \n - * The values for this type SHOULD be in _MSG_MESSAGE_TYPE_E. + * @brief The Message Type. \n + * The values for this type SHOULD be in _MSG_MESSAGE_TYPE_E. + * @since_tizen 2.3 */ typedef unsigned short msg_message_type_t; /** - * @brief The Message Backup Type. \n - * The values for this type SHOULD be in _MSG_MESSAGE_BACKUP_TYPE_E. + * @brief The Message Backup Type. \n + * The values for this type SHOULD be in _MSG_MESSAGE_BACKUP_TYPE_E. + * @since_tizen 2.3 */ typedef unsigned int msg_message_backup_type_t; /** - * @brief The thread ID. + * @brief The thread ID. + * @since_tizen 2.3 */ typedef unsigned int msg_thread_id_t; /* filter */ /** - * @brief The filter ID. + * @brief The filter ID. + * @since_tizen 2.3 */ typedef unsigned char msg_filter_id_t; /** - * @brief The filter Type. \n - * The filter type represents a unique filter type. \n - * The values for this type SHOULD be in _MSG_FILTER_TYPE_E. + * @brief The filter Type. \n + * The filter type represents a unique filter type. \n + * The values for this type SHOULD be in _MSG_FILTER_TYPE_E. + * @since_tizen 2.3 */ typedef unsigned char msg_filter_type_t; @@ -452,7 +526,8 @@ typedef unsigned char msg_filter_type_t; ==================================================================================================*/ /** - * @brief Enumeration for the values of a structure type for #msg_sturuct_t. \n + * @brief Enumeration for the values of a structure type for #msg_sturuct_t. \n + * @since_tizen 2.3 */ enum _MSG_STRUCT_E { MSG_STRUCT_FILTER = 0X0000, /**< Indicates the MSG_STRUCT_FILTER */ @@ -506,8 +581,9 @@ enum _MSG_STRUCT_E { }; /** - * @brief Enumeration for the values of message detail information. \n - * This enum is used as member of #msg_struct_t for MSG_STRUCT_MESSAGE_INFO. + * @brief Enumeration for the values of message detail information. \n + * This enum is used as member of #msg_struct_t for MSG_STRUCT_MESSAGE_INFO. + * @since_tizen 2.3 */ enum _MSG_MESSAGE_INFO_E_ { MSG_MESSAGE_ID_INT = MSG_STRUCT_MESSAGE_INFO+1, /**< Indicates the message ID of this message. */ @@ -542,8 +618,9 @@ enum _MSG_MESSAGE_INFO_E_ { }; /** - * @brief Enumeration for the values of message filter information. \n - * This enum is used as member of #msg_struct_t for MSG_STRUCT_FILTER. + * @brief Enumeration for the values of message filter information. \n + * This enum is used as member of #msg_struct_t for MSG_STRUCT_FILTER. + * @since_tizen 2.3 */ enum MSG_FILTER_INFO_E { MSG_FILTER_ID_INT = MSG_STRUCT_FILTER+1, /**< Indicates the filter ID. */ @@ -553,8 +630,9 @@ enum MSG_FILTER_INFO_E { }; /** - * @brief Enumeration for the values of thread information. \n - * This enum is used as member of #msg_struct_t for MSG_STRUCT_THREAD_INFO. + * @brief Enumeration for the values of thread information. \n + * This enum is used as member of #msg_struct_t for MSG_STRUCT_THREAD_INFO. + * @since_tizen 2.3 */ enum MSG_STRUCT_THREAD_INFO_E { MSG_THREAD_ID_INT = MSG_STRUCT_THREAD_INFO+1, /**< Indicates the message thread ID. */ @@ -575,8 +653,9 @@ enum MSG_STRUCT_THREAD_INFO_E { }; /** - * @brief Enumeration for the values of conversation information. \n - * This enum is used as member of #msg_struct_t for MSG_STRUCT_CONV_INFO. + * @brief Enumeration for the values of conversation information. \n + * This enum is used as member of #msg_struct_t for MSG_STRUCT_CONV_INFO. + * @since_tizen 2.3 */ enum MSG_STRUCT_CONV_INFO_E { MSG_CONV_MSG_ID_INT = MSG_STRUCT_CONV_INFO+1, /**< Indicates the message ID of this message. */ @@ -609,8 +688,9 @@ enum MSG_STRUCT_CONV_INFO_E { }; /** - * @brief Enumeration for the values of setting for SMSC options. \n - * This enum is used as member of #msg_struct_t for MSG_STRUCT_SETTING_SMSC_OPT. + * @brief Enumeration for the values of setting for SMSC options. \n + * This enum is used as member of #msg_struct_t for MSG_STRUCT_SETTING_SMSC_OPT. + * @since_tizen 2.3 */ enum _MSG_STRUCT_SETTING_SMSC_OPT_E { MSG_SMSC_SELECTED_ID_INT = MSG_STRUCT_SETTING_SMSC_OPT+1, /**< Indicates Selected SMSC index option */ @@ -620,8 +700,9 @@ enum _MSG_STRUCT_SETTING_SMSC_OPT_E { }; /** - * @brief Enumeration for the values of setting for SMSC informations. \n - * This enum is used as member of #msg_struct_t for MSG_STRUCT_SETTING_SMSC_INFO. + * @brief Enumeration for the values of setting for SMSC informations. \n + * This enum is used as member of #msg_struct_t for MSG_STRUCT_SETTING_SMSC_INFO. + * @since_tizen 2.3 */ enum _MSG_STRUCT_SETTING_SMSC_INFO_E { MSG_SMSC_ADDR_TON_INT = MSG_STRUCT_SETTING_SMSC_INFO+1, /**< Type of number. See enum _MSG_SMS_TON_E */ @@ -633,8 +714,9 @@ enum _MSG_STRUCT_SETTING_SMSC_INFO_E { }; /** - * @brief Enumeration for the values of setting for CB channel options. \n - * This enum is used as member of #msg_struct_t for MSG_STRUCT_SETTING_CB_OPT. + * @brief Enumeration for the values of setting for CB channel options. \n + * This enum is used as member of #msg_struct_t for MSG_STRUCT_SETTING_CB_OPT. + * @since_tizen 2.3 */ enum _MSG_STRUCT_CB_OPT_E { MSG_CB_RECEIVE_BOOL = MSG_STRUCT_SETTING_CB_OPT+1, /**< Indicates whether the CB message is received or not. */ @@ -654,8 +736,9 @@ enum _MSG_STRUCT_CB_OPT_E { }; /** - * @brief Enumeration for the values of setting for CB channel informations. \n - * This enum is used as member of #msg_struct_t for MSG_STRUCT_SETTING_CB_CHANNEL_INFO. + * @brief Enumeration for the values of setting for CB channel informations. \n + * This enum is used as member of #msg_struct_t for MSG_STRUCT_SETTING_CB_CHANNEL_INFO. + * @since_tizen 2.3 */ enum _MSG_STRUCT_CB_CHANNEL_INFO_E { MSG_CB_CHANNEL_ACTIVATE_BOOL = MSG_STRUCT_SETTING_CB_CHANNEL_INFO+1, /**< Indicates whether the CB channel is activate or passive. */ @@ -665,8 +748,9 @@ enum _MSG_STRUCT_CB_CHANNEL_INFO_E { }; /** - * @brief Enumeration for the values of setting for SMS sending options. \n - * This enum is used as member of #msg_struct_t for MSG_STRUCT_SETTING_SMS_SEND_OPT. + * @brief Enumeration for the values of setting for SMS sending options. \n + * This enum is used as member of #msg_struct_t for MSG_STRUCT_SETTING_SMS_SEND_OPT. + * @since_tizen 2.3 */ enum _MSG_STRUCT_SMS_SEND_OPT_E { MSG_SMS_SENDOPT_ENCODE_TYPE_INT = MSG_STRUCT_SETTING_SMS_SEND_OPT+1, /**< Indicates the string encoding type. See enum _MSG_ENCODE_TYPE_E*/ @@ -677,8 +761,9 @@ enum _MSG_STRUCT_SMS_SEND_OPT_E { }; /** - * @brief Enumeration for the values of setting for MMS sending options. \n - * This enum is used as member of #msg_struct_t for MSG_STRUCT_SETTING_MMS_SEND_OPT. + * @brief Enumeration for the values of setting for MMS sending options. \n + * This enum is used as member of #msg_struct_t for MSG_STRUCT_SETTING_MMS_SEND_OPT. + * @since_tizen 2.3 */ enum _MSG_STRUCT_MMS_SEND_OPT_E { MSG_MMS_SENDOPT_CLASS_TYPE_INT = MSG_STRUCT_SETTING_MMS_SEND_OPT+1, /**< Indicates the class type of message. See enum _MSG_MMS_MSG_CLASS_TYPE_E */ @@ -699,8 +784,9 @@ enum _MSG_STRUCT_MMS_SEND_OPT_E { }; /** - * @brief Enumeration for the values of setting for MMS receiving options. \n - * This enum is used as member of #msg_struct_t for MSG_STRUCT_SETTING_MMS_RECV_OPT. + * @brief Enumeration for the values of setting for MMS receiving options. \n + * This enum is used as member of #msg_struct_t for MSG_STRUCT_SETTING_MMS_RECV_OPT. + * @since_tizen 2.3 */ enum _MSG_STRUCT_MMS_RECV_OPT_E { MSG_MMS_RECVOPT_HOME_RETRIEVE_TYPE_INT = MSG_STRUCT_SETTING_MMS_RECV_OPT+1, /**< Indicates the retrieve type for MMS home network. See enum _MSG_MMS_HOME_RETRIEVE_TYPE_E */ @@ -713,8 +799,9 @@ enum _MSG_STRUCT_MMS_RECV_OPT_E { }; /** - * @brief Enumeration for the values of setting for general options. \n - * This enum is used as member of #msg_struct_t for MSG_STRUCT_SETTING_GENERAL_OPT. + * @brief Enumeration for the values of setting for general options. \n + * This enum is used as member of #msg_struct_t for MSG_STRUCT_SETTING_GENERAL_OPT. + * @since_tizen 2.3 */ enum _MSG_STRUCT_GENERAL_OPT_E { MSG_GENERAL_KEEP_COPY_BOOL = MSG_STRUCT_SETTING_GENERAL_OPT+1, /**< Indicates whether the SMS message copy is kept or not. */ @@ -731,8 +818,9 @@ enum _MSG_STRUCT_GENERAL_OPT_E { }; /** - * @brief Enumeration for the values of setting for push message options. \n - * This enum is used as member of #msg_struct_t for MSG_STRUCT_SETTING_PUSH_MSG_OPT. + * @brief Enumeration for the values of setting for push message options. \n + * This enum is used as member of #msg_struct_t for MSG_STRUCT_SETTING_PUSH_MSG_OPT. + * @since_tizen 2.3 */ enum _MSG_STRUCT_PUSH_MSG_OPT_E { MSG_PUSHMSG_RECEIVE_BOOL = MSG_STRUCT_SETTING_PUSH_MSG_OPT+1, /**< Indicates whether the push message is received or not. */ @@ -740,8 +828,9 @@ enum _MSG_STRUCT_PUSH_MSG_OPT_E { }; /** - * @brief Enumeration for the values of setting for voice message options. \n - * This enum is used as member of #msg_struct_t for MSG_STRUCT_SETTING_VOICE_MSG_OPT. + * @brief Enumeration for the values of setting for voice message options. \n + * This enum is used as member of #msg_struct_t for MSG_STRUCT_SETTING_VOICE_MSG_OPT. + * @since_tizen 2.3 */ enum _MSG_STRUCT_VOICE_MSG_OPT_E { MSG_VOICEMSG_ADDRESS_STR = MSG_STRUCT_SETTING_VOICE_MSG_OPT+1, /**< Indicates the address for voice message. */ @@ -752,16 +841,18 @@ enum _MSG_STRUCT_VOICE_MSG_OPT_E { /** - * @brief Enumeration for the values of setting for message size option. \n - * This enum is used as member of #msg_struct_t for MSG_STRUCT_SETTING_MSGSIZE_OPT. + * @brief Enumeration for the values of setting for message size option. \n + * This enum is used as member of #msg_struct_t for MSG_STRUCT_SETTING_MSGSIZE_OPT. + * @since_tizen 2.3 */ enum _MSG_STRUCT_MSGSISE_OPT_E { MSG_MESSAGE_SIZE_INT = MSG_STRUCT_SETTING_MSGSIZE_OPT+1, /**< Indicates the message size */ }; /** - * @brief Enumeration for the values of MMS detail informations. \n - * This enum is used as member of #msg_struct_t for MSG_STRUCT_MMS. + * @brief Enumeration for the values of MMS detail informations. \n + * This enum is used as member of #msg_struct_t for MSG_STRUCT_MMS. + * @since_tizen 2.3 */ enum MSG_MMS_INFO_E { MSG_MMS_PAGE_LIST_HND = MSG_STRUCT_MMS+1, /**< The pointer to SMIL pages list */ @@ -806,8 +897,9 @@ enum MSG_MMS_INFO_E { }; /** - * @brief Enumeration for the values of MMS multipart informations. \n - * This enum is used as member of #msg_struct_t for MMS_MULTIPART_DATA_S. + * @brief Enumeration for the values of MMS multipart informations. \n + * This enum is used as member of #msg_struct_t for MMS_MULTIPART_DATA_S. + * @since_tizen 2.3 */ enum _MSG_STRUCT_MULTIPART_INFO_E { MSG_MMS_MULTIPART_CONTENT_TYPE_STR = MSG_STRUCT_MULTIPART_INFO+1, /**< Indicates multipart content type */ @@ -821,8 +913,9 @@ enum _MSG_STRUCT_MULTIPART_INFO_E { }; /** - * @brief Enumeration for the values of MMS page informations. \n - * This enum is used as member of #msg_struct_t for MSG_STRUCT_MMS_PAGE. + * @brief Enumeration for the values of MMS page informations. \n + * This enum is used as member of #msg_struct_t for MSG_STRUCT_MMS_PAGE. + * @since_tizen 2.3 */ enum MSG_MMS_PAGE_INFO_E { MSG_MMS_PAGE_MEDIA_LIST_HND = MSG_STRUCT_MMS_PAGE+1, /**< The pointer to media list */ @@ -835,8 +928,9 @@ enum MSG_MMS_PAGE_INFO_E { }; /** - * @brief Enumeration for the values of MMS media informations. \n - * This enum is used as member of #msg_struct_t for MSG_STRUCT_MMS_MEDIA. + * @brief Enumeration for the values of MMS media informations. \n + * This enum is used as member of #msg_struct_t for MSG_STRUCT_MMS_MEDIA. + * @since_tizen 2.3 */ enum MSG_MMS_MEDIA_INFO_E { MSG_MMS_MEDIA_TYPE_INT = MSG_STRUCT_MMS_MEDIA+1, /**< Indicates the SMIL media type. See enum MmsSmilMediaType */ @@ -856,8 +950,9 @@ enum MSG_MMS_MEDIA_INFO_E { }; /** - * @brief Enumeration for the values of MMS attachment informations. \n - * This enum is used as member of #msg_struct_t for MSG_STRUCT_MMS_ATTACH. + * @brief Enumeration for the values of MMS attachment informations. \n + * This enum is used as member of #msg_struct_t for MSG_STRUCT_MMS_ATTACH. + * @since_tizen 2.3 */ enum MSG_MMS_ATTACH_INFO_E { MSG_MMS_ATTACH_MIME_TYPE_INT = MSG_STRUCT_MMS_ATTACH+1, /**< Indicates the file mime type. See enum MimeType */ @@ -871,8 +966,9 @@ enum MSG_MMS_ATTACH_INFO_E { }; /** - * @brief Enumeration for the values of MMS region informations. \n - * This enum is used as member of #msg_struct_t for MSG_STRUCT_MMS_REGION. + * @brief Enumeration for the values of MMS region informations. \n + * This enum is used as member of #msg_struct_t for MSG_STRUCT_MMS_REGION. + * @since_tizen 2.3 */ enum MSG_MMS_REGION_INFO_E { MSG_MMS_REGION_ID_STR = MSG_STRUCT_MMS_REGION+1, /**< Indicates the ID of region information */ @@ -890,8 +986,9 @@ enum MSG_MMS_REGION_INFO_E { }; /** - * @brief Enumeration for the values of MMS meta data informations. \n - * This enum is used as member of #msg_struct_t for MSG_STRUCT_MMS_META. + * @brief Enumeration for the values of MMS meta data informations. \n + * This enum is used as member of #msg_struct_t for MSG_STRUCT_MMS_META. + * @since_tizen 2.3 */ enum MSG_MMS_META_INFO_E { MSG_MMS_META_ID_STR = MSG_STRUCT_MMS_META+1, /**< Indicates the ID of meta information */ @@ -900,8 +997,9 @@ enum MSG_MMS_META_INFO_E { }; /** - * @brief Enumeration for the values of MMS transition informations. \n - * This enum is used as member of #msg_struct_t for MSG_STRUCT_MMS_TRANSITION. + * @brief Enumeration for the values of MMS transition informations. \n + * This enum is used as member of #msg_struct_t for MSG_STRUCT_MMS_TRANSITION. + * @since_tizen 2.3 */ enum MSG_MMS_TRANSITION_INFO_E { MSG_MMS_TRANSITION_ID_STR = MSG_STRUCT_MMS_TRANSITION+1, /**< Indicates the ID of transition information */ @@ -911,8 +1009,9 @@ enum MSG_MMS_TRANSITION_INFO_E { }; /** - * @brief Enumeration for the values of MMS SMIL text informations. \n - * This enum is used as member of #msg_struct_t for MSG_STRUCT_MMS_SMIL_TEXT. + * @brief Enumeration for the values of MMS SMIL text informations. \n + * This enum is used as member of #msg_struct_t for MSG_STRUCT_MMS_SMIL_TEXT. + * @since_tizen 2.3 */ enum MSG_MMS_SMIL_TEXT_INFO_E { MSG_MMS_SMIL_TEXT_TRANSITION_IN_ID_STR = MSG_STRUCT_MMS_SMIL_TEXT+1, /**< Indicates the In SMIL transition ID */ @@ -932,8 +1031,9 @@ enum MSG_MMS_SMIL_TEXT_INFO_E { }; /** - * @brief Enumeration for the values of MMS SMIL avi informations. \n - * This enum is used as member of #msg_struct_t for MSG_STRUCT_MMS_SMIL_AVI. + * @brief Enumeration for the values of MMS SMIL avi informations. \n + * This enum is used as member of #msg_struct_t for MSG_STRUCT_MMS_SMIL_AVI. + * @since_tizen 2.3 */ enum MSG_MMS_SMIL_AVI_INFO_E { MSG_MMS_SMIL_AVI_TRANSITION_IN_ID_STR = MSG_STRUCT_MMS_SMIL_AVI+1, /**< Indicates the In SMIL transition ID */ @@ -946,8 +1046,9 @@ enum MSG_MMS_SMIL_AVI_INFO_E { }; /** - * @brief Enumeration for the values of message sending options. \n - * This enum is used as member of #msg_struct_t for MSG_STRUCT_SENDOPT. + * @brief Enumeration for the values of message sending options. \n + * This enum is used as member of #msg_struct_t for MSG_STRUCT_SENDOPT. + * @since_tizen 2.3 */ enum MSG_SEND_OPT_E { MSG_SEND_OPT_SETTING_BOOL = MSG_STRUCT_SENDOPT+1, /**< Indicates whether the sending option is set or not for a message */ @@ -958,8 +1059,9 @@ enum MSG_SEND_OPT_E { }; /** - * @brief Enumeration for the values of SyncML informations. \n - * This enum is used as member of #msg_struct_t for MSG_STRUCT_SYNCML_INFO. + * @brief Enumeration for the values of SyncML informations. \n + * This enum is used as member of #msg_struct_t for MSG_STRUCT_SYNCML_INFO. + * @since_tizen 2.3 */ enum MSG_SYNCML_INFO_E { MSG_SYNCML_INFO_EXTID_INT = MSG_STRUCT_SYNCML_INFO+1, /**< Indicates the ext ID */ @@ -968,8 +1070,9 @@ enum MSG_SYNCML_INFO_E { }; /** - * @brief Enumeration for the values of message count status. \n - * This enum is used as member of #msg_struct_t for MSG_STRUCT_COUNT_INFO. + * @brief Enumeration for the values of message count status. \n + * This enum is used as member of #msg_struct_t for MSG_STRUCT_COUNT_INFO. + * @since_tizen 2.3 */ enum MSG_COUNT_INFO_E { MSG_COUNT_INFO_READ_INT = MSG_STRUCT_COUNT_INFO+1, /**< The count of read messages */ @@ -979,8 +1082,9 @@ enum MSG_COUNT_INFO_E { }; /** - * @brief Enumeration for the values of message count in a thread. \n - * This enum is used as member of #msg_struct_t for MSG_STRUCT_THREAD_COUNT_INFO. + * @brief Enumeration for the values of message count in a thread. \n + * This enum is used as member of #msg_struct_t for MSG_STRUCT_THREAD_COUNT_INFO. + * @since_tizen 2.3 */ enum MSG_THREAD_COUNT_INFO_E { MSG_THREAD_COUNT_TOTAL_INT = MSG_STRUCT_THREAD_COUNT_INFO+1, /**< Indicates the total number of messages from the Peer. */ @@ -990,8 +1094,9 @@ enum MSG_THREAD_COUNT_INFO_E { }; /** - * @brief Enumeration for the values of thread informations for address. \n - * This enum is used as member of #msg_struct_t for MSG_STRUCT_THREAD_LIST_INDEX. + * @brief Enumeration for the values of thread informations for address. \n + * This enum is used as member of #msg_struct_t for MSG_STRUCT_THREAD_LIST_INDEX. + * @since_tizen 2.3 */ enum MSG_THREAD_LIST_INDEX_E { MSG_THREAD_LIST_INDEX_CONTACTID_INT = MSG_STRUCT_THREAD_LIST_INDEX+1, /**< The contact ID of message common informatioin */ @@ -999,8 +1104,9 @@ enum MSG_THREAD_LIST_INDEX_E { }; /** - * @brief Enumeration for the values of sort rule for getting message list. \n - * This enum is used as member of #msg_struct_t for MSG_STRUCT_SORT_RULE. + * @brief Enumeration for the values of sort rule for getting message list. \n + * This enum is used as member of #msg_struct_t for MSG_STRUCT_SORT_RULE. + * @since_tizen 2.3 */ enum MSG_SORT_RULE_E { MSG_SORT_RULE_SORT_TYPE_INT = MSG_STRUCT_SORT_RULE+1, /**< Indicates the sort type. See enum _MSG_SORT_TYPE_E */ @@ -1008,8 +1114,9 @@ enum MSG_SORT_RULE_E { }; /** - * @brief Enumeration for the values of message folder information. \n - * This enum is used as member of #msg_struct_t for MSG_STRUCT_FOLDER_INFO. + * @brief Enumeration for the values of message folder information. \n + * This enum is used as member of #msg_struct_t for MSG_STRUCT_FOLDER_INFO. + * @since_tizen 2.3 */ enum MSG_FOLDER_INFO_E { MSG_FOLDER_INFO_ID_INT = MSG_STRUCT_FOLDER_INFO+1, /**< Indicates the unique folder ID. */ @@ -1018,8 +1125,9 @@ enum MSG_FOLDER_INFO_E { }; /** - * @brief Enumeration for the values of report message status. \n - * This enum is used as member of #msg_struct_t for MSG_STRUCT_REPORT_STATUS_INFO. + * @brief Enumeration for the values of report message status. \n + * This enum is used as member of #msg_struct_t for MSG_STRUCT_REPORT_STATUS_INFO. + * @since_tizen 2.3 */ enum MSG_REPORT_E { MSG_REPORT_ADDRESS_STR = MSG_STRUCT_REPORT_STATUS_INFO+1, /**< Indicates Report address */ @@ -1029,8 +1137,9 @@ enum MSG_REPORT_E { }; /** - * @brief Enumeration for the values of conditions for getting message list. \n - * This enum is used as member of #msg_struct_t for MSG_STRUCT_MSG_LIST_CONDITION. + * @brief Enumeration for the values of conditions for getting message list. \n + * This enum is used as member of #msg_struct_t for MSG_STRUCT_MSG_LIST_CONDITION. + * @since_tizen 2.3 */ enum MSG_LIST_CONDITION_E { MSG_LIST_CONDITION_FOLDER_ID_INT = MSG_STRUCT_MSG_LIST_CONDITION+1, /**< Indicates the folder ID for searching messages. See enum _MSG_FOLDER_ID_E (Can be used with msg_get_thread_view_list2) */ @@ -1051,8 +1160,9 @@ enum MSG_LIST_CONDITION_E { }; /** - * @brief Enumeration for the values of address informations. \n - * This enum is used as member of #msg_struct_t for MSG_STRUCT_ADDRESS_INFO. + * @brief Enumeration for the values of address informations. \n + * This enum is used as member of #msg_struct_t for MSG_STRUCT_ADDRESS_INFO. + * @since_tizen 2.3 */ enum MSG_ADDRESS_INFO_E { MSG_ADDRESS_INFO_ADDRESS_TYPE_INT = MSG_STRUCT_ADDRESS_INFO+1, /**< The type of an address in case of an Email or a mobile phone. See enum _MSG_ADDRESS_TYPE_E */ @@ -1063,8 +1173,9 @@ enum MSG_ADDRESS_INFO_E { }; /** - * @brief Enumeration for the values of MMS sending options for sent message. \n - * This enum is used as member of #msg_struct_t for MSG_STRUCT_MMS_SENDOPT. + * @brief Enumeration for the values of MMS sending options for sent message. \n + * This enum is used as member of #msg_struct_t for MSG_STRUCT_MMS_SENDOPT. + * @since_tizen 2.3 */ enum MSG_MMS_SENDOPT_E { MSG_MMS_SENDOPTION_READ_REQUEST_BOOL = MSG_STRUCT_MMS_SENDOPT+1, /**< Indicates whether it requests read report or not */ @@ -1075,16 +1186,18 @@ enum MSG_MMS_SENDOPT_E { }; /** - * @brief Enumeration for the values of SMS sending options for sent message. \n - * This enum is used as member of #msg_struct_t for MSG_STRUCT_SMS_SENDOPT. + * @brief Enumeration for the values of SMS sending options for sent message. \n + * This enum is used as member of #msg_struct_t for MSG_STRUCT_SMS_SENDOPT. + * @since_tizen 2.3 */ enum MSG_SMS_SENDOPT_E { MSG_SMS_SENDOPT_REPLYPATH_BOOL = MSG_STRUCT_SMS_SENDOPT+1, /**< Indicates whether reply path is set */ }; /** - * @brief Enumeration for the values of reject message informations. \n - * This enum is used as member of #msg_struct_t for MSG_STRUCT_REJECT_MSG_INFO. + * @brief Enumeration for the values of reject message informations. \n + * This enum is used as member of #msg_struct_t for MSG_STRUCT_REJECT_MSG_INFO. + * @since_tizen 2.3 */ enum MSG_REJECT_MESSAGE_E { MSG_REJECT_MESSAGE_MSGID_INT = MSG_STRUCT_REJECT_MSG_INFO+1, /**< Indicates the ID of rejected message */ @@ -1093,8 +1206,9 @@ enum MSG_REJECT_MESSAGE_E { }; /** - * @brief Enumeration for the values of requested message informations. \n - * This enum is used as member of #msg_struct_t for MSG_STRUCT_REQUEST_INFO. + * @brief Enumeration for the values of requested message informations. \n + * This enum is used as member of #msg_struct_t for MSG_STRUCT_REQUEST_INFO. + * @since_tizen 2.3 */ enum MSG_REQUEST_INFO_E { MSG_REQUEST_REQUESTID_INT = MSG_STRUCT_REQUEST_INFO+1, /**< Indicates the request ID, which is unique. When applications submit a request to the framework, this value will be set by the framework. */ @@ -1103,8 +1217,9 @@ enum MSG_REQUEST_INFO_E { }; /** - * @brief Enumeration for the values of sent status informations. \n - * This enum is used as member of #msg_struct_t for MSG_STRUCT_SENT_STATUS_INFO. + * @brief Enumeration for the values of sent status informations. \n + * This enum is used as member of #msg_struct_t for MSG_STRUCT_SENT_STATUS_INFO. + * @since_tizen 2.3 */ enum MSG_SENT_STATUS_INFO_E { MSG_SENT_STATUS_REQUESTID_INT = MSG_STRUCT_SENT_STATUS_INFO+1, /**< Indicates the corresponding request ID. */ @@ -1112,8 +1227,9 @@ enum MSG_SENT_STATUS_INFO_E { }; /** - * @brief Enumeration for the values of push configurations. \n - * This enum is used as member of #msg_struct_t for MSG_STRUCT_PUSH_CONFIG_INFO. + * @brief Enumeration for the values of push configurations. \n + * This enum is used as member of #msg_struct_t for MSG_STRUCT_PUSH_CONFIG_INFO. + * @since_tizen 2.3 */ enum MSG_PUSH_CONFIG_INFO_E { MSG_PUSH_CONFIG_CONTENT_TYPE_STR = MSG_STRUCT_PUSH_CONFIG_INFO+1, /**< Indicates the content type*/ @@ -1123,8 +1239,9 @@ enum MSG_PUSH_CONFIG_INFO_E { }; /** - * @brief Enumeration for the values of CB message informations. \n - * This enum is used as member of #msg_struct_t for MSG_STRUCT_CB_MSG. + * @brief Enumeration for the values of CB message informations. \n + * This enum is used as member of #msg_struct_t for MSG_STRUCT_CB_MSG. + * @since_tizen 2.3 */ enum MSG_CB_MSG_E { MSG_CB_MSG_TYPE_INT = MSG_STRUCT_CB_MSG+1, /**< MSG_TYPE_SMS_CB/ETWS_PRIMARY/ETWS_SECONDARY (see _MSG_MESSAGE_TYPE_E) */ @@ -1141,8 +1258,9 @@ enum MSG_CB_MSG_E { }; /** - * @brief Enumeration for the values of a message class type. \n - * This enum is used as the value of MSG_CLASS_TYPE_T. + * @brief Enumeration for the values of a message class type. \n + * This enum is used as the value of MSG_CLASS_TYPE_T. + * @since_tizen 2.3 */ enum _MSG_CLASS_TYPE_E { MSG_CLASS_0 = 0, /**< Immediately presented on the recipient device display */ @@ -1153,9 +1271,10 @@ enum _MSG_CLASS_TYPE_E { }; /** - * @brief Enumeration for the type of Message. \n - * More members maybe added if needed. \n - * This enum is used as the value of msg_message_type_t. + * @brief Enumeration for the type of Message. \n + * More members maybe added if needed. \n + * This enum is used as the value of msg_message_type_t. + * @since_tizen 2.3 */ enum _MSG_MESSAGE_TYPE_E { MSG_TYPE_INVALID = 0, /** < Invalid Type Message */ @@ -1182,12 +1301,25 @@ enum _MSG_MESSAGE_TYPE_E { MSG_TYPE_SMS_CMAS_TEST, /** < CB - CMAS Test */ MSG_TYPE_SMS_CMAS_EXERCISE, /** < CB - CMAS Exercise */ MSG_TYPE_SMS_CMAS_OPERATOR_DEFINED, /** < CB - CMAS Operator defined */ + MSG_TYPE_SMS_CMAS_PUBLIC_SAFETY, /** @since_tizen 5.5 < CB - CMAS Public Safety Alerts */ + MSG_TYPE_SMS_CMAS_STATE_LOCAL_TEST, /** @since_tizen 5.5 < CB - CMAS State/Local WEA Test */ + + MSG_TYPE_SMS_CMAS_PRESIDENTIAL_OTHER_LANG, /** @since_tizen 5.5 < CB - CMAS Presidential Alerts for Additional languages */ + MSG_TYPE_SMS_CMAS_EXTREME_OTHER_LANG, /** @since_tizen 5.5 < CB - CMAS Extreme Alerts for Additional language */ + MSG_TYPE_SMS_CMAS_SEVERE_OTHER_LANG, /** @since_tizen 5.5 < CB - CMAS Severe Alerts for Additonal language */ + MSG_TYPE_SMS_CMAS_AMBER_OTHER_LANG, /** @since_tizen 5.5 < CB - CMAS AMBER Alerts for Additional language(Child Abduction Emergency) */ + MSG_TYPE_SMS_CMAS_TEST_OTHER_LANG, /** @since_tizen 5.5 < CB - CMAS Test for Additional language*/ + MSG_TYPE_SMS_CMAS_EXERCISE_OTHER_LANG, /** @since_tizen 5.5 < CB - CMAS Exercise for Additional language*/ + MSG_TYPE_SMS_CMAS_OPERATOR_DEFINED_OTHER_LANG, /** @since_tizen 5.5 < CB - CMAS Operator defined for Additional language*/ + MSG_TYPE_SMS_CMAS_PUBLIC_SAFETY_OTHER_LANG,/** @since_tizen 5.5 < CB - CMAS Public Safety Alerts for Additional languages */ + MSG_TYPE_SMS_CMAS_STATE_LOCAL_TEST_OTHER_LANG, /** @since_tizen 5.5 < CB - CMAS State/Local WEA Test for Additional languages */ MSG_MESSAGE_TYPE_MAX, /** < Placeholder for max value of this enum */ }; /** - * @brief Enumeration for the backup type of Message. More members maybe added if needed \n - * This enum is used as the value of msg_message_backup_type_t. + * @brief Enumeration for the backup type of Message. More members maybe added if needed \n + * This enum is used as the value of msg_message_backup_type_t. + * @since_tizen 2.3 */ enum _MSG_MESSAGE_BACKUP_TYPE_E { MSG_BACKUP_TYPE_ALL = 0, /**< Backup all*/ @@ -1196,9 +1328,10 @@ enum _MSG_MESSAGE_BACKUP_TYPE_E { }; /** - * @brief Enumeration for the values of an error code. \n - * Success code is zero, but all error codes SHOULD be negative and smaller than MSG_SUCCESS. \n - * This enum is used as the value of msg_error_t. + * @brief Enumeration for the values of an error code. \n + * Success code is zero, but all error codes SHOULD be negative and smaller than MSG_SUCCESS. \n + * This enum is used as the value of msg_error_t. + * @since_tizen 2.3 */ enum _MSG_ERROR_E { MSG_SUCCESS = 0, /**< Successful */ @@ -1292,8 +1425,9 @@ enum _MSG_ERROR_E { /** - * @brief Enumeration for the values of a message priority. \n - * This enum is used as the value of msg_priority_type_t. + * @brief Enumeration for the values of a message priority. \n + * This enum is used as the value of msg_priority_type_t. + * @since_tizen 2.3 */ enum _MSG_PRIORITY_TYPE_E { MSG_MESSAGE_PRIORITY_LOW, /**< Low priority */ @@ -1303,8 +1437,9 @@ enum _MSG_PRIORITY_TYPE_E { /** - * @brief Enumeration for the values of a network status. \n - * This enum is used as the value of msg_network_status_t. + * @brief Enumeration for the values of a network status. \n + * This enum is used as the value of msg_network_status_t. + * @since_tizen 2.3 */ enum _MSG_NETWORK_STATUS_E { MSG_NETWORK_NOT_SEND = 0, /**< Message is not sending */ @@ -1334,8 +1469,9 @@ enum _MSG_NETWORK_STATUS_E { /** - * @brief Enumeration for the values of an address type. \n - * This enum is used as the value of msg_address_type_t. + * @brief Enumeration for the values of an address type. \n + * This enum is used as the value of msg_address_type_t. + * @since_tizen 2.3 */ enum _MSG_ADDRESS_TYPE_E { MSG_ADDRESS_TYPE_UNKNOWN = 0, /**< The address type is unknown. */ @@ -1345,8 +1481,9 @@ enum _MSG_ADDRESS_TYPE_E { /** - * @brief Enumeration for the values of a recipient type. \n - * This enum is used as the value of msg_recipient_type_t. + * @brief Enumeration for the values of a recipient type. \n + * This enum is used as the value of msg_recipient_type_t. + * @since_tizen 2.3 */ enum _MSG_RECIPIENT_TYPE_E { MSG_RECIPIENTS_TYPE_UNKNOWN = 0, /**< The recipient type is unknown. */ @@ -1357,8 +1494,9 @@ enum _MSG_RECIPIENT_TYPE_E { /** - * @brief Enumeration for the values of a direction type. \n - * This enum is used as the value of msg_direction_type_t. + * @brief Enumeration for the values of a direction type. \n + * This enum is used as the value of msg_direction_type_t. + * @since_tizen 2.3 */ enum _MSG_DIRECTION_TYPE_E { MSG_DIRECTION_TYPE_MO = 0, /**< The direction type is for mobile originated */ @@ -1367,8 +1505,9 @@ enum _MSG_DIRECTION_TYPE_E { /** - * @brief Enumeration for the values of a string encoding type. \n - * This enum is used as the value of msg_encode_type_t. + * @brief Enumeration for the values of a string encoding type. \n + * This enum is used as the value of msg_encode_type_t. + * @since_tizen 2.3 */ enum _MSG_ENCODE_TYPE_E { MSG_ENCODE_GSM7BIT = 0, /**< The string encoding type is GSM7BIT */ @@ -1386,8 +1525,9 @@ enum _MSG_ENCODE_TYPE_E { /** - * @brief Enumeration for the action type of Push Message. \n - * This enum is used as the value of msg_push_action_t. + * @brief Enumeration for the action type of Push Message. \n + * This enum is used as the value of msg_push_action_t. + * @since_tizen 2.3 */ enum _MSG_PUSH_ACTION_E { /* SI Action */ @@ -1405,8 +1545,9 @@ enum _MSG_PUSH_ACTION_E { /** - * @brief Enumeration for the type of SyncML Message. \n - * This enum is used as the value of msg_syncml_message_type_t. + * @brief Enumeration for the type of SyncML Message. \n + * This enum is used as the value of msg_syncml_message_type_t. + * @since_tizen 2.3 */ enum _MSG_SYNCML_MESSAGE_TYPE_E { DM_WBXML, /** < DM WBXML SyncML Message */ @@ -1424,8 +1565,9 @@ enum _MSG_SYNCML_MESSAGE_TYPE_E { /** - * @brief Enumeration for the values of a Delivery Report Status. \n - * This enum is used as the value of msg_delivery_report_status_t. + * @brief Enumeration for the values of a Delivery Report Status. \n + * This enum is used as the value of msg_delivery_report_status_t. + * @since_tizen 2.3 */ enum _MSG_DELIVERY_REPORT_STATUS_E { MSG_DELIVERY_REPORT_NONE = -1, /**< Indicates the status unavailable */ @@ -1442,8 +1584,9 @@ enum _MSG_DELIVERY_REPORT_STATUS_E { /** - * @brief Enumeration for the values of a Read Report Status. \n - * This enum is used as the value of msg_read_report_status_t. + * @brief Enumeration for the values of a Read Report Status. \n + * This enum is used as the value of msg_read_report_status_t. + * @since_tizen 2.3 */ enum _MSG_READ_REPORT_STATUS_E { MSG_READ_REPORT_NONE = -1, /**< Indicates the status unavailable */ @@ -1453,8 +1596,9 @@ enum _MSG_READ_REPORT_STATUS_E { }; /** - * @brief Enumeration for the values of a Report Type. \n - * This enum is used as the value of msg_read_report_status_t. + * @brief Enumeration for the values of a Report Type. \n + * This enum is used as the value of msg_read_report_status_t. + * @since_tizen 2.3 */ enum _MSG_REPORT_TYPE_E { MSG_REPORT_TYPE_DELIVERY = 0, /**< Indicates the type is delivery report*/ @@ -1464,8 +1608,9 @@ enum _MSG_REPORT_TYPE_E { /* filter */ /** - * @brief Enumeration for the values of a filter type. \n - * This enum is used as the value of msg_filter_type_t. + * @brief Enumeration for the values of a filter type. \n + * This enum is used as the value of msg_filter_type_t. + * @since_tizen 2.3 */ enum _MSG_FILTER_TYPE_E { MSG_FILTER_BY_WORD = 0, /**< Filtered by sub string in the text */ @@ -1479,7 +1624,8 @@ enum _MSG_FILTER_TYPE_E { /* mms */ /** - * @brief Enumeration for the values of a MIME type. + * @brief Enumeration for the values of a MIME type. + * @since_tizen 2.3 */ typedef enum _MimeType { /* 0 */ @@ -1693,18 +1839,20 @@ typedef enum _MimeType { } MimeType; /** - * @brief Enumeration for the values of a DRM type. + * @brief Enumeration for the values of a DRM type. + * @since_tizen 2.3 */ typedef enum { MSG_DRM_TYPE_NONE = 0, /**< Indicates the DRM type none */ MSG_DRM_TYPE_FL = 1, /**< Indicates the forward lock */ /* 2004-07-09: forwardLock type */ MSG_DRM_TYPE_CD = 2, /**< Indicates the combined delivery */ /* 2004-07-09: combined delivery type */ MSG_DRM_TYPE_SD = 3, /**< Indicates the separate delivery */ /* 2004-07-09: seperate delivery type */ - MSG_DRM_TYPE_SSD = 4 /**< Indicates the special separate delivery */ /* 2005-02-28: add Special Sperate Delivery */ + MSG_DRM_TYPE_SSD = 4 /**< Indicates the special separate delivery */ /* 2005-02-28: add Special Sperate Delivery */ } MsgDrmType; /** - * @brief Enumeration for the values of a SMIL region type. + * @brief Enumeration for the values of a SMIL region type. + * @since_tizen 2.3 */ typedef enum _REGION_FIT_TYPE_T { MMSUI_IMAGE_REGION_FIT_HIDDEN, /**< Indicates the hidden fit type */ @@ -1713,7 +1861,8 @@ typedef enum _REGION_FIT_TYPE_T { /** - * @brief Enumeration for the values of a SMIL media type. + * @brief Enumeration for the values of a SMIL media type. + * @since_tizen 2.3 */ typedef enum { MMS_SMIL_MEDIA_INVALID = 0, /**< Indicates the invalid media type */ @@ -1727,7 +1876,8 @@ typedef enum { } MmsSmilMediaType; /** - * @brief Enumeration for the values of a SMIL transition type. + * @brief Enumeration for the values of a SMIL transition type. + * @since_tizen 2.3 */ typedef enum { MMS_SMIL_TRANS_NONE = 0, /**< Indicates the transition type none */ /* default */ @@ -1745,7 +1895,8 @@ typedef enum { } MmsSmilTransType; /** - * @brief Enumeration for the values of a SMIL transition sub type. + * @brief Enumeration for the values of a SMIL transition sub type. + * @since_tizen 2.3 */ typedef enum { MMS_SMIL_TRANS_SUB_NONE = 0, /**< Indicates the transition sub type none */ @@ -1760,7 +1911,8 @@ typedef enum { } MmsSmilTransSubType; /** - * @brief Enumeration for the values of a text font type. + * @brief Enumeration for the values of a text font type. + * @since_tizen 2.3 */ typedef enum { MMS_SMIL_FONT_TYPE_NONE = 0, /**< Indicates the font type none */ @@ -1771,7 +1923,8 @@ typedef enum { } MmsSmilFontType; /** - * @brief Enumeration for the values of a MMS text direction. + * @brief Enumeration for the values of a MMS text direction. + * @since_tizen 2.3 */ typedef enum _MmsTextDir { MMS_TEXT_DIRECTION_INVALID = -1, /**< Indicates the invalid direction */ @@ -1780,7 +1933,8 @@ typedef enum _MmsTextDir { } MmsTextDirection; /** - * @brief Enumeration for the values of MMS Read Report Sent Status. + * @brief Enumeration for the values of MMS Read Report Sent Status. + * @since_tizen 2.3 */ typedef enum { MMS_RECEIVE_READ_REPORT_NO_SEND, /**< Not sent yet */ @@ -1793,8 +1947,9 @@ typedef enum { /* setting */ /** - * @brief Enumeration for the values of an option type. \n - * This enum is used as the value of MSG_OPTION_TYPE_T. + * @brief Enumeration for the values of an option type. \n + * This enum is used as the value of MSG_OPTION_TYPE_T. + * @since_tizen 2.3 */ enum _MSG_OPTION_TYPE_E { MSG_GENERAL_OPT, /**< General option */ @@ -1813,8 +1968,9 @@ enum _MSG_OPTION_TYPE_E { /** - * @brief Enumeration for the values of an SMS network mode. \n - * This enum is used as the value of MSG_SMS_NETWORK_MODE_T. + * @brief Enumeration for the values of an SMS network mode. \n + * This enum is used as the value of MSG_SMS_NETWORK_MODE_T. + * @since_tizen 2.3 */ enum _MSG_SMS_NETWORK_MODE_E { MSG_SMS_NETWORK_PS_ONLY = 0x01, /**< Packet switched */ @@ -1824,8 +1980,9 @@ enum _MSG_SMS_NETWORK_MODE_E { /** - * @brief Enumeration for the value of period of playing alert tone. \n - * The values for this type SHOULD be in MSG_ALERT_TONE_T. + * @brief Enumeration for the value of period of playing alert tone. \n + * The values for this type SHOULD be in MSG_ALERT_TONE_T. + * @since_tizen 2.3 */ enum _MSG_ALERT_TONE_E { MSG_ALERT_TONE_ONCE, /**< Play alert tone once*/ @@ -1836,8 +1993,9 @@ enum _MSG_ALERT_TONE_E { /** - * @brief Enumeration for the value of a default storage to save SMS. \n - * The values for this type SHOULD be in MSG_SMS_SAVE_STORAGE_T. + * @brief Enumeration for the value of a default storage to save SMS. \n + * The values for this type SHOULD be in MSG_SMS_SAVE_STORAGE_T. + * @since_tizen 2.3 */ enum _MSG_SMS_SAVE_STORAGE_E { MSG_SMS_SAVE_STORAGE_SIM, /**< Save SMS to SIM*/ @@ -1846,8 +2004,9 @@ enum _MSG_SMS_SAVE_STORAGE_E { /** - * @brief Enumeration for the values of the type of number for SMS center address. \n - * This enum is used as the value of MSG_SMS_TON_T. + * @brief Enumeration for the values of the type of number for SMS center address. \n + * This enum is used as the value of MSG_SMS_TON_T. + * @since_tizen 2.3 */ enum _MSG_SMS_TON_E { MSG_TON_UNKNOWN = 0, /**< Unknown */ @@ -1862,8 +2021,9 @@ enum _MSG_SMS_TON_E { /** - * @brief Enumeration for the values of the numbering plan ID for SMS center address. \n - * This enum is used as the value of MSG_SMS_NPI_T. + * @brief Enumeration for the values of the numbering plan ID for SMS center address. \n + * This enum is used as the value of MSG_SMS_NPI_T. + * @since_tizen 2.3 */ enum _MSG_SMS_NPI_E { MSG_NPI_UNKNOWN = 0, /**< Unknown */ @@ -1879,8 +2039,9 @@ enum _MSG_SMS_NPI_E { /** - * @brief Enumeration for the values of the protocol ID for SMS center address. \n - * This enum is used as the value of MSG_SMS_PID_T. + * @brief Enumeration for the values of the protocol ID for SMS center address. \n + * This enum is used as the value of MSG_SMS_PID_T. + * @since_tizen 2.3 */ enum _MSG_SMS_PID_E { MSG_PID_NONE, /**< None */ @@ -1895,13 +2056,14 @@ enum _MSG_SMS_PID_E { /** - * @brief Enumeration for the values of the Validity Period for SMS center. \n - * This enum is used as the value of MSG_VAL_PERIOD_T. + * @brief Enumeration for the values of the Validity Period for SMS center. \n + * This enum is used as the value of MSG_VAL_PERIOD_T. + * @since_tizen 2.3 * - * 0 to 143 : (TP-VP + 1) x 5 minutes (i.e. 5 minutes intervals up to 12 hours) - * 144 to 167 : 12 hours + ((TP-VP -143) x 30 minutes) - * 168 to 196 : (TP-VP - 166) x 1 day - * 197 to 255 : (TP-VP - 192) x 1 week + * 0 to 143 : (TP-VP + 1) x 5 minutes (i.e. 5 minutes intervals up to 12 hours) + * 144 to 167 : 12 hours + ((TP-VP -143) x 30 minutes) + * 168 to 196 : (TP-VP - 166) x 1 day + * 197 to 255 : (TP-VP - 192) x 1 week * */ enum _MSG_VAL_PERIOD_E { @@ -1920,8 +2082,9 @@ enum _MSG_VAL_PERIOD_E { /** - * @brief Enumeration for the values of the MMS expiry time. \n - * This enum is used as the value of MSG_MMS_EXPIRY_TIME_T. + * @brief Enumeration for the values of the MMS expiry time. \n + * This enum is used as the value of MSG_MMS_EXPIRY_TIME_T. + * @since_tizen 2.3 */ enum _MSG_MMS_EXPIRY_TIME_E { MSG_EXPIRY_TIME_MAXIMUM = 0, /**< Expiry time is zero */ @@ -1933,8 +2096,9 @@ enum _MSG_MMS_EXPIRY_TIME_E { /** - * @brief Enumeration for the values of the MMS delivery time. \n - * This enum is used as the value of MSG_MMS_DELIVERY_TIME_T. + * @brief Enumeration for the values of the MMS delivery time. \n + * This enum is used as the value of MSG_MMS_DELIVERY_TIME_T. + * @since_tizen 2.3 */ enum _MSG_MMS_DELIVERY_TIME_E { MSG_DELIVERY_TIME_IMMEDIATLY = 0, /**< Immediate MMS delivery */ @@ -1946,8 +2110,9 @@ enum _MSG_MMS_DELIVERY_TIME_E { /** - * @brief Enumeration for the values of the MMS class type. \n - * This enum is used as the value of MSG_MMS_MSG_CLASS_TYPE_T. + * @brief Enumeration for the values of the MMS class type. \n + * This enum is used as the value of MSG_MMS_MSG_CLASS_TYPE_T. + * @since_tizen 2.3 */ enum _MSG_MMS_MSG_CLASS_TYPE_E { MSG_CLASS_PERSONAL, /**mainType == MSG_SMS_TYPE) { switch (msg_data->subType) { - case MSG_CB_SMS: - *value = MSG_TYPE_SMS_CB; - break; - case MSG_JAVACB_SMS: - *value = MSG_TYPE_SMS_JAVACB; - break; - case MSG_WAP_SI_SMS: - case MSG_WAP_SL_SMS: - *value = MSG_TYPE_SMS_WAPPUSH; - break; - case MSG_MWI_VOICE_SMS: - case MSG_MWI_FAX_SMS: - case MSG_MWI_EMAIL_SMS: - case MSG_MWI_OTHER_SMS: - *value = MSG_TYPE_SMS_MWI; - break; - case MSG_SYNCML_CP: - *value = MSG_TYPE_SMS_SYNCML; - break; - case MSG_REJECT_SMS: - *value = MSG_TYPE_SMS_REJECT; - break; - case MSG_ETWS_SMS: - *value = MSG_TYPE_SMS_ETWS_PRIMARY; - break; - case MSG_CMAS_PRESIDENTIAL: - *value = MSG_TYPE_SMS_CMAS_PRESIDENTIAL; - break; - case MSG_CMAS_EXTREME: - *value = MSG_TYPE_SMS_CMAS_EXTREME; - break; - case MSG_CMAS_SEVERE: - *value = MSG_TYPE_SMS_CMAS_SEVERE; - break; - case MSG_CMAS_AMBER: - *value = MSG_TYPE_SMS_CMAS_AMBER; - break; - case MSG_CMAS_TEST: - *value = MSG_TYPE_SMS_CMAS_TEST; - break; - case MSG_CMAS_EXERCISE: - *value = MSG_TYPE_SMS_CMAS_EXERCISE; - break; - case MSG_CMAS_OPERATOR_DEFINED: - *value = MSG_TYPE_SMS_CMAS_OPERATOR_DEFINED; - break; - default: - *value = MSG_TYPE_SMS; - break; + case MSG_CB_SMS: + *value = MSG_TYPE_SMS_CB; + break; + case MSG_JAVACB_SMS: + *value = MSG_TYPE_SMS_JAVACB; + break; + case MSG_WAP_SI_SMS: + case MSG_WAP_SL_SMS: + *value = MSG_TYPE_SMS_WAPPUSH; + break; + case MSG_MWI_VOICE_SMS: + case MSG_MWI_FAX_SMS: + case MSG_MWI_EMAIL_SMS: + case MSG_MWI_OTHER_SMS: + *value = MSG_TYPE_SMS_MWI; + break; + case MSG_SYNCML_CP: + *value = MSG_TYPE_SMS_SYNCML; + break; + case MSG_REJECT_SMS: + *value = MSG_TYPE_SMS_REJECT; + break; + case MSG_ETWS_SMS: + *value = MSG_TYPE_SMS_ETWS_PRIMARY; + break; + case MSG_CMAS_PRESIDENTIAL: + *value = MSG_TYPE_SMS_CMAS_PRESIDENTIAL; + break; + case MSG_CMAS_PRESIDENTIAL_OTHER_LANG: + *value = MSG_TYPE_SMS_CMAS_PRESIDENTIAL_OTHER_LANG; + break; + case MSG_CMAS_EXTREME: + *value = MSG_TYPE_SMS_CMAS_EXTREME; + break; + case MSG_CMAS_EXTREME_OTHER_LANG: + *value = MSG_TYPE_SMS_CMAS_EXTREME_OTHER_LANG; + break; + case MSG_CMAS_SEVERE: + *value = MSG_TYPE_SMS_CMAS_SEVERE; + break; + case MSG_CMAS_SEVERE_OTHER_LANG: + *value = MSG_TYPE_SMS_CMAS_SEVERE_OTHER_LANG; + break; + case MSG_CMAS_AMBER: + *value = MSG_TYPE_SMS_CMAS_AMBER; + break; + case MSG_CMAS_AMBER_OTHER_LANG: + *value = MSG_TYPE_SMS_CMAS_AMBER_OTHER_LANG; + break; + case MSG_CMAS_TEST: + *value = MSG_TYPE_SMS_CMAS_TEST; + break; + case MSG_CMAS_TEST_OTHER_LANG: + *value = MSG_TYPE_SMS_CMAS_TEST_OTHER_LANG; + break; + case MSG_CMAS_EXERCISE: + *value = MSG_TYPE_SMS_CMAS_EXERCISE; + break; + case MSG_CMAS_EXERCISE_OTHER_LANG: + *value = MSG_TYPE_SMS_CMAS_EXERCISE_OTHER_LANG; + break; + case MSG_CMAS_OPERATOR_DEFINED: + *value = MSG_TYPE_SMS_CMAS_OPERATOR_DEFINED; + break; + case MSG_CMAS_OPERATOR_DEFINED_OTHER_LANG: + *value = MSG_TYPE_SMS_CMAS_OPERATOR_DEFINED_OTHER_LANG; + break; + case MSG_CMAS_PUBLIC_SAFETY: + *value = MSG_TYPE_SMS_CMAS_PUBLIC_SAFETY; + break; + case MSG_CMAS_PUBLIC_SAFETY_OTHER_LANG: + *value = MSG_TYPE_SMS_CMAS_PUBLIC_SAFETY_OTHER_LANG; + break; + case MSG_CMAS_STATE_LOCAL_TEST: + *value = MSG_TYPE_SMS_CMAS_STATE_LOCAL_TEST; + break; + case MSG_CMAS_STATE_LOCAL_TEST_OTHER_LANG: + *value = MSG_TYPE_SMS_CMAS_STATE_LOCAL_TEST_OTHER_LANG; + break; + default: + *value = MSG_TYPE_SMS; + break; } } else if (msg_data->mainType == MSG_MMS_TYPE) { if (msg_data->subType == MSG_NOTIFICATIONIND_MMS) @@ -650,38 +683,71 @@ int msg_cb_message_get_int_value(void *data, int field, int *value) switch (field) { case MSG_CB_MSG_TYPE_INT: { - switch (cb_msg->type) { - case MSG_ETWS_SMS: - *value = MSG_TYPE_SMS_ETWS_PRIMARY; - break; - case MSG_CB_SMS: - *value = ((cb_msg->messageId & 0xFFF8) == 0x1100) ? MSG_TYPE_SMS_ETWS_SECONDARY : MSG_TYPE_SMS_CB; - break; - case MSG_CMAS_PRESIDENTIAL: - *value = MSG_TYPE_SMS_CMAS_PRESIDENTIAL; - break; - case MSG_CMAS_EXTREME: - *value = MSG_TYPE_SMS_CMAS_EXTREME; - break; - case MSG_CMAS_SEVERE: - *value = MSG_TYPE_SMS_CMAS_SEVERE; - break; - case MSG_CMAS_AMBER: - *value = MSG_TYPE_SMS_CMAS_AMBER; - break; - case MSG_CMAS_TEST: - *value = MSG_TYPE_SMS_CMAS_TEST; - break; - case MSG_CMAS_EXERCISE: - *value = MSG_TYPE_SMS_CMAS_EXERCISE; - break; - case MSG_CMAS_OPERATOR_DEFINED: - *value = MSG_TYPE_SMS_CMAS_OPERATOR_DEFINED; - break; - default: - ret = MSG_ERR_UNKNOWN; - } + switch (cb_msg->type) { + case MSG_ETWS_SMS: + *value = MSG_TYPE_SMS_ETWS_PRIMARY; + break; + case MSG_CB_SMS: + *value = ((cb_msg->messageId & 0xFFF8) == 0x1100) ? MSG_TYPE_SMS_ETWS_SECONDARY : MSG_TYPE_SMS_CB; + break; + case MSG_CMAS_PRESIDENTIAL: + *value = MSG_TYPE_SMS_CMAS_PRESIDENTIAL; + break; + case MSG_CMAS_PRESIDENTIAL_OTHER_LANG: + *value = MSG_TYPE_SMS_CMAS_PRESIDENTIAL_OTHER_LANG; + break; + case MSG_CMAS_EXTREME: + *value = MSG_TYPE_SMS_CMAS_EXTREME; + break; + case MSG_CMAS_EXTREME_OTHER_LANG: + *value = MSG_TYPE_SMS_CMAS_EXTREME_OTHER_LANG; + break; + case MSG_CMAS_SEVERE: + *value = MSG_TYPE_SMS_CMAS_SEVERE; + break; + case MSG_CMAS_SEVERE_OTHER_LANG: + *value = MSG_TYPE_SMS_CMAS_SEVERE_OTHER_LANG; + break; + case MSG_CMAS_AMBER: + *value = MSG_TYPE_SMS_CMAS_AMBER; + break; + case MSG_CMAS_AMBER_OTHER_LANG: + *value = MSG_TYPE_SMS_CMAS_AMBER_OTHER_LANG; + break; + case MSG_CMAS_TEST: + *value = MSG_TYPE_SMS_CMAS_TEST; + break; + case MSG_CMAS_TEST_OTHER_LANG: + *value = MSG_TYPE_SMS_CMAS_TEST_OTHER_LANG; + break; + case MSG_CMAS_EXERCISE: + *value = MSG_TYPE_SMS_CMAS_EXERCISE; + break; + case MSG_CMAS_EXERCISE_OTHER_LANG: + *value = MSG_TYPE_SMS_CMAS_EXERCISE_OTHER_LANG; + break; + case MSG_CMAS_OPERATOR_DEFINED: + *value = MSG_TYPE_SMS_CMAS_OPERATOR_DEFINED; + break; + case MSG_CMAS_OPERATOR_DEFINED_OTHER_LANG: + *value = MSG_TYPE_SMS_CMAS_OPERATOR_DEFINED_OTHER_LANG; + break; + case MSG_CMAS_PUBLIC_SAFETY: + *value = MSG_TYPE_SMS_CMAS_PUBLIC_SAFETY; + break; + case MSG_CMAS_PUBLIC_SAFETY_OTHER_LANG: + *value = MSG_TYPE_SMS_CMAS_PUBLIC_SAFETY_OTHER_LANG; + break; + case MSG_CMAS_STATE_LOCAL_TEST: + *value = MSG_TYPE_SMS_CMAS_STATE_LOCAL_TEST; + break; + case MSG_CMAS_STATE_LOCAL_TEST_OTHER_LANG: + *value = MSG_TYPE_SMS_CMAS_STATE_LOCAL_TEST_OTHER_LANG; + break; + default: + ret = MSG_ERR_UNKNOWN; } + } break; case MSG_CB_MSG_RECV_TIME_INT: *value = cb_msg->receivedTime; diff --git a/mapi/msg_storage.cpp b/mapi/msg_storage.cpp index b7ba883..b7ae508 100755 --- a/mapi/msg_storage.cpp +++ b/mapi/msg_storage.cpp @@ -386,7 +386,7 @@ EXPORT_API int msg_get_message(msg_handle_t handle, msg_message_id_t msg_id, msg try { err = pHandle->getMessage(msg_id, (MSG_MESSAGE_HIDDEN_S *)pMsgStruct->data, (MSG_SENDINGOPT_S *)pStruct->data); } catch (MsgException& e) { - MSG_FATAL("%s", e.what()); + MSG_FATAL("msg_get_message failed with exception %s", e.what()); return MSG_ERR_STORAGE_ERROR; } diff --git a/plugin/sms_plugin/SmsPluginCbMsgHandler.cpp b/plugin/sms_plugin/SmsPluginCbMsgHandler.cpp index 85300ba..83fcce5 100755 --- a/plugin/sms_plugin/SmsPluginCbMsgHandler.cpp +++ b/plugin/sms_plugin/SmsPluginCbMsgHandler.cpp @@ -489,20 +489,24 @@ unsigned short SmsPluginCbMsgHandler::encodeCbSerialNum(SMS_CBMSG_SERIAL_NUM_S s return serialNum; } -int SmsPluginCbMsgHandler::CMAS_class(unsigned short message_id) +int SmsPluginCbMsgHandler::getCMASType(unsigned short message_id) { int ret = 0; switch (message_id) { case 4370: - case 4383: ret = MSG_CMAS_PRESIDENTIAL; break; + case 4383: + ret = MSG_CMAS_PRESIDENTIAL_OTHER_LANG; + break; case 4371: case 4372: + ret = MSG_CMAS_EXTREME; + break; case 4384: case 4385: - ret = MSG_CMAS_EXTREME; + ret = MSG_CMAS_EXTREME_OTHER_LANG; break; case 4373: case 4374: @@ -510,30 +514,52 @@ int SmsPluginCbMsgHandler::CMAS_class(unsigned short message_id) case 4376: case 4377: case 4378: + ret = MSG_CMAS_SEVERE; + break; case 4386: case 4387: case 4388: case 4389: case 4390: case 4391: - ret = MSG_CMAS_SEVERE; + ret = MSG_CMAS_SEVERE_OTHER_LANG; break; case 4379: - case 4392: ret = MSG_CMAS_AMBER; break; + case 4392: + ret = MSG_CMAS_AMBER_OTHER_LANG; + break; case 4380: - case 4393: ret = MSG_CMAS_TEST; break; + case 4393: + ret = MSG_CMAS_TEST_OTHER_LANG; + break; case 4381: - case 4394: ret = MSG_CMAS_EXERCISE; break; + case 4394: + ret = MSG_CMAS_EXERCISE_OTHER_LANG; + break; case 4382: - case 4395: ret = MSG_CMAS_OPERATOR_DEFINED; break; + case 4395: + ret = MSG_CMAS_OPERATOR_DEFINED_OTHER_LANG; + break; + case 4396: + ret = MSG_CMAS_PUBLIC_SAFETY; + break; + case 4397: + ret = MSG_CMAS_PUBLIC_SAFETY_OTHER_LANG; + break; + case 4398: + ret = MSG_CMAS_STATE_LOCAL_TEST; + break; + case 4399: + ret = MSG_CMAS_STATE_LOCAL_TEST_OTHER_LANG; + break; default: break; } @@ -722,12 +748,12 @@ void SmsPluginCbMsgHandler::convertCbMsgToMsginfo(SMS_CBMSG_S *pCbMsg, MSG_MESSA pMsgInfo->msgType.mainType = MSG_SMS_TYPE; if (pCbMsg->cbMsgType == SMS_CBMSG_TYPE_CBS) { - int cmas_class = CMAS_class(pCbMsg->msgId); + int cmas_Type = getCMASType(pCbMsg->msgId); - if (cmas_class == 0) + if (cmas_Type == 0) pMsgInfo->msgType.subType = MSG_CB_SMS; else - pMsgInfo->msgType.subType = (MSG_SUB_TYPE_T)cmas_class; + pMsgInfo->msgType.subType = (MSG_SUB_TYPE_T)cmas_Type; } else if (pCbMsg->cbMsgType == SMS_CBMSG_TYPE_JAVACBS) { pMsgInfo->msgType.subType = MSG_JAVACB_SMS; } diff --git a/plugin/sms_plugin/include/SmsPluginCbMsgHandler.h b/plugin/sms_plugin/include/SmsPluginCbMsgHandler.h index acc96b7..d379fb8 100755 --- a/plugin/sms_plugin/include/SmsPluginCbMsgHandler.h +++ b/plugin/sms_plugin/include/SmsPluginCbMsgHandler.h @@ -77,7 +77,7 @@ private: void Decode3gCbMsg(TelSmsCbMsg_t *pCbMsg, SMS_CBMSG_PAGE_S *pCbPage); void DecodeEtwsMsg(TelSmsEtwsMsg_t *pEtwsMsg, SMS_ETWS_PRIMARY_S *pEtwsPn); unsigned short encodeCbSerialNum(SMS_CBMSG_SERIAL_NUM_S snFields); - int CMAS_class(unsigned short message_id); + int getCMASType(unsigned short message_id); bool checkCbOpt(SMS_CBMSG_PAGE_S *CbPage, bool *pJavaMsg, msg_sim_slot_id_t simIndex); unsigned char checkCbPage(SMS_CBMSG_PAGE_S *CbPage); -- 2.7.4