Fixed: Thumbnails in conversation

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

diff --git a/src/Common/Utils/inc/ThumbnailMaker.h b/src/Common/Utils/inc/ThumbnailMaker.h
index e22f90904cbebfe1aaa4549837ca96911e632c71..10827007e0ad7d9e426cf04139134f440ce18619 100644 (file)
--- a/src/Common/Utils/inc/ThumbnailMaker.h
+++ b/src/Common/Utils/inc/ThumbnailMaker.h
@@ -28,6 +28,7 @@ namespace Msg
 {
     class App;
     typedef long ThumbId;
+    const ThumbId invalidThumbId = -1;
 
     class ThumbnailMaker
         : public IContactManagerListener

diff --git a/src/Conversation/ConvList/Controller/inc/ConvListItem.h b/src/Conversation/ConvList/Controller/inc/ConvListItem.h
index 474d6c76f176b20aec87b0be3d02bf4ec139c13b..98dd0554356d60f41bacb5955339274059dba3b1 100644 (file)
--- a/src/Conversation/ConvList/Controller/inc/ConvListItem.h
+++ b/src/Conversation/ConvList/Controller/inc/ConvListItem.h
@@ -54,7 +54,7 @@ namespace Msg
                          FileViewer &fileViewer,
                          WorkingDirRef workingDir,
                          const std::string &searchWord,
-                         const ThumbId &thumbId = -1);
+                         const ThumbId &thumbId = invalidThumbId);
 
             virtual ~ConvListItem();
 

diff --git a/src/Conversation/ConvList/Controller/src/ConvList.cpp b/src/Conversation/ConvList/Controller/src/ConvList.cpp
index fe4906238162246a8cadf0b463e6d6021a8c308f..da9dd5cd2f6d2a69a9ddd43f6be6a806dfa39deb 100644 (file)
--- a/src/Conversation/ConvList/Controller/src/ConvList.cpp
+++ b/src/Conversation/ConvList/Controller/src/ConvList.cpp
@@ -155,7 +155,7 @@ void ConvList::updateRecipThumbId()
             m_RecipThumbId = m_App.getThumbnailMaker().getThumbId(addressList->at(0));
         else
         {
-            m_RecipThumbId = ThumbnailMaker::SingleThumb;
+            m_RecipThumbId =  m_App.getThumbnailMaker().getThumbId(ThumbnailMaker::SingleThumb);
             MSG_LOG_WARN("Msg address list is empty");
         }
     }
@@ -183,9 +183,10 @@ ConvListItem *ConvList::getItem(MsgId msgId) const
 
 void ConvList::appendItem(const MsgConversationItem &item)
 {
-    static const ThumbId invalidId = -1;
-    const ThumbId &thumbId = item.getDirection() == Message::MD_Received ? m_RecipThumbId : invalidId;
-    appendItem(new ConvListItem(item, m_App, m_FileViewer, m_WorkingDir, m_SearchWord, thumbId));
+    if(item.getDirection() == Message::MD_Received)
+        appendItem(new ConvListItem(item, m_App, m_FileViewer, m_WorkingDir, m_SearchWord, m_RecipThumbId));
+    else
+        appendItem(new ConvListItem(item, m_App, m_FileViewer, m_WorkingDir, m_SearchWord));
 }
 
 void ConvList::appendItem(ConvListItem *item)