fix(files): keep deleting live photo peers after a missing one - #64690
Merged
Merged
Conversation
handleCacheEntriesRemovedEvent() returned from the loop as soon as one peer could not be found, so every remaining peer in the same batch was left behind. This happens whenever both halves of a live photo are in the removed tree, since the first half is already gone when its peer id is looked up. Signed-off-by: Git'Fellow <12234510+solracsf@users.noreply.github.com>
solracsf
requested review from
CarlSchwan,
leftybournes,
salmart-dev and
sorbaugh
and removed request for
a team
September 23, 2026 14:07
Member
Author
|
/backport to stable35 |
Member
Author
|
/backport to stable34 |
Member
Author
|
/backport to stable33 |
icewind1991
approved these changes
Sep 23, 2026
provokateurin
approved these changes
Sep 23, 2026
This was referenced Sep 23, 2026
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
3 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.
Summary
SyncLivePhotosListener::handleCacheEntriesRemovedEvent()deletes the peer file for every removed live photo in a batch, but itreturned as soon as one peer could not be found in the user's folder instead ofcontinueing to the next one. Any peer after the missing one in the same batch was left behind.This happens when both halves of a live photo are inside the removed tree: by the time the loop reaches the second half's id, the first one is already gone from the folder,
getFirstNodeById()returnsnull, and the loop stops there.Found while looking into #64661, but unrelated to that issue's chunking problem.
Checklist
3. to review, feature component)stable32)AI (if applicable)