Merge branch 'jb10055' into 'master'

[nemo-qml-plugin-calendar] Emit error if event cannot be loaded. Contributes to JB#10055

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

src/calendareventquery.cpp

@@ -37,7 +37,7 @@
 #include "calendarutils.h"
 
 CalendarEventQuery::CalendarEventQuery()
-    : mIsComplete(true), mOccurrence(0), mAttendeesCached(false)
+    : mIsComplete(true), mOccurrence(0), mAttendeesCached(false), mEventError(false)
 {
     connect(CalendarManager::instance(), SIGNAL(dataUpdated()), this, SLOT(refresh()));
     connect(CalendarManager::instance(), SIGNAL(storageModified()), this, SLOT(refresh()));
@@ -161,7 +161,7 @@ void CalendarEventQuery::componentComplete()
     refresh();
 }
 
-void CalendarEventQuery::doRefresh(CalendarData::Event event)
+void CalendarEventQuery::doRefresh(CalendarData::Event event, bool eventError)
 {
     // The value of mUid may have changed, verify that we got what we asked for
     if (event.isValid() && (event.uniqueId != mUid || event.recurrenceId != mRecurrenceId))
@@ -212,6 +212,16 @@ void CalendarEventQuery::doRefresh(CalendarData::Event event)
         mAttendeesCached = true;
         emit attendeesChanged();
     }
+
+    if (mEventError != eventError) {
+        mEventError = eventError;
+        emit eventErrorChanged();
+    }
+}
+
+bool CalendarEventQuery::eventError() const
+{
+    return mEventError;
 }
 
 KDateTime CalendarEventQuery::recurrenceId()

src/calendareventquery.h

@@ -100,6 +100,7 @@ class CalendarEventQuery : public QObject, public QQmlParserStatus
     Q_PROPERTY(QObject *event READ event NOTIFY eventChanged)
     Q_PROPERTY(QObject *occurrence READ occurrence NOTIFY occurrenceChanged)
     Q_PROPERTY(QList<QObject*> attendees READ attendees NOTIFY attendeesChanged)
+    Q_PROPERTY(bool eventError READ eventError NOTIFY eventErrorChanged)
 
 public:
     CalendarEventQuery();
@@ -121,10 +122,12 @@ class CalendarEventQuery : public QObject, public QQmlParserStatus
 
     QList<QObject*> attendees();
 
+    bool eventError() const;
+
     virtual void classBegin();
     virtual void componentComplete();
 
-    void doRefresh(CalendarData::Event event);
+    void doRefresh(CalendarData::Event event, bool eventError);
 
 signals:
     void uniqueIdChanged();
@@ -133,6 +136,7 @@ class CalendarEventQuery : public QObject, public QQmlParserStatus
     void occurrenceChanged();
     void attendeesChanged();
     void startTimeChanged();
+    void eventErrorChanged();
 
     // Indicates that the event UID has changed in database, event has been moved between notebooks.
     // The property uniqueId will not be changed, the data pointer properties event and occurrence
@@ -151,6 +155,7 @@ private slots:
     CalendarData::Event mEvent;
     CalendarEventOccurrence *mOccurrence;
     bool mAttendeesCached;
+    bool mEventError;
     QList<CalendarData::Attendee> mAttendees;
 };
 

src/calendarmanager.cpp

@@ -465,9 +465,19 @@ void CalendarManager::doAgendaAndQueryRefresh()
         if (event.uniqueId.isEmpty()
                 && !mLoadedQueries.contains(eventUid)
                 && !missingUidList.contains(eventUid)) {
+            // we haven't yet loaded this event from storage.
             missingUidList << eventUid;
+            query->doRefresh(event, false);
+        } else if (event.uniqueId.isEmpty() && mLoadedQueries.contains(eventUid)) {
+            // the event was unable to be loaded from storage,
+            // even though we have attempted to load its data.
+            // most likely, the event has been deleted.
+            query->doRefresh(event, true);
+        } else {
+            // we have loaded this event from storage.
+            // refresh the query based on the loaded event data.
+            query->doRefresh(event, false);
         }
-        query->doRefresh(event);
 
         if (mResetPending && !missingUidList.contains(eventUid))
             missingUidList << eventUid;