feat(backup): unified exclusions timeline #1379

Merged
chris merged 1 commit from feat/exclusions-timeline into main 2026-10-25 15:32:10 +01:00
Owner

Design amendment 2026-10-25: the "Nicht in Memories" timeline becomes ONE list — local exclusions AND server-removed items (UPLOADED + shadowed lifecycle), each with its type-appropriate action: Wieder sichern (local), Wiederherstellen via the existing restore-intent queue (trashed), no button + honest re-add copy (permanently deleted). The separate Vom-Server-entfernt card on the backup screen is gone; the door row counts both halves together. Reconciler/data layer untouched. Tests: 869 green (app 697, core 172).

Design amendment 2026-10-25: the "Nicht in Memories" timeline becomes ONE list — local exclusions AND server-removed items (UPLOADED + shadowed lifecycle), each with its type-appropriate action: Wieder sichern (local), Wiederherstellen via the existing restore-intent queue (trashed), no button + honest re-add copy (permanently deleted). The separate Vom-Server-entfernt card on the backup screen is gone; the door row counts both halves together. Reconciler/data layer untouched. Tests: 869 green (app 697, core 172).
feat(backup): unified Nicht-in-Memories timeline — server-removed items included
All checks were successful
Wiki Sync / Sync wiki from docs (push) Has been skipped
Build and Deploy / Detect changed services and test scopes (push) Successful in 3s
Build and Deploy / Smoke API and media worker (push) Has been skipped
Build and Deploy / Smoke web (push) Has been skipped
Build and Deploy / Smoke ML worker (push) Has been skipped
Build and Deploy / Smoke people worker (push) Has been skipped
Build and Deploy / Build postgres image (push) Has been skipped
Build and Deploy / Build Android CI image (push) Has been skipped
Build and Deploy / Build plants worker image (push) Has been skipped
Build and Deploy / Build converter worker image (push) Has been skipped
Build and Deploy / Deploy postgres (push) Has been skipped
Build and Deploy / Build API image (push) Has been skipped
Build and Deploy / Build media worker image (push) Has been skipped
Build and Deploy / Build ML worker image (push) Has been skipped
Build and Deploy / Build people worker image (push) Has been skipped
Build and Deploy / Build web image (push) Has been skipped
Build and Deploy / Deploy API (push) Has been skipped
Build and Deploy / Deploy web (push) Has been skipped
Build and Deploy / Deploy media worker (push) Has been skipped
Build and Deploy / Deploy ML worker (push) Has been skipped
Build and Deploy / Deploy plants worker (push) Has been skipped
Build and Deploy / Deploy people worker (push) Has been skipped
Build and Deploy / Deploy converter worker (push) Has been skipped
Build and Deploy / Deploy review instance (push) Has been skipped
Build and Deploy / Clean Docker build artifacts (push) Has been skipped
Build and Deploy / Run scoped PR tests (push) Successful in 5s
Build and Deploy / Android unit tests and debug APK (push) Successful in 3m58s
9e39fedddf
Design amendment 2026-10-25: ONE list for everything deliberately not in
Memories, local or server-side.

- ExclusionsViewModel merges the shadowed state rows (UPLOADED + server
  lifecycle trashed/permanently_deleted) into the same date-grouped
  sections. The state row's updatedAtEpochMillis is the honest removal-
  date proxy (the row records the last update, not the removal moment);
  rows without a timestamp fall under 'Früher'. A shadowed row whose
  MediaStore id also sits in the local ledger renders once (the local
  exclusion wins).
- Type-appropriate actions: trashed → 'Wiederherstellen' records the
  same unconditional 'restore' intent (CAS on the tapped lifecycle
  state) the Entfernungs-Verlauf records — no new server endpoint, the
  C4-idempotent drain applies it and the next delta pull clears the
  row. Permanently deleted → NO button (ISSUE-193 honesty): the row
  shows the existing re-add hint copy.
- Visual distinction: thumbnail from the local twin (content URI via
  the scan resolver; honest CloudOff placeholder when the file is gone)
  plus a 'Vom Server entfernt' tag line and the removed-history state
  line ('Im Papierkorb'/'Endgültig entfernt' — existing strings).
