TizenRefApp-8429 Launch file viewer for MMS file in Conversation

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

diff --git a/src/Common/AppControl/src/FileViewer.cpp b/src/Common/AppControl/src/FileViewer.cpp
index a24f2a26777faf4fd4987d8edd23f6c69134384d..582f0d0b8352012da6e4ab14ef3732376f7f7e01 100644 (file)
--- a/src/Common/AppControl/src/FileViewer.cpp
+++ b/src/Common/AppControl/src/FileViewer.cpp
@@ -46,8 +46,7 @@ bool FileViewer::launch(const std::string &file)
     if (mime.empty() || file.empty())
         return false;
 
-    if (m_Handle)
-    {
+    if (m_Handle) {
         app_control_set_mime(m_Handle, mime.c_str());
         std::string uri = "file://" + file;
         app_control_set_uri(m_Handle, uri.c_str());
@@ -61,15 +60,13 @@ bool FileViewer::launchWithCopy(const std::string &file)
 {
     bool res = false;
 
-    if (!AppControlLauncher::getInst().isLaunchInProgress())
-    {
+    if (!AppControlLauncher::getInst().isLaunchInProgress()) {
         // Remove previous file (correct only for APP_CONTROL_LAUNCH_MODE_GROUP)
         if (!m_FilePath.empty())
             FileUtils::remove(m_FilePath);
 
         m_FilePath = FileUtils::addFileToDataDir(file);
-        if (!m_FilePath.empty())
-        {
+        if (!m_FilePath.empty()) {
             FileUtils::saveFileToStorage(m_FilePath);
             res = launch(m_FilePath);
         }

diff --git a/src/Conversation/Controller/inc/ConvListItem.h b/src/Conversation/Controller/inc/ConvListItem.h
index cbd2a8c3746a11082488614044c967014844f9b3..b458d52b35e72d7f27c8c0a4d394bdc1168bb600 100644 (file)
--- a/src/Conversation/Controller/inc/ConvListItem.h
+++ b/src/Conversation/Controller/inc/ConvListItem.h
@@ -24,6 +24,7 @@
 #include "WorkingDir.h"
 #include "BubbleEntity.h"
 #include "Popup.h"
+#include "FileViewer.h"
 
 #include <list>
 
@@ -78,6 +79,7 @@ namespace Msg {
             std::list<BubbleEntityRef> m_BubbleEntityList;
             WorkingDirRef m_WorkingDir;
             BubbleEntityFactory &m_BubbleEntityFactory;
+            FileViewer m_FileViewer;
     };
 }
 

diff --git a/src/Conversation/Controller/src/ConvListItem.cpp b/src/Conversation/Controller/src/ConvListItem.cpp
index 03f14dc083ae78adfbc0b9a7166b24f9c2b84872..e2b11d1f2f1595583b5c503ada4da60117a34a27 100644 (file)
--- a/src/Conversation/Controller/src/ConvListItem.cpp
+++ b/src/Conversation/Controller/src/ConvListItem.cpp
@@ -180,7 +180,9 @@ void ConvListItem::onAction(BubbleViewItem &item)
     if (auto *audio = dynamic_cast<BubbleAudioEntity*>(&item.getEntity())) {
         audio->clickHandler();
     } else {
-        // TODO: impl.
+        std::string filePath = item.getEntity().getFilePath();
+        if (!filePath.empty())
+            m_FileViewer.launchWithCopy(filePath);
     }
 }