Merge lp:~gary-wzl77/qtorganizer5-eds/fix_1445577 into lp:qtorganizer5-eds

[Gary.Wang]

remove invalid QTimeZone when converting icaltimetype to QDateTime

remove invalid QTimeZone when converting icaltimetype to QDateTime

[Renato Araujo Oliveira Filho (renatofilho)]

Reading the bug report I would say that the event is losing the timezone when edited. Is the app setting the correct timezone? If the app does not set the timezone the event will be handled as a Floating event.

review: Needs Information

[Gary.Wang (gary-wzl77)]

Actually, there is no such a timezone settings in app. App just follows system timezone.

My Time & Date in system settings
Time zone:
Asia/Shangehai UTC+8

----Create an event (display correctly in weeklyview)
qml: event.name: Ttttt
qml: event.startDateTime: Fri Jul 24 07:00:00 2015 GMT+0800
qml: event.endDateTime: Fri Jul 24 08:00:00 2015 GMT+0800

----Edit an event with only name changed (wrong display and event backs x hours)
qml: event.name: Ttttt-edit
qml: event.startDateTime: Fri Jul 24 07:00:00 2015 GMT+0800
qml: event.endDateTime: Fri Jul 24 08:00:00 2015 GMT+0800

[lp:~gary-wzl77/qtorganizer5-eds/fix_1445577]

87. By Gary.Wang on 2015-08-26

Convert local timezone to UTC time zone when parsing start & end datetime
if they're not floating time.

[Gary.Wang (gary-wzl77)]

I check this issue today and find sth as following:
when user modify a event with start or end date time changed, issue wont' occur.
when user modify a event without start datetime and end date time changed, issue occurs.
Reason for this is if start and end date time are not changed when modification, the timeSpec is for these two datetime is Qt::TimeZone instead of Qt::UTC when parsing them, then
tz.id().constData() == "able/localtime" which cause timezone == null and empty for tzId after icaltimezone_get_builtin_timezone was called.
so finally event backs x(timezone) hours after e_cal_client_modify_objects called.

As I mentioned above, we follow system timezone and have no way to set timezone in qml.
The easy fix is if start & end datetime are not floating time, then we need to convert Local timezone to UTC time zone.
Please review latest MP.
Thanks

[Renato Araujo Oliveira Filho (renatofilho)]

Could you resubmit this MR adding "https://code.launchpad.net/~renatofilho/qtorganizer5-eds/fix-1437305/+merge/261666" as Prerequisite Branch, it will make only your changes visible on the diff. And make it easy to review.

[Gary.Wang (gary-wzl77)]

OK, I will delete this one later on and create another MP for review since I can't resubmit merge proposal in same branch.
Thanks.

Unmerged revisions

