Merge branch 'jb52657' into 'master'

Ensure recurrenceId is parsed from the network reply correctly See merge request mer-core/buteo-sync-plugins-social!82
sailfishos · Jan 14, 2021 · e646c75 · e646c75
2 parents 0992b8c + 6ad1952
commit e646c75
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/google/google-calendars/googlecalendarsyncadaptor.cpp b/src/google/google-calendars/googlecalendarsyncadaptor.cpp
@@ -2014,7 +2014,7 @@ void GoogleCalendarSyncAdaptor::upsyncChanges(const QString &accessToken,
         reply->setProperty("accountId", m_accountId);
         reply->setProperty("accessToken", accessToken);
         reply->setProperty("kcalEventId", kcalEventId);
-        reply->setProperty("recurrenceId", recurrenceId.toString());
+        reply->setProperty("recurrenceId", recurrenceId);
         reply->setProperty("calendarId", calendarId);
         reply->setProperty("eventId", eventId);
         reply->setProperty("upsyncType", static_cast<int>(upsyncType));
@@ -2043,7 +2043,7 @@ void GoogleCalendarSyncAdaptor::upsyncFinishedHandler()
 {
     QNetworkReply *reply = qobject_cast<QNetworkReply*>(sender());
     QString kcalEventId = reply->property("kcalEventId").toString();
-    QDateTime recurrenceId = QDateTime::fromString(reply->property("recurrenceId").toString(), Qt::ISODate);
+    QDateTime recurrenceId = reply->property("recurrenceId").toDateTime();
     QString calendarId = reply->property("calendarId").toString();
     int upsyncType = reply->property("upsyncType").toInt();
     QByteArray replyData = reply->readAll();