Merge branch 'jb46554' into 'master'

Use ResponseType if available to show calendar attendance

See merge request mer-core/nemo-qml-plugin-calendar!47

src/calendarutils.cpp

@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2015 Jolla Ltd.
+ * Copyright (c) 2015-2019 Jolla Ltd.
+ * Copyright (c) 2019 Open Mobile Platform LLC.
+ *
  * Contact: Petri M. Gerdt <petri.gerdt@jollamobile.com>
  *
  * You may use this file under the terms of the BSD license as follows:
@@ -301,3 +303,22 @@ KCalCore::Attendee::PartStat CalendarUtils::convertResponse(CalendarEvent::Respo
         return KCalCore::Attendee::NeedsAction;
     }
 }
+
+CalendarEvent::Response CalendarUtils::convertResponseType(const QString &responseType)
+{
+    // QString::toInt() conversion defaults to 0 on failure
+    switch (responseType.toInt()) {
+    case 1: // OrganizerResponseType (Organizer's acceptance is implicit)
+    case 3: // AcceptedResponseType
+        return CalendarEvent::ResponseAccept;
+    case 2: // TentativeResponseType
+        return CalendarEvent::ResponseTentative;
+    case 4: // DeclinedResponseType
+        return CalendarEvent::ResponseDecline;
+    case -1: // ResponseTypeUnset
+    case 0: // NoneResponseType
+    case 5: // NotRespondedResponseType
+    default:
+        return CalendarEvent::ResponseUnspecified;
+    }
+}

src/calendarutils.h

@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2015 Jolla Ltd.
+ * Copyright (c) 2015-2019 Jolla Ltd.
+ * Copyright (c) 2019 Open Mobile Platform LLC.
+ *
  * Contact: Petri M. Gerdt <petri.gerdt@jollamobile.com>
  *
  * You may use this file under the terms of the BSD license as follows:
@@ -53,6 +55,7 @@ bool importFromFile(const QString &fileName, KCalCore::Calendar::Ptr calendar);
 bool importFromIcsRawData(const QByteArray &icsData, KCalCore::Calendar::Ptr calendar);
 CalendarEvent::Response convertPartStat(KCalCore::Attendee::PartStat status);
 KCalCore::Attendee::PartStat convertResponse(CalendarEvent::Response response);
+CalendarEvent::Response convertResponseType(const QString &responseType);
 
 } // namespace CalendarUtils
 

src/calendarworker.cpp

@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2014 Jolla Ltd.
+ * Copyright (c) 2014-2019 Jolla Ltd.
+ * Copyright (c) 2019 Open Mobile Platform LLC.
+ *
  * Contact: Petri M. Gerdt <petri.gerdt@jollamobile.com>
  *
  * You may use this file under the terms of the BSD license as follows:
@@ -806,11 +808,21 @@ CalendarData::Event CalendarWorker::createEventStruct(const KCalCore::Event::Ptr
     }
     event.externalInvitation = externalInvitation;
 
+    // It would be good to set the attendance status directly in the event within the plugin,
+    // however in some cases the account email and owner attendee email won't necessarily match
+    // (e.g. in the case where server-side aliases are defined but unknown to the plugin).
+    // So we handle this here to avoid "missing" some status changes due to owner email mismatch.
+    // This defaults to QString() -> ResponseUnspecified in case the property is undefined
+    event.ownerStatus = CalendarUtils::convertResponseType(e->nonKDECustomProperty("X-EAS-RESPONSE-TYPE"));
+
     KCalCore::Attendee::List attendees = e->attendees();
 
     foreach (KCalCore::Attendee::Ptr calAttendee, attendees) {
         if (calAttendee->email() == calendarOwnerEmail) {
-            event.ownerStatus = CalendarUtils::convertPartStat(calAttendee->status());
+            if (CalendarUtils::convertPartStat(calAttendee->status()) != CalendarEvent::ResponseUnspecified) {
+                // Override the ResponseType
+                event.ownerStatus = CalendarUtils::convertPartStat(calAttendee->status());
+            }
             //TODO: KCalCore::Attendee::RSVP() returns false even if response was requested for some accounts like Google.
             // We can use attendee role until the problem is not fixed (probably in Google plugin).
             // To be updated later when google account support for responses is added.

src/src.pro

@@ -6,6 +6,7 @@ CONFIG += qt plugin hide_symbols
 
 QT += qml concurrent
 QT -= gui
+QMAKE_CXXFLAGS += -Werror
 
 target.path = $$[QT_INSTALL_QML]/$$PLUGIN_IMPORT_PATH
 PKGCONFIG += libkcalcoren-qt5 libmkcal-qt5 libical accounts-qt5