Fix for issue N_SE-47007,N_SE-47064,N_SE-47055

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

diff --git a/src/ClEventDeleterForm.cpp b/src/ClEventDeleterForm.cpp
index bd33aa3..ec20b38 100644 (file)
--- a/src/ClEventDeleterForm.cpp
+++ b/src/ClEventDeleterForm.cpp
@@ -950,7 +950,15 @@ EventDeleterForm::OnCalendarEventChanged(void)
     {
        __pSelectAll->SetSelected(false);
     }
-       __pSelectBeforeToday->SetSelected(false);
+    if (IsSelectedAllEventBeforeToday())
+    {
+       __pSelectBeforeToday->SetSelected(true);
+    }
+    else
+    {
+       __pSelectBeforeToday->SetSelected(false);
+    }
+
        UpdateSelectedLabel();
 
        if (!IsSelectedAnyEvent() && __pTwoButtonPopup != null && __pTwoButtonPopup->GetShowState() == true)

diff --git a/src/ClEventPresentationModel.cpp b/src/ClEventPresentationModel.cpp
index b04fbdc..66c9e61 100644 (file)
--- a/src/ClEventPresentationModel.cpp
+++ b/src/ClEventPresentationModel.cpp
@@ -822,21 +822,6 @@ EventPresentationModel::Update(void)
        AppLogDebug("Enter.");
        String subject = __pEvent->GetSubject();
 
-       // 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--);
-                       }
-               }
-       }
-
        DateTime startUtcTime, endUtcTime;
        if (__pEvent->IsAllDayEvent())
        {
@@ -956,6 +941,20 @@ 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;
        }