TizenRefApp-7364 Popup is visible if message app launched by app_control (compose...

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

diff --git a/src/Common/Controller/src/NaviFrameController.cpp b/src/Common/Controller/src/NaviFrameController.cpp
index f5e774e..a47ade8 100644 (file)
--- a/src/Common/Controller/src/NaviFrameController.cpp
+++ b/src/Common/Controller/src/NaviFrameController.cpp
@@ -21,6 +21,7 @@
 #include "MsgThread.h"
 #include "Conversation.h"
 #include "Logger.h"
+#include "PopupManager.h"
 
 #include <memory>
 #include <notification.h>
@@ -45,7 +46,10 @@ void NaviFrameController::pop(FrameController &frame)
     if(isLastFrame())
         getApp().exit();
     else
+    {
+        getApp().getPopupManager().reset();
         NaviFrameView::pop(frame);
+    }
 }
 
 void NaviFrameController::destroy()
@@ -56,7 +60,6 @@ void NaviFrameController::destroy()
 bool NaviFrameController::prepare(const AppControlCommand &cmd)
 {
     MSG_LOG("Execute app. control command: ", cmd.getOperationMsg());
-
     std::string errorMsg;
     if(!getMsgEngine().isReady(errorMsg))
     {

diff --git a/src/Conversation/Main/Controller/src/Conversation.cpp b/src/Conversation/Main/Controller/src/Conversation.cpp
index 771407a..b902e1f 100644 (file)
--- a/src/Conversation/Main/Controller/src/Conversation.cpp
+++ b/src/Conversation/Main/Controller/src/Conversation.cpp
@@ -112,6 +112,7 @@ Conversation::~Conversation()
 
 void Conversation::execCmd(const AppControlComposeRef &cmd)
 {
+    getApp().getPopupManager().reset();
     if(!isRecipExists() && !isBodyEmpty() && m_Mode == NewMessageMode) // Check if we can save draft to avoid losing data
     {
         m_DefferedCmd.composeCmd = cmd;
@@ -167,6 +168,7 @@ void Conversation::execCmd(const AppControlDefaultRef &cmd)
         return;
     }
 
+    getApp().getPopupManager().reset();
     MsgId msgId = cmd->getMessageId();
     setThreadId(getMsgEngine().getStorage().getMessage(msgId)->getThreadId());
     if(msgId.isValid())