maryjane/syncevolution
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

CalDAV: filter out X-SYNCEVOLUTION-EXDATE-DETACHED

Browse source 
If the engine got a parent event with X-SYNCEVOLUTION-EXDATE-DETACHED,
merged it internally and then wrote it back, the
X-SYNCEVOLUTION-EXDATE-DETACHED would have been stored in the CalDAV
server. Now this is avoided by removing all such properties before
storing the new or updated event.

This was previously done (and still is) as an extra precaution in the
code which adds the properties.
This commit is contained in:
Patrick Ohly 2011-11-14 12:00:37 +00:00
parent 1cd49e9ecd
commit ede6e65ccb
1 changed files with 23 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/backends/webdav/CalDAVSource.cpp
View file

@ -25,6 +25,22 @@ static std::string SubIDName(const std::string &subid)
return subid.empty() ? "<master>" : subid;
}
/** remove X-SYNCEVOLUTION-EXDATE-DETACHED from VEVENT */
static void removeSyncEvolutionExdateDetached(icalcomponent *parent)
{
icalproperty *prop = icalcomponent_get_first_property(parent, ICAL_ANY_PROPERTY);
while (prop) {
icalproperty *next = icalcomponent_get_next_property(parent, ICAL_ANY_PROPERTY);
const char *xname = icalproperty_get_x_name(prop);
if (xname &&
!strcmp(xname, "X-SYNCEVOLUTION-EXDATE-DETACHED")) {
icalcomponent_remove_property(parent, prop);
icalproperty_free(prop);
}
prop = next;
}
}
CalDAVSource::CalDAVSource(const SyncSourceParams &params,
const boost::shared_ptr<Neon::Settings> &settings) :
WebDAVSource(params, settings)
@ -328,6 +344,10 @@ SubSyncSource::SubItemResult CalDAVSource::insertSubItem(const std::string &luid
comp = icalcomponent_get_next_component(newEvent->m_calendar, ICAL_VEVENT_COMPONENT)) {
std::string subid = Event::getSubID(comp);
EventCache::iterator it;
// remove X-SYNCEVOLUTION-EXDATE-DETACHED, could be added by
// the engine's read/modify/write cycle when resolving a
// conflict
removeSyncEvolutionExdateDetached(comp);
if (!luid.empty() &&
(it = m_cache.find(luid)) != m_cache.end()) {
// Additional sanity check: ensure that the expected UID is set.
@ -759,18 +779,9 @@ void CalDAVSource::readSubItem(const std::string &davLUID, const std::string &su
// RECURRENCE-IDs in detached recurrences by creating
// X-SYNCEVOLUTION-EXDATE-DETACHED in the parent
if (parent && event.m_subids.size() > 1) {
// remove all old X-SYNCEVOLUTION-EXDATE-DETACHED
icalproperty *prop = icalcomponent_get_first_property(parent, ICAL_ANY_PROPERTY);
while (prop) {
icalproperty *next = icalcomponent_get_next_property(parent, ICAL_ANY_PROPERTY);
const char *xname = icalproperty_get_x_name(prop);
if (xname &&
!strcmp(xname, "X-SYNCEVOLUTION-EXDATE-DETACHED")) {
icalcomponent_remove_property(parent, prop);
icalproperty_free(prop);
}
prop = next;
}
// remove all old X-SYNCEVOLUTION-EXDATE-DETACHED (just in case)
removeSyncEvolutionExdateDetached(parent);
// now populate with RECURRENCE-IDs of detached recurrences
for (icalcomponent *comp = icalcomponent_get_first_component(event.m_calendar, ICAL_VEVENT_COMPONENT);
comp;