diff options
author | Kyeonghun Lee <kh9090.lee@samsung.com> | 2016-03-24 19:42:54 +0900 |
---|---|---|
committer | Kyeonghun Lee <kh9090.lee@samsung.com> | 2016-03-31 16:32:40 +0900 |
commit | 2861f388ee8accfddc4bd0f733bc24599f57081c (patch) | |
tree | 7238433b58d65e1351f33c5e8e1c3599667c9556 /include | |
parent | 71663dcf370a17423983ca565950d0c2741fd946 (diff) | |
download | msg-service-2861f388ee8accfddc4bd0f733bc24599f57081c.tar.gz msg-service-2861f388ee8accfddc4bd0f733bc24599f57081c.tar.bz2 msg-service-2861f388ee8accfddc4bd0f733bc24599f57081c.zip |
move notification, media-player feature to msg-manager from msg-service
Change-Id: I51b43c5dc666efa2ed8e8eccd087e720569afcfe
Signed-off-by: Kyeonghun Lee <kh9090.lee@samsung.com>
Diffstat (limited to 'include')
-rwxr-xr-x | include/common/MsgInternalTypes.h | 6 | ||||
-rwxr-xr-x | include/externals/MsgNotificationWrapper.h | 119 | ||||
-rwxr-xr-x | include/externals/MsgSensorWrapper.h | 1 | ||||
-rwxr-xr-x | include/externals/MsgSoundPlayer.h | 79 | ||||
-rwxr-xr-x | include/framework/MsgDeliverHandler.h | 1 | ||||
-rwxr-xr-x | include/utils/MsgContact.h | 3 | ||||
-rwxr-xr-x | include/utils/MsgUtilFunction.h | 6 |
7 files changed, 19 insertions, 196 deletions
diff --git a/include/common/MsgInternalTypes.h b/include/common/MsgInternalTypes.h index 70a930b..8526dfa 100755 --- a/include/common/MsgInternalTypes.h +++ b/include/common/MsgInternalTypes.h @@ -186,11 +186,7 @@ #define MSG_MESSAGE_DURING_CALL DEFAULT_GENERAL_OPT_PATH"/during_call" #define MSG_DEFAULT_APP_ID "org.tizen.message" -#define MSG_QUICKPANEL_APP_ID "org.tizen.quickpanel" -#define MSG_INDICATOR_APP_ID "org.tizen.indicator" -#define MSG_CALL_APP_ID "org.tizen.call-ui" -#define MSG_SETTING_APP_ID "org.tizen.setting" -#define MSG_TEL_URI_VOICEMAIL "tel:VOICEMAIL" +#define MSG_MGR_APP_ID "org.tizen.msg-manager" #define MSG_TELEPHONY_SMS_FEATURE "http://tizen.org/feature/network.telephony.sms" #define MSG_TELEPHONY_MMS_FEATURE "http://tizen.org/feature/network.telephony.mms" diff --git a/include/externals/MsgNotificationWrapper.h b/include/externals/MsgNotificationWrapper.h index 7bb8c11..ae84c54 100755 --- a/include/externals/MsgNotificationWrapper.h +++ b/include/externals/MsgNotificationWrapper.h @@ -21,7 +21,6 @@ INCLUDE FILES ==================================================================================================*/ #include "MsgInternalTypes.h" -#include "MsgSqliteWrapper.h" /*================================================================================================== DEFINES @@ -30,42 +29,8 @@ #define MSG_APP_LOCALEDIR TZ_SYS_RO_APP_PATH "/" MSG_DEFAULT_APP_ID "/res/locale" -#define MSG_NOTIFICATION_ICON_DIR "/" MSG_QUICKPANEL_APP_ID "/shared/res/noti_icons" -#define MSG_STATUS_ICON_DIR MSG_INDICATOR_APP_ID "/res/icons" - -/* notification icon */ -#define MSG_NORMAL_ICON_PATH TZ_SYS_RO_APP_PATH MSG_NOTIFICATION_ICON_DIR "/Message/noti_message.png" -#define MSG_SIM_ICON_PATH TZ_SYS_RO_APP_PATH MSG_NOTIFICATION_ICON_DIR "/Message/noti_message_sim-card.png" -#define MSG_OTA_ICON_PATH TZ_SYS_RO_APP_PATH MSG_NOTIFICATION_ICON_DIR "/Message/noti_message_OTA.png" -#define MSG_VOICE_ICON_PATH TZ_SYS_RO_APP_PATH MSG_NOTIFICATION_ICON_DIR "/Message/noti_voice_mail.png" -#define MSG_CB_ICON_PATH TZ_SYS_RO_APP_PATH MSG_NOTIFICATION_ICON_DIR "/Message/noti_message_cb-msg.png" -#define MSG_READ_ICON_PATH TZ_SYS_RO_APP_PATH MSG_NOTIFICATION_ICON_DIR "/Message/noti_message_read_report.png" -#define MSG_DELIVERY_ICON_PATH TZ_SYS_RO_APP_PATH MSG_NOTIFICATION_ICON_DIR "/Message/noti_message_delivery_report.png" -#define MSG_REPLY_ICON_PATH TZ_SYS_RO_APP_PATH MSG_NOTIFICATION_ICON_DIR "/Message/noti_message_reply.png" -#define MSG_SMS_SENDING_FAILED_ICON_PATH TZ_SYS_RO_APP_PATH MSG_NOTIFICATION_ICON_DIR "/Message/noti_message_failed.png" -#define MSG_MMS_SENDING_FAILED_ICON_PATH TZ_SYS_RO_APP_PATH MSG_NOTIFICATION_ICON_DIR "/Message/noti_message_mms_failed.png" -#define MSG_MMS_RETRIVE_FAILED_ICON_PATH TZ_SYS_RO_APP_PATH MSG_NOTIFICATION_ICON_DIR "/Message/noti_message_mms_problem.png" -#define MSG_EMERGENCY_ICON_PATH TZ_SYS_RO_APP_PATH MSG_DEFAULT_APP_ID "/res/icons/default/small/noti_emergency_mode.png" -#define MSG_NO_CONTACT_PROFILE_ICON_PATH TZ_SYS_RO_APP_PATH MSG_NOTIFICATION_ICON_DIR "/Contact/noti_contact_default.png" -#define MSG_ACTIVE_PUSH_ICON_PATH "reserved:push_message" - -/* status bar icon */ -#define MSG_NORMAL_STATUS_ICON TZ_SYS_RO_APP_PATH MSG_STATUS_ICON_DIR "/Notify/B03_notify_message.png" -#define MSG_FAILED_STATUS_ICON TZ_SYS_RO_APP_PATH MSG_STATUS_ICON_DIR "/Notify/B03_notify_message_failed.png" -#define MSG_DELIVER_REPORT_STATUS_ICON TZ_SYS_RO_APP_PATH MSG_STATUS_ICON_DIR "/Event/B03_event_delivery_report_message.png" -#define MSG_READ_REPORT_STATUS_ICON TZ_SYS_RO_APP_PATH MSG_STATUS_ICON_DIR "/Event/B03_event_read_report_message.png" -#define MSG_VOICE_MSG_STATUS_ICON TZ_SYS_RO_APP_PATH MSG_STATUS_ICON_DIR "/Event/B03_event_voicemail.png" -#define MSG_SIM_FULL_STATUS_ICON TZ_SYS_RO_APP_PATH MSG_STATUS_ICON_DIR "/SIM card full/B03_sim_card_full.png" #ifndef TIZEN_I586_ENABLED -/* system string */ -#define NEW_MESSAGE "IDS_MSGF_POP_NEW_MESSAGE" -#define NEW_MESSAGES "IDS_MSGF_POP_NEW_MESSAGES" -#define MSG_UNKNOWN_SENDER "IDS_MSGF_BODY_UNKNOWN" -#define MSG_NO_SUBJECT "IDS_MSGF_BODY_NO_SUBJECT" -#define MSG_SUBJECT_COLON "IDS_MSGF_OPT_SUBJECT_COLON" - - /* message app string for ticker noti */ #define SENDING_MULTIMEDIA_MESSAGE_FAILED "IDS_MSGF_POP_SENDING_MULTIMEDIA_MESSAGE_FAILED" #define MULTIMEDIA_MESSAGE_SENT "IDS_MSGF_POP_MULTIMEDIA_MESSAGE_SENT" @@ -77,45 +42,9 @@ #define SMS_MESSAGE_SIM_MESSAGE_FULL "IDS_MSGF_BODY_SIM_MEMORY_FULL_DELETE_SOME_ITEMS" #define SMS_MESSAGE_MEMORY_FULL "IDS_MSGF_POP_NOT_ENOUGH_MEMORY_DELETE_SOME_ITEMS" #define SMS_FDN_RESTRICTED "IDS_MSGF_POP_FDN_ENABLED_CANT_SEND_MSG" -#define SMS_SIM_CARD_FULL "IDS_MSG_HEADER_SIM_CARD_FULL" #define SMS_MESSAGE_SIZE_OVER_SIM_SLOT_SIZE "IDS_MSGF_BODY_MESSAGE_IS_TOO_LARGE_TO_STORE_AS_A_SINGLE_MESSAGE_TO_SIM_CARD" -/* message app string for quickpanel noti */ -#define MSG_MESSAGE "IDS_MSGF_BODY_MESSAGE" -#define VOICE_MAIL "IDS_MSGF_BODY_VOICEMAIL" -#define NEW_VOICE_MAIL "IDS_MSGF_BODY_NEW_VOICEMAIL" -#define CB_MESSAGE "IDS_MSGF_BODY_CB_MESSAGES" -#define CP_MESSAGE "IDS_MSGF_BODY_CP_MESSAGES" -#define PUSH_MESSAGE "IDS_MSGF_BODY_PUSH_MESSAGES" -#define DELIVERY_MESSAGE "IDS_MSGF_BODY_DELIVERY_REPORT" -#define READ_REPORT_MESSAGE "IDS_MSGF_POP_READ_REPORT" -#define EXPIRED_MESSAGE "IDS_MSGF_BODY_MESSAGE_HAS_EXPIRED" -#define REJECTED_MESSAGE "IDS_MSGF_BODY_MMSDELIVERYMSGREJECTED" -#define DEFERRED_MESSAGE "IDS_MSGF_POP_MESSAGE_DEFERRED" -#define UNRECOGNISED_MESSAGE "IDS_MSGF_POP_MESSAGE_UNRECOGNISED" -#define INDETEMINATE_MESSAGE "IDS_MSGF_POP_INDETERMINATE" -#define UNREACHABLE_MESSAGE "IDS_MSGF_POP_UNREACHABLE" -#define DELIVERED_MESSAGE "IDS_MSGF_BODY_MESSAGE_DELIVERED" -#define VOICE_1_MESSAGE "IDS_MSGF_BODY_1_MESSAGE" -#define VOICE_N_MESSAGE "IDS_MSGF_BODY_PD_MESSAGES" -#define SIM_CARD_MESSAGE "IDS_MSGF_BODY_SIM_CARD_MESSAGES" -#define READ_REPORT_READ "IDS_COM_BODY_READ" -#define READ_REPORT_DELETE "IDS_MSG_OPT_DELETE" -#define FAILED_MSG_EXIST "IDS_MSG_BODY_FAILED_MESSAGES_EXIST" -#define ENABLE_EMERGENCY_MODE "IDS_MSG_BODY_ENABLE_EMERGENCY_MODE_JPN_DCM" -#define EMERGENCY_MODE_DESCRIPTION "IDS_MSG_SBODY_TAP_HERE_TO_ENABLE_EMERGENCY_MODE_TO_SAVE_BATTERY_POWER_JPN_DCM" -#define FAILED_TO_SEND_MESSAGE "IDS_MSG_HEADER_FAILED_TO_SEND_MESSAGE_ABB" -#define MESSAGE_SIZE_UNIT_KB "IDS_MSGF_BODY_MSGSIZE_KB" -#define MESSAGE_SIZE_STRING "IDS_MSGF_BODY_MESSAGE_SIZE" -#define MSG_SUBJECT_COLON "IDS_MSGF_OPT_SUBJECT_COLON" #else -/* system string */ -#define NEW_MESSAGE "New message" -#define NEW_MESSAGES "New messages" -#define MSG_UNKNOWN_SENDER "New message from Unknown." -#define MSG_NO_SUBJECT "No subject" - - /* message app string for ticker noti */ #define SENDING_MULTIMEDIA_MESSAGE_FAILED "Sending multimedia message failed" #define MULTIMEDIA_MESSAGE_SENT "Multimedia message sent." @@ -127,37 +56,8 @@ #define SMS_MESSAGE_SIM_MESSAGE_FULL "SIM memory full. Delete some items." #define SMS_MESSAGE_MEMORY_FULL "Not enough memory. Delete some items." #define SMS_FDN_RESTRICTED "Unable to send the message while Fixed dialling mode is enabled." -#define SMS_SIM_CARD_FULL "SIM card full" #define SMS_MESSAGE_SIZE_OVER_SIM_SLOT_SIZE "Message is too large to store as a single message to SIM card." -/* message app string for quickpanel noti */ -#define MSG_MESSAGE "Message" -#define VOICE_MAIL "Voicemail" -#define NEW_VOICE_MAIL "New voicemail" -#define CB_MESSAGE "CB messages" -#define CP_MESSAGE "CP messages" -#define PUSH_MESSAGE "Push messages" -#define DELIVERY_MESSAGE "Delivery report" -#define READ_REPORT_MESSAGE "Read report" -#define EXPIRED_MESSAGE "Message expired." -#define REJECTED_MESSAGE "Message rejected." -#define DEFERRED_MESSAGE "Message deferred" -#define UNRECOGNISED_MESSAGE "Message unrecognised" -#define INDETEMINATE_MESSAGE "Indeterminate." -#define UNREACHABLE_MESSAGE "Unreachable" -#define DELIVERED_MESSAGE "Message delivered" -#define VOICE_1_MESSAGE "1 message" -#define VOICE_N_MESSAGE "%d messages" -#define SIM_CARD_MESSAGE "SIM card messages" -#define READ_REPORT_READ "Read" -#define READ_REPORT_DELETE "Deleted." -#define FAILED_MSG_EXIST "Failed messages exist." -#define ENABLE_EMERGENCY_MODE "Enable Emergency mode" -#define EMERGENCY_MODE_DESCRIPTION "Tap here to enable Emergency mode to save battery power." -#define FAILED_TO_SEND_MESSAGE "Failed to send message." -#define MESSAGE_SIZE_UNIT_KB "KB" -#define MESSAGE_SIZE_STRING "Message Size" -#define MSG_SUBJECT_COLON "Subject:" #endif #define NOTIFICATION_PRIV_ID DEFAULT_SETTING_PATH"/notification_priv_id" @@ -168,10 +68,6 @@ #define MSG_SENTFAIL_NOTI_ID DEFAULT_SETTING_PATH"/sentfail_noti_id" #define SIM_FULL_NOTI_PRIV_ID DEFAULT_SETTING_PATH"/sim_full_noti_id" -#define MSG_NOTI_TEXT_LEN (512) -#define MSG_NOTI_TEXT_LEN_S (256) -#define MSG_ACTIVE_NOTI_BUTTON_NUM 3 - enum _msg_notification_type_e { MSG_NOTI_TYPE_ALL = 0x00, @@ -199,8 +95,17 @@ enum _msg_active_notification_type_e { MSG_ACTIVE_NOTI_TYPE_INSTANT, }; +enum _MSG_SOUND_TYPE_E +{ + MSG_SOUND_PLAY_DEFAULT = 0, + MSG_SOUND_PLAY_USER, + MSG_SOUND_PLAY_EMERGENCY, + MSG_SOUND_PLAY_VOICEMAIL, +}; + typedef unsigned char msg_notification_type_t; /* _msg_notification_type_e */ typedef unsigned char msg_active_notification_type_t; /* _msg_active_notification_type_e */ +typedef unsigned char MSG_SOUND_TYPE_T; msg_error_t MsgInsertNotification(MSG_MESSAGE_INFO_S *msg_info); @@ -211,14 +116,12 @@ msg_error_t MsgInsertOnlyActiveNotification(msg_notification_type_t noti_type, M msg_error_t MsgDeleteReportNotification(const char *addr); msg_error_t MsgInsertTicker(const char* pTickerMsg, const char* pLocaleTickerMsg, bool bPlayFeedback, int msgId); -msg_error_t MsgInsertInstantMessage(msg_notification_type_t noti_type); -msg_error_t MsgInitNoti(); -msg_error_t MsgInsertBadge(unsigned int unreadMsgCnt); msg_error_t MsgDeleteNoti(msg_notification_type_t noti_type, int simIndex); +void MsgSoundPlayStart(const MSG_ADDRESS_INFO_S *pAddrInfo, MSG_SOUND_TYPE_T soundType); + void MsgRefreshAllNotification(bool bWithSimNoti, bool bFeedback, msg_active_notification_type_t active_type); void MsgDeleteNotification(msg_notification_type_t noti_type, int simIndex); -void MsgInitReportNotiList(); bool MsgCheckNotificationSettingEnable(void); #endif diff --git a/include/externals/MsgSensorWrapper.h b/include/externals/MsgSensorWrapper.h index ed7014f..8a6bc57 100755 --- a/include/externals/MsgSensorWrapper.h +++ b/include/externals/MsgSensorWrapper.h @@ -30,6 +30,7 @@ typedef void (*msg_sensor_cb)(); FUNCTION PROTOTYPES ==================================================================================================*/ +void MsgInitSensor(); msg_error_t MsgSensorConnect(); void MsgSensorDisconnect(); msg_error_t MsgRegSensorCB(msg_sensor_cb cb); diff --git a/include/externals/MsgSoundPlayer.h b/include/externals/MsgSoundPlayer.h deleted file mode 100755 index 200390e..0000000 --- a/include/externals/MsgSoundPlayer.h +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. All rights reserved - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * 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_SOUND_PLAYER_H -#define MSG_SOUND_PLAYER_H - - -/*================================================================================================== - TYPES -==================================================================================================*/ -typedef unsigned char MSG_SOUND_TYPE_T; - -/*================================================================================================== - ENUMS -==================================================================================================*/ -enum _MSG_SOUND_TYPE_E -{ - MSG_SOUND_PLAY_DEFAULT = 0, - MSG_SOUND_PLAY_USER, - MSG_SOUND_PLAY_EMERGENCY, - MSG_SOUND_PLAY_VOICEMAIL, -}; - -/*================================================================================================== - CLASS DEFINITIONS -==================================================================================================*/ -class MsgSoundPlayer { -public: - static MsgSoundPlayer* instance(); - - void MsgSoundPlayStart(const MSG_ADDRESS_INFO_S *pAddrInfo, MSG_SOUND_TYPE_T soundType); - void MsgSoundPlayStop(); - - int MsgStreamStart(MSG_SOUND_TYPE_T soundType); - void MsgStreamStop(); - - void MsgSoundInitRepeatAlarm(); - - void MsgGetRingtonePath(char *userRingtonePath, char **msg_tone_file_path_p); - void MsgGetPlayStatus(bool bVoiceMail, bool *bPlaySound, bool *bPlayVibration, bool *bOnCall); - -private: - MsgSoundPlayer(); - ~MsgSoundPlayer(); - - void MsgSoundPlayMelody(char *pMsgToneFilePath); - void MsgSoundPlayVibration(char *vibrationPath); - - void MsgSoundSetRepeatAlarm(); - void MsgSoundCreateRepeatAlarm(int RepeatTime); - int MsgSoundGetUnreadMsgCnt(); - void MsgGetPlayStatus(bool bOnCall, bool bSound, bool bVibration, bool bMsgSound, bool bMsgVibration, bool *bPlaySound, bool *bPlayVibration); - - static MsgSoundPlayer* pInstance; - - bool bPlaying; - bool bVibrating; - bool bFeedbackInit; - - int g_alarmId; - - char *defaultRingtonePath; -}; - -#endif /* MSG_SOUND_PLAYER_H */ - diff --git a/include/framework/MsgDeliverHandler.h b/include/framework/MsgDeliverHandler.h index 8baf4af..b18a97e 100755 --- a/include/framework/MsgDeliverHandler.h +++ b/include/framework/MsgDeliverHandler.h @@ -32,7 +32,6 @@ msg_error_t MsgHandleIncomingMsg(MSG_MESSAGE_INFO_S *pMsgInfo, bool *pSendNoti); msg_error_t MsgHandleSMS(MSG_MESSAGE_INFO_S *pMsgInfo, bool *pSendNoti, bool *bOnlyNoti); msg_error_t MsgHandleMMS(MSG_MESSAGE_INFO_S *pMsgInfo, bool *pSendNoti); -void MsgPlayTTSMode(MSG_SUB_TYPE_T msgSubType, msg_message_id_t msgId, bool isFavorites); void MsgLaunchClass0(msg_message_id_t msgId); /*================================================================================================== diff --git a/include/utils/MsgContact.h b/include/utils/MsgContact.h index b71fc07..3337d31 100755 --- a/include/utils/MsgContact.h +++ b/include/utils/MsgContact.h @@ -26,8 +26,6 @@ /*================================================================================================== FUNCTION PROTOTYPES ==================================================================================================*/ -msg_error_t MsgInitContactSvc(); - msg_error_t MsgGetContactInfo(const MSG_ADDRESS_INFO_S *pAddrInfo, MSG_CONTACT_INFO_S *pContactInfo); 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); @@ -37,7 +35,6 @@ void MsgDeletePhoneLog(msg_message_id_t msgId); bool checkBlockingMode(char *address, bool *pisFavorites); -int MsgContactGetMinMatchDigit(); void MsgConvertNumber(const char* pSrcNum, char* pDestNum, int destSize); bool MsgIsNumber(const char* pSrc); #endif /* MSG_CONTACT_H */ diff --git a/include/utils/MsgUtilFunction.h b/include/utils/MsgUtilFunction.h index 9b68fbd..8472c2a 100755 --- a/include/utils/MsgUtilFunction.h +++ b/include/utils/MsgUtilFunction.h @@ -28,6 +28,8 @@ #include "MsgInternalTypes.h" #include "MsgCmdTypes.h" +#include <bundle.h> + /*================================================================================================== DEFINES ==================================================================================================*/ @@ -45,6 +47,8 @@ bool MsgCheckFeatureSupport(const char *feature_name); +int MsgContactGetMinMatchDigit(); + /* Encoders */ int MsgEncodeCountInfo(MSG_COUNT_INFO_S *pCountInfo, char **ppDest); @@ -152,6 +156,8 @@ gchar * msg_replace_non_ascii_char(const gchar *pszText, gunichar replacementCha uid_t msg_get_login_user(); +msg_error_t msg_launch_app(const char *app_id, bundle *bundle_data); + /* Dbus function */ void MsgDbusInit(); void MsgDbusDeinit(); |