TizenRefApp-6873 Thread list isn't opened from message sending failed notifications

Change-Id: I209c6506660505b5255779024d83e8e4fd15e8a4
Signed-off-by: Oleksander Kostenko <o.kostenko@samsung.com>

diff --git a/src/Common/AppControl/inc/AppControlDefault.h b/src/Common/AppControl/inc/AppControlDefault.h
index b8f3fda..b2f47d3 100644 (file)
--- a/src/Common/AppControl/inc/AppControlDefault.h
+++ b/src/Common/AppControl/inc/AppControlDefault.h
@@ -38,7 +38,8 @@ namespace Msg
                 MainType, //Type from home screen
                 ReplyType, //Type for reply message button clicked
                 ViewType, //Type for view message button clicked
-                NotificationType //Type from notification panel
+                NotificationType, //Type from notification panel
+                SendFailedType //Send failed message type
             };
 
         public:

diff --git a/src/Common/AppControl/src/AppControlDefault.cpp b/src/Common/AppControl/src/AppControlDefault.cpp
index 4f26e6d..5f58f6e 100644 (file)
--- a/src/Common/AppControl/src/AppControlDefault.cpp
+++ b/src/Common/AppControl/src/AppControlDefault.cpp
@@ -66,8 +66,10 @@ void AppControlDefault::parse(app_control_h handle)
     free(key);
     if(type == valueReply)
         m_DefaultType = ReplyType;
-    else if(type == valueNewMsg || type == valueSendFailed)
+    else if(type == valueNewMsg)
         viewMessage(handle);
+    else if(type == valueSendFailed)
+        m_DefaultType = SendFailedType;
     else
         MSG_LOG("Unknown type!");
 

diff --git a/src/Conversation/Main/Controller/src/Conversation.cpp b/src/Conversation/Main/Controller/src/Conversation.cpp
index cc45477..98661b2 100644 (file)
--- a/src/Conversation/Main/Controller/src/Conversation.cpp
+++ b/src/Conversation/Main/Controller/src/Conversation.cpp
@@ -130,6 +130,12 @@ void Conversation::execCmd(const AppControlDefaultRef &cmd)
         saveDraftMsg();
     }
 
+    if(cmd->getDefaultType() == AppControlDefault::SendFailedType)
+    {
+        pop();
+        return;
+    }
+
     if(cmd->getDefaultType() == AppControlDefault::NotificationType && getMsgEngine().getStorage().getUnreadThreadCount() > 1)
     {
         pop();