Fixed: video in msg body

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

diff --git a/src/Conversation/Body/Controller/src/Page.cpp b/src/Conversation/Body/Controller/src/Page.cpp
index 775f791..fc10d61 100644 (file)
--- a/src/Conversation/Body/Controller/src/Page.cpp
+++ b/src/Conversation/Body/Controller/src/Page.cpp
@@ -266,7 +266,7 @@ void Page::addVideo(const std::string &videoFilePath)
 
     if(!newVideoFilePath.empty())
     {
-        long long fileSize = FileUtils::getFileSize(thumbFilePath);
+        long long fileSize = FileUtils::getFileSize(newVideoFilePath);
         // FIXME: if getVideoFrame returns false ?
         MediaUtils::getVideoFrame(videoFilePath, thumbFilePath);
         m_Body.addVideo(*this, newVideoFilePath, fileSize, thumbFilePath);

diff --git a/src/Conversation/Body/View/inc/VideoPageViewItem.h b/src/Conversation/Body/View/inc/VideoPageViewItem.h
index 5a1d467..b1239e9 100644 (file)
--- a/src/Conversation/Body/View/inc/VideoPageViewItem.h
+++ b/src/Conversation/Body/View/inc/VideoPageViewItem.h
@@ -32,6 +32,7 @@ namespace Msg
             virtual ~VideoPageViewItem();
 
             virtual Type getType() const;
+            virtual std::string getFileName() const;
     };
 }
 

diff --git a/src/Conversation/Body/View/src/VideoPageViewItem.cpp b/src/Conversation/Body/View/src/VideoPageViewItem.cpp
index 6190d07..82fda1c 100644 (file)
--- a/src/Conversation/Body/View/src/VideoPageViewItem.cpp
+++ b/src/Conversation/Body/View/src/VideoPageViewItem.cpp
@@ -16,6 +16,7 @@
  */
 
 #include "VideoPageViewItem.h"
+#include "FileUtils.h"
 
 using namespace Msg;
 
@@ -29,6 +30,11 @@ VideoPageViewItem::~VideoPageViewItem()
 {
 }
 
+std::string VideoPageViewItem::getFileName() const
+{
+    return FileUtils::getFileName(getResourcePath());
+}
+
 VideoPageViewItem::Type VideoPageViewItem::getType() const
 {
     return VideoType;