=== modified file 'organizer/qorganizer-eds-engine.cpp'
--- organizer/qorganizer-eds-engine.cpp	2015-07-14 00:48:09 +0000
+++ organizer/qorganizer-eds-engine.cpp	2015-08-27 02:06:04 +0000
@@ -1212,7 +1212,8 @@
 {
     uint tmTime;
 
-    if (tzId) {
+    // check if ialtimetype contais a time and timezone
+    if (!icaltime_is_date(value) && tzId) {
         icaltimezone *timezone = icaltimezone_get_builtin_timezone_from_tzid(tzId);
         // fallback: sometimes the tzId contains the location name
         if (!timezone) {
@@ -1237,26 +1238,31 @@
     QDateTime finalDate(dateTime);
     QTimeZone tz;
 
-    switch (finalDate.timeSpec()) {
-    case Qt::UTC:
-    case Qt::OffsetFromUTC:
-        // convert date to UTC timezone
-        tz = QTimeZone("UTC");
-        finalDate = finalDate.toTimeZone(tz);
-        break;
-    case Qt::TimeZone:
-        tz = finalDate.timeZone();
-        if (!tz.isValid()) {
-            // floating time
-            finalDate = QDateTime(finalDate.date(), finalDate.time(), Qt::UTC);
+    if (!allDay) {
+        switch (finalDate.timeSpec()) {
+        case Qt::UTC:
+        case Qt::OffsetFromUTC:
+            // convert date to UTC timezone
+            tz = QTimeZone("UTC");
+            finalDate = finalDate.toTimeZone(tz);
+            break;
+        case Qt::TimeZone:
+            tz = finalDate.timeZone();
+            if (!tz.isValid()) {
+                // floating time
+                finalDate = QDateTime(finalDate.date(), finalDate.time(), Qt::UTC);
+            } else {
+                tz = QTimeZone("UTC");
+                finalDate = finalDate.toTimeZone(tz);
+            }
+            break;
+        case Qt::LocalTime:
+            tz = QTimeZone(QTimeZone::systemTimeZoneId());
+            finalDate = finalDate.toTimeZone(tz);
+            break;
+        default:
+            break;
         }
-        break;
-    case Qt::LocalTime:
-        tz = QTimeZone(QTimeZone::systemTimeZoneId());
-        finalDate = finalDate.toTimeZone(tz);
-        break;
-    default:
-        break;
     }
 
     if (tz.isValid()) {

=== modified file 'tests/unittest/event-test.cpp'
--- tests/unittest/event-test.cpp	2015-04-13 21:30:00 +0000
+++ tests/unittest/event-test.cpp	2015-08-27 02:06:04 +0000
@@ -498,15 +498,16 @@
         QCOMPARE(errorMap[1], QOrganizerManager::InvalidCollectionError);
     }
 
-    void testCreateAllDayEvent()
+    void testCreateAllDayTodo()
     {
         static QString displayLabelValue = QStringLiteral("All day title");
         static QString descriptionValue = QStringLiteral("All day description");
 
+        QDateTime eventDateTime = QDateTime(QDate(2013, 9, 3), QTime(0,30,0));
         QOrganizerTodo todo;
         todo.setCollectionId(m_collection.id());
         todo.setAllDay(true);
-        todo.setStartDateTime(QDateTime(QDate(2013, 9, 3), QTime(0,30,0)));
+        todo.setStartDateTime(eventDateTime);
         todo.setDisplayLabel(displayLabelValue);
         todo.setDescription(descriptionValue);
 
@@ -532,7 +533,51 @@
 
         QOrganizerTodo todoResult = static_cast<QOrganizerTodo>(items[0]);
         QCOMPARE(todoResult.isAllDay(), true);
-    }
+        QCOMPARE(todoResult.startDateTime().date(), eventDateTime.date());
+        QCOMPARE(todoResult.startDateTime().time(), QTime(0, 0, 0));
+    }
+
+    void testCreateAllDayEvent()
+    {
+        static QString displayLabelValue = QStringLiteral("All day title");
+        static QString descriptionValue = QStringLiteral("All day description");
+
+        QDateTime eventDateTime = QDateTime(QDate(2013, 9, 3), QTime(0,30,0));
+        QOrganizerEvent event;
+        event.setStartDateTime(eventDateTime);
+        event.setEndDateTime(eventDateTime.addDays(1));
+        event.setDisplayLabel(displayLabelValue);
+        event.setDescription(descriptionValue);
+        event.setAllDay(true);
+
+        QtOrganizer::QOrganizerManager::Error error;
+        QMap<int, QtOrganizer::QOrganizerManager::Error> errorMap;
+        QList<QOrganizerItem> items;
+        items << event;
+        bool saveResult = m_engine->saveItems(&items,
+                                            QList<QtOrganizer::QOrganizerItemDetail::DetailType>(),
+                                            &errorMap,
+                                            &error);
+        QVERIFY(saveResult);
+        QCOMPARE(error, QOrganizerManager::NoError);
+        QVERIFY(errorMap.isEmpty());
+        QOrganizerItemId id = items[0].id();
+        QVERIFY(!id.isNull());
+
+        QOrganizerItemFetchHint hint;
+        QList<QOrganizerItemId> ids;
+        ids << items[0].id();
+        items = m_engine->items(ids, hint, &errorMap, &error);
+        QCOMPARE(items.count(), 1);
+
+        QOrganizerEvent eventResult = static_cast<QOrganizerEvent>(items[0]);
+        QCOMPARE(eventResult.isAllDay(), true);
+        QCOMPARE(eventResult.startDateTime().date(), eventDateTime.date());
+        QCOMPARE(eventResult.startDateTime().time(), QTime(0, 0, 0));
+        QCOMPARE(eventResult.endDateTime().date(), eventDateTime.date().addDays(1));
+        QCOMPARE(eventResult.endDateTime().time(), QTime(0, 0, 0));
+    }
+
 
     void testCreateTodoEventWithStartDate()
     {