From 8dbb405520ebb7f79a4331c02694e41e83e59c44 Mon Sep 17 00:00:00 2001 From: Denis Dolzhenko Date: Fri, 16 Sep 2016 13:01:51 +0300 Subject: [PATCH] TizenRefApp-7030 Make voice call option for email recipient Change-Id: I09ba47530f821f3d4cb012b7c56623eb87bb788b Signed-off-by: Denis Dolzhenko --- src/Conversation/Main/Controller/src/Conversation.cpp | 8 ++++++-- src/Viewer/Controller/inc/Viewer.h | 2 +- src/Viewer/Controller/src/Viewer.cpp | 7 ++++--- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/Conversation/Main/Controller/src/Conversation.cpp b/src/Conversation/Main/Controller/src/Conversation.cpp index ba34840d..ce9d4ded 100644 --- a/src/Conversation/Main/Controller/src/Conversation.cpp +++ b/src/Conversation/Main/Controller/src/Conversation.cpp @@ -244,8 +244,11 @@ void Conversation::showUnsavedRecipientPopup(const std::string &address) } else if(m_Mode == ConversationMode) { - popup.appendItem(*new PopupAddressListItem(popup, msg("IDS_MSG_OPT_MAKE_VOICE_CALL"), address, - POPUPLIST_ITEM_PRESSED_CB(Conversation, onMakeVoiceItemPressed), this)); + if(MsgUtils::isValidNumber(address)) + { + popup.appendItem(*new PopupAddressListItem(popup, msg("IDS_MSG_OPT_MAKE_VOICE_CALL"), address, + POPUPLIST_ITEM_PRESSED_CB(Conversation, onMakeVoiceItemPressed), this)); + } } popup.appendItem(*new PopupAddressListItem(popup, msg("IDS_MSG_OPT_CREATE_CONTACT_ABB"), address, @@ -810,6 +813,7 @@ void Conversation::showSendDpmNotif(const MsgAddressList &addressList) std::string text = msgArgs("IDS_MSG_POP_THE_SECURITY_POLICY_PREVENTS_SENDING_MESSAGES_TO_THE_FOLLOWING_RECIPIENTS_C_NPS", addresses.c_str()); auto &popupMngr = getApp().getPopupManager(); Popup &popup = popupMngr.getPopup(); + popup.setAutoDismissBlockClickedFlag(true); popup.addButton(msgt("IDS_MSG_BUTTON_OK_ABB"), Popup::OkButtonId); popup.setContent(text); popup.show(); diff --git a/src/Viewer/Controller/inc/Viewer.h b/src/Viewer/Controller/inc/Viewer.h index 5c883a5e..41896f52 100644 --- a/src/Viewer/Controller/inc/Viewer.h +++ b/src/Viewer/Controller/inc/Viewer.h @@ -117,7 +117,7 @@ namespace Msg std::string createMessageText() const; void createSmilPlayer(); void recipientClickHandler(const std::string &address); - void showRecipPopup(const std::string &title); + void showRecipPopup(const std::string &address); void updatePlayPos(); void updateSubject(); void updateButtonState(); diff --git a/src/Viewer/Controller/src/Viewer.cpp b/src/Viewer/Controller/src/Viewer.cpp index 55d371bc..5682d505 100644 --- a/src/Viewer/Controller/src/Viewer.cpp +++ b/src/Viewer/Controller/src/Viewer.cpp @@ -216,12 +216,13 @@ void Viewer::naviPrevButtonHandler() pop(); } -void Viewer::showRecipPopup(const std::string &title) +void Viewer::showRecipPopup(const std::string &address) { PopupList &popup = getApp().getPopupManager().getPopupList(); - popup.setTitle(title); + popup.setTitle(address); popup.setAutoDismissBlockClickedFlag(true); - popup.appendItem(msg("IDS_MSG_OPT_MAKE_VOICE_CALL"), POPUPLIST_ITEM_PRESSED_CB(Viewer, onMakeVoiceItemPressed), this); + if(MsgUtils::isValidNumber(address)) + popup.appendItem(msg("IDS_MSG_OPT_MAKE_VOICE_CALL"), POPUPLIST_ITEM_PRESSED_CB(Viewer, onMakeVoiceItemPressed), this); popup.appendItem(msg("IDS_MSG_OPT_CREATE_CONTACT_ABB"), POPUPLIST_ITEM_PRESSED_CB(Viewer, onCreateContactItemPressed), this); popup.appendItem(msg("IDS_MSG_OPT_UPDATE_CONTACT"), POPUPLIST_ITEM_PRESSED_CB(Viewer, onUpdateContactItemPressed), this); popup.show(); -- 2.34.1