Fixed: Checking dpm restriction before sending

Change-Id: I0e9ad9229ebc0f656d225266ca30104904e335ad
Signed-off-by: Denis Dolzhenko <d.dolzhenko@samsung.com>

diff --git a/src/Conversation/Main/Controller/src/Conversation.cpp b/src/Conversation/Main/Controller/src/Conversation.cpp
index d8caef64d500c319664e6348f7bb42838aeff3df..f345dd8cafca479df355fe3c6b6b44f2d9321fc4 100644 (file)
--- 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();