diff options
Diffstat (limited to 'include')
24 files changed, 164 insertions, 311 deletions
diff --git a/include/common/MsgCmdTypes.h b/include/common/MsgCmdTypes.h index 9b6ff41..ecab740 100755 --- a/include/common/MsgCmdTypes.h +++ b/include/common/MsgCmdTypes.h @@ -42,15 +42,15 @@ typedef unsigned int MSG_EVENT_TYPE_T; ==================================================================================================*/ typedef struct _MSG_CMD_S { - MSG_CMD_TYPE_T cmdType; + MSG_CMD_TYPE_T cmdType; char cmdCookie[MAX_COOKIE_LEN]; - char cmdData[2]; + char cmdData[2]; } MSG_CMD_S; typedef struct _MSG_EVENT_S { - MSG_EVENT_TYPE_T eventType; + MSG_EVENT_TYPE_T eventType; msg_error_t result; char data[2]; } MSG_EVENT_S; @@ -67,114 +67,99 @@ enum _MSG_CMD_TYPE_E MSG_CMD_GET_STORAGELIST, MSG_CMD_ADD_MSG, MSG_CMD_ADD_SYNCML_MSG, - +// 5 MSG_CMD_UPDATE_MSG, MSG_CMD_UPDATE_READ, MSG_CMD_UPDATE_PROTECTED, MSG_CMD_DELETE_MSG, MSG_CMD_DELALL_MSGINFOLDER, - // 10 MSG_CMD_MOVE_MSGTOFOLDER, MSG_CMD_MOVE_MSGTOSTORAGE, MSG_CMD_COUNT_MSG, MSG_CMD_GET_MSG, - MSG_CMD_GET_FOLDERVIEWLIST, - MSG_CMD_ADD_FOLDER, +// 15 MSG_CMD_UPDATE_FOLDER, MSG_CMD_DELETE_FOLDER, MSG_CMD_GET_FOLDERLIST, MSG_CMD_ADD_FILTER, - -// 20 MSG_CMD_UPDATE_FILTER, +// 20 MSG_CMD_DELETE_FILTER, MSG_CMD_GET_FILTERLIST, MSG_CMD_SET_FILTER_OPERATION, MSG_CMD_GET_FILTER_OPERATION, - - MSG_CMD_GET_MSG_TYPE, MSG_CMD_SUBMIT_REQ, - MSG_CMD_CANCEL_REQ, +// 25 MSG_CMD_REG_SENT_STATUS_CB, MSG_CMD_REG_STORAGE_CHANGE_CB, - -// 30 MSG_CMD_REG_INCOMING_MSG_CB, MSG_CMD_REG_INCOMING_MMS_CONF_MSG_CB, MSG_CMD_REG_INCOMING_SYNCML_MSG_CB, +// 30 MSG_CMD_REG_INCOMING_LBS_MSG_CB, MSG_CMD_PLG_SENT_STATUS_CNF, - MSG_CMD_PLG_STORAGE_CHANGE_IND, MSG_CMD_PLG_INCOMING_MSG_IND, MSG_CMD_PLG_INCOMING_MMS_CONF, +//35 MSG_CMD_PLG_INCOMING_SYNCML_IND, MSG_CMD_PLG_INCOMING_LBS_IND, - -// 40 MSG_CMD_PLG_INIT_SIM_BY_SAT, MSG_CMD_GET_THREADVIEWLIST, - MSG_CMD_GET_CONVERSATIONVIEWLIST, MSG_CMD_DELETE_THREADMESSAGELIST, +// 40 MSG_CMD_GET_CONTACT_COUNT, - MSG_CMD_GET_QUICKPANEL_DATA, MSG_CMD_COUNT_BY_MSGTYPE, MSG_CMD_RESET_DB, MSG_CMD_GET_MEMSIZE, +// 45 MSG_CMD_BACKUP_MESSAGE, - -// 50 MSG_CMD_RESTORE_MESSAGE, MSG_CMD_UPDATE_THREAD_READ, MSG_CMD_REG_SYNCML_MSG_OPERATION_CB, MSG_CMD_SYNCML_OPERATION, +// 50 MSG_CMD_GET_REPORT_STATUS, - MSG_CMD_GET_THREAD_ID_BY_ADDRESS, MSG_CMD_GET_THREAD_INFO, MSG_CMD_GET_SMSC_OPT, MSG_CMD_GET_CB_OPT, +// 55 MSG_CMD_GET_SMS_SEND_OPT, - -// 60 MSG_CMD_GET_MMS_SEND_OPT, MSG_CMD_GET_MMS_RECV_OPT, MSG_CMD_GET_PUSH_MSG_OPT, MSG_CMD_GET_VOICE_MSG_OPT, +// 60 MSG_CMD_GET_GENERAL_MSG_OPT, - MSG_CMD_GET_MSG_SIZE_OPT, MSG_CMD_SET_SMSC_OPT, MSG_CMD_SET_CB_OPT, MSG_CMD_SET_SMS_SEND_OPT, +// 65 MSG_CMD_SET_MMS_SEND_OPT, - -// 70 MSG_CMD_SET_MMS_RECV_OPT, MSG_CMD_SET_PUSH_MSG_OPT, MSG_CMD_SET_VOICE_MSG_OPT, MSG_CMD_SET_GENERAL_MSG_OPT, +// 70 MSG_CMD_SET_MSG_SIZE_OPT, - MSG_CMD_REG_INCOMING_PUSH_MSG_CB, MSG_CMD_PLG_INCOMING_PUSH_IND, MSG_CMD_REG_INCOMING_CB_MSG_CB, MSG_CMD_PLG_INCOMING_CB_IND, +//75 MSG_CMD_ADD_PUSH_EVENT, - -// 80 MSG_CMD_DELETE_PUSH_EVENT, MSG_CMD_UPDATE_PUSH_EVENT, MSG_CMD_DELETE_MESSAGE_BY_LIST, MSG_CMD_SET_FILTER_ACTIVATION, +// 80 MSG_CMD_ADD_SIM_MSG, - -// 85 MSG_CMD_PLG_RESEND_MESSAGE, - MSG_CMD_SEND_PENDING_PUSH_MESSAGE, MSG_CMD_REG_REPORT_MSG_INCOMING_CB, MSG_CMD_UPDATE_IMSI, @@ -192,126 +177,114 @@ enum _MSG_EVENT_TYPE_E MSG_EVENT_GET_STORAGELIST, MSG_EVENT_ADD_MSG, MSG_EVENT_ADD_SYNCML_MSG, - +// 5 MSG_EVENT_UPDATE_MSG, MSG_EVENT_UPDATE_READ, MSG_EVENT_UPDATE_PROTECTED, MSG_EVENT_DELETE_MSG, MSG_EVENT_DELALL_MSGINFOLDER, - // 10 MSG_EVENT_MOVE_MSGTOFOLDER, MSG_EVENT_MOVE_MSGTOSTORAGE, MSG_EVENT_COUNT_MSG, MSG_EVENT_GET_MSG, - MSG_EVENT_GET_FOLDERVIEWLIST, - MSG_EVENT_ADD_FOLDER, +// 15 MSG_EVENT_UPDATE_FOLDER, MSG_EVENT_DELETE_FOLDER, MSG_EVENT_GET_FOLDERLIST, MSG_EVENT_ADD_FILTER, - -// 20 MSG_EVENT_UPDATE_FILTER, +// 20 MSG_EVENT_DELETE_FILTER, MSG_EVENT_GET_FILTERLIST, MSG_EVENT_SET_FILTER_OPERATION, MSG_EVENT_GET_FILTER_OPERATION, - - MSG_EVENT_GET_MSG_TYPE, MSG_EVENT_SUBMIT_REQ, - MSG_EVENT_CANCEL_REQ, +// 25 MSG_EVENT_REG_SENT_STATUS_CB, + MSG_EVENT_REG_STORAGE_CHANGE_CB, MSG_EVENT_REG_INCOMING_MSG_CB, - -// 30 MSG_EVENT_REG_INCOMING_MMS_CONF_MSG_CB, MSG_EVENT_REG_INCOMING_SYNCML_MSG_CB, +// 30 MSG_EVENT_REG_INCOMING_LBS_MSG_CB, - MSG_EVENT_REG_STORAGE_CHANGE_CB, MSG_EVENT_PLG_SENT_STATUS_CNF, - MSG_EVENT_PLG_STORAGE_CHANGE_IND, MSG_EVENT_PLG_INCOMING_MSG_IND, MSG_EVENT_PLG_INCOMING_MMS_CONF, +//35 MSG_EVENT_PLG_INCOMING_SYNCML_MSG_IND, MSG_EVENT_PLG_INCOMING_LBS_MSG_IND, - -// 40 MSG_EVENT_PLG_INIT_SIM_BY_SAT, MSG_EVENT_GET_THREADVIEWLIST, - MSG_EVENT_GET_CONVERSATIONVIEWLIST, MSG_EVENT_DELETE_THREADMESSAGELIST, +// 40 MSG_EVENT_GET_CONTACT_COUNT, - MSG_EVENT_GET_QUICKPANEL_DATA, MSG_EVENT_COUNT_BY_MSGTYPE, MSG_EVENT_RESET_DB, MSG_EVENT_GET_MEMSIZE, +//45 MSG_EVENT_BACKUP_MESSAGE, - -// 50 MSG_EVENT_RESTORE_MESSAGE, MSG_EVENT_UPDATE_THREAD_READ, MSG_EVENT_REG_SYNCML_MSG_OPERATION_CB, MSG_EVENT_SYNCML_OPERATION, +// 50 MSG_EVENT_GET_REPORT_STATUS, - MSG_EVENT_GET_THREAD_ID_BY_ADDRESS, MSG_EVENT_GET_THREAD_INFO, MSG_EVENT_GET_SMSC_OPT, MSG_EVENT_GET_CB_OPT, +// 55 MSG_EVENT_GET_SMS_SEND_OPT, - -// 60 MSG_EVENT_GET_MMS_SEND_OPT, MSG_EVENT_GET_MMS_RECV_OPT, MSG_EVENT_GET_PUSH_MSG_OPT, MSG_EVENT_GET_VOICE_MSG_OPT, +// 60 MSG_EVENT_GET_GENERAL_MSG_OPT, - MSG_EVENT_GET_MSG_SIZE_OPT, MSG_EVENT_SET_SMSC_OPT, MSG_EVENT_SET_CB_OPT, MSG_EVENT_SET_SMS_SEND_OPT, +// 65 MSG_EVENT_SET_MMS_SEND_OPT, - -// 70 MSG_EVENT_SET_MMS_RECV_OPT, MSG_EVENT_SET_PUSH_MSG_OPT, MSG_EVENT_SET_VOICE_MSG_OPT, MSG_EVENT_SET_GENERAL_MSG_OPT, +// 70 MSG_EVENT_SET_MSG_SIZE_OPT, - MSG_EVENT_REG_INCOMING_PUSH_MSG_CB, MSG_EVENT_PLG_INCOMING_PUSH_MSG_IND, MSG_EVENT_REG_INCOMING_CB_MSG_CB, MSG_EVENT_PLG_INCOMING_CB_MSG_IND, +// 75 MSG_EVENT_ADD_PUSH_EVENT, - -// 80 MSG_EVENT_DELETE_PUSH_EVENT, MSG_EVENT_UPDATE_PUSH_EVENT, MSG_EVENT_DELETE_MESSAGE_BY_LIST, MSG_EVENT_SET_FILTER_ACTIVATION, +// 80 MSG_EVENT_ADD_SIM_MSG, - -// 85 MSG_EVENT_PLG_RESEND_MESSAGE, - MSG_EVENT_SEND_PENDING_PUSH_MESSAGE, MSG_EVENT_REG_REPORT_MSG_INCOMING_CB, - MSG_EVENT_PLG_REPORT_MSG_INCOMING_IND, + MSG_EVENT_UPDATE_IMSI, #ifdef FEATURE_SMS_CDMA MSG_EVENT_PLG_CHECK_UNIQUENESS, #endif - MSG_EVENT_UPDATE_IMSI, + +// Enums that does not match _MSG_CMD_TYPE_E + MSG_EVENT_PLG_REPORT_MSG_INCOMING_IND, // end of MSG_EVENT; new EVENT should be defined before MSG_EVENT_NUM MSG_EVENT_NUM }; + #endif // MSG_CMD_TYPES_H diff --git a/include/common/MsgCppTypes.h b/include/common/MsgCppTypes.h index d4d63a1..746b7e7 100755 --- a/include/common/MsgCppTypes.h +++ b/include/common/MsgCppTypes.h @@ -21,9 +21,13 @@ INCLUDE FILES ==================================================================================================*/ #include <stdio.h> -#include <vector> +#include <memory> -typedef std::vector<char> CharVector; +template <typename T> +void unique_ptr_deleter( T **ptr ) { + if (ptr && *ptr ) + delete[] *ptr; +} template <class T> diff --git a/include/common/MsgInternalTypes.h b/include/common/MsgInternalTypes.h index 26a592f..ee2bf94 100755 --- a/include/common/MsgInternalTypes.h +++ b/include/common/MsgInternalTypes.h @@ -40,10 +40,7 @@ // temporary -#define MSG_NATIONAL_SIM "memory/private/msg-service/national_sim" #define MSG_SIM_MSISDN "memory/private/msg-service/msisdn" -#define MSG_SIM_ICCID "memory/private/msg-service/iccid" -#define MSG_FMM_SIM_CHANGE_NUM "db/SyncML/oma-dm-service/fmmSimChangeNum" #define MAX_FULL_PATH_SIZE 320 // max length for internal file path #define MAX_THREAD_ADDR_LEN 40 @@ -89,11 +86,10 @@ #define DEFAULT_SIM_COUNT_PATH DEFAULT_SETTING_PATH"/sim_count" #define MSG_KEEP_COPY DEFAULT_GENERAL_OPT_PATH"/keep_copy" -#define MSG_ALERT_REP_TYPE DEFAULT_GENERAL_OPT_PATH"/alert_rep_type" +//#define MSG_ALERT_REP_TYPE DEFAULT_GENERAL_OPT_PATH"/alert_rep_type" +#define MSG_ALERT_REP_TYPE "db/setting/sound/noti/msg_alert_rep_type" #define MSG_AUTO_ERASE DEFAULT_GENERAL_OPT_PATH"/auto_erase" #define MSG_BLOCK_MESSAGE DEFAULT_GENERAL_OPT_PATH"/block_msg" -#define CONTACT_SYNC_TIME DEFAULT_GENERAL_OPT_PATH"/contact_sync_time" -#define MSG_SEARCH_TAGS DEFAULT_GENERAL_OPT_PATH"/search_tags" #define MSG_BLOCK_UNKNOWN_MSG DEFAULT_GENERAL_OPT_PATH"/block_unknown_msg" #define MSG_SMS_LIMIT DEFAULT_GENERAL_OPT_PATH"/sms_limit" @@ -104,7 +100,6 @@ #define MSG_SETTING_RINGTONE_PATH DEFAULT_GENERAL_OPT_PATH"/ringtone_path" #define MSG_SETTING_RINGTONE_TYPE DEFAULT_GENERAL_OPT_PATH"/ringtone_type" #define MSG_MMS_UA_PROFILE DEFAULT_GENERAL_OPT_PATH"/ua_profile" -#define MSG_MMS_UA_AGENT DEFAULT_GENERAL_OPT_PATH"/ua_agent" #define SMS_SEND_DCS DEFAULT_SMS_SEND_OPT_PATH"/dcs" #define SMS_SEND_NETWORK_MODE VCONFKEY_MESSAGE_NETWORK_MODE @@ -189,9 +184,10 @@ #define MSG_DEFAULT_APP_ID "org.tizen.message" #define MSG_QUICKPANEL_APP_ID "org.tizen.quickpanel" +#define MSG_CALL_APP_ID "org.tizen.call" -#define MSG_TELEPHONY_FEATURE "http://tizen.org/feature/network.telephony" -#define MSG_TELEPHONY_MMS_FEATURE "http://tizen.org/feature/network.telephony.mms" +#define MSG_TELEPHONY_SMS_FEATURE "http://tizen.org/feature/network.telephony.sms" +#define MSG_TELEPHONY_MMS_FEATURE "http://tizen.org/feature/network.telephony.mms" /*================================================================================================== TYPES @@ -214,28 +210,12 @@ typedef unsigned char MSG_SUB_TYPE_T; /** - * @brief Represents a message tag type. \n - * Each main type of a message can be divided into some tag types. \n - * For instance of SMS, the message sub type can be one of the Priority, Finance, and so on. \n - * The values for this type SHOULD be in _MSG_SUB_TYPE_E. - */ -typedef unsigned int MSG_TAG_TYPE_T; - - -/** * @brief Represents a message class. \n * The values for this type SHOULD be in _MSG_CLASS_TYPE_E. */ typedef unsigned char MSG_CLASS_TYPE_T; -/** - * @brief Represents a message class. \n - * The values for this type SHOULD be in _MSG_MMS_TRANSACTION_TYPE_E. - */ -typedef unsigned char MSG_MMS_TRANSACTION_TYPE_T; - - /*================================================================================================== STRUCTURES ==================================================================================================*/ @@ -387,16 +367,6 @@ typedef struct char szThumbFilePath[MSG_FILEPATH_LEN_MAX + 1]; /**< Indicates the thumbnail file path */ } MSG_MMS_MULTIPART_S; -/** - * @brief Represents sim message informatioin list. - */ -typedef struct -{ - int nIdxCnt; /**< The count of sim index */ - int nMsgCnt; /**< The count of sim message */ - MSG_MESSAGE_INFO_S *simMsgInfo; /**< The pointer to sim message informatioin */ -} MSG_SIM_MSG_INFO_LIST_S; - /** * @brief Represents a request in the framework. \n @@ -419,7 +389,7 @@ typedef struct typedef struct { int listenerFd; /**< Rx fd for status cnf */ - void* handleAddr; /**< Handle address for status cnf */ + unsigned int handleAddr; /**< Handle address for status cnf */ msg_message_id_t sentMsgId; /**< The ID of a sent message for updating message status */ } MSG_PROXY_INFO_S; @@ -515,12 +485,6 @@ typedef struct } MSG_CMD_REG_INCOMING_CB_MSG_CB_S; -typedef struct -{ - int alarm_id; - MSG_REQUEST_INFO_S reqInfo; -}MSG_SCHEDULED_MSG_S; - /** * @brief Represents a CB message in the framework. */ @@ -550,12 +514,6 @@ typedef struct _MSG_UNIQUE_INDEX_S int telesvc_id; } MSG_UNIQUE_INDEX_S; -typedef struct -{ - time_t receivedTime; - unsigned short serialNum; - unsigned short messageId; // Message Identifier -} MSG_CB_DUPLICATE_S; #endif @@ -641,17 +599,6 @@ enum _MSG_SUB_TYPE_E /** - * @brief Represents the values of a message transaction type. \n - * This enum is used as the value of MSG_MMS_TRANSACTION_TYPE_T. - */ -enum _MSG_MMS_TRANSACTION_TYPE_E -{ - MSG_MMS_SEND_COMPLETE = 0, - MSG_MMS_RETRIEVE_COMPLETE, - MSG_MMS_UNKNOWN, -}; - -/** * @brief Represents the values of File Type of MMS. \n * This enum is used as the value of . */ diff --git a/include/common/MsgSettingTypes.h b/include/common/MsgSettingTypes.h index 733096d..ab30fb0 100755 --- a/include/common/MsgSettingTypes.h +++ b/include/common/MsgSettingTypes.h @@ -284,7 +284,6 @@ typedef struct bool bPreview; /**< Indicates whether preview for incoming message is shown or not. */ char ringtonePath[MSG_FILEPATH_LEN_MAX+1]; /**< Indicates the message ringtone path */ int ringtoneType; /**< Indicates the message ringtone type. */ - int searchTags; /**< Indicates the tags to be enabled for search ex) MSG_MESSAGE_TAG_PRIMARY | MSG_MESSAGE_TAG_PROMOTION. See enum _MSG_TAG_TYPE_E */ }MSG_GENERAL_OPT_S; diff --git a/include/common/MsgStorageTypes.h b/include/common/MsgStorageTypes.h index ca6c3d0..f882676 100755 --- a/include/common/MsgStorageTypes.h +++ b/include/common/MsgStorageTypes.h @@ -136,19 +136,6 @@ typedef struct /** - * @brief Represents search condition values. - */ -typedef struct -{ - msg_folder_id_t folderId; - msg_message_type_t msgType; - char *pAddressVal; - char *pSearchVal; - int reserved; -} MSG_SEARCH_CONDITION_S; - - -/** * @brief Represents Message list condition values. */ typedef struct diff --git a/include/externals/MsgNotificationWrapper.h b/include/externals/MsgNotificationWrapper.h index ed51127..2bd902c 100755 --- a/include/externals/MsgNotificationWrapper.h +++ b/include/externals/MsgNotificationWrapper.h @@ -156,7 +156,6 @@ #define VOICE_NOTI_ID_2 DEFAULT_SETTING_PATH"/voice_noti_id2" #define CB_NOTI_PRIV_ID DEFAULT_SETTING_PATH"/cb_noti_priv_id" #define SIM_MSG_NOTI_PRIV_ID DEFAULT_SETTING_PATH"/sim_msg_noti_priv_id" -#define EMERGENCY_MODE_NOTI_ID DEFAULT_SETTING_PATH"/emergency_noti_id" #define MSG_SENTFAIL_NOTI_ID DEFAULT_SETTING_PATH"/sentfail_noti_id" #define SIM_FULL_NOTI_PRIV_ID DEFAULT_SETTING_PATH"/sim_full_noti_id" diff --git a/include/framework/MsgCmdHandler.h b/include/framework/MsgCmdHandler.h index 8add308..21a86a2 100755 --- a/include/framework/MsgCmdHandler.h +++ b/include/framework/MsgCmdHandler.h @@ -41,7 +41,6 @@ int MsgMoveMessageToStorageHandler(const MSG_CMD_S *pCmd, char **ppEvent); int MsgCountMessageHandler(const MSG_CMD_S *pCmd, char **ppEvent); int MsgCountMsgByTypeHandler(const MSG_CMD_S *pCmd, char **ppEvent); int MsgGetMessageHandler(const MSG_CMD_S *pCmd, char **ppEvent); -int MsgGetFolderViewListHandler(const MSG_CMD_S *pCmd, char **ppEvent); int MsgAddFolderHandler(const MSG_CMD_S *pCmd, char **ppEvent); int MsgUpdateFolderHandler(const MSG_CMD_S *pCmd, char **ppEvent); @@ -49,10 +48,8 @@ int MsgDeleteFolderHandler(const MSG_CMD_S *pCmd, char **ppEvent); int MsgGetFolderListHandler(const MSG_CMD_S *pCmd, char **ppEvent); int MsgInitSimBySatHandler(const MSG_CMD_S *pCmd, char **ppEvent); -int MsgGetMsgTypeHandler(const MSG_CMD_S *pCmd, char **ppEvent); int MsgGetThreadViewListHandler(const MSG_CMD_S *pCmd, char **ppEvent); -int MsgGetConversationViewListHandler(const MSG_CMD_S *pCmd, char **ppEvent); int MsgDeleteThreadMessageListHandler(const MSG_CMD_S *pCmd, char **ppEvent); int MsgCountMsgByContactHandler(const MSG_CMD_S *pCmd, char **ppEvent); @@ -70,7 +67,6 @@ int MsgSetConfigHandler(const MSG_CMD_S *pCmd, char **ppEvent); int MsgGetConfigHandler(const MSG_CMD_S *pCmd, char **ppEvent); int MsgSubmitReqHandler(const MSG_CMD_S *pCmd, char **ppEvent); -int MsgCancelReqHandler(const MSG_CMD_S *pCmd, char **ppEvent); int MsgRegSentStatusCallbackHandler(const MSG_CMD_S *pCmd, char **ppEvent); int MsgRegIncomingMsgCallbackHandler(const MSG_CMD_S *pCmd, char **ppEvent); @@ -108,9 +104,6 @@ int MsgUpdatePushEventHandler(const MSG_CMD_S *pCmd, char **ppEvent); int MsgAddSimMessageHandler(const MSG_CMD_S *pCmd, char **ppEvent); int MsgResendMessageHandler(const MSG_CMD_S *pCmd, char **ppEvent); int MsgUpdateIMSIHandler(const MSG_CMD_S *pCmd, char **ppEvent); -#ifdef MSG_PENDING_PUSH_MESSAGE -int MsgSendPendingPushMsgHandler(const MSG_CMD_S *pCmd, char **ppEvent); -#endif #ifdef FEATURE_SMS_CDMA int MsgCheckUniquenessHandler(const MSG_CMD_S *pCmd, char **ppEvent); #endif diff --git a/include/framework/MsgTransManager.h b/include/framework/MsgTransManager.h index 81a32af..9046eb3 100755 --- a/include/framework/MsgTransManager.h +++ b/include/framework/MsgTransManager.h @@ -42,9 +42,6 @@ ==================================================================================================*/ typedef std::map<MSG_CMD_TYPE_T, int (*)(const MSG_CMD_S*, char**)> handler_map; typedef std::map<int, MSG_PROXY_INFO_S> sentmsg_map; -#ifdef MSG_PENDING_PUSH_MESSAGE -typedef std::list<MSG_PUSH_MESSAGE_DATA_S> pushpending_list; -#endif typedef std::map<int, bool> fd_map; typedef std::list<MSG_CMD_REG_INCOMING_MSG_CB_S> newmsg_list; typedef std::list<MSG_CMD_REG_INCOMING_MMS_CONF_MSG_CB_S> mmsconf_list; @@ -84,16 +81,13 @@ public: void setSyncMLMsgOperationCB(MSG_CMD_REG_SYNCML_MSG_OPERATION_CB_S *pCbinfo); void setStorageChangeCB(int listenerFd); void setReportMsgCB(int listenerFd); -#ifdef MSG_PENDING_PUSH_MESSAGE - void sendPendingPushMsg(void); -#endif javamms_list& getJavaMMSList(); void broadcastIncomingMsgCB(const msg_error_t err, const MSG_MESSAGE_INFO_S *msgInfo); void broadcastMMSConfCB(const msg_error_t err, const MSG_MESSAGE_INFO_S *msgInfo, const MMS_RECV_DATA_S *mmsRecvData); void broadcastPushMsgCB(const msg_error_t err, const MSG_PUSH_MESSAGE_DATA_S *pushData); - void broadcastCBMsgCB(const msg_error_t err, const MSG_CB_MSG_S *cbMsg); + void broadcastCBMsgCB(const msg_error_t err, const MSG_CB_MSG_S *cbMsg, msg_message_id_t cbMsgId); void broadcastSyncMLMsgCB(const msg_error_t err, const MSG_SYNCML_MESSAGE_DATA_S *syncMLData); void broadcastLBSMsgCB(const msg_error_t err, const MSG_LBS_MESSAGE_DATA_S *lbsData); void broadcastSyncMLMsgOperationCB(const msg_error_t err, const int msgId, const int extId); @@ -120,9 +114,6 @@ private: bool running; handler_map handlerMap; -#ifdef MSG_PENDING_PUSH_MESSAGE - pushpending_list pushMsgList; -#endif sentmsg_map sentMsgMap; // req_id, listener_fd, msghandle_addr fd_map statusCBFdMap; // src_fd, true if registered diff --git a/include/mapi/msg.h b/include/mapi/msg.h index 7b2b7bb..ac6fa8d 100755 --- a/include/mapi/msg.h +++ b/include/mapi/msg.h @@ -48,12 +48,10 @@ extern "C" ==================================================================================================*/ /** - * @internal * @ingroup MSG_SERVICE_FRAMEWORK * @defgroup MSG_SERVICE_FRAMEWORK_CONTROL_MODULE Control API * @brief The Control API provides functions to manage message handle and set or get each structure. * - * @internal * @addtogroup MSG_SERVICE_FRAMEWORK_CONTROL_MODULE * @{ * @@ -69,6 +67,7 @@ extern "C" * @section MSG_SERVICE_FRAMEWORK_CONTROL_MODULE_FEATURE Related Features * This API is related with the following features:\n * - http://tizen.org/feature/network.telephony\n + * - http://tizen.org/feature/network.telephony.sms\n * * It is recommended to design feature related codes in your application for reliability.\n * @@ -152,6 +151,7 @@ int msg_close_msg_handle(msg_handle_t *handle); * * @retval #msg_struct_t Successfully created structure pointer * @retval NULL Invalid parameter + * @retval MSG_ERR_NOT_SUPPORTED Not supported * */ @@ -528,6 +528,7 @@ int msg_list_add_item(msg_struct_t msg_struct_handle, int field, msg_struct_t *i * * @retval #msg_struct_t Successfully done * @retval NULL Input parameter (list_handle) is not valid + * @retval MSG_ERR_NOT_SUPPORTED Not supported * */ @@ -576,6 +577,27 @@ int msg_list_clear(msg_struct_t msg_struct_handle, int field); /** + * @brief Releases entire data of a list handle and the list. + * + * @since_tizen 2.3.1 + * + * @remarks #msg_list_handle_t MUST be valid, otherwise the function will fail. + * + * @param[in] list_handle A pointer of message structure type + * + * @return @c 0 on success, + * otherwise a negative error value + * + * @retval MSG_SUCCESS Successfully done + * @retval MSG_ERR_NULL_POINTER Input parameter is NULL + * @retval MSG_ERR_NOT_SUPPORTED Not supported + * + */ + +int msg_list_free(msg_list_handle_t list_handle); + + +/** * @brief Adds a filter to block messages by address or word. * * @since_tizen 2.3 diff --git a/include/mapi/msg_private.h b/include/mapi/msg_private.h index 92168ba..2f9d00b 100755 --- a/include/mapi/msg_private.h +++ b/include/mapi/msg_private.h @@ -86,9 +86,9 @@ int msg_message_list_clear(msg_struct_t msg_struct_handle, int field); // filter -bool msg_get_filter_info_bool(void *filter, int field); -int msg_get_filter_info_int(void *filter, int field); -char *msg_get_filter_info_str(void *filter, int field); +int msg_get_filter_info_bool(void *filter, int field, bool *value); +int msg_get_filter_info_int(void *filter, int field, int *value); +int msg_get_filter_info_str(void *filter, int field, char *value, int size); int msg_set_filter_info_bool(void *filter, int field, bool value); int msg_set_filter_info_int(void *filter, int field, int value); int msg_set_filter_info_str(void *filter, int field, char *value, int size); @@ -109,12 +109,9 @@ int msg_mms_set_int_value(msg_struct_s *msg_struct, int field, int value); int msg_mms_set_str_value(msg_struct_s *msg_struct, int field, char *value, int size); int msg_mms_set_bool_value(msg_struct_s *msg_struct, int field, bool value); int msg_mms_set_struct_handle(msg_struct_s *msg_struct, int field, msg_struct_s *value); -int msg_mms_set_list_handle(msg_struct_s *msg_struct, int field, msg_list_handle_t value); int msg_mms_list_append(msg_struct_t msg_struct_handle, int field, msg_struct_t *item); -void convert_to_mmsdata(const msg_struct_s *pSrc, MMS_MESSAGE_DATA_S *pDest); -void convert_from_mmsdata(const MMS_MESSAGE_DATA_S *pSrc, msg_struct_s *pDest); void convert_to_hidden_mmsdata(MMS_DATA_S *pSrc, msg_struct_s *pDest); void convert_from_hidden_mmsdata(msg_struct_s *pSrc, MMS_DATA_S *pDest); // setting @@ -127,103 +124,101 @@ int msg_setting_set_int_value(msg_struct_s *msg_struct, int field, int value); int msg_setting_set_str_value(msg_struct_s *msg_struct, int field, char *value, int size); int msg_setting_set_bool_value(msg_struct_s *msg_struct, int field, bool value); -int msg_get_smsc_opt_int(void *smsc_opt, int field); +int msg_get_smsc_opt_int(void *smsc_opt, int field, int *value); int msg_set_smsc_opt_int(void *smsc_opt, int field, int value); int msg_get_smsc_opt_list(void *smsc_opt, int field, void **value); -int msg_get_smsc_info_int(void *smsc_info, int field); +int msg_get_smsc_info_int(void *smsc_info, int field, int *value); int msg_set_smsc_info_int(void *smsc_info, int field, int value); -char* msg_get_smsc_info_str(void *smsc_info, int field); +int msg_get_smsc_info_str(void *smsc_info, int field, char *value, int size); int msg_set_smsc_info_str(void *smsc_info, int field, char *val, int size); -int msg_get_cb_option_int(void *cb_opt, int field); +int msg_get_cb_option_int(void *cb_opt, int field, int *value); int msg_set_cb_option_int(void *cb_opt, int field, int value); -bool msg_get_cb_option_bool(void *cb_opt, int field); +int msg_get_cb_option_bool(void *cb_opt, int field, bool *value); int msg_set_cb_option_bool(void *cb_opt, int field, bool value); int msg_get_cb_option_list(void *cb_opt, int field, void **value); -int msg_get_cb_channel_info_int(void *cb_ch_info, int field); +int msg_get_cb_channel_info_int(void *cb_ch_info, int field, int *value); int msg_set_cb_channel_info_int(void *cb_ch_info, int field, int value); -bool msg_get_cb_channel_info_bool(void *cb_ch_info, int field); +int msg_get_cb_channel_info_bool(void *cb_ch_info, int field, bool *value); int msg_set_cb_channel_info_bool(void *cb_ch_info, int field, bool value); -char *msg_get_cb_channel_info_str(void *cb_ch_info, int field); +int msg_get_cb_channel_info_str(void *cb_ch_info, int field, char *value, int size); int msg_set_cb_channel_info_str(void *cb_ch_info, int field, char *val, int size); -int msg_get_sms_send_opt_int(void *sms_send_opt, int field); +int msg_get_sms_send_opt_int(void *sms_send_opt, int field, int *value); int msg_set_sms_send_opt_int(void *sms_send_opt, int field, int value); -bool msg_get_sms_send_opt_bool(void *sms_send_opt, int field); +int msg_get_sms_send_opt_bool(void *sms_send_opt, int field, bool *value); int msg_set_sms_send_opt_bool(void *sms_send_opt, int field, bool value); -int msg_get_mms_send_opt_int(void *mms_send_opt, int field); +int msg_get_mms_send_opt_int(void *mms_send_opt, int field, int *value); int msg_set_mms_send_opt_int(void *mms_send_opt, int field, int value); -bool msg_get_mms_send_opt_bool(void *mms_send_opt, int field); +int msg_get_mms_send_opt_bool(void *mms_send_opt, int field, bool *value); int msg_set_mms_send_opt_bool(void *mms_send_opt, int field, bool value); -int msg_get_mms_recv_opt_int(void *mms_recv_opt, int field); +int msg_get_mms_recv_opt_int(void *mms_recv_opt, int field, int *value); int msg_set_mms_recv_opt_int(void *mms_recv_opt, int field, int value); -bool msg_get_mms_recv_opt_bool(void *mms_recv_opt, int field); +int msg_get_mms_recv_opt_bool(void *mms_recv_opt, int field, bool *value); int msg_set_mms_recv_opt_bool(void *mms_recv_opt, int field, bool value); -int msg_get_push_msg_opt_int(void *push_msg_opt, int field); +int msg_get_push_msg_opt_int(void *push_msg_opt, int field, int *value); int msg_set_push_msg_opt_int(void *push_msg_opt, int field, int value); -bool msg_get_push_msg_opt_bool(void *push_msg_opt, int field); +int msg_get_push_msg_opt_bool(void *push_msg_opt, int field, bool *value); int msg_set_push_msg_opt_bool(void *push_msg_opt, int field, bool value); -int msg_get_voice_msg_opt_int(void *voice_msg_opt, int field); +int msg_get_voice_msg_opt_int(void *voice_msg_opt, int field, int *value); int msg_set_voice_msg_opt_int(void *voice_msg_opt, int field, int value); -char *msg_get_voice_msg_opt_str(void *voice_msg_opt, int field); +int msg_get_voice_msg_opt_str(void *voice_msg_opt, int field, char *value, int size); int msg_set_voice_msg_opt_str(void *voice_msg_opt, int field, char *val, int size); -int msg_get_general_opt_int(void *general_opt, int field); +int msg_get_general_opt_int(void *general_opt, int field, int *value); int msg_set_general_opt_int(void *general_opt, int field, int value); -bool msg_get_general_opt_bool(void *general_opt, int field); +int msg_get_general_opt_bool(void *general_opt, int field, bool *value); int msg_set_general_opt_bool(void *general_opt, int field, bool value); -char *msg_get_general_opt_str(void *general_opt, int field); +int msg_get_general_opt_str(void *general_opt, int field, char *value, int size); int msg_set_general_opt_str(void *general_opt, int field, char *val, int size); -int msg_get_msgsize_opt_int(void *size_opt, int field); +int msg_get_msgsize_opt_int(void *size_opt, int field, int *value); int msg_set_msgsize_opt_int(void *size_opt, int field, int value); /* Wap Push */ -char* msg_push_config_get_str(void *event_info, int field, int size); -bool msg_push_config_get_bool(void *event_info, int field); +int msg_push_config_get_str(void *event_info, int field, char *value, int size); +int msg_push_config_get_bool(void *event_info, int field, bool *value); int msg_push_config_set_str(void *event_info, int field, char *value, int size); int msg_push_config_set_bool(void *event, int field, bool value); /* added internal apis for new managed api (storage) */ -int msg_syncml_info_get_int(void *syncml_info, int field); -int msg_count_info_get_int(void *count_info, int field); -int msg_thread_count_get_int(void *count_info, int field); -int msg_thread_index_get_int(void *index_info, int field); -int msg_sortrule_get_int(void *sort_info, int field); -int msg_folder_info_get_int(void *folder_info, int field); -int msg_thread_info_get_int(void *data, int field); -int msg_conv_info_get_int(void *data, int field); -int msg_search_condition_get_int(void *condition_info, int field); -int msg_list_condition_get_int(void *condition_info, int field); -int msg_report_status_get_int(void *report_info, int field); -char* msg_report_status_get_str(void *report_info, int field); -char* msg_folder_info_get_str(void *folder_info, int field); -char *msg_thread_info_get_str(void *data, int field); -char *msg_conv_info_get_str(void *data, int field); -char* msg_search_condition_get_str(void *condition_info, int field, int size); -char* msg_list_condition_get_str(void *condition_info, int field, int size); -bool msg_sendopt_get_bool(void *send_opt, int field); -bool msg_sortrule_get_bool(void *sort_rule, int field); -bool msg_conv_get_bool(void *data, int field); -bool msg_thread_info_get_bool(void *data, int field); -bool msg_list_condition_get_bool(void *data, int field); +int msg_syncml_info_get_int(void *syncml_info, int field, int *value); +int msg_count_info_get_int(void *count_info, int field, int *value); +int msg_thread_count_get_int(void *count_info, int field, int *value); +int msg_thread_index_get_int(void *index_info, int field, int *value); +int msg_sortrule_get_int(void *sort_info, int field, int *value); +int msg_folder_info_get_int(void *folder_info, int field, int *value); +int msg_thread_info_get_int(void *data, int field, int *value); +int msg_conv_info_get_int(void *data, int field, int *value); +int msg_list_condition_get_int(void *condition_info, int field, int *value); +int msg_report_status_get_int(void *report_info, int field, int *value); +int msg_report_status_get_str(void *report_info, int field, char *value, int size); +int msg_folder_info_get_str(void *folder_info, int field, char *value, int size); +int msg_thread_info_get_str(void *data, int field, char *value, int size); +int msg_conv_info_get_str(void *data, int field, char *value, int size); +int msg_list_condition_get_str(void *condition_info, int field, char *value, int size); +int msg_sendopt_get_bool(void *send_opt, int field, bool *value); +int msg_sortrule_get_bool(void *sort_rule, int field, bool *value); +int msg_conv_get_bool(void *data, int field, bool *value); +int msg_thread_info_get_bool(void *data, int field, bool *value); +int msg_list_condition_get_bool(void *data, int field, bool *value); int msg_sendopt_get_struct_handle(msg_struct_s *msg_struct, int field, void **value); int msg_syncml_get_struct_handle(msg_struct_s *msg_struct, int field, void **value); int msg_thread_index_get_struct_handle(msg_struct_s *msg_struct, int field, void **value); int msg_list_condition_get_struct_handle(msg_struct_s *msg_struct, int field, void **value); -int msg_address_info_get_int(void *addr_info, int field); -int msg_mms_sendopt_get_int(void *opt_info, int field); -int msg_reject_message_get_int(void *msg_info, int field); -char* msg_address_info_get_str(void *addr_info, int field, int size); -char* msg_reject_message_get_str(void *msg_info, int field, int size); -bool msg_mms_sendopt_get_bool(void *opt_info, int field); -bool msg_sms_sendopt_get_bool(void *opt_info, int field); +int msg_address_info_get_int(void *addr_info, int field, int *value); +int msg_mms_sendopt_get_int(void *opt_info, int field, int *value); +int msg_reject_message_get_int(void *msg_info, int field, int *value); +int msg_address_info_get_str(void *addr_info, int field, char *value, int size); +int msg_reject_message_get_str(void *msg_info, int field, char *value, int size); +int msg_mms_sendopt_get_bool(void *opt_info, int field, bool *value); +int msg_sms_sendopt_get_bool(void *opt_info, int field, bool *value); int msg_syncml_info_set_int(void *syncml_info, int field, int value); int msg_count_info_set_int(void *count_info, int field, int value); @@ -231,11 +226,9 @@ int msg_thread_count_set_int(void *count_info, int field, int value); int msg_thread_index_set_int(void *index_info, int field, int value); int msg_sortrule_set_int(void *sort_info, int field, int value); int msg_folder_info_set_int(void *folder_info, int field, int value); -int msg_search_condition_set_int(void *condition_info, int field, int value); int msg_list_condition_set_int(void *condition_info, int field, int value); int msg_report_status_set_int(void *report_info, int field, int value); int msg_folder_info_set_str(void *folder_info, int field, char *value, int size); -int msg_search_condition_set_str(void *condition_info, int field, char *value, int size); int msg_list_condition_set_str(void *condition_info, int field, char *value, int size); int msg_sendopt_set_bool(void *send_opt, int field, bool value); int msg_sortrule_set_bool(void *sort_rule, int field, bool value); @@ -254,13 +247,13 @@ int msg_mms_sendopt_set_bool(void *option, int field, bool value); int msg_sms_sendopt_set_bool(void *option, int field, bool value); /* added internal apis for new managed api (transport) */ -int msg_request_get_int(void *request_info, int field); +int msg_request_get_int(void *request_info, int field, int *value); int msg_request_get_struct_handle(msg_struct_s *msg_struct, int field, void **value); int msg_request_set_int(void *request_info, int field, int value); int msg_request_set_struct_handle(msg_struct_s *msg_struct, int field, msg_struct_s *value); -int msg_sent_status_get_int(MSG_SENT_STATUS_S *sent_status_info, int field); +int msg_sent_status_get_int(MSG_SENT_STATUS_S *sent_status_info, int field, int *value); -char* msg_media_item_get_str(void *data, int field, int size); +int msg_media_item_get_str(void *data, int field, char *value, int size); int msg_media_item_get_int(void *data, int field, int *value); int msg_conversation_get_list_hnd(void *data, int field, void **value); diff --git a/include/mapi/msg_storage.h b/include/mapi/msg_storage.h index 837af02..2cd864f 100755 --- a/include/mapi/msg_storage.h +++ b/include/mapi/msg_storage.h @@ -30,12 +30,10 @@ extern "C" /** - * @internal * @ingroup MSG_SERVICE_FRAMEWORK * @defgroup MSG_SERVICE_FRAMEWORK_STORAGE_MODULE Storage API * @brief The Storage API provides functions to get message information with multiple types. * - * @internal * @addtogroup MSG_SERVICE_FRAMEWORK_STORAGE_MODULE * @{ * @@ -51,6 +49,7 @@ extern "C" * @section MSG_SERVICE_FRAMEWORK_STORAGE_MODULE_FEATURE Related Features * This API is related with the following features:\n * - http://tizen.org/feature/network.telephony\n + * - http://tizen.org/feature/network.telephony.sms\n * * It is recommended to design feature related codes in your application for reliability.\n * diff --git a/include/mapi/msg_storage_types.h b/include/mapi/msg_storage_types.h index 792d6ef..fb2504a 100755 --- a/include/mapi/msg_storage_types.h +++ b/include/mapi/msg_storage_types.h @@ -28,7 +28,6 @@ ==================================================================================================*/ /** - * @internal * @addtogroup MSG_SERVICE_FRAMEWORK_STORAGE_MODULE * @{ */ diff --git a/include/mapi/msg_transport.h b/include/mapi/msg_transport.h index 6dd003c..2e71c1d 100755 --- a/include/mapi/msg_transport.h +++ b/include/mapi/msg_transport.h @@ -29,12 +29,10 @@ extern "C" #endif /** - * @internal * @ingroup MSG_SERVICE_FRAMEWORK * @defgroup MSG_SERVICE_FRAMEWORK_TRANSPORT_MODULE Transport API * @brief The Transport API provides functions to send SMS/MMS and register incoming/sending/syncML/report callback. * - * @internal * @addtogroup MSG_SERVICE_FRAMEWORK_TRANSPORT_MODULE * @{ * @@ -55,6 +53,7 @@ extern "C" * @section MSG_SERVICE_FRAMEWORK_TRANSPORT_MODULE_FEATURE Related Features * This API is related with the following features:\n * - http://tizen.org/feature/network.telephony\n + * - http://tizen.org/feature/network.telephony.sms\n * - http://tizen.org/feature/network.telephony.mms\n * * It is recommended to design feature related codes in your application for reliability.\n @@ -373,7 +372,7 @@ int msg_reg_report_message_callback(msg_handle_t handle, msg_report_msg_incoming * @retval MSG_ERR_NOT_SUPPORTED Not supported */ -int msg_syncml_message_operation(msg_handle_t handle, msg_message_id_t msgId); +int msg_syncml_message_operation(msg_handle_t handle, msg_message_id_t msgId); /** @@ -395,6 +394,7 @@ int msg_syncml_message_operation(msg_handle_t handle, msg_message_id_t msgId); * * @retval MSG_SUCCESS Success in operation * @retval MSG_ERR_INVALID_PARAMETER Input parameter is invalid + * @retval MSG_ERR_MEMORY_ERROR Memory error * @retval MSG_ERR_PERMISSION_DENIED The application does not have the privilege to call this method * @retval MSG_ERR_NOT_SUPPORTED Not supported * diff --git a/include/mapi/msg_transport_types.h b/include/mapi/msg_transport_types.h index d27811f..2bd4c2c 100755 --- a/include/mapi/msg_transport_types.h +++ b/include/mapi/msg_transport_types.h @@ -25,7 +25,6 @@ #include "msg_storage_types.h" /** - * @internal * @addtogroup MSG_SERVICE_FRAMEWORK_TRANSPORT_MODULE * @{ */ diff --git a/include/mapi/msg_types.h b/include/mapi/msg_types.h index 10e66a0..c26ade7 100755 --- a/include/mapi/msg_types.h +++ b/include/mapi/msg_types.h @@ -28,7 +28,6 @@ #endif /** - * @internal * @addtogroup MSG_SERVICE_FRAMEWORK * @{ */ @@ -492,7 +491,6 @@ enum _MSG_STRUCT_E { MSG_STRUCT_THREAD_LIST_INDEX = 0x3400, /**< Indicates the MSG_STRUCT_THREAD_LIST_INDEX */ MSG_STRUCT_SORT_RULE = 0x3500, /**< Indicates the MSG_STRUCT_SORT_RULE */ MSG_STRUCT_FOLDER_INFO = 0x3600, /**< Indicates the MSG_STRUCT_FOLDER_INFO */ - MSG_STRUCT_SEARCH_CONDITION = 0x3700, /**< Indicates the MSG_STRUCT_SEARCH_CONDITION */ MSG_STRUCT_REPORT_STATUS_INFO = 0x3800, /**< Indicates the MSG_STRUCT_REPORT_STATUS_INFO */ MSG_STRUCT_MSG_LIST_CONDITION = 0x3900, /**< Indicates the MSG_LIST_CONDITION */ @@ -535,7 +533,6 @@ enum _MSG_MESSAGE_INFO_E_ { MSG_MESSAGE_DEST_PORT_INT, /**< Indicates the recipient port number, not greater than 16 bit */ MSG_MESSAGE_SRC_PORT_INT, /**< Indicates the sender port number, not greater than 16 bit */ MSG_MESSAGE_ATTACH_COUNT_INT, /**< Indicates the count of attached files in MMS. */ - MSG_MESSAGE_THUMBNAIL_PATH_STR, /**< Indicates the thumbnail path of message. */ MSG_MESSAGE_DATA_SIZE_INT, /**< Indicates the data size. The unit is byte. */ MSG_MESSAGE_SMS_DATA_STR, /**< Indicates the message payload information as a body. default character encoding is UTF-8*/ MSG_MESSAGE_MMS_TEXT_STR, /**< Indicates the text part of MMS message payload. default character encoding is UTF-8 */ @@ -684,7 +681,7 @@ enum _MSG_STRUCT_SMS_SEND_OPT_E { * This enum is used as member of #msg_struct_t for MSG_STRUCT_SETTING_MMS_SEND_OPT. */ 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 */ + 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 */ MSG_MMS_SENDOPT_PRIORITY_TYPE_INT, /**< Indicates the priority of the message. See enum _MSG_PRIORITY_TYPE_E */ MSG_MMS_SENDOPT_EXPIRY_TIME_INT, /**< Indicates the time when the message is to be removed from the MMSC. See enum _MSG_MMS_EXPIRY_TIME_E */ MSG_MMS_SENDOPT_DELIVERY_TIME_INT, /**< Indicates the message transmission time which is set in the MMSC. See enum _MSG_MMS_DELIVERY_TIME_E */ @@ -728,7 +725,7 @@ enum _MSG_STRUCT_GENERAL_OPT_E { MSG_GENERAL_MSG_NOTIFICATION_BOOL, /**< Indicates whether notification for incoming message is shown or not. */ MSG_GENERAL_MSG_VIBRATION_BOOL, /**< Indicates whether vibration for incoming message is run or not. */ MSG_GENERAL_MSG_PREVIEW_BOOL, /**< Indicates whether preview for incoming message is shown or not. */ - MSG_GENERAL_RINGTONE_TYPE_INT, /**< Indicates the message ringtone type. */ + MSG_GENERAL_RINGTONE_TYPE_INT, /**< Indicates the message ringtone type. See enum _MSG_RINGTONE_TYPE_E */ MSG_GENERAL_RINGTONE_PATH_STR /**< Indicates the message ringtone path */ }; @@ -1020,18 +1017,6 @@ enum MSG_FOLDER_INFO_E { }; /** - * @brief Enumeration for the values of conditions for searching message. \n - * This enum is used as member of #msg_struct_t for MSG_STRUCT_SEARCH_CONDITION. - */ -enum MSG_SEARCH_CONDITION_E { - MSG_SEARCH_CONDITION_FOLDERID_INT = MSG_STRUCT_SEARCH_CONDITION+1, /**< The folder ID for searching messages. See enum _MSG_FOLDER_ID_E */ - MSG_SEARCH_CONDITION_MSGTYPE_INT, /**< The message type for searching messages. See enum _MSG_MESSAGE_TYPE_E */ - MSG_SEARCH_CONDITION_ADDRESS_VALUE_STR, /**< The address value for searching messages. */ - MSG_SEARCH_CONDITION_SEARCH_VALUE_STR, /**< The string to search */ - MSG_SEARCH_CONDITION_RESERVED_INT, /**< The search condition reserved*/ -}; - -/** * @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. */ diff --git a/include/proxy/MsgHandle.h b/include/proxy/MsgHandle.h index eeb2204..831a4d4 100755 --- a/include/proxy/MsgHandle.h +++ b/include/proxy/MsgHandle.h @@ -48,7 +48,6 @@ class MsgHandle // Transport msg_error_t submitReq(MSG_REQUEST_S* pReq); - msg_error_t cancelReq(msg_request_id_t reqId); msg_error_t regSentStatusCallback(msg_sent_status_cb onStatusChanged, void *pUserParam); msg_error_t regSmsMessageCallback(msg_sms_incoming_cb onMsgIncoming, unsigned short port, void *pUserParam); @@ -79,7 +78,6 @@ class MsgHandle msg_error_t countMsgByContact(const MSG_THREAD_LIST_INDEX_INFO_S *pAddrInfo, MSG_THREAD_COUNT_INFO_S *pMsgThreadCountList); msg_error_t getMessage(msg_message_id_t MsgId, MSG_MESSAGE_HIDDEN_S *pMsg, MSG_SENDINGOPT_S *pSendOpt); msg_error_t getConversationViewItem(msg_message_id_t MsgId, MSG_CONVERSATION_VIEW_S *pConv); - msg_error_t getFolderViewList(msg_folder_id_t FolderId, const MSG_SORT_RULE_S *pSortRule, msg_struct_list_s *pMsgFolderViewList); msg_error_t addFolder(const MSG_FOLDER_INFO_S *pFolderInfo); msg_error_t updateFolder(const MSG_FOLDER_INFO_S *pFolderInfo); msg_error_t deleteFolder(msg_folder_id_t FolderId); diff --git a/include/utils/MsgContact.h b/include/utils/MsgContact.h index 717d9d9..3ccd75e 100755 --- a/include/utils/MsgContact.h +++ b/include/utils/MsgContact.h @@ -24,7 +24,6 @@ #include "MsgInternalTypes.h" -typedef void (*MsgContactChangeCB)(); //contacts-service is not used for gear #ifndef MSG_CONTACTS_SERVICE_NOT_SUPPORTED @@ -34,27 +33,17 @@ typedef void (*MsgContactChangeCB)(); msg_error_t MsgOpenContactSvc(); msg_error_t MsgCloseContactSvc(); -msg_error_t MsgInitContactSvc(MsgContactChangeCB cb); +msg_error_t MsgInitContactSvc(); msg_error_t MsgGetContactInfo(const MSG_ADDRESS_INFO_S *pAddrInfo, MSG_CONTACT_INFO_S *pContactInfo); msg_error_t MsgGetContactSearchList(const char *pSearchVal, MSG_ADDRESS_INFO_S **pAddrInfo, int *count); -void MsgSyncAddressbook(); -void MsgSyncContact(); - -bool MsgInsertContact(MSG_CONTACT_INFO_S *pContactInfo, const char *pNumber); -bool MsgUpdateContact(int index, int type); -bool MsgDeleteContact(int index); - int MsgGetContactNameOrder(); msg_error_t MsgGetContactStyleDisplayName(const char *first, const char *last, const char *middle, const char *prefix, const char *suffix, int contactNameOrder, char *displayName, unsigned int size); void MsgAddPhoneLog(const MSG_MESSAGE_INFO_S *pMsgInfo); void MsgDeletePhoneLog(msg_message_id_t msgId); -int MsgContactSVCBeginTrans(); -int MsgContactSVCEndTrans(bool bSuccess); - bool checkBlockingMode(char *address, bool *pisFavorites); #endif //MSG_CONTACTS_SERVICE_NOT_SUPPORTED diff --git a/include/utils/MsgDebug.h b/include/utils/MsgDebug.h index 8cb07d5..8bd06c6 100755 --- a/include/utils/MsgDebug.h +++ b/include/utils/MsgDebug.h @@ -102,31 +102,31 @@ #define MSG_SMS_VLD_INFO(fmt, ...)\ do\ {\ - SLOG(LOG_DEBUG, MSG_SMS_VALID_TAG, "[SMS INFO]%s, "fmt"\n", __TIMESTAMP__, ##__VA_ARGS__);\ + SLOG(LOG_DEBUG, MSG_SMS_VALID_TAG, "[SMS INFO]%s, " fmt "\n", __TIMESTAMP__, ##__VA_ARGS__);\ } while (0) #define MSG_SMS_VLD_TXT(fmt, ...)\ do\ {\ - SLOG(LOG_DEBUG, MSG_SMS_VALID_TAG, "[SMS_TEXT]%s, "fmt"\n", __TIMESTAMP__, ##__VA_ARGS__);\ + SLOG(LOG_DEBUG, MSG_SMS_VALID_TAG, "[SMS_TEXT]%s, " fmt "\n", __TIMESTAMP__, ##__VA_ARGS__);\ } while (0) #define MSG_MMS_VLD_INFO(fmt, ...)\ do\ {\ - SLOG(LOG_DEBUG, MSG_MMS_VALID_TAG, "[MMS INFO]%s, "fmt"\n", __TIMESTAMP__, ##__VA_ARGS__);\ + SLOG(LOG_DEBUG, MSG_MMS_VALID_TAG, "[MMS INFO]%s, " fmt "\n", __TIMESTAMP__, ##__VA_ARGS__);\ } while (0) #define MSG_MMS_VLD_TXT(fmt, ...)\ do\ {\ - SLOG(LOG_DEBUG, MSG_MMS_VALID_TAG, "[MMS TEXT]%s, "fmt"\n", __TIMESTAMP__, ##__VA_ARGS__);\ + SLOG(LOG_DEBUG, MSG_MMS_VALID_TAG, "[MMS TEXT]%s, " fmt "\n", __TIMESTAMP__, ##__VA_ARGS__);\ } while (0) #define MSG_MMS_VLD_FILE(fmt, ...)\ do\ {\ - SLOG(LOG_DEBUG, MSG_MMS_VALID_TAG, "[MMS FILE]%s, "fmt"\n", __TIMESTAMP__, ##__VA_ARGS__);\ + SLOG(LOG_DEBUG, MSG_MMS_VALID_TAG, "[MMS FILE]%s, " fmt "\n", __TIMESTAMP__, ##__VA_ARGS__);\ } while (0) /*err & warn return message log macros*/ diff --git a/include/utils/MsgMmsMessage.h b/include/utils/MsgMmsMessage.h index e08e2bd..342a683 100755 --- a/include/utils/MsgMmsMessage.h +++ b/include/utils/MsgMmsMessage.h @@ -21,6 +21,7 @@ INCLUDE FILES ==================================================================================================*/ #include "MsgTypes.h" +#include "MsgInternalTypes.h" #include "MsgMmsTypes.h" msg_error_t _MsgMmsAddPage(MMS_MESSAGE_DATA_S *pMsgData, MMS_PAGE_S *pPage); @@ -91,4 +92,6 @@ void _MsgMmsMultipartPrint(MMS_MULTIPART_DATA_S *multipart); bool _MsgMmsRemoveEmptyObject(MMS_MESSAGE_DATA_S *pMmsMsg); +int MsgMmsCheckFilepathSmack(int fd, const char *ipc_filename); + #endif // MSG_MMS_MESSAGE_H diff --git a/include/utils/MsgSqliteWrapper.h b/include/utils/MsgSqliteWrapper.h index ef2e99a..24f56c8 100755 --- a/include/utils/MsgSqliteWrapper.h +++ b/include/utils/MsgSqliteWrapper.h @@ -93,7 +93,7 @@ public: bool checkTableExist(const char *pTableName); msg_error_t execQuery(const char *pQuery); - msg_error_t getTable(const char *pQuery, int *pRowCnt); + msg_error_t getTable(const char *pQuery, int *pRowCnt, int *pColumnCnt); void freeTable(); msg_error_t bindText(const char *pBindStr, int index); msg_error_t bindInt(const int pBindint, int index); diff --git a/include/utils/MsgUtilFile.h b/include/utils/MsgUtilFile.h index 8600b2a..ecea9b5 100755 --- a/include/utils/MsgUtilFile.h +++ b/include/utils/MsgUtilFile.h @@ -60,6 +60,6 @@ bool MsgChown(const char *filepath, int uid, int gid); bool MsgCreateFile(const char *pFilePath,char *pData, int DataSize); char *MsgGetDirName(char *file_path); char *MsgGetFileName(char *file_path); - +int MsgCheckFilepathSmack(const char *app_smack_label, char *file_path); #endif // MSG_UTIL_FILE_H diff --git a/include/utils/MsgUtilFunction.h b/include/utils/MsgUtilFunction.h index 5595a01..d7774c3 100755 --- a/include/utils/MsgUtilFunction.h +++ b/include/utils/MsgUtilFunction.h @@ -20,7 +20,7 @@ #define MSG_UTIL_CH_EMAIL_AT '@' /*================================================================================================== - INCLUDE FILES + INCLUDE FILES ==================================================================================================*/ #include "MsgStorageTypes.h" #include "MsgSettingTypes.h" @@ -29,7 +29,18 @@ #include "MsgCmdTypes.h" /*================================================================================================== - FUNCTION PROTOTYPES + DEFINES +==================================================================================================*/ + +#define MSG_TYPE_CHECK(a, b) \ + do {\ + if(a != (b & 0xff00)) {\ + return MSG_ERR_INVALID_PARAMETER; \ + } \ + }while(0) + +/*================================================================================================== + FUNCTION PROTOTYPES ==================================================================================================*/ bool MsgCheckFeatureSupport(const char *feature_name); @@ -57,8 +68,6 @@ int MsgEncodeFilterList(msg_struct_list_s *pFilterList, char **ppDest); int MsgEncodeFilterFlag(bool *pSetFlag, char **ppDest); -int MsgEncodeMsgType(MSG_MESSAGE_TYPE_S *pMsgType, char **ppDest); - int MsgEncodeThreadViewList(msg_struct_list_s *pThreadViewList, char **ppDest); int MsgEncodeConversationViewList(msg_struct_list_s *pConvViewList, char **ppDest); diff --git a/include/utils/MsgUtilStorage.h b/include/utils/MsgUtilStorage.h index 1a8cffd..14347aa 100755 --- a/include/utils/MsgUtilStorage.h +++ b/include/utils/MsgUtilStorage.h @@ -46,7 +46,7 @@ msg_error_t MsgStoAddAddress(MsgDbHandler *pDbHandle, const MSG_MESSAGE_INFO_S * msg_error_t MsgStoGetAddressByMsgId(MsgDbHandler *pDbHandle, msg_message_id_t msgId, int contactNameOrder, int *nAddressCnt, MSG_ADDRESS_INFO_S **pAddress); msg_error_t MsgStoGetAddressByMsgId(MsgDbHandler *pDbHandle, msg_message_id_t msgId, int contactNameOrder, msg_struct_list_s *pAddress); msg_error_t MsgStoGetAddressByConvId(MsgDbHandler *pDbHandle, msg_thread_id_t convId, int contactNameOrder, msg_struct_list_s *pAddrlist); -#else +#else // MSG_CONTACTS_SERVICE_NOT_SUPPORTED //contactNameOrder is never used msg_error_t MsgStoGetAddressByMsgId(MsgDbHandler *pDbHandle, msg_message_id_t msgId, int *nAddressCnt, MSG_ADDRESS_INFO_S **pAddress); msg_error_t MsgStoGetAddressByMsgId(MsgDbHandler *pDbHandle, msg_message_id_t msgId, msg_struct_list_s *pAddress); @@ -74,17 +74,12 @@ bool MsgExistConversation(MsgDbHandler *pDbHandle, msg_thread_id_t convId); bool MsgExistMessage(MsgDbHandler *pDbHandle, MSG_MESSAGE_INFO_S *pMsg); int MsgStoGetUnreadCnt(MsgDbHandler *pDbHandle, MSG_MAIN_TYPE_T MsgType); -msg_error_t MsgStoAddContactInfo(MsgDbHandler *pDbHandle, MSG_CONTACT_INFO_S *pContactInfo, const char *pNumber); -msg_error_t MsgStoClearContactInfoByAddrbookIdList(MsgDbHandler *pDbHandle, int* addrbookList, int addrbookCnt); -msg_error_t MsgStoClearContactInfo(MsgDbHandler *pDbHandle, int ContactId); -msg_error_t MsgStoResetContactInfo(MsgDbHandler *pDbHandle, int contactId); msg_error_t MsgStoGetMmsRawFilePath(MsgDbHandler *pDbHandle, msg_message_id_t msgId, char *pFilePath); bool MsgStoCheckReadReportRequested(MsgDbHandler *pDbHandle, msg_message_id_t MsgId); bool MsgStoCheckReadReportIsSent(MsgDbHandler *pDbHandle, msg_message_id_t MsgId); msg_error_t MsgStoUpdateNetworkStatus(MsgDbHandler *pDbHandle, MSG_MESSAGE_INFO_S *pMsgInfo, msg_network_status_t status); // Lists -msg_error_t MsgStoGetFolderViewList(msg_folder_id_t FolderId, const MSG_SORT_RULE_S *pSortRule, msg_struct_list_s *pMsgFolderViewList); msg_error_t MsgStoGetThreadViewList(const MSG_SORT_RULE_S *pSortRule, msg_struct_list_s *pThreadViewList); msg_error_t MsgStoGetConversationViewItem(msg_message_id_t msgId, MSG_CONVERSATION_VIEW_S *pConv); msg_error_t MsgStoGetConversationViewList(msg_thread_id_t ThreadId, msg_struct_list_s *pConvViewList); diff --git a/include/utils/MsgZoneManager.h b/include/utils/MsgZoneManager.h deleted file mode 100755 index 4056ce5..0000000 --- a/include/utils/MsgZoneManager.h +++ /dev/null @@ -1,31 +0,0 @@ -/* -* Copyright 2012-2013 Samsung Electronics Co., Ltd -* -* Licensed under the Flora License, Version 1.1 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://floralicense.org/license/ -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -#ifndef MSG_ZONE_MANAGER_H -#define MSG_ZONE_MANAGER_H - -void MsgZoneInit(); -void MsgZoneClean(); - -char* MsgZoneGetName(int fd); -bool MsgZoneIsAllowed(int fd); - - -void MsgZoneChange(); -void MsgZoneRevert(); - -#endif // MSG_ZONE_MANAGER_H - |