From 83ab2b483cb0c1424cce6f6a087b062b78a5106e Mon Sep 17 00:00:00 2001 From: Denis Dolzhenko Date: Fri, 23 Dec 2016 12:11:10 +0200 Subject: [PATCH] Checking dpm restriction before sending Change-Id: I246676280a38dd5d60319cce7f8b3d98973c5634 Signed-off-by: Denis Dolzhenko --- src/Conversation/Main/Controller/src/Conversation.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Conversation/Main/Controller/src/Conversation.cpp b/src/Conversation/Main/Controller/src/Conversation.cpp index e9570315..d8caef64 100644 --- a/src/Conversation/Main/Controller/src/Conversation.cpp +++ b/src/Conversation/Main/Controller/src/Conversation.cpp @@ -580,7 +580,7 @@ void Conversation::handleSendResult(const Message &msg, MsgTransport::SendResult strId = "IDS_MSG_BODY_UNABLE_TO_SEND_THIS_MESSAGE_INSERT_YOUR_SIM_CARD_AND_TRY_AGAIN"; break; case MsgTransport::SendDPMRestricted: - showSendDpmNotif(msg.getAddressList()); + // Message service shows own popup for this case. return; default: strId = "IDS_MSGC_BODY_UNABLE_TO_SEND_MESSAGE"; @@ -667,7 +667,7 @@ void Conversation::sendMessage() return; if (m_pRecipPanel && - m_pRecipPanel->getEntryFocus() && + m_pRecipPanel->getEntryFocus() && !m_pRecipPanel->getEntryText().empty() && !m_pRecipPanel->addRecipientsFromEntry()) return; -- 2.34.1