From 17ae0933972db11e23f92917f0cd31d19906b012 Mon Sep 17 00:00:00 2001
From: Denis Dolzhenko <d.dolzhenko@samsung.com>
Date: Fri, 23 Sep 2016 14:45:31 +0300
Subject: [PATCH] TizenRefApp-7250 Back button doesn't close Conversation view

Change-Id: Iea750762a2408e67239843a333add9df4cce4077
Signed-off-by: Denis Dolzhenko <d.dolzhenko@samsung.com>
---
 src/Common/Controller/src/NaviFrameController.cpp     | 6 +++++-
 src/Common/View/src/NaviFrameView.cpp                 | 2 +-
 src/Conversation/Body/View/src/BodyView.cpp           | 4 ++++
 src/Conversation/Main/Controller/src/Conversation.cpp | 3 ++-
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/Common/Controller/src/NaviFrameController.cpp b/src/Common/Controller/src/NaviFrameController.cpp
index 01f7388..f5e774e 100644
--- a/src/Common/Controller/src/NaviFrameController.cpp
+++ b/src/Common/Controller/src/NaviFrameController.cpp
@@ -103,7 +103,11 @@ void NaviFrameController::execCmd(const AppControlComposeRef &cmd)
     if(prepare(*cmd))
     {
         Conversation *conv = getTopFrame<Conversation>();
-        if(!conv)
+        if(conv)
+        {
+            promote(*conv);
+        }
+        else
         {
             conv = new Conversation(*this);
             push(*conv);
diff --git a/src/Common/View/src/NaviFrameView.cpp b/src/Common/View/src/NaviFrameView.cpp
index 5e600ae..cd1fb04 100644
--- a/src/Common/View/src/NaviFrameView.cpp
+++ b/src/Common/View/src/NaviFrameView.cpp
@@ -182,7 +182,7 @@ void NaviFrameView::insertToBottom(NaviFrameItem &item)
 
 void NaviFrameView::promote(NaviFrameItem &item)
 {
-    bool isTop = &item != getTopFrame();
+    bool isTop = &item == getTopFrame();
     if(!isTop)
     {
         m_TransitionStatus = true;
diff --git a/src/Conversation/Body/View/src/BodyView.cpp b/src/Conversation/Body/View/src/BodyView.cpp
index 4cd9221..421c107 100644
--- a/src/Conversation/Body/View/src/BodyView.cpp
+++ b/src/Conversation/Body/View/src/BodyView.cpp
@@ -77,6 +77,10 @@ void BodyView::setText(const std::string &text)
             free(markupText);
         }
     }
+    else
+    {
+        clear();
+    }
 }
 
 void BodyView::setFocus(bool focus)
diff --git a/src/Conversation/Main/Controller/src/Conversation.cpp b/src/Conversation/Main/Controller/src/Conversation.cpp
index 74a366b..32b3f86 100644
--- a/src/Conversation/Main/Controller/src/Conversation.cpp
+++ b/src/Conversation/Main/Controller/src/Conversation.cpp
@@ -1264,11 +1264,12 @@ void Conversation::onNoRecipDiscardButtonClicked(Popup &popup, int buttonId)
 {
     if(isDefferedCmd())
     {
+        m_pBody->clear();
         if(m_DefferedCmd.defaultCmd)
         {   // If we came from notification menu and unread threads will be more than one, we should to go back on thread list view
             if(m_DefferedCmd.defaultCmd->getDefaultType() == AppControlDefault::NotificationType && getMsgEngine().getStorage().getUnreadThreadCount() > 1)
             {
-                    pop();
+                pop();
             }
             else
             {   // Go to needed conversation
-- 
2.7.4