Fix prevUid updation while setting up items

resources/etesync/calendartaskbasehandler.cpp

@@ -53,12 +53,14 @@ void CalendarTaskBaseHandler::getItemListFromEntries(std::vector<EteSyncEntryPtr
     for (auto &entry : entries) {
         if (!entry) {
             qCDebug(ETESYNC_LOG) << "SetupItems: Entry is null";
+            prevUid = QStringFromCharPtr(CharPtr(etesync_entry_get_uid(entry.get())));
             continue;
         }
         EteSyncSyncEntryPtr syncEntry = etesync_entry_get_sync_entry(entry.get(), cryptoManager.get(), prevUid);
 
         if (!syncEntry) {
             qCDebug(ETESYNC_LOG) << "SetupItems: syncEntry is null for entry" << etesync_entry_get_uid(entry.get());
+            prevUid = QStringFromCharPtr(CharPtr(etesync_entry_get_uid(entry.get())));
             continue;
         }
 
@@ -69,6 +71,7 @@ void CalendarTaskBaseHandler::getItemListFromEntries(std::vector<EteSyncEntryPtr
 
         if (!incidence || (incidence->uid()).isEmpty()) {
             qCDebug(ETESYNC_LOG) << "Couldn't parse entry with uid" << etesync_entry_get_uid(entry.get());
+            prevUid = QStringFromCharPtr(CharPtr(etesync_entry_get_uid(entry.get())));
             continue;
         }
 

resources/etesync/etesyncresource.cpp

@@ -264,6 +264,7 @@ BaseHandler *EteSyncResource::fetchHandlerForCollection(const Akonadi::Collectio
 
 void EteSyncResource::retrieveItems(const Akonadi::Collection &collection)
 {
+    qCDebug(ETESYNC_LOG) << "Retrieving entries for journal" << collection.remoteId();
     const int timeSinceLastCacheUpdate = mJournalsCacheUpdateTime.secsTo(QDateTime::currentDateTime());
     if (timeSinceLastCacheUpdate <= 30) {
         const QString journalUid = collection.remoteId();