Fix removed address book items not being synced between federated instances#59312
Merged
icewind1991 merged 6 commits intomasterfrom Apr 23, 2026
Merged
Fix removed address book items not being synced between federated instances#59312icewind1991 merged 6 commits intomasterfrom
icewind1991 merged 6 commits intomasterfrom
Conversation
icewind1991
requested review from
a team,
SebastianKrupinski and
hamza221
as code owners
icewind1991
added
3. to review
icewind1991
requested review from
ArtificialOwl,
CarlSchwan,
leftybournes and
salmart-dev
and removed request for
a team
hamza221
approved these changes
Mar 31, 2026
hamza221
requested changes
Mar 31, 2026
| // when doing a full sync, remove any items in the local address book that aren't in the remote one | ||
| if (!$syncToken) { | ||
| $existingCards = $this->backend->getCards($addressBookId); | ||
| $removedCards = array_filter($existingCards, fn (array $card) => !in_array($card['uri'], $received)); |
Contributor
There was a problem hiding this comment.
Premature approval,
This logic doesn't work in case of truncation, not all the cards are received at each step
Member
Author
There was a problem hiding this comment.
Changed it to "mark" all cards at the start of the sync by setting the mtime to null, then at the end delete all cards that haven't been touched by the sync.
icewind1991
force-pushed
the
calender-sync-delete
branch
2 times, most recently
from
85aba8b to
93fe7e3
Compare
hamza221
reviewed
Apr 15, 2026
Signed-off-by: Robin Appelman <robin@icewind.nl>
…a sync Signed-off-by: Robin Appelman <robin@icewind.nl>
Signed-off-by: Robin Appelman <robin@icewind.nl>
Signed-off-by: Robin Appelman <robin@icewind.nl>
Signed-off-by: Robin Appelman <robin@icewind.nl>
icewind1991
force-pushed
the
calender-sync-delete
branch
from
93fe7e3 to
fc11eef
Compare
Signed-off-by: Robin Appelman <robin@icewind.nl>
Member
Author
|
Fixed an issue with the limit handling of the initial sync where because of a missing ordering some items could be skipped. |
hamza221
approved these changes
Apr 23, 2026
| $syncToken = $oldSyncToken; | ||
| $syncToken = $full ? null : $oldSyncToken; | ||
|
|
||
| $book = $this->syncService->ensureSystemAddressBookExists($targetPrincipal, $targetBookId, $targetBookProperties); |
Contributor
There was a problem hiding this comment.
Causes a redundant call inside https://github.com/nextcloud/server/blob/master/apps/dav/lib/CardDAV/SyncService.php#L51
Maybe it should be removed inside syncRemoteAddressBook and we pass the addressbook as a parameter ?
Member
Author
|
/backport to stable33 |
Member
Author
|
/backport to stable32 |
Member
Author
|
/backport to stable31 |
2 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Currently deleted address book items aren't send in the sync
REPORTresponse.This adds the removed items to the
REPORTresponse.Additionally it adds a
--fulloption to theocc federation:sync-addressbookscommand to allow fixing existing cases of deletes not being synced.