- BackupScreen: the separate 'Vom Server entfernt' card is gone; the
  door row now counts excludedEntryCount + shadowedCount via the
  documented notInMemoriesCount property. The history link lives on the
  timeline's footer; BackupScreen drops its dead onOpenRemovedHistory.
- Reconciler/BackupEngine/data layer untouched (view-only unification).

Tests: 16 exclusion-VM tests (5 new: shadowed grouping/kind/tag, no
double-listing, trashed→restore queued, purged→no action, queue-write
failure) + door-row count test; suite 869 green (app 697, core 172).
chris force-pushed feat/exclusions-timeline from 9e39fedddf
All checks were successful
Wiki Sync / Sync wiki from docs (push) Has been skipped
Build and Deploy / Detect changed services and test scopes (push) Successful in 3s
Build and Deploy / Smoke API and media worker (push) Has been skipped
Build and Deploy / Smoke web (push) Has been skipped
Build and Deploy / Smoke ML worker (push) Has been skipped
Build and Deploy / Smoke people worker (push) Has been skipped
Build and Deploy / Build postgres image (push) Has been skipped
Build and Deploy / Build Android CI image (push) Has been skipped
Build and Deploy / Build plants worker image (push) Has been skipped
Build and Deploy / Build converter worker image (push) Has been skipped
Build and Deploy / Deploy postgres (push) Has been skipped
Build and Deploy / Build API image (push) Has been skipped
Build and Deploy / Build media worker image (push) Has been skipped
Build and Deploy / Build ML worker image (push) Has been skipped
Build and Deploy / Build people worker image (push) Has been skipped
Build and Deploy / Build web image (push) Has been skipped
Build and Deploy / Deploy API (push) Has been skipped
Build and Deploy / Deploy web (push) Has been skipped
Build and Deploy / Deploy media worker (push) Has been skipped
Build and Deploy / Deploy ML worker (push) Has been skipped
Build and Deploy / Deploy plants worker (push) Has been skipped
Build and Deploy / Deploy people worker (push) Has been skipped
Build and Deploy / Deploy converter worker (push) Has been skipped
Build and Deploy / Deploy review instance (push) Has been skipped
Build and Deploy / Clean Docker build artifacts (push) Has been skipped
Build and Deploy / Run scoped PR tests (push) Successful in 5s
Build and Deploy / Android unit tests and debug APK (push) Successful in 3m58s
to 2421816eb7
All checks were successful
Wiki Sync / Sync wiki from docs (push) Has been skipped
Build and Deploy / Detect changed services and test scopes (push) Successful in 3s
Build and Deploy / Smoke API and media worker (push) Has been skipped
Build and Deploy / Smoke web (push) Has been skipped
Build and Deploy / Smoke ML worker (push) Has been skipped
Build and Deploy / Smoke people worker (push) Has been skipped
Build and Deploy / Build postgres image (push) Has been skipped
Build and Deploy / Build Android CI image (push) Has been skipped
Build and Deploy / Build plants worker image (push) Has been skipped
Build and Deploy / Build converter worker image (push) Has been skipped
Build and Deploy / Deploy postgres (push) Has been skipped
Build and Deploy / Build API image (push) Has been skipped
Build and Deploy / Build media worker image (push) Has been skipped
Build and Deploy / Build ML worker image (push) Has been skipped
Build and Deploy / Build people worker image (push) Has been skipped
Build and Deploy / Build web image (push) Has been skipped
Build and Deploy / Deploy API (push) Has been skipped
Build and Deploy / Deploy web (push) Has been skipped
Build and Deploy / Deploy media worker (push) Has been skipped
Build and Deploy / Deploy ML worker (push) Has been skipped
Build and Deploy / Deploy plants worker (push) Has been skipped
Build and Deploy / Deploy people worker (push) Has been skipped
Build and Deploy / Deploy converter worker (push) Has been skipped
Build and Deploy / Deploy review instance (push) Has been skipped
Build and Deploy / Clean Docker build artifacts (push) Has been skipped
Build and Deploy / Run scoped PR tests (push) Successful in 5s
Build and Deploy / Android unit tests and debug APK (push) Successful in 3m50s
2026-10-25 15:26:23 +01:00
Compare
chris merged commit 494984b8c1 into main 2026-10-25 15:32:10 +01:00
Sign in to join this conversation.
No reviewers
No labels
No milestone
No project
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference
chris/memories!1379
No description provided.