feat(mobile): review remote-trashed assets before syncing deletions on Android by PeterOmbodi · Pull Request #28280 · immich-app/immich

PeterOmbodi · 2026-05-07T13:47:12Z

Description

This PR adds a new Review remote deletions option for Android remote deletion sync.

It is based on the work from the previous review-related PRs:

showing remote-deleted local assets for user review feat(mobile): review remote-trashed assets before syncing deletions on Android (part #1) #23992
applying the user's review decision by either keeping the local asset or moving it to the device trash feat(mobile): review remote-trashed assets before syncing deletions on Android (part #2) #27785

The existing Android remote deletion sync behavior is preserved. The new option is added next to the existing modes:

Sync remote deletions: existing automatic behavior. Matching local assets in backup-selected albums are moved to the device trash when MANAGE_MEDIA is available.
Review remote deletions: new behavior. Matching local assets in backup-selected albums are shown for review, and the user decides whether to keep the local asset or move it to trash.
Off: existing behavior. The app does not automatically modify local media.

Behavior

On Android, when a remote asset is moved to trash or permanently deleted remotely, the mobile app can detect matching local assets in backup-selected albums.

With Review remote deletions enabled, matching local assets that are currently in backup-selected albums are shown in a review queue instead of being moved automatically. The user can then:

keep the local asset on the device
move the local asset to the device trash

If album backup selection changes after a remote trash intent was recorded, the review page only shows and applies decisions to matching local assets that are still in backup-selected albums.

Remote restore events can restore matching local trashed assets when the selected mode allows it and the app has the required Android media permission.

Technical Notes

Trash sync flow

The implementation separates remote trash intent handling from local trash snapshot reconciliation:

SyncStreamService owns remote trash/restore events from the sync stream.
LocalSyncService owns Android local trash snapshot reconciliation.
trashSyncEntity stores current review decisions for remote trash intents.
trashedLocalAssetEntity stores current known local trash state.

Remote trash events

SyncStreamService handles remote trash intents while remote ids and deleted timestamps are still available.

For remote asset trash/delete events:

Remote asset rows are updated or prepared for deletion.
Matching local assets are looked up in currently backup-selected albums.
Assets with an existing approved/rejected review decision are ignored.
In automatic sync mode, local asset ids are passed to AssetMediaRepository.deleteAll when MANAGE_MEDIA is available.
Only ids returned by deleteAll are recorded as locally trashed.
Pending/rejected review rows for successfully moved checksums are removed.
Unresolved candidates are written to trashSyncEntity as review candidates so they can be surfaced in review mode.

Review decisions

ActionService.resolveRemoteTrash applies explicit user decisions:

Reject: marks the remote trash intent as rejected and keeps the local asset.
Approve: moves matching local asset ids from currently backup-selected albums through AssetMediaRepository.deleteAll, records successfully moved assets in local trash state, then marks those checksums as approved.

The approval update happens after local trash state is written, because approved rows are excluded from future candidate lookup.

Local trash snapshot sync

LocalSyncService does not derive remote trash candidates.

It reconciles the Android local trash snapshot:

Read current Android trashed assets.
Update trashedLocalAssetEntity.
Remove pending/rejected review rows that are already locally resolved.
Restore local trashed assets for remote restore events when mode and permission allow it.
Run throttled cleanup for stale rows.

Cleanup rules

trashSyncEntity is a current review queue, not a history table.

Rows are cleaned when:

the remote asset is restored/alive again
the local asset no longer exists
the local asset is already in local trash
an approved local trash row is no longer backed by local trash state

Approved/rejected decisions suppress repeated remote delete or permanent-delete events until a remote restore invalidates the decision.

Testing

Tested with updated unit/repository coverage for:

remote trash candidate lookup
review timeline backed by local assets
existing automatic remote deletion sync success and partial success
review candidate creation
user approve/reject actions
local trash snapshot reconciliation
cleanup of stale/resolved review rows

Manual test path:

Use an Android 12+ device.
Select a local album for backup.
Use an asset from that backup-selected album.
Enable Review remote deletions in Settings -> Advanced.
Grant Manage Media Access when prompted.
From the web app, either move the backed-up asset to trash or permanently delete it.
Run or wait for remote sync on the mobile app.
Verify that the matching local asset appears as pending review.

Review decision branches:

Choose Keep on device.
Verify that the local asset stays on device and is removed from the review queue.
Repeat the remote deletion flow with another asset.
Run or wait for remote sync on the mobile app.
Choose Move to trash.
Verify that the local asset moves to device trash and is removed from the review queue.

Album selection branch:

Repeat the remote deletion flow with another asset.
Run or wait for remote sync on the mobile app.
Verify that the asset appears as pending review.
Remove the asset's local album from backup selection.
Verify that the asset is no longer shown as actionable in the review queue.
Re-select the album for backup and verify that the pending review item becomes visible/actionable again if the review decision was not resolved.

Automatic sync regression branch:

Enable Sync remote deletions.
From the web app, either move a backed-up asset to trash or permanently delete it.
Run or wait for remote sync on the mobile app.
Verify that the matching local asset is moved to device trash automatically when Manage Media Access is available.

Remote restore regression branch:

Restore the asset remotely.
Run or wait for remote sync on the mobile app.
Verify that matching local trashed assets are restored when the selected mode allows it and Manage Media Access is available.

Checklist:

I have carefully read CONTRIBUTING.md
I have performed a self-review of my own code
I have made corresponding changes to the documentation if applicable
I have no unrelated changes in the PR.
I have confirmed that any new dependencies are strictly necessary.
I have written tests for new code (if applicable)
I have followed naming conventions/patterns in the surrounding code
All code in src/services/ uses repositories implementations for database calls, filesystem operations, etc.
All code in src/repositories/ is pretty basic/simple and does not have any immich specific logic (that belongs in src/services/)

Please describe to which degree, if any, an LLM was used in creating this pull request.

An LLM was used to review chages and draft this PR description.

- Refactor TrashSyncService and ActionService - Respect isSyncApproved value in timeline.trashSyncReview - Use i18n values instead of hardcoded strings - Close review page when out-of-sync record count reaches 0

…ash, isApproved → allow

refactor code

refactor outOfSyncCountProvider create appSettingStreamProvider ImmichToast: add warning mode, add onTap callback refactor code

allow/deny buttons on asset preview (draft)

…ssets_v2 # Conflicts: # i18n/en.json # mobile/drift_schemas/main/drift_schema_v7.json # mobile/lib/infrastructure/repositories/db.repository.dart # mobile/lib/infrastructure/repositories/db.repository.drift.dart # mobile/lib/infrastructure/repositories/db.repository.steps.dart # mobile/lib/presentation/widgets/asset_viewer/bottom_bar.widget.dart # mobile/lib/routing/router.dart # mobile/test/drift/main/generated/schema.dart # mobile/test/drift/main/generated/schema_v7.dart

…rashed_state

show warning mark on avatar instead rework out-of-sync button

…ssets_v2 # Conflicts: # i18n/en.json # mobile/lib/presentation/widgets/asset_viewer/bottom_bar.widget.dart # mobile/lib/widgets/common/app_bar_dialog/app_bar_dialog.dart # mobile/lib/widgets/common/immich_sliver_app_bar.dart # mobile/lib/widgets/settings/advanced_settings.dart

…sync_assets_v2 # Conflicts: # mobile/lib/domain/services/sync_stream.service.dart # mobile/lib/domain/services/trash_sync.service.dart

refactor trash_sync service, action service add label for Deny/Allow actions buttons

delete LocalAssetEntity records when moved to trash refactor code

…rashed_state

refactro code

…rashed_state

…rashed_state # Conflicts: # mobile/test/domain/services/sync_stream_service_test.dart

…n flow - Add new `local_trashed_asset` table to store metadata of trashed assets - Save trashed asset info into `local_trashed_asset` before deletion - Use `local_trashed_asset` as source for asset restoration - Implement file restoration by `mediaId`

…rashed_state # Conflicts: # mobile/drift_schemas/main/drift_schema_v10.json # mobile/lib/infrastructure/repositories/db.repository.dart # mobile/lib/infrastructure/repositories/db.repository.drift.dart # mobile/lib/infrastructure/repositories/db.repository.steps.dart # mobile/test/drift/main/generated/schema_v10.dart

Rename the local asset lookup to clarify remote trash candidate behavior and exclude assets that already have accepted or rejected trash sync decisions. Defer approving trash sync entries until local trash processing completes, and avoid updating rejected entries during candidate upserts. Add repository and service test coverage for the updated trash sync flow.

update action service tests for success, failure, and partial-delete cases.

use `AssetMediaRepository.deleteAll` for automatic remote trash handling update sync stream tests

move manage media operations into `AssetMediaRepository` and remove the separate local files manager repository/service. remove unused Pigeon methods.

# Conflicts: # mobile/drift_schemas/main/drift_schema_v25.json # mobile/lib/domain/models/store.model.dart # mobile/lib/infrastructure/repositories/db.repository.dart # mobile/lib/infrastructure/repositories/db.repository.drift.dart # mobile/lib/infrastructure/repositories/db.repository.steps.dart # mobile/lib/services/app_settings.service.dart # mobile/lib/widgets/settings/advanced_settings.dart # mobile/test/drift/main/generated/schema_v25.dart

Peter Ombodi and others added 30 commits August 11, 2025 09:51

remove redundant changes

15b7bc2

refactor(trash-sync): update services and review handling

2c815f3

- Refactor TrashSyncService and ActionService - Respect isSyncApproved value in timeline.trashSyncReview - Use i18n values instead of hardcoded strings - Close review page when out-of-sync record count reaches 0

close review page if all conflicts resolved

6ca0607

refactor(trash-sync): rename setMoveToTrashDecision → resolveRemoteTr…

01bb756

…ash, isApproved → allow

sync remote restoration

dd2caef

refactor code

show toast about exist out-of-sync changes

7381e93

refactor outOfSyncCountProvider create appSettingStreamProvider ImmichToast: add warning mode, add onTap callback refactor code

refactor code

c0824ba

allow/deny buttons on asset preview (draft)

resolve merge conflicts

d08d6a3

refactor code (minor nitpicks)

b79371b

Merge remote-tracking branch 'origin/main' into feature/sync_assets_t…

bec675a

…rashed_state

revert changes related to toast

fc19318

show warning mark on avatar instead rework out-of-sync button

minor changes - remove debugPrint, use hardcoded label (temp)

5f22554

Merge branch 'feature/sync_assets_trashed_state' into feature/out-of-…

9feb2be

…sync_assets_v2 # Conflicts: # mobile/lib/domain/services/sync_stream.service.dart # mobile/lib/domain/services/trash_sync.service.dart

resolve merge conflicts

c93b789

refactor trash_sync service, action service add label for Deny/Allow actions buttons

Merge branch 'main' into feature/sync_assets_trashed_state

2ef8d55

process restoreFromTrash sequentially instead of Future.wait

c7e4f9d

group local assets by checksum before moving to trash

d8fb41e

delete LocalAssetEntity records when moved to trash refactor code

Merge remote-tracking branch 'origin/main' into feature/sync_assets_t…

f7573ae

…rashed_state

Merge remote-tracking branch 'public/main' into feature/sync_assets_t…

f019353

…rashed_state

fix format

c9da959

Merge remote-tracking branch 'public/main' into feature/sync_assets_t…

b8274c9

…rashed_state

use checksum for asset restoration

40ac65d

refactro code

fix format

468d163

sync trash only for backup-selected assets

8888657

Merge remote-tracking branch 'public/main' into feature/sync_assets_t…

b8e4149

…rashed_state

Merge remote-tracking branch 'public/main' into feature/sync_assets_t…

57540f6

…rashed_state # Conflicts: # mobile/test/domain/services/sync_stream_service_test.dart

Peter Ombodi added 5 commits May 7, 2026 10:40

fix(mobile): restore manage media permission settings API

facd5c2

fix(mobile): delete remote trash approvals via media repository

44ec55d

update action service tests for success, failure, and partial-delete cases.

fix(mobile): auto-trash sync assets by local ids

d2c8218

use `AssetMediaRepository.deleteAll` for automatic remote trash handling update sync stream tests

fix(mobile): fix asset viewer reload after bottom bar actions

4c6b9a2

PeterOmbodi requested review from danieldietzler and shenlong-tanwen as code owners May 7, 2026 13:47

immich-push-o-matic Bot added 📱mobile 🖥️web 🗄️server labels May 7, 2026

PeterOmbodi marked this pull request as draft May 7, 2026 13:54

PeterOmbodi changed the base branch from feat/review-page to main May 7, 2026 13:55

Peter Ombodi added 2 commits May 7, 2026 18:04

refactor(mobile): consolidate media trash handling

e2a08d4

move manage media operations into `AssetMediaRepository` and remove the separate local files manager repository/service. remove unused Pigeon methods.

shenlong-tanwen added changelog:feature and removed 🖥️web 🗄️server labels May 7, 2026

shenlong-tanwen removed the request for review from danieldietzler May 7, 2026 15:20

fix(mobile): resolve merge conflicts

f82cc5c

PeterOmbodi marked this pull request as ready for review May 7, 2026 16:13

PeterOmbodi marked this pull request as draft May 8, 2026 14:18

Peter Ombodi added 2 commits May 8, 2026 18:06

fix(mobile): show local assets in trash sync timeline

ecdf624

fix(mobile): use local assets for trash sync review actions

1abab68

PeterOmbodi marked this pull request as ready for review May 8, 2026 16:46

Peter Ombodi added 4 commits May 9, 2026 11:54

fix(mobile): chunk trash sync approval updates

299fd27

Merge remote-tracking branch 'origin/main' into feat/review-page

f6c72d6

fix(mobile): align trash review eligibility with selected albums

9e50268

style(mobile): format code

375a9ec

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

feat(mobile): review remote-trashed assets before syncing deletions on Android#28280

feat(mobile): review remote-trashed assets before syncing deletions on Android#28280
PeterOmbodi wants to merge 264 commits into
immich-app:mainfrom
PeterOmbodi:feat/review-page

PeterOmbodi commented May 7, 2026 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Uh oh!

Conversation

PeterOmbodi commented May 7, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Behavior

Technical Notes

Remote trash events

Review decisions

Local trash snapshot sync

Cleanup rules

Testing

Checklist:

Please describe to which degree, if any, an LLM was used in creating this pull request.

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

PeterOmbodi commented May 7, 2026 •

edited

Loading