Fix for issue N_SE-48574

Change-Id: Iaac087e00db1ee804b7d79e8efd6322a32f106cd
Signed-off-by: Gaurav Bhatt <gaurav.bhatt@samsung.com>

diff --git a/src/ClEventPresentationModel.cpp b/src/ClEventPresentationModel.cpp
index decdd31..049794b 100644 (file)
--- a/src/ClEventPresentationModel.cpp
+++ b/src/ClEventPresentationModel.cpp
@@ -729,21 +729,6 @@ EventPresentationModel::SetEventInstance(const CalEventInstance& event, bool all
                 __pCalendar = __pCalendarbook->GetCalendarN(ID_DEFAULT_EVENT_CALENDAR);
        }
 
-       // Check duplicated reminder
-       for (int i = 0; i < GetCountReminder() - 1; ++i)
-       {
-               Reminder reminder = *GetReminder(i);
-               for (int j = i + 1; j < GetCountReminder(); ++j)
-               {
-                       Reminder compReminder = *GetReminder(j);
-                       if (reminder.GetTimeOffset() == compReminder.GetTimeOffset()
-                                && reminder.GetTimeUnit() == compReminder.GetTimeUnit())
-                       {
-                               __pEvent->RemoveReminderAt(j--);
-                       }
-               }
-       }
-
        return E_SUCCESS;
 }
 
@@ -911,6 +896,21 @@ EventPresentationModel::Update(void)
                                GetErrorMessage(r), startUtcTime.ToString().GetPointer(), endUtcTime.ToString().GetPointer());
        }
 
+       // Check duplicated reminder
+       for (int i = 0; i < GetCountReminder() - 1; ++i)
+       {
+               Reminder reminder = *GetReminder(i);
+               for (int j = i + 1; j < GetCountReminder(); ++j)
+               {
+                       Reminder compReminder = *GetReminder(j);
+                       if (reminder.GetTimeOffset() == compReminder.GetTimeOffset()
+                                && reminder.GetTimeUnit() == compReminder.GetTimeUnit())
+                       {
+                               __pEvent->RemoveReminderAt(j--);
+                       }
+               }
+       }
+
        AppLogDebug("AddEvent before.");
        if (__pEvent->GetRecordId() == INVALID_RECORD_ID)
        {
@@ -956,20 +956,6 @@ EventPresentationModel::Update(void)
 
        if (r == E_SUCCESS)
        {
-               // Check duplicated reminder
-               for (int i = 0; i < GetCountReminder() - 1; ++i)
-               {
-                       Reminder reminder = *GetReminder(i);
-                       for (int j = i + 1; j < GetCountReminder(); ++j)
-                       {
-                               Reminder compReminder = *GetReminder(j);
-                               if (reminder.GetTimeOffset() == compReminder.GetTimeOffset()
-                                        && reminder.GetTimeUnit() == compReminder.GetTimeUnit())
-                               {
-                                       __pEvent->RemoveReminderAt(j--);
-                               }
-                       }
-               }
                delete __pEventInstance;
                __pEventInstance = null;
        }