TizenRefApp-7513 Date line is not deleted after delete all messages from this date...

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

diff --git a/src/Common/View/inc/ListView.h b/src/Common/View/inc/ListView.h
index a246b2efc535ec0487b4e35dee54e84e4330070b..aed2e8e39c2e92dba86eb259a3e48274bb072cc0 100644 (file)
--- a/src/Common/View/inc/ListView.h
+++ b/src/Common/View/inc/ListView.h
@@ -312,10 +312,10 @@ namespace Msg
     T *ListView::getNextItem(ListItem &item) const
     {
         T *res = nullptr;
-        ListItem *next = nullptr;
+        ListItem *next = &item;
         do
         {
-            next = getNextItem(item);
+            next = getNextItem(*next);
             res = dynamic_cast<T*>(next);
         } while(next && !res);
 
@@ -326,12 +326,12 @@ namespace Msg
     T *ListView::getPrevItem(ListItem &item) const
     {
         T *res = nullptr;
-        ListItem *next = nullptr;
+        ListItem *prev = &item;
         do
         {
-            next = getPrevItem(item);
-            res = dynamic_cast<T*>(next);
-        } while(next && !res);
+            prev = getPrevItem(*prev);
+            res = dynamic_cast<T*>(prev);
+        } while(prev && !res);
 
         return res;
     }

diff --git a/src/Conversation/ConvList/Controller/src/ConvList.cpp b/src/Conversation/ConvList/Controller/src/ConvList.cpp
index f96586d5a4549135010b681896df667b3c976bdc..cfa5171341662542ce80b66b7a8b98ca32c5c40b 100644 (file)
--- a/src/Conversation/ConvList/Controller/src/ConvList.cpp
+++ b/src/Conversation/ConvList/Controller/src/ConvList.cpp
@@ -282,8 +282,7 @@ void ConvList::dateLineDelIfNec(ConvListItem *item)
     if(prev)
     {
         ListItem *nextItem = m_pList->getNextItem(*item);
-        needDelDateLine = nextItem ? dynamic_cast<DateLineItem*>(nextItem) != nullptr : true;
-
+        needDelDateLine = nextItem ? dynamic_cast<ConvListItem*>(nextItem) == nullptr : true;
         if(needDelDateLine)
         {
             m_DateLineItemSet.erase(prev->getDateLine());