From f7e03ddc08f638ac43a9046bde1f2b45debac347 Mon Sep 17 00:00:00 2001 From: Denis Dolzhenko Date: Mon, 26 Dec 2016 11:39:53 +0200 Subject: [PATCH] Fixed: Checking dpm restriction before sending Change-Id: I0e9ad9229ebc0f656d225266ca30104904e335ad Signed-off-by: Denis Dolzhenko --- src/Conversation/Main/Controller/src/Conversation.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Conversation/Main/Controller/src/Conversation.cpp b/src/Conversation/Main/Controller/src/Conversation.cpp index d8caef64..f345dd8c 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: - // Message service shows own popup for this case. + // Checked in checkBeforeSend() method. return; default: strId = "IDS_MSGC_BODY_UNABLE_TO_SEND_MESSAGE"; @@ -601,6 +601,12 @@ bool Conversation::checkBeforeSend(const Message &msg) return false; } + if (getApp().getSysSettingsManager().isMessagingRestrictedByDpm()) + { + showSendDpmNotif(msg.getAddressList()); + return false; + } + if (msg.isMms() && !getApp().getSysSettingsManager().isMobileDataEnabled()) { showMobileDataPopup(); -- 2.34.1