| Summary: | Akonadi Dav Resource: Missing Conflict Resolution | ||
|---|---|---|---|
| Product: | [Frameworks and Libraries] Akonadi | Reporter: | Till Schäfer <till2.schaefer> |
| Component: | DAV Resource | Assignee: | kdepim bugs <kdepim-bugs> |
| Status: | RESOLVED FIXED | ||
| Severity: | normal | CC: | alejandro_aero, aqeel, einmaladresse_2, euredudeheit1, ingo, kde, public, soujak |
| Priority: | NOR | ||
| Version: | 4.13 | ||
| Target Milestone: | --- | ||
| Platform: | Gentoo Packages | ||
| OS: | Linux | ||
| Latest Commit: | http://commits.kde.org/kdepim-runtime/44d38d363d6ff7b4f8c892becfb58a0339dbef0e | Version Fixed In: | 4.14.10 |
| Sentry Crash Report: | |||
|
Description
Till Schäfer
2014-08-26 10:11:31 UTC
The way the resource is designed is the following: Say we delete an event from Calendar in KOrganizer: 1) Akonadi calls item-deleted function in resource 2) Resource grabs url and etag and send a delete request to the caldav server together with an if-match header and the stored etag. 3) If everything worked, resource deletes item from akonadi collection Now comes the tricky bit: If the above DOES NOT WORK (because the item was changed meanwhile before we sent that delete request), the resource gets a 412 error back from the server and calls its retry function and that does emit broken, offline. So in order for this to work, we need to introduce conflict resolution handling. Ie in the above, have three exclusive options: 1) ask the user for input 2) delete anyway (we are the boss) 3) reload from server. This currently does not work as the dav job is not given to the retry function, only the error message. In the above example of deleting an element, the resource should probably do (either or): 1) Ask user for input and then do one of the below 2) Server wins: ignore delete request and start new job to retrieve updated item from DAV server - if that fails, either ignore silently or notify user 3) Client wins: Restart the job without the if-match header, delete the item. If that fails, delete item from collection only, and/or notify user *** This bug has been confirmed by popular vote. *** I think bug #343152 is a duplicate of this one. Any news on this one?! Git commit 44d38d363d6ff7b4f8c892becfb58a0339dbef0e by Grégory Oestreicher. Committed on 18/06/2015 at 20:59. Pushed by goestreicher into branch 'KDE/4.14'. Add simple conflict handling The conflict dialog will only be shown for local update / remote update conflicts. For cases where one side deleted the item while it was updated on the other, the deleting side loses the conflict automatically to prevent data loss. Related: bug 335090 FIXED-IN: 4.14.10 M +30 -0 resources/dav/common/davitemdeletejob.cpp M +13 -0 resources/dav/common/davitemdeletejob.h M +5 -4 resources/dav/common/davitemfetchjob.cpp M +2 -3 resources/dav/common/davitemfetchjob.h M +32 -2 resources/dav/common/davitemmodifyjob.cpp M +13 -0 resources/dav/common/davitemmodifyjob.h M +5 -0 resources/dav/common/davjobbase.cpp M +5 -0 resources/dav/common/davjobbase.h M +168 -8 resources/dav/resource/davgroupwareresource.cpp M +8 -0 resources/dav/resource/davgroupwareresource.h http://commits.kde.org/kdepim-runtime/44d38d363d6ff7b4f8c892becfb58a0339dbef0e *** Bug 343152 has been marked as a duplicate of this bug. *** *** Bug 341333 has been marked as a duplicate of this bug. *** |