Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PIM
KDE PIM Runtime
Commits
e9310258
Commit
e9310258
authored
Aug 17, 2020
by
Shashwat Jolly
Browse files
Fix prevUid updation while setting up items
parent
319371f2
Changes
2
Hide whitespace changes
Inline
Side-by-side
resources/etesync/calendartaskbasehandler.cpp
View file @
e9310258
...
...
@@ -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
View file @
e9310258
...
...
@@ -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
();
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment