Fix/delete assets on trash empty #26070
Open
+102
−32
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.
Description
Under certain conditions, after the remote trash is emptied, assets may be uploaded again from the mobile device to the cloud.
see: #16732 (comment)
Reproduction conditions:
Steps to reproduce:
Root cause:
The current trash sync logic effectively synchronizes the remote and local trash states.
If the remote trash is emptied immediately after deletion, the sync list remains empty, and the corresponding local asset is not moved to the local trash. When the backup queue runs, the asset is uploaded to the cloud again.
Fixes # (#26069)
Handling for permanently deleted remote assets has been added.
If a local asset associated with a permanently deleted remote asset is found, it is automatically moved to the local trash.
How Has This Been Tested?
Repeat steps 1–3 from Steps to reproduce.
4. Verify that the asset is no longer present in the app timeline.
5. Verify that the asset is not uploaded back to the cloud.
Checklist:
src/services/uses repositories implementations for database calls, filesystem operations, etc.src/repositories/is pretty basic/simple and does not have any immich specific logic (that belongs insrc/services/)LLM usage:
GPT-5.3 Codex was used to help verify SQL queries and assist in writing tests.
...