refactor(web): sidebar

.github/workflows/docs-deploy.yml

@@ -131,7 +131,7 @@ jobs:
           token: ${{ steps.token.outputs.token }}
 
       - name: Setup Mise
-        uses: immich-app/devtools/actions/use-mise@cd24790a7f5f6439ac32cc94f5523cb2de8bfa8c # use-mise-action-v1.1.0
+        uses: immich-app/devtools/actions/use-mise@b868e6e7c8cc212beec876330b4059e661ee44bb # use-mise-action-v1.1.1
 
       - name: Load parameters
         id: parameters

.github/workflows/docs-destroy.yml

@@ -29,7 +29,7 @@ jobs:
           token: ${{ steps.token.outputs.token }}
 
       - name: Setup Mise
-        uses: immich-app/devtools/actions/use-mise@cd24790a7f5f6439ac32cc94f5523cb2de8bfa8c # use-mise-action-v1.1.0
+        uses: immich-app/devtools/actions/use-mise@b868e6e7c8cc212beec876330b4059e661ee44bb # use-mise-action-v1.1.1
 
       - name: Destroy Docs Subdomain
         env:

.github/workflows/test.yml

@@ -502,25 +502,14 @@ jobs:
       - name: Run e2e tests (web)
         env:
           CI: true
-        run: npx playwright test --project=chromium
+        run: npx playwright test
         if: ${{ !cancelled() }}
-      - name: Archive web results
+      - name: Archive test results
         uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
         if: success() || failure()
         with:
           name: e2e-web-test-results-${{ matrix.runner }}
           path: e2e/playwright-report/
-      - name: Run ui tests (web)
-        env:
-          CI: true
-        run: npx playwright test --project=ui
-        if: ${{ !cancelled() }}
-      - name: Archive ui results
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
-        if: success() || failure()
-        with:
-          name: e2e-ui-test-results-${{ matrix.runner }}
-          path: e2e/playwright-report/
   success-check-e2e:
     name: End-to-End Tests Success
     needs: [e2e-tests-server-cli, e2e-tests-web]

CHANGELOG.md

@@ -1,302 +0,0 @@
-
-# v2.5.0
-
-# v2.4.0
-
-## Highlights
-
-Welcome to the release `v2.4.0` of Immich. This release focuses on bug fixes, QoL improvements, and polished UI components across mobile and the web. Let's dive right in.
-
-* Show the owner's name in the shared album
-* Command palette
-* Change search type directly in the search bar
-* Better action button placement in the mobile asset viewer
-* Notable fix: fix an issue where metadata extraction could fail on high concurrency
-
-### Show the owner's name in the shared album.
-
-On the web, in shared albums, you can now toggle an option to display the asset's owner name at the bottom right corner of the thumbnail.
-
- ![](/api/attachments.redirect?id=3e4d661e-4015-4b04-b8f3-a055e9d4db01 " =1071x758")
-
-### Command palette
-
-The web app now has an integrated command palette, which can be opened  with `ctrl + k` on Windows/Linux or `cmd + k` on macOS. The first iteration of this lets you quickly navigate between administration pages by typing the name of the page you want to go to. It also already supports some common actions when on the respective admin pages, many of which also support shortcuts. Have a look around and check them out! 
-
- ![](/api/attachments.redirect?id=d6bc1387-f2cb-45c1-9287-4ee8176dfb41 " =748x652")
-
-### Change search type directly in the search bar
-
-You can now click on the pill from the search bar to select a different search type without opening the search filter panel.
-
- ![](/api/attachments.redirect?id=97a90b16-8b08-4292-bcb5-46aa75c01043 " =1033x199")
-
-
-### Better placement of action buttons in the mobile asset viewer
-
-Previously, to perform a specific action on the asset, you needed first to swipe up to open the detail panel, then swipe all the way to the right and tap the action. It limits the discoverability of some actions. To help resolve that issue, all the action buttons in the detail panel are now moved to the drop-down menu when tapping on the vertical dot icon (or kebab menu), along with some buttons that used to be on the top bar, clearing up space to display more useful information when viewing the asset.
-
-
- ![](/api/attachments.redirect?id=f68f8af5-2aaf-4625-821f-6c129da7fed3 " =342x741")
-
-## What's Changed
-
-### 🫥 Deprecated Changes
-
-* feat: queues by @jrasm91 in <https://github.com/immich-app/immich/pull/24142>
-
-### 🚀 Features
-
-* feat: improve performance: don't sort timeline buckets from server by @midzelis in <https://github.com/immich-app/immich/pull/24032>
-* feat: command palette by @danieldietzler in <https://github.com/immich-app/immich/pull/23693>
-* feat(web): Shared album owner labels by @xCJPECKOVERx and @idubnori in <https://github.com/immich-app/immich/pull/21171>
-* feat(mobile): persist album sorting & layout in settings by @YarosMallorca in <https://github.com/immich-app/immich/pull/22133>
-* feat: queue detail page by @jrasm91 in <https://github.com/immich-app/immich/pull/24352>
-* chore(mobile): add kebabu menu in asset viewer by @idubnori in <https://github.com/immich-app/immich/pull/24387>
-* feat(mobile): create new album from add to modal by @YarosMallorca in <https://github.com/immich-app/immich/pull/24431>
-* feat(mobile): move buttons in the bottom sheet to the kebabu menu by @idubnori in <https://github.com/immich-app/immich/pull/24175>
-
-### 🌟 Enhancements
-
-* feat(web): allow navigating the map with arrow keys by @lukashass in <https://github.com/immich-app/immich/pull/24080>
-* feat: separate camera and lens info in detail panel by @fabianbees in <https://github.com/immich-app/immich/pull/23670>
-* feat(web): shared link card tweaks by @jrasm91 in <https://github.com/immich-app/immich/pull/24192>
-* feat(server): exclude syncthing folders from external libraries by @SaphuA in <https://github.com/immich-app/immich/pull/24240>
-* feat(web): search type selection dropdown by @YarosMallorca in <https://github.com/immich-app/immich/pull/24091>
-* feat: header context menu by @jrasm91 in <https://github.com/immich-app/immich/pull/24374>
-* feat(mobile): move top bar buttons into kebabu menu in AssetViewer by @idubnori in <https://github.com/immich-app/immich/pull/24461>
-* feat(web): asset selection bar in tags view by @YarosMallorca in <https://github.com/immich-app/immich/pull/24522>
-* feat(web): slideshow feature on shared albums by @YarosMallorca in <https://github.com/immich-app/immich/pull/24598>
-* feat: replace heart icons to thumbs-up across activity by @idubnori in <https://github.com/immich-app/immich/pull/24590>
-
-### 🐛 Bug fixes
-
-* fix: effect loop by @jrasm91 in <https://github.com/immich-app/immich/pull/24014>
-* fix: do not clear hash on updated_at change by @shenlong-tanwen in <https://github.com/immich-app/immich/pull/24039>
-* fix: disable animation "add to" action menu by @bwees in <https://github.com/immich-app/immich/pull/24040>
-* fix: Use correct app store link by @Mraedis in <https://github.com/immich-app/immich/pull/24062>
-* fix: show archived assets in favorite page by @bwees in <https://github.com/immich-app/immich/pull/24052>
-* fix(mobile): first video memory on page doesn't play by @YarosMallorca in <https://github.com/immich-app/immich/pull/23906>
-* feat(web): show detected faces in spherical photos by @meesfrensel in <https://github.com/immich-app/immich/pull/23974>
-* fix: add users to album by @danieldietzler in <https://github.com/immich-app/immich/pull/24133>
-* fix(server): sanitize DB_URL for pg_dumpall to remove unknown query params by @lutostag in <https://github.com/immich-app/immich/pull/23333>
-* fix: use proper updatedAt value in local assets by @shenlong-tanwen in <https://github.com/immich-app/immich/pull/24137>
-* fix: albums page reactivity loops by @danieldietzler in <https://github.com/immich-app/immich/pull/24046>
-* fix: getAspectRatio fallback to db width and height by @shenlong-tanwen in <https://github.com/immich-app/immich/pull/24131>
-* fix(web): fix support & feedback modal wrapping by @Snowknight26 in <https://github.com/immich-app/immich/pull/24018>
-* fix: don't get OCR data in shared link by @alextran1502 in <https://github.com/immich-app/immich/pull/24152>
-* fix: duration extraction by @jrasm91 in <https://github.com/immich-app/immich/pull/24178>
-* fix(ml): Upgrade ONNX Runtime to v1.22.1 to fix ROCm build failures by @LukaPrebil in <https://github.com/immich-app/immich/pull/24045>
-* fix: update timeline-manager after archive actions by @midzelis in <https://github.com/immich-app/immich/pull/24010>
-* fix: theme switcher by @jrasm91 in <https://github.com/immich-app/immich/pull/24209>
-* fix: label 'for' attributes in user-api-key-grid by @kimsey0 in <https://github.com/immich-app/immich/pull/24232>
-* fix(mobile): enable backup text overflows by @YarosMallorca in <https://github.com/immich-app/immich/pull/24227>
-* fix(web): integrate zoom toggle button into panorama photo viewer by @meesfrensel in <https://github.com/immich-app/immich/pull/24189>
-* fix(web): use full tag path when creating nested subtags by @NiklasvonM in <https://github.com/immich-app/immich/pull/24249>
-* fix: only generate memory based on users assets by @alextran1502 in <https://github.com/immich-app/immich/pull/24151>
-* fix(mobile): docs link by @mmomjian in <https://github.com/immich-app/immich/pull/24277>
-* fix(server): use bigrams for cjk by @mertalev in <https://github.com/immich-app/immich/pull/24285>
-* fix(ml): do not upscale preview by @mertalev in <https://github.com/immich-app/immich/pull/24322>
-* fix(web): open onboarding documentation link in new tab by @carbonemys in <https://github.com/immich-app/immich/pull/24289>
-* fix(mobile): use correct timezone displayed in the info sheet by @kao-byte in <https://github.com/immich-app/immich/pull/24310>
-* fix(web): folder view sort oder by @etnoy in <https://github.com/immich-app/immich/pull/24337>
-* fix(server): do not delete offline assets by @mertalev in <https://github.com/immich-app/immich/pull/24355>
-* fix: exposure info and better readability by @alextran1502 in <https://github.com/immich-app/immich/pull/24344>
-* fix: Adjust the zoom level by @jforseth210 in <https://github.com/immich-app/immich/pull/24353>
-* fix: local full sync on Android on resume by @alextran1502 in <https://github.com/immich-app/immich/pull/24348>
-* fix(web): Add minimum content size to logo for consistent visual on small screens by @kiloomar in <https://github.com/immich-app/immich/pull/24372>
-* fix: use adjustment time in iOS for hash reset by @shenlong-tanwen in <https://github.com/immich-app/immich/pull/24047>
-* fix(server): update exiftool-vendored to v34 for more robust metadata extraction by @skatsubo in <https://github.com/immich-app/immich/pull/24424>
-* fix(mobile): cannot create album while name field is focused by @YarosMallorca in <https://github.com/immich-app/immich/pull/24449>
-* fix(web): \[album table view\] long album title overflows table row by @simonkub in <https://github.com/immich-app/immich/pull/24450>
-* fix(mobile): fix overflow text in backup card by @YarosMallorca in <https://github.com/immich-app/immich/pull/24448>
-* fix(mobile): timeline bottom padding on selection by @YarosMallorca in <https://github.com/immich-app/immich/pull/24480>
-* feat(mobile): Localized backup upload details page by @ArnyminerZ in <https://github.com/immich-app/immich/pull/21136>
-* fix(mobile): iOS local permission dialog extra whitespace by @kurtmckee in <https://github.com/immich-app/immich/pull/24491>
-* fix(mobile): versionStatus.message text overflow by @idubnori in <https://github.com/immich-app/immich/pull/24504>
-* fix(server): prevent metadata extraction failures on large video files by @hubert-taieb in <https://github.com/immich-app/immich/pull/24094>
-* fix(web): show inferred timezone in date editor by @skatsubo in <https://github.com/immich-app/immich/pull/24513>
-* fix(mobile): local videos with '#' don't play on android by @YarosMallorca in <https://github.com/immich-app/immich/pull/24373>
-* fix: refresh appear in list after asset is added to a current or new album by @alextran1502 in <https://github.com/immich-app/immich/pull/24523>
-* fix(mobile): birthday off by one day on remote by @YarosMallorca in <https://github.com/immich-app/immich/pull/24527>
-* fix(web): download panel being hidden by admin sidebar by @diogotcorreia in <https://github.com/immich-app/immich/pull/24583>
-* fix(web): recent search doesn't use search type by @YarosMallorca in <https://github.com/immich-app/immich/pull/24578>
-* fix(server): only extract image's duration if format supports animation by @meesfrensel in <https://github.com/immich-app/immich/pull/24587>
-* fix(mobile): local delete missing from sheet on some routes  by @YarosMallorca in <https://github.com/immich-app/immich/pull/24505>
-* fix(mobile): better UI for metadata panel by @kao-byte in <https://github.com/immich-app/immich/pull/24428>
-* fix: shared link expiration and small styling by @alextran1502 in <https://github.com/immich-app/immich/pull/24566>
-
-### 📚 Documentation
-
-* docs: DB_STORAGE_TYPE is only used by the database container by @dionysius in <https://github.com/immich-app/immich/pull/24215>
-* fix(docs): build `cli` for e2e tests by @roschaefer in <https://github.com/immich-app/immich/pull/24184>
-* docs(faq): add more info on archiving by @etnoy in <https://github.com/immich-app/immich/pull/24326>
-* fix(docs): server and machine-learning use IMMICH_HOST and IMMICH_PORT by @dionysius in <https://github.com/immich-app/immich/pull/24335>
-* fix: prevent OOM on nginx reverse proxy servers by @NicholasFlamy in <https://github.com/immich-app/immich/pull/24351>
-* fix(docs): obsolete docs about rootless docker by @roschaefer in <https://github.com/immich-app/immich/pull/24376>
-* fix(docs): websockets in nginx example by @fourthwall in <https://github.com/immich-app/immich/pull/24411>
-* fix(docs): slow upload speed with example nginx reverse proxy config by @goalie2002 in <https://github.com/immich-app/immich/pull/24490>
-* fix(docs): typo in maintenance mode command by @bartvanvelden in <https://github.com/immich-app/immich/pull/24518>
-
-### 🌐 Translations
-
-* chore: add new language requests by @danieldietzler in <https://github.com/immich-app/immich/pull/23991>
-
-## New Contributors
-
-* @ujjwal123123 made their first contribution in <https://github.com/immich-app/immich/pull/24101>
-* @lutostag made their first contribution in <https://github.com/immich-app/immich/pull/23333>
-* @LukaPrebil made their first contribution in <https://github.com/immich-app/immich/pull/24045>
-* @kimsey0 made their first contribution in <https://github.com/immich-app/immich/pull/24232>
-* @SaphuA made their first contribution in <https://github.com/immich-app/immich/pull/24240>
-* @dionysius made their first contribution in <https://github.com/immich-app/immich/pull/24215>
-* @NiklasvonM made their first contribution in <https://github.com/immich-app/immich/pull/24249>
-* @kao-byte made their first contribution in <https://github.com/immich-app/immich/pull/24098>
-* @carbonemys made their first contribution in <https://github.com/immich-app/immich/pull/24289>
-* @kiloomar made their first contribution in <https://github.com/immich-app/immich/pull/24372>
-* @fourthwall made their first contribution in <https://github.com/immich-app/immich/pull/24411>
-* @simonkub made their first contribution in <https://github.com/immich-app/immich/pull/24450>
-* @ArnyminerZ made their first contribution in <https://github.com/immich-app/immich/pull/21136>
-* @kurtmckee made their first contribution in <https://github.com/immich-app/immich/pull/24491>
-* @hubert-taieb made their first contribution in <https://github.com/immich-app/immich/pull/24094>
-* @bartvanvelden made their first contribution in <https://github.com/immich-app/immich/pull/24518>
-
-**Full Changelog**: <https://github.com/immich-app/immich/compare/v2.3.1...v2.4.0>
-
-<!-- Release notes generated using configuration in .github/release.yml at main -->
-
-## What's Changed
-### 🚀 Features
-* feat: workflow ui by @alextran1502 in https://github.com/immich-app/immich/pull/24190
-* feat: disable admin setup by @jrasm91 in https://github.com/immich-app/immich/pull/24628
-* feat: free up space by @alextran1502 in https://github.com/immich-app/immich/pull/24999
-* feat: use fastlane sigh to manage signing profiles by @alextran1502 in https://github.com/immich-app/immich/pull/25089
-* feat: image editing by @bwees in https://github.com/immich-app/immich/pull/24155
-* feat: add cloud id during native sync by @shenlong-tanwen in https://github.com/immich-app/immich/pull/20418
-* chore: web editor improvements by @bwees in https://github.com/immich-app/immich/pull/25169
-* feat: restore database backups by @insertish in https://github.com/immich-app/immich/pull/23978
-* feat(mobile): star rating by @YarosMallorca in https://github.com/immich-app/immich/pull/24457
-### 🌟 Enhancements
-* feat: focus jumped-to item in timeline by @bo0tzz in https://github.com/immich-app/immich/pull/24738
-* feat: modal routes by @jrasm91 in https://github.com/immich-app/immich/pull/24726
-* feat: prefer admin settings page over users page by @jrasm91 in https://github.com/immich-app/immich/pull/24780
-* feat: shared link edit by @jrasm91 in https://github.com/immich-app/immich/pull/24783
-* feat(mobile): use tabular figures in backup info card by @wrbl606 in https://github.com/immich-app/immich/pull/24820
-* feat(mobile): album options to kebab menu by @idubnori in https://github.com/immich-app/immich/pull/24204
-* feat: Hide/show controls when zoom state changes by @Lauritz-Tieste in https://github.com/immich-app/immich/pull/24784
-* feat(server): Support camera `make`, `model`, and `lensModel` in Storage Template by @rahul-kumar-saini in https://github.com/immich-app/immich/pull/24650
-* feat(ml): update ONNX Runtime, OpenVINO and ROCm stack by @savely-krasovsky in https://github.com/immich-app/immich/pull/23458
-* chore(server): Vchord 1.0 support by @mmomjian in https://github.com/immich-app/immich/pull/23845
-* feat(web): Add coordinate pair location searching. by @GustavJones in https://github.com/immich-app/immich/pull/24799
-* feat: show asset owners for editors in shared albums by @ama156 in https://github.com/immich-app/immich/pull/24890
-* feat(web): undo delete single asset by @YarosMallorca in https://github.com/immich-app/immich/pull/24439
-* feat(server): implement switchable logging formats (console/json) by @DanielRamosAcosta in https://github.com/immich-app/immich/pull/24791
-* chore(web): bump immich/ui for tooltips by @jrasm91 in https://github.com/immich-app/immich/pull/24632
-* feat(web): star rating keyboard shortcut by @cbochs in https://github.com/immich-app/immich/pull/24620
-* feat: bulk asset metadata endpoints by @jrasm91 in https://github.com/immich-app/immich/pull/25133
-* feat(mobile): 2026 font by @alextran1502 in https://github.com/immich-app/immich/pull/25213
-* feat(web): search albums by description by @YarosMallorca in https://github.com/immich-app/immich/pull/25244
-* feat(web): 2026 font by @alextran1502 in https://github.com/immich-app/immich/pull/25174
-* chore: dart http foreground upload by @alextran1502 in https://github.com/immich-app/immich/pull/24883
-* feat: update intel compute driver by @savely-krasovsky in https://github.com/immich-app/immich/pull/25259
-* feat: download original asset by @danieldietzler in https://github.com/immich-app/immich/pull/25302
-* feat: allow /memory?id= in AndroidManifest by @arne182 in https://github.com/immich-app/immich/pull/25373
-* fix: add scoped API permissions to map endpoints by @meesfrensel in https://github.com/immich-app/immich/pull/25423
-* fix(server): scoped permissions for more endpoints by @meesfrensel in https://github.com/immich-app/immich/pull/25452
-* feat: generate progressive JPEGs for thumbnails by @midzelis in https://github.com/immich-app/immich/pull/25463
-* feat: loop slideshows by @GeneralZero in https://github.com/immich-app/immich/pull/25462
-* feat(mobile): native clients by @mertalev in https://github.com/immich-app/immich/pull/21459
-### 🐛 Bug fixes
-* fix(maintenance): prevent enable/disable maintenance CLI hanging on occasion by @insertish in https://github.com/immich-app/immich/pull/24713
-* fix(web): display jxl original by @mertalev in https://github.com/immich-app/immich/pull/24766
-* fix(web): stale album info by @jrasm91 in https://github.com/immich-app/immich/pull/24787
-* fix: album card timezone by @danieldietzler in https://github.com/immich-app/immich/pull/24855
-* fix(web): let slideshow videos play (#19601) by @keanucz in https://github.com/immich-app/immich/pull/24914
-* fix(server): update exiftool-vendored to v34.3 for correct colon-less timezone parsing by @dosten in https://github.com/immich-app/immich/pull/24979
-* fix(mobile): hide delete action for remote-only assets by @skrmc in https://github.com/immich-app/immich/pull/25010
-* fix: import config from json by @MontejoJorge in https://github.com/immich-app/immich/pull/25030
-* fix: search input has incorrect focus state after closing the search filter modal by @alextran1502 in https://github.com/immich-app/immich/pull/24886
-* fix(web): duplicate key error and enable expiration editing for expired shared links by @timonrieger in https://github.com/immich-app/immich/pull/24686
-* fix: shared-link-mapper by @jrasm91 in https://github.com/immich-app/immich/pull/24794
-* fix(server): migrate motion part of live photo by @NikhilAlapati in https://github.com/immich-app/immich/pull/24688
-* fix(web): use asset date for change date popup when single asset selected by @majiayu000 in https://github.com/immich-app/immich/pull/25076
-* fix(web): long text taking more width than expected in duplicate manager by @HemendraSinghShekhawat in https://github.com/immich-app/immich/pull/24547
-* fix(web): broken asset urls if shared link has photos in name by @YarosMallorca in https://github.com/immich-app/immich/pull/24451
-* fix(server): search statistics with personIds returns 500 by @majiayu000 in https://github.com/immich-app/immich/pull/25074
-* fix(web): server stats layout by @meesfrensel in https://github.com/immich-app/immich/pull/25085
-* fix: enter now submits the date modals by @fabb in https://github.com/immich-app/immich/pull/25053
-* fix(web): improve text contrast in minimized upload panel by @majiayu000 in https://github.com/immich-app/immich/pull/25075
-* fix: propagate iCloud Shared Album flag by @alextran1502 in https://github.com/immich-app/immich/pull/25060
-* fix: description does not rerender when navigating between assets by @alextran1502 in https://github.com/immich-app/immich/pull/25137
-* fix(server): avoid upserting empty metadata array by @timonrieger in https://github.com/immich-app/immich/pull/25143
-* fix(server): Document HTTP 200 response for duplicate uploads in OpenAPI by @timonrieger in https://github.com/immich-app/immich/pull/25148
-* fix(web): person asset count doesn't update when navigating by @YarosMallorca in https://github.com/immich-app/immich/pull/24438
-* fix(mobile): remove weird zooming behaviour on videos and play/pause button delay by @goalie2002 in https://github.com/immich-app/immich/pull/24006
-* fix: unlock properties after successful sidecar write by @danieldietzler in https://github.com/immich-app/immich/pull/25168
-* fix(web): show relevant navbar options for partner assets by @YarosMallorca in https://github.com/immich-app/immich/pull/24832
-* fix(web): added background gradient for video time visibility by @HemendraSinghShekhawat in https://github.com/immich-app/immich/pull/25138
-* feat(mobile): do not restore locally deleted assets during trash sync (Android) by @PeterOmbodi in https://github.com/immich-app/immich/pull/24218
-* fix: asset local type casting by @alextran1502 in https://github.com/immich-app/immich/pull/25214
-* fix(web): ocr button not clickable for stacked assets by @YarosMallorca in https://github.com/immich-app/immich/pull/25210
-* fix(web): Handle upload failures from public users by @juliancarrivick in https://github.com/immich-app/immich/pull/24826
-* fix(mobile): prevent system UI from hiding on drag down gesture by @goalie2002 in https://github.com/immich-app/immich/pull/25240
-* fix: migration order by @jrasm91 in https://github.com/immich-app/immich/pull/25249
-* fix(web): redirect to login by @jrasm91 in https://github.com/immich-app/immich/pull/25254
-* fix(mobile): improve asset transition back to timeline by @goalie2002 in https://github.com/immich-app/immich/pull/24485
-* fix: dark mode appbar color by @akashKarmakar02 in https://github.com/immich-app/immich/pull/24976
-* fix(web): add min-width to setting input field by @K0lin in https://github.com/immich-app/immich/pull/25317
-* fix(server): api key update checks by @jrasm91 in https://github.com/immich-app/immich/pull/25363
-* fix(mobile): album selector icon visibility by @ByteSizedMarius in https://github.com/immich-app/immich/pull/25311
-* fix(mobile): indicators not showing on thumbnail tile after asset change in viewer by @goalie2002 in https://github.com/immich-app/immich/pull/25297
-* fix(web): handle deletion from asset viewer on map page by @meesfrensel in https://github.com/immich-app/immich/pull/25393
-* fix: tag update race condition by @danieldietzler in https://github.com/immich-app/immich/pull/25371
-* fix(web): allow exiting pin setup flow by @meesfrensel in https://github.com/immich-app/immich/pull/25413
-* fix: upload file without extension by @alextran1502 in https://github.com/immich-app/immich/pull/25419
-* fix: incorrect asset viewer scale on image frame update by @shenlong-tanwen in https://github.com/immich-app/immich/pull/25430
-* fix(mobile): bring back map settings by @shenlong-tanwen in https://github.com/immich-app/immich/pull/25448
-* fix(web): fix badge value in queues page by @beinganukul in https://github.com/immich-app/immich/pull/25445
-* fix(mobile): backfill asset dimensions to exif table by @bwees in https://github.com/immich-app/immich/pull/25483
-* fix(mobile): do not try to load video as image by @mertalev in https://github.com/immich-app/immich/pull/25495
-### 📚 Documentation
-* fix: product keys wording in commercial guidelines faq by @bo0tzz in https://github.com/immich-app/immich/pull/24765
-* docs: config options for hardware transcoding by @Javex in https://github.com/immich-app/immich/pull/24853
-* fix: use my.immich.app as url placeholder in docs by @bo0tzz in https://github.com/immich-app/immich/pull/25153
-* chore:  update Thai README (remove "under active development" lines) by @ppnplus in https://github.com/immich-app/immich/pull/25208
-* fix(docs): add missing mermaid dependency and configuration by @bdoerfchen in https://github.com/immich-app/immich/pull/25247
-* chore(docs): update RAM req by @mmomjian in https://github.com/immich-app/immich/pull/25344
-* feat(docs): add Free Up Space section by @aviv926 in https://github.com/immich-app/immich/pull/25253
-* docs: update README_de_DE.md by @solluh in https://github.com/immich-app/immich/pull/25443
-* fix(docs): document that fullsize thumbnail might redirect to original by @meesfrensel in https://github.com/immich-app/immich/pull/25416
-
-## New Contributors
-* @wrbl606 made their first contribution in https://github.com/immich-app/immich/pull/24820
-* @keanucz made their first contribution in https://github.com/immich-app/immich/pull/24914
-* @rahul-kumar-saini made their first contribution in https://github.com/immich-app/immich/pull/24650
-* @dosten made their first contribution in https://github.com/immich-app/immich/pull/24979
-* @GustavJones made their first contribution in https://github.com/immich-app/immich/pull/24799
-* @skrmc made their first contribution in https://github.com/immich-app/immich/pull/25010
-* @ama156 made their first contribution in https://github.com/immich-app/immich/pull/24890
-* @DanielRamosAcosta made their first contribution in https://github.com/immich-app/immich/pull/24791
-* @NikhilAlapati made their first contribution in https://github.com/immich-app/immich/pull/24688
-* @flpcury made their first contribution in https://github.com/immich-app/immich/pull/24867
-* @Javex made their first contribution in https://github.com/immich-app/immich/pull/24853
-* @majiayu000 made their first contribution in https://github.com/immich-app/immich/pull/25076
-* @HemendraSinghShekhawat made their first contribution in https://github.com/immich-app/immich/pull/24547
-* @cbochs made their first contribution in https://github.com/immich-app/immich/pull/24620
-* @fabb made their first contribution in https://github.com/immich-app/immich/pull/25053
-* @ppnplus made their first contribution in https://github.com/immich-app/immich/pull/25208
-* @juliancarrivick made their first contribution in https://github.com/immich-app/immich/pull/24826
-* @bdoerfchen made their first contribution in https://github.com/immich-app/immich/pull/25247
-* @akashKarmakar02 made their first contribution in https://github.com/immich-app/immich/pull/24976
-* @K0lin made their first contribution in https://github.com/immich-app/immich/pull/25317
-* @NAM-MAN made their first contribution in https://github.com/immich-app/immich/pull/25320
-* @ByteSizedMarius made their first contribution in https://github.com/immich-app/immich/pull/25311
-* @arne182 made their first contribution in https://github.com/immich-app/immich/pull/25373
-* @solluh made their first contribution in https://github.com/immich-app/immich/pull/25443
-* @beinganukul made their first contribution in https://github.com/immich-app/immich/pull/25445
-* @GeneralZero made their first contribution in https://github.com/immich-app/immich/pull/25462
-
-**Full Changelog**: https://github.com/immich-app/immich/compare/v2.4.1...v2.5.0
-
----
-

cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@immich/cli",
-  "version": "2.2.106",
+  "version": "2.2.105",
   "description": "Command Line Interface (CLI) for Immich",
   "type": "module",
   "exports": "./dist/index.js",
@@ -20,7 +20,7 @@
     "@types/lodash-es": "^4.17.12",
     "@types/micromatch": "^4.0.9",
     "@types/mock-fs": "^4.13.1",
-    "@types/node": "^24.10.8",
+    "@types/node": "^24.10.4",
     "@vitest/coverage-v8": "^3.0.0",
     "byte-size": "^9.0.0",
     "cli-progress": "^3.12.0",

docs/docs/features/mobile-app.mdx

@@ -68,56 +68,6 @@ Now make sure that the local album is selected in the backup screen (steps 1-2 a
   title="Upload button after photos selection"
 />
 
-## Free Up Space
-
-The **Free Up Space** tool allows you to remove local media files from your device that have already been successfully backed up to your Immich server (and are not in the Immich trash). This helps reclaim storage on your mobile device without losing your memories.
-
-### How it works
-
-1.  **Configuration:**
-    - **Cutoff Date:** You can select a cutoff date. The tool will only look for photos and videos **on or before** this date.
-    - **Filter Options:** You can choose to remove **All** assets, or restrict removal to **Photos only** or **Videos only**.
-    - **Keep Favorites:** By default, local assets marked as favorites are preserved on your device, even if they match the cutoff date.
-2.  **Scan & Review:** Before any files are removed, you are presented with a review screen to verify which items will be deleted.
-3.  **Deletion:** Confirmed items are moved to your device's native Trash/Recycle Bin. They will be permanently removed by the OS based on your system settings (usually after 30 days).
-
-:::info Android Permissions
-For the smoothest experience on Android, you should grant Immich special delete privileges. Without this, you may be prompted to confirm deletion for every single image.
-
-Go to **Immich Settings > Advanced** and enable **"Media Management Access"**.
-:::
-
-### iCloud Photos (iOS Users)
-
-If you use **iCloud Photos** alongside Immich, it is vital to understand how deletion affects your data. iCloud utilizes a two-way sync; this means deleting a photo from your iPhone to free up space will **also delete it from iCloud**.
-
-:::warning iCloud & Backups
-If you rely on iCloud as a secondary backup (part of a 3-2-1 backup strategy), using the Free Up Space feature in Immich will remove the file from both your phone and iCloud.
-
-Once deleted, the photo will exist **only** on your Immich server (and your phone's "Recently Deleted" folder for 30 days).
-
-When you use iCloud Photos and delete a photo or video on one device, it's also deleted on all other devices where you're signed in with the same Apple Account.
-
-More information on the [Apple Support](https://support.apple.com/en-us/108922#iCloud_photo_library) website
-
-**Shared Albums**
-Assets that are part of an **iCloud Shared Album** are automatically excluded from the cleanup scan to ensure they remain viewable to others in the shared album.
-:::
-
-### External App Dependencies (WhatsApp, etc.)
-
-:::danger WhatsApp & Local Files
-Android applications like **WhatsApp** rely on local files to display media in chat history.
-
-If Immich backs up your WhatsApp folder and you run **Free Up Space**, the local copies of these images will be deleted. Consequently, **media in your WhatsApp chats will appear blurry or missing.** You will only be able to view these photos inside the Immich app; they will no longer be visible within the WhatsApp interface.
-
-**Recommendation:** If keeping chat history intact is important, please ensure you review the deletion list carefully or consider excluding WhatsApp folders from the backup if you intend to use this feature frequently.
-:::
-
-:::info reclaim storage
-You must empty the system/gallery trash manually to reclaim storage.
-:::
-
 ## Album Sync
 
 You can sync or mirror an album from your phone to the Immich server on your account. For example, if you select Recents, Camera and Videos album for backup, the corresponding album with the same name will be created on the server. Once the assets from those albums are uploaded, they will be put into the target albums automatically.

docs/static/archived-versions.json

@@ -1,8 +1,4 @@
 [
-  {
-    "label": "v2.5.0",
-    "url": "https://docs.v2.5.0.archive.immich.app"
-  },
   {
     "label": "v2.4.1",
     "url": "https://docs.v2.4.1.archive.immich.app"

e2e/package.json

@@ -1,6 +1,6 @@
 {
   "name": "immich-e2e",
-  "version": "2.5.0",
+  "version": "2.4.1",
   "description": "",
   "main": "index.js",
   "type": "module",
@@ -27,7 +27,7 @@
     "@playwright/test": "^1.44.1",
     "@socket.io/component-emitter": "^3.1.2",
     "@types/luxon": "^3.4.2",
-    "@types/node": "^24.10.8",
+    "@types/node": "^24.10.4",
     "@types/pg": "^8.15.1",
     "@types/pngjs": "^6.0.4",
     "@types/supertest": "^6.0.2",

e2e/playwright.config.ts

@@ -8,7 +8,7 @@ dotenv.config({ path: resolve(import.meta.dirname, '.env') });
 export const playwrightHost = process.env.PLAYWRIGHT_HOST ?? '127.0.0.1';
 export const playwrightDbHost = process.env.PLAYWRIGHT_DB_HOST ?? '127.0.0.1';
 export const playwriteBaseUrl = process.env.PLAYWRIGHT_BASE_URL ?? `http://${playwrightHost}:2285`;
-export const playwriteSlowMo = Number.parseInt(process.env.PLAYWRIGHT_SLOW_MO ?? '0');
+export const playwriteSlowMo = parseInt(process.env.PLAYWRIGHT_SLOW_MO ?? '0');
 export const playwrightDisableWebserver = process.env.PLAYWRIGHT_DISABLE_WEBSERVER;
 
 process.env.PW_EXPERIMENTAL_SERVICE_WORKER_NETWORK_EVENTS = '1';
@@ -40,9 +40,9 @@ const config: PlaywrightTestConfig = {
       workers: 1,
     },
     {
-      name: 'ui',
+      name: 'parallel tests',
       use: { ...devices['Desktop Chrome'] },
-      testMatch: /.*\.ui-spec\.ts/,
+      testMatch: /.*\.parallel-e2e-spec\.ts/,
       fullyParallel: true,
       workers: process.env.CI ? 3 : Math.max(1, Math.round(cpus().length * 0.75) - 1),
     },

e2e/src/api/specs/database-backups.e2e-spec.ts

@@ -1,350 +0,0 @@
-import { LoginResponseDto, ManualJobName } from '@immich/sdk';
-import { errorDto } from 'src/responses';
-import { app, utils } from 'src/utils';
-import request from 'supertest';
-import { afterAll, beforeAll, describe, expect, it } from 'vitest';
-
-describe('/admin/database-backups', () => {
-  let cookie: string | undefined;
-  let admin: LoginResponseDto;
-
-  beforeAll(async () => {
-    await utils.resetDatabase();
-    admin = await utils.adminSetup();
-    await utils.resetBackups(admin.accessToken);
-  });
-
-  describe('GET /', async () => {
-    it('should succeed and be empty', async () => {
-      const { status, body } = await request(app)
-        .get('/admin/database-backups')
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-      expect(status).toBe(200);
-      expect(body).toEqual({
-        backups: [],
-      });
-    });
-
-    it('should contain a created backup', async () => {
-      await utils.createJob(admin.accessToken, {
-        name: ManualJobName.BackupDatabase,
-      });
-
-      await utils.waitForQueueFinish(admin.accessToken, 'backupDatabase');
-
-      await expect
-        .poll(
-          async () => {
-            const { status, body } = await request(app)
-              .get('/admin/database-backups')
-              .set('Authorization', `Bearer ${admin.accessToken}`);
-
-            expect(status).toBe(200);
-            return body;
-          },
-          {
-            interval: 500,
-            timeout: 10_000,
-          },
-        )
-        .toEqual(
-          expect.objectContaining({
-            backups: [
-              expect.objectContaining({
-                filename: expect.stringMatching(/immich-db-backup-\d{8}T\d{6}-v.*-pg.*\.sql\.gz$/),
-                filesize: expect.any(Number),
-              }),
-            ],
-          }),
-        );
-    });
-  });
-
-  describe('DELETE /', async () => {
-    it('should delete backup', async () => {
-      const filename = await utils.createBackup(admin.accessToken);
-
-      const { status } = await request(app)
-        .delete(`/admin/database-backups`)
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send({ backups: [filename] });
-
-      expect(status).toBe(200);
-
-      const { status: listStatus, body } = await request(app)
-        .get('/admin/database-backups')
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-
-      expect(listStatus).toBe(200);
-      expect(body).toEqual(
-        expect.objectContaining({
-          backups: [],
-        }),
-      );
-    });
-  });
-
-  // => action: restore database flow
-
-  describe.sequential('POST /start-restore', () => {
-    afterAll(async () => {
-      await request(app).post('/admin/maintenance').set('cookie', cookie!).send({ action: 'end' });
-      await utils.poll(
-        () => request(app).get('/server/config'),
-        ({ status, body }) => status === 200 && !body.maintenanceMode,
-      );
-
-      admin = await utils.adminSetup();
-    });
-
-    it.sequential('should not work when the server is configured', async () => {
-      const { status, body } = await request(app).post('/admin/database-backups/start-restore').send();
-
-      expect(status).toBe(400);
-      expect(body).toEqual(errorDto.badRequest('The server already has an admin'));
-    });
-
-    it.sequential('should enter maintenance mode in "database restore mode"', async () => {
-      await utils.resetDatabase(); // reset database before running this test
-
-      const { status, headers } = await request(app).post('/admin/database-backups/start-restore').send();
-
-      expect(status).toBe(201);
-
-      cookie = headers['set-cookie'][0].split(';')[0];
-
-      await expect
-        .poll(
-          async () => {
-            const { status, body } = await request(app).get('/server/config');
-            expect(status).toBe(200);
-            return body.maintenanceMode;
-          },
-          {
-            interval: 500,
-            timeout: 10_000,
-          },
-        )
-        .toBeTruthy();
-
-      const { status: status2, body } = await request(app).get('/admin/maintenance/status').send({ token: 'token' });
-      expect(status2).toBe(200);
-      expect(body).toEqual({
-        active: true,
-        action: 'select_database_restore',
-      });
-    });
-  });
-
-  // => action: restore database
-
-  describe.sequential('POST /backups/restore', () => {
-    beforeAll(async () => {
-      await utils.disconnectDatabase();
-    });
-
-    afterAll(async () => {
-      await utils.connectDatabase();
-    });
-
-    it.sequential('should restore a backup', { timeout: 60_000 }, async () => {
-      let filename = await utils.createBackup(admin.accessToken);
-
-      // work-around until test is running on released version
-      await utils.move(
-        `/data/backups/${filename}`,
-        '/data/backups/immich-db-backup-20260114T184016-v2.5.0-pg14.19.sql.gz',
-      );
-      filename = 'immich-db-backup-20260114T184016-v2.5.0-pg14.19.sql.gz';
-
-      const { status } = await request(app)
-        .post('/admin/maintenance')
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send({
-          action: 'restore_database',
-          restoreBackupFilename: filename,
-        });
-
-      expect(status).toBe(201);
-
-      await expect
-        .poll(
-          async () => {
-            const { status, body } = await request(app).get('/server/config');
-            expect(status).toBe(200);
-            return body.maintenanceMode;
-          },
-          {
-            interval: 500,
-            timeout: 10_000,
-          },
-        )
-        .toBeTruthy();
-
-      const { status: status2, body } = await request(app).get('/admin/maintenance/status').send({ token: 'token' });
-      expect(status2).toBe(200);
-      expect(body).toEqual(
-        expect.objectContaining({
-          active: true,
-          action: 'restore_database',
-        }),
-      );
-
-      await expect
-        .poll(
-          async () => {
-            const { status, body } = await request(app).get('/server/config');
-            expect(status).toBe(200);
-            return body.maintenanceMode;
-          },
-          {
-            interval: 500,
-            timeout: 60_000,
-          },
-        )
-        .toBeFalsy();
-    });
-
-    it.sequential('fail to restore a corrupted backup', { timeout: 60_000 }, async () => {
-      await utils.prepareTestBackup('corrupted');
-
-      const { status, headers } = await request(app)
-        .post('/admin/maintenance')
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send({
-          action: 'restore_database',
-          restoreBackupFilename: 'development-corrupted.sql.gz',
-        });
-
-      expect(status).toBe(201);
-      cookie = headers['set-cookie'][0].split(';')[0];
-
-      await expect
-        .poll(
-          async () => {
-            const { status, body } = await request(app).get('/server/config');
-            expect(status).toBe(200);
-            return body.maintenanceMode;
-          },
-          {
-            interval: 500,
-            timeout: 10_000,
-          },
-        )
-        .toBeTruthy();
-
-      await expect
-        .poll(
-          async () => {
-            const { status, body } = await request(app).get('/admin/maintenance/status').send({ token: 'token' });
-            expect(status).toBe(200);
-            return body;
-          },
-          {
-            interval: 500,
-            timeout: 10_000,
-          },
-        )
-        .toEqual(
-          expect.objectContaining({
-            active: true,
-            action: 'restore_database',
-            error: 'Something went wrong, see logs!',
-          }),
-        );
-
-      const { status: status2, body: body2 } = await request(app)
-        .get('/admin/maintenance/status')
-        .set('cookie', cookie!)
-        .send({ token: 'token' });
-      expect(status2).toBe(200);
-      expect(body2).toEqual(
-        expect.objectContaining({
-          active: true,
-          action: 'restore_database',
-          error: expect.stringContaining('IM CORRUPTED'),
-        }),
-      );
-
-      await request(app).post('/admin/maintenance').set('cookie', cookie!).send({
-        action: 'end',
-      });
-
-      await utils.poll(
-        () => request(app).get('/server/config'),
-        ({ status, body }) => status === 200 && !body.maintenanceMode,
-      );
-    });
-
-    it.sequential('rollback to restore point if backup is missing admin', { timeout: 60_000 }, async () => {
-      await utils.prepareTestBackup('empty');
-
-      const { status, headers } = await request(app)
-        .post('/admin/maintenance')
-        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send({
-          action: 'restore_database',
-          restoreBackupFilename: 'development-empty.sql.gz',
-        });
-
-      expect(status).toBe(201);
-      cookie = headers['set-cookie'][0].split(';')[0];
-
-      await expect
-        .poll(
-          async () => {
-            const { status, body } = await request(app).get('/server/config');
-            expect(status).toBe(200);
-            return body.maintenanceMode;
-          },
-          {
-            interval: 500,
-            timeout: 10_000,
-          },
-        )
-        .toBeTruthy();
-
-      await expect
-        .poll(
-          async () => {
-            const { status, body } = await request(app).get('/admin/maintenance/status').send({ token: 'token' });
-            expect(status).toBe(200);
-            return body;
-          },
-          {
-            interval: 500,
-            timeout: 30_000,
-          },
-        )
-        .toEqual(
-          expect.objectContaining({
-            active: true,
-            action: 'restore_database',
-            error: 'Something went wrong, see logs!',
-          }),
-        );
-
-      const { status: status2, body: body2 } = await request(app)
-        .get('/admin/maintenance/status')
-        .set('cookie', cookie!)
-        .send({ token: 'token' });
-      expect(status2).toBe(200);
-      expect(body2).toEqual(
-        expect.objectContaining({
-          active: true,
-          action: 'restore_database',
-          error: expect.stringContaining('Server health check failed, no admin exists.'),
-        }),
-      );
-
-      await request(app).post('/admin/maintenance').set('cookie', cookie!).send({
-        action: 'end',
-      });
-
-      await utils.poll(
-        () => request(app).get('/server/config'),
-        ({ status, body }) => status === 200 && !body.maintenanceMode,
-      );
-    });
-  });
-});

e2e/src/api/specs/maintenance.e2e-spec.ts

@@ -14,7 +14,6 @@ describe('/admin/maintenance', () => {
     await utils.resetDatabase();
     admin = await utils.adminSetup();
     nonAdmin = await utils.userSetup(admin.accessToken, createUserDto.user1);
-    await utils.resetBackups(admin.accessToken);
   });
 
   // => outside of maintenance mode
@@ -27,17 +26,6 @@ describe('/admin/maintenance', () => {
     });
   });
 
-  describe('GET /status', async () => {
-    it('to always indicate we are not in maintenance mode', async () => {
-      const { status, body } = await request(app).get('/admin/maintenance/status').send({ token: 'token' });
-      expect(status).toBe(200);
-      expect(body).toEqual({
-        active: false,
-        action: 'end',
-      });
-    });
-  });
-
   describe('POST /login', async () => {
     it('should not work out of maintenance mode', async () => {
       const { status, body } = await request(app).post('/admin/maintenance/login').send({ token: 'token' });
@@ -51,7 +39,6 @@ describe('/admin/maintenance', () => {
   describe.sequential('POST /', () => {
     it('should require authentication', async () => {
       const { status, body } = await request(app).post('/admin/maintenance').send({
-        active: false,
         action: 'end',
       });
       expect(status).toBe(401);
@@ -82,7 +69,6 @@ describe('/admin/maintenance', () => {
         .send({
           action: 'start',
         });
-
       expect(status).toBe(201);
 
       cookie = headers['set-cookie'][0].split(';')[0];
@@ -93,13 +79,12 @@ describe('/admin/maintenance', () => {
       await expect
         .poll(
           async () => {
-            const { status, body } = await request(app).get('/server/config');
-            expect(status).toBe(200);
+            const { body } = await request(app).get('/server/config');
             return body.maintenanceMode;
           },
           {
-            interval: 500,
-            timeout: 10_000,
+            interval: 5e2,
+            timeout: 1e4,
           },
         )
         .toBeTruthy();
@@ -117,17 +102,6 @@ describe('/admin/maintenance', () => {
       });
     });
 
-    describe('GET /status', async () => {
-      it('to indicate we are in maintenance mode', async () => {
-        const { status, body } = await request(app).get('/admin/maintenance/status').send({ token: 'token' });
-        expect(status).toBe(200);
-        expect(body).toEqual({
-          active: true,
-          action: 'start',
-        });
-      });
-    });
-
     describe('POST /login', async () => {
       it('should fail without cookie or token in body', async () => {
         const { status, body } = await request(app).post('/admin/maintenance/login').send({});
@@ -184,13 +158,12 @@ describe('/admin/maintenance', () => {
       await expect
         .poll(
           async () => {
-            const { status, body } = await request(app).get('/server/config');
-            expect(status).toBe(200);
+            const { body } = await request(app).get('/server/config');
             return body.maintenanceMode;
           },
           {
-            interval: 500,
-            timeout: 10_000,
+            interval: 5e2,
+            timeout: 1e4,
           },
         )
         .toBeFalsy();

e2e/src/generators/timeline/rest-response.ts

@@ -348,7 +348,6 @@ export function toAssetResponseDto(asset: MockTimelineAsset, owner?: UserRespons
     checksum: asset.checksum,
     width: exifInfo.exifImageWidth ?? 1,
     height: exifInfo.exifImageHeight ?? 1,
-    isEdited: false,
   };
 }
 

e2e/src/utils.ts

@@ -6,9 +6,7 @@ import {
   CheckExistingAssetsDto,
   CreateAlbumDto,
   CreateLibraryDto,
-  JobCreateDto,
   MaintenanceAction,
-  ManualJobName,
   MetadataSearchDto,
   Permission,
   PersonCreateDto,
@@ -23,7 +21,6 @@ import {
   checkExistingAssets,
   createAlbum,
   createApiKey,
-  createJob,
   createLibrary,
   createPartner,
   createPerson,
@@ -31,12 +28,10 @@ import {
   createStack,
   createUserAdmin,
   deleteAssets,
-  deleteDatabaseBackup,
   getAssetInfo,
   getConfig,
   getConfigDefaults,
   getQueuesLegacy,
-  listDatabaseBackups,
   login,
   runQueueCommandLegacy,
   scanLibrary,
@@ -57,15 +52,11 @@ import {
 import { BrowserContext } from '@playwright/test';
 import { exec, spawn } from 'node:child_process';
 import { createHash } from 'node:crypto';
-import { createWriteStream, existsSync, mkdirSync, renameSync, rmSync, writeFileSync } from 'node:fs';
-import { mkdtemp } from 'node:fs/promises';
+import { existsSync, mkdirSync, renameSync, rmSync, writeFileSync } from 'node:fs';
 import { tmpdir } from 'node:os';
-import { dirname, join, resolve } from 'node:path';
-import { Readable } from 'node:stream';
-import { pipeline } from 'node:stream/promises';
+import { dirname, resolve } from 'node:path';
 import { setTimeout as setAsyncTimeout } from 'node:timers/promises';
 import { promisify } from 'node:util';
-import { createGzip } from 'node:zlib';
 import pg from 'pg';
 import { io, type Socket } from 'socket.io-client';
 import { loginDto, signupDto } from 'src/fixtures';
@@ -93,9 +84,8 @@ export const asBearerAuth = (accessToken: string) => ({ Authorization: `Bearer $
 export const asKeyAuth = (key: string) => ({ 'x-api-key': key });
 export const immichCli = (args: string[]) =>
   executeCommand('pnpm', ['exec', 'immich', '-d', `/${tempDir}/immich/`, ...args], { cwd: '../cli' }).promise;
-export const dockerExec = (args: string[]) =>
-  executeCommand('docker', ['exec', '-i', 'immich-e2e-server', '/bin/bash', '-c', args.join(' ')]);
-export const immichAdmin = (args: string[]) => dockerExec([`immich-admin ${args.join(' ')}`]);
+export const immichAdmin = (args: string[]) =>
+  executeCommand('docker', ['exec', '-i', 'immich-e2e-server', '/bin/bash', '-c', `immich-admin ${args.join(' ')}`]);
 export const specialCharStrings = ["'", '"', ',', '{', '}', '*'];
 export const TEN_TIMES = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9];
 
@@ -159,26 +149,12 @@ const onEvent = ({ event, id }: { event: EventType; id: string }) => {
 };
 
 export const utils = {
-  connectDatabase: async () => {
-    if (!client) {
-      client = new pg.Client(dbUrl);
-      client.on('end', () => (client = null));
-      client.on('error', () => (client = null));
-      await client.connect();
-    }
-
-    return client;
-  },
-
-  disconnectDatabase: async () => {
-    if (client) {
-      await client.end();
-    }
-  },
-
   resetDatabase: async (tables?: string[]) => {
     try {
-      client = await utils.connectDatabase();
+      if (!client) {
+        client = new pg.Client(dbUrl);
+        await client.connect();
+      }
 
       tables = tables || [
         // TODO e2e test for deleting a stack, since it is quite complex
@@ -505,9 +481,6 @@ export const utils = {
   tagAssets: (accessToken: string, tagId: string, assetIds: string[]) =>
     tagAssets({ id: tagId, bulkIdsDto: { ids: assetIds } }, { headers: asBearerAuth(accessToken) }),
 
-  createJob: async (accessToken: string, jobCreateDto: JobCreateDto) =>
-    createJob({ jobCreateDto }, { headers: asBearerAuth(accessToken) }),
-
   queueCommand: async (accessToken: string, name: QueueName, queueCommandDto: QueueCommandDto) =>
     runQueueCommandLegacy({ name, queueCommandDto }, { headers: asBearerAuth(accessToken) }),
 
@@ -586,45 +559,6 @@ export const utils = {
     mkdirSync(`${testAssetDir}/temp`, { recursive: true });
   },
 
-  async move(source: string, dest: string) {
-    return executeCommand('docker', ['exec', 'immich-e2e-server', 'mv', source, dest]).promise;
-  },
-
-  createBackup: async (accessToken: string) => {
-    await utils.createJob(accessToken, {
-      name: ManualJobName.BackupDatabase,
-    });
-
-    return utils.poll(
-      () => request(app).get('/admin/database-backups').set('Authorization', `Bearer ${accessToken}`),
-      ({ status, body }) => status === 200 && body.backups.length === 1,
-      ({ body }) => body.backups[0].filename,
-    );
-  },
-
-  resetBackups: async (accessToken: string) => {
-    const { backups } = await listDatabaseBackups({ headers: asBearerAuth(accessToken) });
-
-    const backupFiles = backups.map((b) => b.filename);
-    await deleteDatabaseBackup(
-      { databaseBackupDeleteDto: { backups: backupFiles } },
-      { headers: asBearerAuth(accessToken) },
-    );
-  },
-
-  prepareTestBackup: async (generate: 'empty' | 'corrupted') => {
-    const dir = await mkdtemp(join(tmpdir(), 'test-'));
-    const fn = join(dir, 'file');
-
-    const sql = Readable.from(generate === 'corrupted' ? 'IM CORRUPTED;' : 'SELECT 1;');
-    const gzip = createGzip();
-    const writeStream = createWriteStream(fn);
-    await pipeline(sql, gzip, writeStream);
-
-    await executeCommand('docker', ['cp', fn, `immich-e2e-server:/data/backups/development-${generate}.sql.gz`])
-      .promise;
-  },
-
   resetAdminConfig: async (accessToken: string) => {
     const defaultConfig = await getConfigDefaults({ headers: asBearerAuth(accessToken) });
     await updateConfig({ systemConfigDto: defaultConfig }, { headers: asBearerAuth(accessToken) });
@@ -667,25 +601,6 @@ export const utils = {
     await utils.waitForQueueFinish(accessToken, 'sidecar');
     await utils.waitForQueueFinish(accessToken, 'metadataExtraction');
   },
-
-  async poll<T>(cb: () => Promise<T>, validate: (value: T) => boolean, map?: (value: T) => any) {
-    let timeout = 0;
-    while (true) {
-      try {
-        const data = await cb();
-        if (validate(data)) {
-          return map ? map(data) : data;
-        }
-        timeout++;
-        if (timeout >= 10) {
-          throw 'Could not clean up test.';
-        }
-        await new Promise((resolve) => setTimeout(resolve, 5e2));
-      } catch {
-        // no-op
-      }
-    }
-  },
 };
 
 utils.initSdk();

e2e/src/web/specs/asset-viewer/asset-viewer.parallel-e2e-spec.ts

@@ -12,7 +12,7 @@ import {
 import { setupBaseMockApiRoutes } from 'src/mock-network/base-network';
 import { setupTimelineMockApiRoutes, TimelineTestContext } from 'src/mock-network/timeline-network';
 import { utils } from 'src/utils';
-import { assetViewerUtils } from 'src/web/specs/timeline/utils';
+import { assetViewerUtils, cancelAllPollers } from 'src/web/specs/timeline/utils';
 
 test.describe.configure({ mode: 'parallel' });
 test.describe('asset-viewer', () => {
@@ -49,6 +49,7 @@ test.describe('asset-viewer', () => {
   });
 
   test.afterEach(() => {
+    cancelAllPollers();
     testContext.slowBucket = false;
     changes.albumAdditions = [];
     changes.assetDeletions = [];

e2e/src/web/specs/database-backups.e2e-spec.ts

@@ -1,105 +0,0 @@
-import { LoginResponseDto } from '@immich/sdk';
-import { expect, test } from '@playwright/test';
-import { utils } from 'src/utils';
-
-test.describe.configure({ mode: 'serial' });
-
-test.describe('Database Backups', () => {
-  let admin: LoginResponseDto;
-
-  test.beforeAll(async () => {
-    utils.initSdk();
-    await utils.resetDatabase();
-    admin = await utils.adminSetup();
-  });
-
-  test('restore a backup from settings', async ({ context, page }) => {
-    test.setTimeout(60_000);
-
-    await utils.resetBackups(admin.accessToken);
-    const filename = await utils.createBackup(admin.accessToken);
-    await utils.setAuthCookies(context, admin.accessToken);
-
-    // work-around until test is running on released version
-    await utils.move(
-      `/data/backups/${filename}`,
-      '/data/backups/immich-db-backup-20260114T184016-v2.5.0-pg14.19.sql.gz',
-    );
-
-    await page.goto('/admin/maintenance?isOpen=backups');
-    await page.getByRole('button', { name: 'Restore', exact: true }).click();
-    await page.getByRole('dialog').getByRole('button', { name: 'Restore' }).click();
-
-    await page.waitForURL('/maintenance?**');
-    await page.waitForURL('/admin/maintenance**', { timeout: 60_000 });
-  });
-
-  test('handle backup restore failure', async ({ context, page }) => {
-    test.setTimeout(60_000);
-
-    await utils.resetBackups(admin.accessToken);
-    await utils.prepareTestBackup('corrupted');
-    await utils.setAuthCookies(context, admin.accessToken);
-
-    await page.goto('/admin/maintenance?isOpen=backups');
-    await page.getByRole('button', { name: 'Restore', exact: true }).click();
-    await page.getByRole('dialog').getByRole('button', { name: 'Restore' }).click();
-
-    await page.waitForURL('/maintenance?**');
-    await expect(page.getByText('IM CORRUPTED')).toBeVisible({ timeout: 60_000 });
-    await page.getByRole('button', { name: 'End maintenance mode' }).click();
-    await page.waitForURL('/admin/maintenance**');
-  });
-
-  test('rollback to restore point if backup is missing admin', async ({ context, page }) => {
-    test.setTimeout(60_000);
-
-    await utils.resetBackups(admin.accessToken);
-    await utils.prepareTestBackup('empty');
-    await utils.setAuthCookies(context, admin.accessToken);
-
-    await page.goto('/admin/maintenance?isOpen=backups');
-    await page.getByRole('button', { name: 'Restore', exact: true }).click();
-    await page.getByRole('dialog').getByRole('button', { name: 'Restore' }).click();
-
-    await page.waitForURL('/maintenance?**');
-    await expect(page.getByText('Server health check failed, no admin exists.')).toBeVisible({ timeout: 60_000 });
-    await page.getByRole('button', { name: 'End maintenance mode' }).click();
-    await page.waitForURL('/admin/maintenance**');
-  });
-
-  test('restore a backup from onboarding', async ({ context, page }) => {
-    test.setTimeout(60_000);
-
-    await utils.resetBackups(admin.accessToken);
-    const filename = await utils.createBackup(admin.accessToken);
-    await utils.setAuthCookies(context, admin.accessToken);
-
-    // work-around until test is running on released version
-    await utils.move(
-      `/data/backups/${filename}`,
-      '/data/backups/immich-db-backup-20260114T184016-v2.5.0-pg14.19.sql.gz',
-    );
-
-    await utils.resetDatabase();
-
-    await page.goto('/');
-    await page.getByRole('button', { name: 'Restore from backup' }).click();
-
-    try {
-      await page.waitForURL('/maintenance**');
-    } catch {
-      // when chained with the rest of the tests
-      // this navigation may fail..? not sure why...
-      await page.goto('/maintenance');
-      await page.waitForURL('/maintenance**');
-    }
-
-    await page.getByRole('button', { name: 'Next' }).click();
-    await page.getByRole('button', { name: 'Restore', exact: true }).click();
-    await page.getByRole('dialog').getByRole('button', { name: 'Restore' }).click();
-
-    await page.waitForURL('/maintenance?**');
-    await page.waitForURL('/photos', { timeout: 60_000 });
-  });
-});

e2e/src/web/specs/maintenance.e2e-spec.ts

@@ -16,12 +16,12 @@ test.describe('Maintenance', () => {
   test('enter and exit maintenance mode', async ({ context, page }) => {
     await utils.setAuthCookies(context, admin.accessToken);
 
-    await page.goto('/admin/maintenance');
-    await page.getByRole('button', { name: 'Switch to maintenance mode' }).click();
+    await page.goto('/admin/system-settings?isOpen=maintenance');
+    await page.getByRole('button', { name: 'Start maintenance mode' }).click();
 
     await expect(page.getByText('Temporarily Unavailable')).toBeVisible({ timeout: 10_000 });
     await page.getByRole('button', { name: 'End maintenance mode' }).click();
-    await page.waitForURL('**/admin/maintenance*', { timeout: 10_000 });
+    await page.waitForURL('**/admin/system-settings*', { timeout: 10_000 });
   });
 
   test('maintenance shows no options to users until they authenticate', async ({ page }) => {

e2e/src/web/specs/timeline/timeline.parallel-e2e-spec.ts

@@ -18,6 +18,7 @@ import { pageRoutePromise, setupTimelineMockApiRoutes, TimelineTestContext } fro
 import { utils } from 'src/utils';
 import {
   assetViewerUtils,
+  cancelAllPollers,
   padYearMonth,
   pageUtils,
   poll,
@@ -63,6 +64,7 @@ test.describe('Timeline', () => {
   });
 
   test.afterEach(() => {
+    cancelAllPollers();
     testContext.slowBucket = false;
     changes.albumAdditions = [];
     changes.assetDeletions = [];

e2e/src/web/specs/timeline/utils.ts

@@ -23,6 +23,13 @@ export async function throttlePage(context: BrowserContext, page: Page) {
   await session.send('Emulation.setCPUThrottlingRate', { rate: 10 });
 }
 
+let activePollsAbortController = new AbortController();
+
+export const cancelAllPollers = () => {
+  activePollsAbortController.abort();
+  activePollsAbortController = new AbortController();
+};
+
 export const poll = async <T>(
   page: Page,
   query: () => Promise<T>,
@@ -30,14 +37,21 @@ export const poll = async <T>(
 ) => {
   let result;
   const timeout = Date.now() + 10_000;
+  const signal = activePollsAbortController.signal;
 
   const terminate = callback || ((result: Awaited<T> | undefined) => !!result);
   while (!terminate(result) && Date.now() < timeout) {
+    if (signal.aborted) {
+      return;
+    }
     try {
       result = await query();
     } catch {
       // ignore
     }
+    if (signal.aborted) {
+      return;
+    }
     if (page.isClosed()) {
       return;
     }

i18n/en.json

@@ -104,8 +104,6 @@
     "image_preview_description": "Medium-size image with stripped metadata, used when viewing a single asset and for machine learning",
     "image_preview_quality_description": "Preview quality from 1-100. Higher is better, but produces larger files and can reduce app responsiveness. Setting a low value may affect machine learning quality.",
     "image_preview_title": "Preview Settings",
-    "image_progressive": "Progressive",
-    "image_progressive_description": "Encode JPEG images progressively for gradual loading display. This has no effect on WebP images.",
     "image_quality": "Quality",
     "image_resolution": "Resolution",
     "image_resolution_description": "Higher resolutions can preserve more detail but take longer to encode, have larger file sizes and can reduce app responsiveness.",
@@ -190,21 +188,10 @@
     "machine_learning_smart_search_enabled": "Enable smart search",
     "machine_learning_smart_search_enabled_description": "If disabled, images will not be encoded for smart search.",
     "machine_learning_url_description": "The URL of the machine learning server. If more than one URL is provided, each server will be attempted one-at-a-time until one responds successfully, in order from first to last. Servers that don't respond will be temporarily ignored until they come back online.",
-    "maintenance_delete_backup": "Delete Backup",
-    "maintenance_delete_backup_description": "This file will be irrevocably deleted.",
-    "maintenance_delete_error": "Failed to delete backup.",
-    "maintenance_restore_backup": "Restore Backup",
-    "maintenance_restore_backup_description": "Immich will be wiped and restored from the chosen backup. A backup will be created before continuing.",
-    "maintenance_restore_backup_different_version": "This backup was created with a different version of Immich!",
-    "maintenance_restore_backup_unknown_version": "Couldn't determine backup version.",
-    "maintenance_restore_database_backup": "Restore database backup",
-    "maintenance_restore_database_backup_description": "Rollback to an earlier database state using a backup file",
     "maintenance_settings": "Maintenance",
     "maintenance_settings_description": "Put Immich into maintenance mode.",
-    "maintenance_start": "Switch to maintenance mode",
+    "maintenance_start": "Start maintenance mode",
     "maintenance_start_error": "Failed to start maintenance mode.",
-    "maintenance_upload_backup": "Upload database backup file",
-    "maintenance_upload_backup_error": "Could not upload backup, is it an .sql/.sql.gz file?",
     "manage_concurrency": "Manage Concurrency",
     "manage_concurrency_description": "Navigate to the jobs page to manage job concurrency",
     "manage_log_settings": "Manage log settings",
@@ -451,9 +438,6 @@
   "admin_password": "Admin Password",
   "administration": "Administration",
   "advanced": "Advanced",
-  "advanced_settings_clear_image_cache": "Clear Image Cache",
-  "advanced_settings_clear_image_cache_error": "Failed to clear image cache",
-  "advanced_settings_clear_image_cache_success": "Successfully cleared {size}",
   "advanced_settings_enable_alternate_media_filter_subtitle": "Use this option to filter media during sync based on alternate criteria. Only try this if you have issues with the app detecting all albums.",
   "advanced_settings_enable_alternate_media_filter_title": "[EXPERIMENTAL] Use alternate device album sync filter",
   "advanced_settings_log_level_title": "Log level: {level}",
@@ -517,7 +501,6 @@
   "all": "All",
   "all_albums": "All albums",
   "all_people": "All people",
-  "all_photos": "All photos",
   "all_videos": "All videos",
   "allow_dark_mode": "Allow dark mode",
   "allow_edits": "Allow edits",
@@ -525,9 +508,6 @@
   "allow_public_user_to_upload": "Allow public user to upload",
   "allowed": "Allowed",
   "alt_text_qr_code": "QR code image",
-  "always_keep": "Always keep",
-  "always_keep_photos_hint": "Free Up Space will keep all photos on this device.",
-  "always_keep_videos_hint": "Free Up Space will keep all videos on this device.",
   "anti_clockwise": "Anti-clockwise",
   "api_key": "API Key",
   "api_key_description": "This value will only be shown once. Please be sure to copy it before closing the window.",
@@ -623,7 +603,7 @@
   "backup_album_selection_page_select_albums": "Select albums",
   "backup_album_selection_page_selection_info": "Selection Info",
   "backup_album_selection_page_total_assets": "Total unique assets",
-  "backup_albums_sync": "Backup Albums Synchronization",
+  "backup_albums_sync": "Backup albums synchronization",
   "backup_all": "All",
   "backup_background_service_backup_failed_message": "Failed to backup assets. Retrying…",
   "backup_background_service_complete_notification": "Asset backup complete",
@@ -760,13 +740,13 @@
   "cleanup_confirm_prompt_title": "Remove from this device?",
   "cleanup_deleted_assets": "Moved {count} assets to device trash",
   "cleanup_deleting": "Moving to trash...",
+  "cleanup_filter_description": "Choose which types of assets to remove in the cleanup",
   "cleanup_found_assets": "Found {count} backed up assets",
-  "cleanup_found_assets_with_size": "Found {count} backed up assets ({size})",
   "cleanup_icloud_shared_albums_excluded": "iCloud Shared Albums are excluded from the scan",
-  "cleanup_no_assets_found": "No assets found matching the criteria above. Free Up Space can only remove assets that have been backed up to the server",
+  "cleanup_no_assets_found": "No backed up assets found matching your criteria",
   "cleanup_preview_title": "Assets to remove ({count})",
-  "cleanup_step3_description": "Scan for backed up assets matching your date and keep settings.",
-  "cleanup_step4_summary": "{count} assets (created before {date}) to remove from your local device. Photos will remain accessible from the Immich app.",
+  "cleanup_step3_description": "Scan for photos and videos that have been backed up to the server with the selected cutoff date and filter options",
+  "cleanup_step4_summary": "{count} assets created before {date} are queued for removal from your device",
   "cleanup_trash_hint": "To fully reclaim storage space, open the system gallery app and empty the trash",
   "clear": "Clear",
   "clear_all": "Clear all",
@@ -864,7 +844,7 @@
   "custom_locale": "Custom Locale",
   "custom_locale_description": "Format dates and numbers based on the language and the region",
   "custom_url": "Custom URL",
-  "cutoff_date_description": "Keep photos from the last…",
+  "cutoff_date_description": "Remove photos and videos older than",
   "cutoff_day": "{count, plural, one {day} other {days}}",
   "cutoff_year": "{count, plural, one {year} other {years}}",
   "daily_title_text_date": "E, MMM dd",
@@ -1016,14 +996,11 @@
   "error_change_sort_album": "Failed to change album sort order",
   "error_delete_face": "Error deleting face from asset",
   "error_getting_places": "Error getting places",
-  "error_loading_albums": "Error loading albums",
   "error_loading_image": "Error loading image",
   "error_loading_partners": "Error loading partners: {error}",
-  "error_retrieving_asset_information": "Error retrieving asset information",
   "error_saving_image": "Error: {error}",
   "error_tag_face_bounding_box": "Error tagging face - cannot get bounding box coordinates",
   "error_title": "Error - Something went wrong",
-  "error_while_navigating": "Error while navigating to asset",
   "errors": {
     "cannot_navigate_next_asset": "Cannot navigate to the next asset",
     "cannot_navigate_previous_asset": "Cannot navigate to previous asset",
@@ -1199,6 +1176,7 @@
   "filetype": "Filetype",
   "filter": "Filter",
   "filter_description": "Conditions to filter the target assets",
+  "filter_options": "Filter options",
   "filter_people": "Filter people",
   "filter_places": "Filter places",
   "filters": "Filters",
@@ -1212,7 +1190,7 @@
   "forgot_pin_code_question": "Forgot your PIN?",
   "forward": "Forward",
   "free_up_space": "Free Up Space",
-  "free_up_space_description": "Move backed-up photos and videos to your device's trash to free up space. Your copies on the server remain safe.",
+  "free_up_space_description": "Move backed-up photos and videos to your device's trash to free up space. Your copies on the server remain safe",
   "free_up_space_settings_subtitle": "Free up device storage",
   "full_path": "Full path: {path}",
   "gcast_enabled": "Google Cast",
@@ -1329,15 +1307,10 @@
   "json_editor": "JSON editor",
   "json_error": "JSON error",
   "keep": "Keep",
-  "keep_albums": "Keep albums",
-  "keep_albums_count": "Keeping {count} {count, plural, one {album} other {albums}}",
   "keep_all": "Keep All",
-  "keep_description": "Choose what stays on your device when freeing up space.",
   "keep_favorites": "Keep favorites",
-  "keep_on_device": "Keep on device",
-  "keep_on_device_hint": "Select items to keep on this device",
+  "keep_favorites_description": "Favorite assets will not be deleted from your device",
   "keep_this_delete_others": "Keep this, delete others",
-  "keeping": "Keeping: {items}",
   "kept_this_deleted_others": "Kept this asset and deleted {count, plural, one {# asset} other {# assets}}",
   "keyboard_shortcuts": "Keyboard shortcuts",
   "language": "Language",
@@ -1431,28 +1404,10 @@
   "loop_videos_description": "Enable to automatically loop a video in the detail viewer.",
   "main_branch_warning": "You're using a development version; we strongly recommend using a release version!",
   "main_menu": "Main menu",
-  "maintenance_action_restore": "Restoring Database",
   "maintenance_description": "Immich has been put into <link>maintenance mode</link>.",
   "maintenance_end": "End maintenance mode",
   "maintenance_end_error": "Failed to end maintenance mode.",
   "maintenance_logged_in_as": "Currently logged in as {user}",
-  "maintenance_restore_from_backup": "Restore From Backup",
-  "maintenance_restore_library": "Restore Your Library",
-  "maintenance_restore_library_confirm": "If this looks correct, continue to restoring a backup!",
-  "maintenance_restore_library_description": "Restoring Database",
-  "maintenance_restore_library_folder_has_files": "{folder} has {count} folder(s)",
-  "maintenance_restore_library_folder_no_files": "{folder} is missing files!",
-  "maintenance_restore_library_folder_pass": "readable and writable",
-  "maintenance_restore_library_folder_read_fail": "not readable",
-  "maintenance_restore_library_folder_write_fail": "not writable",
-  "maintenance_restore_library_hint_missing_files": "You may be missing important files",
-  "maintenance_restore_library_hint_regenerate_later": "You can regenerate these later in settings",
-  "maintenance_restore_library_hint_storage_template_missing_files": "Using storage template? You may be missing files",
-  "maintenance_restore_library_loading": "Loading integrity checks and heuristics…",
-  "maintenance_task_backup": "Creating a backup of the existing database…",
-  "maintenance_task_migrations": "Running database migrations…",
-  "maintenance_task_restore": "Restoring the chosen backup…",
-  "maintenance_task_rollback": "Restore failed, rolling back to restore point…",
   "maintenance_title": "Temporarily Unavailable",
   "make": "Make",
   "manage_geolocation": "Manage location",
@@ -1567,12 +1522,11 @@
   "next_memory": "Next memory",
   "no": "No",
   "no_actions_added": "No actions added yet",
-  "no_albums_found": "No albums found",
   "no_albums_message": "Create an album to organize your photos and videos",
   "no_albums_with_name_yet": "It looks like you do not have any albums with this name yet.",
   "no_albums_yet": "It looks like you do not have any albums yet.",
   "no_archived_assets_message": "Archive photos and videos to hide them from your Photos view",
-  "no_assets_message": "Click to upload your first photo",
+  "no_assets_message": "CLICK TO UPLOAD YOUR FIRST PHOTO",
   "no_assets_to_show": "No assets to show",
   "no_cast_devices_found": "No cast devices found",
   "no_checksum_local": "No checksum available - cannot fetch local assets",
@@ -1597,7 +1551,6 @@
   "no_results_description": "Try a synonym or more general keyword",
   "no_shared_albums_message": "Create an album to share photos and videos with people in your network",
   "no_uploads_in_progress": "No uploads in progress",
-  "none": "None",
   "not_allowed": "Not allowed",
   "not_available": "N/A",
   "not_in_any_album": "Not in any album",
@@ -1927,7 +1880,6 @@
   "search_filter_media_type_title": "Select media type",
   "search_filter_ocr": "Search by OCR",
   "search_filter_people_title": "Select people",
-  "search_filter_star_rating": "Star Rating",
   "search_for": "Search for",
   "search_for_existing_person": "Search for existing person",
   "search_no_more_result": "No more results",
@@ -2132,8 +2084,6 @@
   "skip_to_folders": "Skip to folders",
   "skip_to_tags": "Skip to tags",
   "slideshow": "Slideshow",
-  "slideshow_repeat": "Repeat slideshow",
-  "slideshow_repeat_description": "Loop back to beginning when slideshow ends",
   "slideshow_settings": "Slideshow settings",
   "sort_albums_by": "Sort albums by...",
   "sort_created": "Date created",
@@ -2210,7 +2160,6 @@
   "theme_setting_theme_subtitle": "Choose the app's theme setting",
   "theme_setting_three_stage_loading_subtitle": "Three-stage loading might increase the loading performance but causes significantly higher network load",
   "theme_setting_three_stage_loading_title": "Enable three-stage loading",
-  "then": "Then",
   "they_will_be_merged_together": "They will be merged together",
   "third_party_resources": "Third-Party Resources",
   "time": "Time",
@@ -2266,7 +2215,6 @@
   "unhide_person": "Unhide person",
   "unknown": "Unknown",
   "unknown_country": "Unknown Country",
-  "unknown_date": "Unknown date",
   "unknown_year": "Unknown Year",
   "unlimited": "Unlimited",
   "unlink_motion_video": "Unlink motion video",
@@ -2309,7 +2257,7 @@
   "url": "URL",
   "usage": "Usage",
   "use_biometric": "Use biometric",
-  "use_current_connection": "Use current connection",
+  "use_current_connection": "use current connection",
   "use_custom_date_range": "Use custom date range instead",
   "user": "User",
   "user_has_been_deleted": "This user has been deleted.",

machine-learning/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "immich-ml"
-version = "2.5.0"
+version = "2.4.1"
 description = ""
 authors = [{ name = "Hau Tran", email = "alex.tran1502@gmail.com" }]
 requires-python = ">=3.11,<4.0"

mise.toml

@@ -3,7 +3,7 @@ experimental_monorepo_root = true
 [tools]
 node = "24.13.0"
 flutter = "3.35.7"
-pnpm = "10.28.0"
+pnpm = "10.27.0"
 terragrunt = "0.93.10"
 opentofu = "1.10.7"
 java = "25.0.1"

mobile/android/app/CMakeLists.txt

@@ -8,5 +8,3 @@ project(native_buffer LANGUAGES C)
 add_library(native_buffer SHARED
     src/main/cpp/native_buffer.c
 )
-
-target_link_libraries(native_buffer jnigraphics)

mobile/android/app/build.gradle

@@ -31,7 +31,7 @@ if (keystorePropertiesFile.exists()) {
 
 android {
   compileSdkVersion 35
-  ndkVersion = "28.2.13676358"
+  ndkVersion = "28.1.13356709"
 
   compileOptions {
     sourceCompatibility JavaVersion.VERSION_17
@@ -48,7 +48,6 @@ android {
   }
 
   buildFeatures {
-    buildConfig true
     compose true
   }
 
@@ -106,11 +105,8 @@ dependencies {
   def serialization_version = '1.8.1'
   def compose_version = '1.1.1'
   def gson_version = '2.10.1'
-  def okhttp_version = '4.12.0'
 
   implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-  implementation "com.squareup.okhttp3:okhttp:$okhttp_version"
-  implementation 'org.chromium.net:cronet-embedded:143.7445.0'
   implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutines_version"
   implementation "androidx.work:work-runtime-ktx:$work_version"
   implementation "androidx.concurrent:concurrent-futures:$concurrent_version"

mobile/android/app/src/main/AndroidManifest.xml

@@ -117,9 +117,6 @@
         <data
           android:host="my.immich.app"
           android:pathPrefix="/memories/" />
-        <data
-          android:host="my.immich.app"
-          android:path="/memory" />
         <data
           android:host="my.immich.app"
           android:pathPrefix="/photos/" />

mobile/android/app/src/main/cpp/native_buffer.c

@@ -1,38 +1,40 @@
 #include <jni.h>
 #include <stdlib.h>
-#include <string.h>
 
 JNIEXPORT jlong JNICALL
-Java_app_alextran_immich_NativeBuffer_allocate(
+Java_app_alextran_immich_images_ThumbnailsImpl_00024Companion_allocateNative(
+        JNIEnv *env, jclass clazz, jint size) {
+    void *ptr = malloc(size);
+    return (jlong) ptr;
+}
+
+JNIEXPORT jlong JNICALL
+Java_app_alextran_immich_images_ThumbnailsImpl_allocateNative(
         JNIEnv *env, jclass clazz, jint size) {
     void *ptr = malloc(size);
     return (jlong) ptr;
 }
 
 JNIEXPORT void JNICALL
-Java_app_alextran_immich_NativeBuffer_free(
+Java_app_alextran_immich_images_ThumbnailsImpl_00024Companion_freeNative(
         JNIEnv *env, jclass clazz, jlong address) {
     free((void *) address);
 }
 
-JNIEXPORT jlong JNICALL
-Java_app_alextran_immich_NativeBuffer_realloc(
-        JNIEnv *env, jclass clazz, jlong address, jint size) {
-    void *ptr = realloc((void *) address, size);
-    return (jlong) ptr;
+JNIEXPORT void JNICALL
+Java_app_alextran_immich_images_ThumbnailsImpl_freeNative(
+        JNIEnv *env, jclass clazz, jlong address) {
+    free((void *) address);
 }
 
 JNIEXPORT jobject JNICALL
-Java_app_alextran_immich_NativeBuffer_wrap(
+Java_app_alextran_immich_images_ThumbnailsImpl_00024Companion_wrapAsBuffer(
         JNIEnv *env, jclass clazz, jlong address, jint capacity) {
     return (*env)->NewDirectByteBuffer(env, (void *) address, capacity);
 }
 
-JNIEXPORT void JNICALL
-Java_app_alextran_immich_NativeBuffer_copy(
-        JNIEnv *env, jclass clazz, jobject buffer, jlong destAddress, jint offset, jint length) {
-    void *src = (*env)->GetDirectBufferAddress(env, buffer);
-    if (src != NULL) {
-        memcpy((void *) destAddress, (char *) src + offset, length);
-    }
+JNIEXPORT jobject JNICALL
+Java_app_alextran_immich_images_ThumbnailsImpl_wrapAsBuffer(
+        JNIEnv *env, jclass clazz, jlong address, jint capacity) {
+    return (*env)->NewDirectByteBuffer(env, (void *) address, capacity);
 }

mobile/android/app/src/main/kotlin/app/alextran/immich/HttpSSLOptionsPlugin.kt

@@ -2,7 +2,6 @@ package app.alextran.immich
 
 import android.annotation.SuppressLint
 import android.content.Context
-import app.alextran.immich.core.SSLConfig
 import io.flutter.embedding.engine.plugins.FlutterPlugin
 import io.flutter.plugin.common.BinaryMessenger
 import io.flutter.plugin.common.MethodCall
@@ -52,18 +51,15 @@ class HttpSSLOptionsPlugin : FlutterPlugin, MethodChannel.MethodCallHandler {
       when (call.method) {
         "apply" -> {
           val args = call.arguments<ArrayList<*>>()!!
-          val allowSelfSigned = args[0] as Boolean
-          val serverHost = args[1] as? String
-          val clientCertHash = (args[2] as? ByteArray)
 
           var tm: Array<TrustManager>? = null
-          if (allowSelfSigned) {
-            tm = arrayOf(AllowSelfSignedTrustManager(serverHost))
+          if (args[0] as Boolean) {
+            tm = arrayOf(AllowSelfSignedTrustManager(args[1] as? String))
           }
 
           var km: Array<KeyManager>? = null
-          if (clientCertHash != null) {
-            val cert = ByteArrayInputStream(clientCertHash)
+          if (args[2] != null) {
+            val cert = ByteArrayInputStream(args[2] as ByteArray)
             val password = (args[3] as String).toCharArray()
             val keyStore = KeyStore.getInstance("PKCS12")
             keyStore.load(cert, password)
@@ -73,9 +69,6 @@ class HttpSSLOptionsPlugin : FlutterPlugin, MethodChannel.MethodCallHandler {
             km = keyManagerFactory.keyManagers
           }
 
-          // Update shared SSL config for OkHttp and other HTTP clients
-          SSLConfig.apply(km, tm, allowSelfSigned, serverHost, clientCertHash?.contentHashCode() ?: 0)
-
           val sslContext = SSLContext.getInstance("TLS")
           sslContext.init(km, tm, null)
           HttpsURLConnection.setDefaultSSLSocketFactory(sslContext.socketFactory)

mobile/android/app/src/main/kotlin/app/alextran/immich/MainActivity.kt

@@ -10,10 +10,8 @@ import app.alextran.immich.background.BackgroundWorkerLockApi
 import app.alextran.immich.connectivity.ConnectivityApi
 import app.alextran.immich.connectivity.ConnectivityApiImpl
 import app.alextran.immich.core.ImmichPlugin
-import app.alextran.immich.images.LocalImageApi
-import app.alextran.immich.images.LocalImagesImpl
-import app.alextran.immich.images.RemoteImageApi
-import app.alextran.immich.images.RemoteImagesImpl
+import app.alextran.immich.images.ThumbnailApi
+import app.alextran.immich.images.ThumbnailsImpl
 import app.alextran.immich.sync.NativeSyncApi
 import app.alextran.immich.sync.NativeSyncApiImpl26
 import app.alextran.immich.sync.NativeSyncApiImpl30
@@ -38,9 +36,7 @@ class MainActivity : FlutterFragmentActivity() {
           NativeSyncApiImpl30(ctx)
         }
       NativeSyncApi.setUp(messenger, nativeSyncApiImpl)
-      LocalImageApi.setUp(messenger, LocalImagesImpl(ctx))
-      RemoteImageApi.setUp(messenger, RemoteImagesImpl(ctx))
-
+      ThumbnailApi.setUp(messenger, ThumbnailsImpl(ctx))
       BackgroundWorkerFgHostApi.setUp(messenger, BackgroundWorkerApiImpl(ctx))
       ConnectivityApi.setUp(messenger, ConnectivityApiImpl(ctx))
 

mobile/android/app/src/main/kotlin/app/alextran/immich/NativeBuffer.kt

@@ -1,52 +0,0 @@
-package app.alextran.immich
-
-import java.nio.ByteBuffer
-
-const val INITIAL_BUFFER_SIZE = 32 * 1024
-
-object NativeBuffer {
-  init {
-    System.loadLibrary("native_buffer")
-  }
-
-  @JvmStatic
-  external fun allocate(size: Int): Long
-
-  @JvmStatic
-  external fun free(address: Long)
-
-  @JvmStatic
-  external fun realloc(address: Long, size: Int): Long
-
-  @JvmStatic
-  external fun wrap(address: Long, capacity: Int): ByteBuffer
-
-  @JvmStatic
-  external fun copy(buffer: ByteBuffer, destAddress: Long, offset: Int, length: Int)
-}
-
-class NativeByteBuffer(initialCapacity: Int) {
-  var pointer = NativeBuffer.allocate(initialCapacity)
-  var capacity = initialCapacity
-  var offset = 0
-
-  inline fun ensureHeadroom() {
-    if (offset == capacity) {
-      capacity *= 2
-      pointer = NativeBuffer.realloc(pointer, capacity)
-    }
-  }
-
-  inline fun wrapRemaining() = NativeBuffer.wrap(pointer + offset, capacity - offset)
-
-  inline fun advance(bytesRead: Int) {
-    offset += bytesRead
-  }
-
-  inline fun free() {
-    if (pointer != 0L) {
-      NativeBuffer.free(pointer)
-      pointer = 0L
-    }
-  }
-}

mobile/android/app/src/main/kotlin/app/alextran/immich/core/SSLConfig.kt

@@ -1,73 +0,0 @@
-package app.alextran.immich.core
-
-import java.security.KeyStore
-import javax.net.ssl.KeyManager
-import javax.net.ssl.SSLContext
-import javax.net.ssl.SSLSocketFactory
-import javax.net.ssl.TrustManager
-import javax.net.ssl.TrustManagerFactory
-import javax.net.ssl.X509TrustManager
-
-/**
- * Shared SSL configuration for OkHttp and HttpsURLConnection.
- * Stores the SSLSocketFactory and X509TrustManager configured by HttpSSLOptionsPlugin.
- */
-object SSLConfig {
-  var sslSocketFactory: SSLSocketFactory? = null
-    private set
-
-  var trustManager: X509TrustManager? = null
-    private set
-
-  var requiresCustomSSL: Boolean = false
-    private set
-
-  private val listeners = mutableListOf<() -> Unit>()
-  private var configHash: Int = 0
-
-  fun addListener(listener: () -> Unit) {
-    listeners.add(listener)
-  }
-
-  fun apply(
-    keyManagers: Array<KeyManager>?,
-    trustManagers: Array<TrustManager>?,
-    allowSelfSigned: Boolean,
-    serverHost: String?,
-    clientCertHash: Int
-  ) {
-    synchronized(this) {
-      val newHash = computeHash(allowSelfSigned, serverHost, clientCertHash)
-      val newRequiresCustomSSL = allowSelfSigned || keyManagers != null
-      if (newHash == configHash && sslSocketFactory != null && requiresCustomSSL == newRequiresCustomSSL) {
-        return  // Config unchanged, skip
-      }
-
-      val sslContext = SSLContext.getInstance("TLS")
-      sslContext.init(keyManagers, trustManagers, null)
-      sslSocketFactory = sslContext.socketFactory
-      trustManager = trustManagers?.filterIsInstance<X509TrustManager>()?.firstOrNull()
-        ?: getDefaultTrustManager()
-      requiresCustomSSL = newRequiresCustomSSL
-      configHash = newHash
-      notifyListeners()
-    }
-  }
-
-  private fun computeHash(allowSelfSigned: Boolean, serverHost: String?, clientCertHash: Int): Int {
-    var result = allowSelfSigned.hashCode()
-    result = 31 * result + (serverHost?.hashCode() ?: 0)
-    result = 31 * result + clientCertHash
-    return result
-  }
-
-  private fun notifyListeners() {
-    listeners.forEach { it() }
-  }
-
-  private fun getDefaultTrustManager(): X509TrustManager {
-    val factory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm())
-    factory.init(null as KeyStore?)
-    return factory.trustManagers.filterIsInstance<X509TrustManager>().first()
-  }
-}

mobile/android/app/src/main/kotlin/app/alextran/immich/images/RemoteImages.g.kt

@@ -1,123 +0,0 @@
-// Autogenerated from Pigeon (v26.0.2), do not edit directly.
-// See also: https://pub.dev/packages/pigeon
-@file:Suppress("UNCHECKED_CAST", "ArrayInDataClass")
-
-package app.alextran.immich.images
-
-import android.util.Log
-import io.flutter.plugin.common.BasicMessageChannel
-import io.flutter.plugin.common.BinaryMessenger
-import io.flutter.plugin.common.EventChannel
-import io.flutter.plugin.common.MessageCodec
-import io.flutter.plugin.common.StandardMethodCodec
-import io.flutter.plugin.common.StandardMessageCodec
-import java.io.ByteArrayOutputStream
-import java.nio.ByteBuffer
-private object RemoteImagesPigeonUtils {
-
-  fun wrapResult(result: Any?): List<Any?> {
-    return listOf(result)
-  }
-
-  fun wrapError(exception: Throwable): List<Any?> {
-    return if (exception is FlutterError) {
-      listOf(
-        exception.code,
-        exception.message,
-        exception.details
-      )
-    } else {
-      listOf(
-        exception.javaClass.simpleName,
-        exception.toString(),
-        "Cause: " + exception.cause + ", Stacktrace: " + Log.getStackTraceString(exception)
-      )
-    }
-  }
-}
-private open class RemoteImagesPigeonCodec : StandardMessageCodec() {
-  override fun readValueOfType(type: Byte, buffer: ByteBuffer): Any? {
-    return     super.readValueOfType(type, buffer)
-  }
-  override fun writeValue(stream: ByteArrayOutputStream, value: Any?)   {
-    super.writeValue(stream, value)
-  }
-}
-
-
-/** Generated interface from Pigeon that represents a handler of messages from Flutter. */
-interface RemoteImageApi {
-  fun requestImage(url: String, headers: Map<String, String>, requestId: Long, callback: (Result<Map<String, Long>?>) -> Unit)
-  fun cancelRequest(requestId: Long)
-  fun clearCache(callback: (Result<Long>) -> Unit)
-
-  companion object {
-    /** The codec used by RemoteImageApi. */
-    val codec: MessageCodec<Any?> by lazy {
-      RemoteImagesPigeonCodec()
-    }
-    /** Sets up an instance of `RemoteImageApi` to handle messages through the `binaryMessenger`. */
-    @JvmOverloads
-    fun setUp(binaryMessenger: BinaryMessenger, api: RemoteImageApi?, messageChannelSuffix: String = "") {
-      val separatedMessageChannelSuffix = if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else ""
-      run {
-        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.RemoteImageApi.requestImage$separatedMessageChannelSuffix", codec)
-        if (api != null) {
-          channel.setMessageHandler { message, reply ->
-            val args = message as List<Any?>
-            val urlArg = args[0] as String
-            val headersArg = args[1] as Map<String, String>
-            val requestIdArg = args[2] as Long
-            api.requestImage(urlArg, headersArg, requestIdArg) { result: Result<Map<String, Long>?> ->
-              val error = result.exceptionOrNull()
-              if (error != null) {
-                reply.reply(RemoteImagesPigeonUtils.wrapError(error))
-              } else {
-                val data = result.getOrNull()
-                reply.reply(RemoteImagesPigeonUtils.wrapResult(data))
-              }
-            }
-          }
-        } else {
-          channel.setMessageHandler(null)
-        }
-      }
-      run {
-        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.RemoteImageApi.cancelRequest$separatedMessageChannelSuffix", codec)
-        if (api != null) {
-          channel.setMessageHandler { message, reply ->
-            val args = message as List<Any?>
-            val requestIdArg = args[0] as Long
-            val wrapped: List<Any?> = try {
-              api.cancelRequest(requestIdArg)
-              listOf(null)
-            } catch (exception: Throwable) {
-              RemoteImagesPigeonUtils.wrapError(exception)
-            }
-            reply.reply(wrapped)
-          }
-        } else {
-          channel.setMessageHandler(null)
-        }
-      }
-      run {
-        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.RemoteImageApi.clearCache$separatedMessageChannelSuffix", codec)
-        if (api != null) {
-          channel.setMessageHandler { _, reply ->
-            api.clearCache{ result: Result<Long> ->
-              val error = result.exceptionOrNull()
-              if (error != null) {
-                reply.reply(RemoteImagesPigeonUtils.wrapError(error))
-              } else {
-                val data = result.getOrNull()
-                reply.reply(RemoteImagesPigeonUtils.wrapResult(data))
-              }
-            }
-          }
-        } else {
-          channel.setMessageHandler(null)
-        }
-      }
-    }
-  }
-}

mobile/android/app/src/main/kotlin/app/alextran/immich/images/RemoteImagesImpl.kt

@@ -1,530 +0,0 @@
-package app.alextran.immich.images
-
-import android.content.Context
-import android.os.CancellationSignal
-import android.os.OperationCanceledException
-import app.alextran.immich.BuildConfig
-import app.alextran.immich.INITIAL_BUFFER_SIZE
-import app.alextran.immich.NativeBuffer
-import app.alextran.immich.NativeByteBuffer
-import app.alextran.immich.core.SSLConfig
-import kotlinx.coroutines.*
-import okhttp3.Cache
-import okhttp3.Call
-import okhttp3.Callback
-import okhttp3.ConnectionPool
-import okhttp3.Dispatcher
-import okhttp3.OkHttpClient
-import okhttp3.Request
-import okhttp3.Response
-import org.chromium.net.CronetEngine
-import org.chromium.net.CronetException
-import org.chromium.net.UrlRequest
-import org.chromium.net.UrlResponseInfo
-import java.io.EOFException
-import java.io.File
-import java.io.IOException
-import java.nio.ByteBuffer
-import java.nio.file.FileVisitResult
-import java.nio.file.Files
-import java.nio.file.Path
-import java.nio.file.SimpleFileVisitor
-import java.nio.file.attribute.BasicFileAttributes
-import java.util.concurrent.ConcurrentHashMap
-import java.util.concurrent.Executors
-import java.util.concurrent.TimeUnit
-import javax.net.ssl.SSLSocketFactory
-import javax.net.ssl.X509TrustManager
-
-
-private const val USER_AGENT = "Immich_Android_${BuildConfig.VERSION_NAME}"
-private const val MAX_REQUESTS_PER_HOST = 64
-private const val KEEP_ALIVE_CONNECTIONS = 10
-private const val KEEP_ALIVE_DURATION_MINUTES = 5L
-private const val CACHE_SIZE_BYTES = 1024L * 1024 * 1024
-
-private class RemoteRequest(val cancellationSignal: CancellationSignal)
-
-class RemoteImagesImpl(context: Context) : RemoteImageApi {
-  private val requestMap = ConcurrentHashMap<Long, RemoteRequest>()
-
-  init {
-    ImageFetcherManager.initialize(context)
-  }
-
-  companion object {
-    val CANCELLED = Result.success<Map<String, Long>?>(null)
-  }
-
-  override fun requestImage(
-    url: String,
-    headers: Map<String, String>,
-    requestId: Long,
-    callback: (Result<Map<String, Long>?>) -> Unit
-  ) {
-    val signal = CancellationSignal()
-    requestMap[requestId] = RemoteRequest(signal)
-
-    ImageFetcherManager.fetch(
-      url,
-      headers,
-      signal,
-      onSuccess = { buffer ->
-        requestMap.remove(requestId)
-        if (signal.isCanceled) {
-          NativeBuffer.free(buffer.pointer)
-          return@fetch callback(CANCELLED)
-        }
-
-        callback(
-          Result.success(
-            mapOf(
-              "pointer" to buffer.pointer,
-              "length" to buffer.offset.toLong()
-            )
-          )
-        )
-      },
-      onFailure = { e ->
-        requestMap.remove(requestId)
-        val result = if (signal.isCanceled) CANCELLED else Result.failure(e)
-        callback(result)
-      }
-    )
-  }
-
-  override fun cancelRequest(requestId: Long) {
-    requestMap.remove(requestId)?.cancellationSignal?.cancel()
-  }
-
-  override fun clearCache(callback: (Result<Long>) -> Unit) {
-    CoroutineScope(Dispatchers.IO).launch {
-      try {
-        ImageFetcherManager.clearCache(callback)
-      } catch (e: Exception) {
-        callback(Result.failure(e))
-      }
-    }
-  }
-}
-
-private object ImageFetcherManager {
-  private lateinit var appContext: Context
-  private lateinit var cacheDir: File
-  private lateinit var fetcher: ImageFetcher
-  private var initialized = false
-
-  fun initialize(context: Context) {
-    if (initialized) return
-    synchronized(this) {
-      if (initialized) return
-      appContext = context.applicationContext
-      cacheDir = context.cacheDir
-      fetcher = build()
-      SSLConfig.addListener(::invalidate)
-      initialized = true
-    }
-  }
-
-  fun fetch(
-    url: String,
-    headers: Map<String, String>,
-    signal: CancellationSignal,
-    onSuccess: (NativeByteBuffer) -> Unit,
-    onFailure: (Exception) -> Unit,
-  ) {
-    fetcher.fetch(url, headers, signal, onSuccess, onFailure)
-  }
-
-  fun clearCache(onCleared: (Result<Long>) -> Unit) {
-    fetcher.clearCache(onCleared)
-  }
-
-  private fun invalidate() {
-    synchronized(this) {
-      val oldFetcher = fetcher
-      if (oldFetcher is OkHttpImageFetcher && SSLConfig.requiresCustomSSL) {
-        fetcher = oldFetcher.reconfigure(SSLConfig.sslSocketFactory, SSLConfig.trustManager)
-        return
-      }
-      fetcher = build()
-      oldFetcher.drain()
-    }
-  }
-
-  private fun build(): ImageFetcher {
-    return if (SSLConfig.requiresCustomSSL) {
-      OkHttpImageFetcher.create(cacheDir, SSLConfig.sslSocketFactory, SSLConfig.trustManager)
-    } else {
-      CronetImageFetcher(appContext, cacheDir)
-    }
-  }
-}
-
-private sealed interface ImageFetcher {
-  fun fetch(
-    url: String,
-    headers: Map<String, String>,
-    signal: CancellationSignal,
-    onSuccess: (NativeByteBuffer) -> Unit,
-    onFailure: (Exception) -> Unit,
-  )
-
-  fun drain()
-
-  fun clearCache(onCleared: (Result<Long>) -> Unit)
-}
-
-private class CronetImageFetcher(context: Context, cacheDir: File) : ImageFetcher {
-  private val ctx = context
-  private var engine: CronetEngine
-  private val executor = Executors.newFixedThreadPool(4)
-  private val stateLock = Any()
-  private var activeCount = 0
-  private var draining = false
-  private var onCacheCleared: ((Result<Long>) -> Unit)? = null
-  private val storageDir = File(cacheDir, "cronet").apply { mkdirs() }
-
-  init {
-    engine = build(context)
-  }
-
-  override fun fetch(
-    url: String,
-    headers: Map<String, String>,
-    signal: CancellationSignal,
-    onSuccess: (NativeByteBuffer) -> Unit,
-    onFailure: (Exception) -> Unit,
-  ) {
-    synchronized(stateLock) {
-      if (draining) {
-        onFailure(IllegalStateException("Engine is draining"))
-        return
-      }
-      activeCount++
-    }
-
-    val callback = FetchCallback(onSuccess, onFailure, ::onComplete)
-    val requestBuilder = engine.newUrlRequestBuilder(url, callback, executor)
-    headers.forEach { (key, value) -> requestBuilder.addHeader(key, value) }
-    val request = requestBuilder.build()
-    signal.setOnCancelListener(request::cancel)
-    request.start()
-  }
-
-  private fun build(ctx: Context): CronetEngine {
-    return CronetEngine.Builder(ctx)
-      .enableHttp2(true)
-      .enableQuic(true)
-      .enableBrotli(true)
-      .setStoragePath(storageDir.absolutePath)
-      .setUserAgent(USER_AGENT)
-      .enableHttpCache(CronetEngine.Builder.HTTP_CACHE_DISK, CACHE_SIZE_BYTES)
-      .build()
-  }
-
-  private fun onComplete() {
-    val didDrain = synchronized(stateLock) {
-      activeCount--
-      draining && activeCount == 0
-    }
-    if (didDrain) {
-      onDrained()
-    }
-  }
-
-  override fun drain() {
-    val didDrain = synchronized(stateLock) {
-      if (draining) return
-      draining = true
-      activeCount == 0
-    }
-    if (didDrain) {
-      onDrained()
-    }
-  }
-
-  private fun onDrained() {
-    engine.shutdown()
-    val onCacheCleared = synchronized(stateLock) {
-      val onCacheCleared = onCacheCleared
-      this.onCacheCleared = null
-      onCacheCleared
-    }
-    if (onCacheCleared == null) {
-      executor.shutdown()
-    } else {
-      CoroutineScope(Dispatchers.IO).launch {
-        val result = runCatching { deleteFolderAndGetSize(storageDir.toPath()) }
-        // Cronet is very good at self-repair, so it shouldn't fail here regardless of clear result
-        engine = build(ctx)
-        synchronized(stateLock) { draining = false }
-        onCacheCleared(result)
-      }
-    }
-  }
-
-  override fun clearCache(onCleared: (Result<Long>) -> Unit) {
-    synchronized(stateLock) {
-      if (onCacheCleared != null) {
-        return onCleared(Result.success(-1))
-      }
-      onCacheCleared = onCleared
-    }
-    drain()
-  }
-
-  private class FetchCallback(
-    private val onSuccess: (NativeByteBuffer) -> Unit,
-    private val onFailure: (Exception) -> Unit,
-    private val onComplete: () -> Unit,
-  ) : UrlRequest.Callback() {
-    private var buffer: NativeByteBuffer? = null
-    private var wrapped: ByteBuffer? = null
-    private var error: Exception? = null
-
-    override fun onRedirectReceived(request: UrlRequest, info: UrlResponseInfo, newUrl: String) {
-      request.followRedirect()
-    }
-
-    override fun onResponseStarted(request: UrlRequest, info: UrlResponseInfo) {
-      if (info.httpStatusCode !in 200..299) {
-        error = IOException("HTTP ${info.httpStatusCode}: ${info.httpStatusText}")
-        return request.cancel()
-      }
-
-      try {
-        val contentLength = info.allHeaders["content-length"]?.firstOrNull()?.toIntOrNull() ?: 0
-        if (contentLength > 0) {
-          buffer = NativeByteBuffer(contentLength + 1)
-          wrapped = NativeBuffer.wrap(buffer!!.pointer, contentLength + 1)
-          request.read(wrapped)
-        } else {
-          buffer = NativeByteBuffer(INITIAL_BUFFER_SIZE)
-          request.read(buffer!!.wrapRemaining())
-        }
-      } catch (e: Exception) {
-        error = e
-        return request.cancel()
-      }
-    }
-
-    override fun onReadCompleted(
-      request: UrlRequest,
-      info: UrlResponseInfo,
-      byteBuffer: ByteBuffer
-    ) {
-      try {
-        val buf = if (wrapped == null) {
-          buffer!!.run {
-            advance(byteBuffer.position())
-            ensureHeadroom()
-            wrapRemaining()
-          }
-        } else {
-          wrapped
-        }
-        request.read(buf)
-      } catch (e: Exception) {
-        error = e
-        return request.cancel()
-      }
-    }
-
-    override fun onSucceeded(request: UrlRequest, info: UrlResponseInfo) {
-      wrapped?.let { buffer!!.advance(it.position()) }
-      onSuccess(buffer!!)
-      onComplete()
-    }
-
-    override fun onFailed(request: UrlRequest, info: UrlResponseInfo?, error: CronetException) {
-      buffer?.free()
-      onFailure(error)
-      onComplete()
-    }
-
-    override fun onCanceled(request: UrlRequest, info: UrlResponseInfo?) {
-      buffer?.free()
-      onFailure(error ?: OperationCanceledException())
-      onComplete()
-    }
-  }
-
-  suspend fun deleteFolderAndGetSize(root: Path): Long = withContext(Dispatchers.IO) {
-    var totalSize = 0L
-
-    Files.walkFileTree(root, object : SimpleFileVisitor<Path>() {
-      override fun visitFile(file: Path, attrs: BasicFileAttributes): FileVisitResult {
-        totalSize += attrs.size()
-        Files.delete(file)
-        return FileVisitResult.CONTINUE
-      }
-
-      override fun postVisitDirectory(dir: Path, exc: IOException?): FileVisitResult {
-        if (dir != root) {
-          Files.delete(dir)
-        }
-        return FileVisitResult.CONTINUE
-      }
-    })
-
-    totalSize
-  }
-}
-
-private class OkHttpImageFetcher private constructor(
-  private val client: OkHttpClient,
-) : ImageFetcher {
-  private val stateLock = Any()
-  private var activeCount = 0
-  private var draining = false
-
-  companion object {
-    fun create(
-      cacheDir: File,
-      sslSocketFactory: SSLSocketFactory?,
-      trustManager: X509TrustManager?,
-    ): OkHttpImageFetcher {
-      val dir = File(cacheDir, "okhttp")
-      val connectionPool = ConnectionPool(
-        maxIdleConnections = KEEP_ALIVE_CONNECTIONS,
-        keepAliveDuration = KEEP_ALIVE_DURATION_MINUTES,
-        timeUnit = TimeUnit.MINUTES
-      )
-
-      val builder = OkHttpClient.Builder()
-        .addInterceptor { chain ->
-          chain.proceed(
-            chain.request().newBuilder()
-              .header("User-Agent", USER_AGENT)
-              .build()
-          )
-        }
-        .dispatcher(Dispatcher().apply { maxRequestsPerHost = MAX_REQUESTS_PER_HOST })
-        .connectionPool(connectionPool)
-        .cache(Cache(File(dir, "thumbnails"), CACHE_SIZE_BYTES))
-
-      if (sslSocketFactory != null && trustManager != null) {
-        builder.sslSocketFactory(sslSocketFactory, trustManager)
-      }
-
-      return OkHttpImageFetcher(builder.build())
-    }
-  }
-
-  fun reconfigure(
-    sslSocketFactory: SSLSocketFactory?,
-    trustManager: X509TrustManager?,
-  ): OkHttpImageFetcher {
-    val builder = client.newBuilder()
-    if (sslSocketFactory != null && trustManager != null) {
-      builder.sslSocketFactory(sslSocketFactory, trustManager)
-    }
-    // Evict idle connections using old SSL config
-    client.connectionPool.evictAll()
-    return OkHttpImageFetcher(builder.build())
-  }
-
-  private fun onComplete() {
-    val shouldClose = synchronized(stateLock) {
-      activeCount--
-      draining && activeCount == 0
-    }
-    if (shouldClose) {
-      client.cache?.close()
-    }
-  }
-
-  override fun fetch(
-    url: String,
-    headers: Map<String, String>,
-    signal: CancellationSignal,
-    onSuccess: (NativeByteBuffer) -> Unit,
-    onFailure: (Exception) -> Unit,
-  ) {
-    synchronized(stateLock) {
-      if (draining) {
-        return onFailure(IllegalStateException("Client is draining"))
-      }
-      activeCount++
-    }
-
-    val requestBuilder = Request.Builder().url(url)
-    headers.forEach { (key, value) -> requestBuilder.addHeader(key, value) }
-    val call = client.newCall(requestBuilder.build())
-    signal.setOnCancelListener(call::cancel)
-
-    call.enqueue(object : Callback {
-      override fun onFailure(call: Call, e: IOException) {
-        onFailure(e)
-        onComplete()
-      }
-
-      override fun onResponse(call: Call, response: Response) {
-        response.use {
-          if (!response.isSuccessful) {
-            return onFailure(IOException("HTTP ${response.code}: ${response.message}")).also { onComplete() }
-          }
-
-          val body = response.body
-            ?: return onFailure(IOException("Empty response body")).also { onComplete() }
-
-          if (call.isCanceled()) {
-            onFailure(OperationCanceledException())
-            return onComplete()
-          }
-
-          body.source().use { source ->
-            val length = body.contentLength().toInt()
-            val buffer = NativeByteBuffer(if (length > 0) length else INITIAL_BUFFER_SIZE)
-            try {
-              if (length > 0) {
-                val wrapped = NativeBuffer.wrap(buffer.pointer, length)
-                while (wrapped.hasRemaining()) {
-                  if (call.isCanceled()) throw OperationCanceledException()
-                  if (source.read(wrapped) == -1) throw EOFException()
-                }
-                buffer.advance(length)
-              } else {
-                while (true) {
-                  if (call.isCanceled()) throw OperationCanceledException()
-                  val bytesRead = source.read(buffer.wrapRemaining())
-                  if (bytesRead == -1) break
-                  buffer.advance(bytesRead)
-                  buffer.ensureHeadroom()
-                }
-              }
-              onSuccess(buffer)
-            } catch (e: Exception) {
-              buffer.free()
-              onFailure(e)
-            }
-            onComplete()
-          }
-        }
-      }
-    })
-  }
-
-  override fun drain() {
-    val shouldClose = synchronized(stateLock) {
-      if (draining) return
-      draining = true
-      activeCount == 0
-    }
-    client.connectionPool.evictAll()
-    if (shouldClose) {
-      client.cache?.close()
-    }
-  }
-
-  override fun clearCache(onCleared: (Result<Long>) -> Unit) {
-    try {
-      val size = client.cache!!.size()
-      client.cache!!.evictAll()
-      onCleared(Result.success(size))
-    } catch (e: Exception) {
-      onCleared(Result.failure(e))
-    }
-  }
-}

mobile/android/app/src/main/kotlin/app/alextran/immich/images/ThumbHash.java

@@ -7,8 +7,6 @@ package app.alextran.immich.images;
 
 import java.nio.ByteBuffer;
 
-import app.alextran.immich.NativeBuffer;
-
 // modified to use native allocations
 public final class ThumbHash {
   /**
@@ -58,8 +56,8 @@ public final class ThumbHash {
     int w = Math.round(ratio > 1.0f ? 32.0f : 32.0f * ratio);
     int h = Math.round(ratio > 1.0f ? 32.0f / ratio : 32.0f);
     int size = w * h * 4;
-    long pointer = NativeBuffer.allocate(size);
-    ByteBuffer rgba = NativeBuffer.wrap(pointer, size);
+    long pointer = ThumbnailsImpl.allocateNative(size);
+    ByteBuffer rgba = ThumbnailsImpl.wrapAsBuffer(pointer, size);
     int cx_stop = Math.max(lx, hasAlpha ? 5 : 3);
     int cy_stop = Math.max(ly, hasAlpha ? 5 : 3);
     float[] fx = new float[cx_stop];

mobile/android/app/src/main/kotlin/app/alextran/immich/images/Thumbnails.g.kt

@@ -13,7 +13,7 @@ import io.flutter.plugin.common.StandardMethodCodec
 import io.flutter.plugin.common.StandardMessageCodec
 import java.io.ByteArrayOutputStream
 import java.nio.ByteBuffer
-private object LocalImagesPigeonUtils {
+private object ThumbnailsPigeonUtils {
 
   fun wrapResult(result: Any?): List<Any?> {
     return listOf(result)
@@ -47,7 +47,7 @@ class FlutterError (
   override val message: String? = null,
   val details: Any? = null
 ) : Throwable()
-private open class LocalImagesPigeonCodec : StandardMessageCodec() {
+private open class ThumbnailsPigeonCodec : StandardMessageCodec() {
   override fun readValueOfType(type: Byte, buffer: ByteBuffer): Any? {
     return     super.readValueOfType(type, buffer)
   }
@@ -58,22 +58,22 @@ private open class LocalImagesPigeonCodec : StandardMessageCodec() {
 
 
 /** Generated interface from Pigeon that represents a handler of messages from Flutter. */
-interface LocalImageApi {
-  fun requestImage(assetId: String, requestId: Long, width: Long, height: Long, isVideo: Boolean, callback: (Result<Map<String, Long>?>) -> Unit)
-  fun cancelRequest(requestId: Long)
+interface ThumbnailApi {
+  fun requestImage(assetId: String, requestId: Long, width: Long, height: Long, isVideo: Boolean, callback: (Result<Map<String, Long>>) -> Unit)
+  fun cancelImageRequest(requestId: Long)
   fun getThumbhash(thumbhash: String, callback: (Result<Map<String, Long>>) -> Unit)
 
   companion object {
-    /** The codec used by LocalImageApi. */
+    /** The codec used by ThumbnailApi. */
     val codec: MessageCodec<Any?> by lazy {
-      LocalImagesPigeonCodec()
+      ThumbnailsPigeonCodec()
     }
-    /** Sets up an instance of `LocalImageApi` to handle messages through the `binaryMessenger`. */
+    /** Sets up an instance of `ThumbnailApi` to handle messages through the `binaryMessenger`. */
     @JvmOverloads
-    fun setUp(binaryMessenger: BinaryMessenger, api: LocalImageApi?, messageChannelSuffix: String = "") {
+    fun setUp(binaryMessenger: BinaryMessenger, api: ThumbnailApi?, messageChannelSuffix: String = "") {
       val separatedMessageChannelSuffix = if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else ""
       run {
-        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.LocalImageApi.requestImage$separatedMessageChannelSuffix", codec)
+        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.ThumbnailApi.requestImage$separatedMessageChannelSuffix", codec)
         if (api != null) {
           channel.setMessageHandler { message, reply ->
             val args = message as List<Any?>
@@ -82,13 +82,13 @@ interface LocalImageApi {
             val widthArg = args[2] as Long
             val heightArg = args[3] as Long
             val isVideoArg = args[4] as Boolean
-            api.requestImage(assetIdArg, requestIdArg, widthArg, heightArg, isVideoArg) { result: Result<Map<String, Long>?> ->
+            api.requestImage(assetIdArg, requestIdArg, widthArg, heightArg, isVideoArg) { result: Result<Map<String, Long>> ->
               val error = result.exceptionOrNull()
               if (error != null) {
-                reply.reply(LocalImagesPigeonUtils.wrapError(error))
+                reply.reply(ThumbnailsPigeonUtils.wrapError(error))
               } else {
                 val data = result.getOrNull()
-                reply.reply(LocalImagesPigeonUtils.wrapResult(data))
+                reply.reply(ThumbnailsPigeonUtils.wrapResult(data))
               }
             }
           }
@@ -97,16 +97,16 @@ interface LocalImageApi {
         }
       }
       run {
-        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.LocalImageApi.cancelRequest$separatedMessageChannelSuffix", codec)
+        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.ThumbnailApi.cancelImageRequest$separatedMessageChannelSuffix", codec)
         if (api != null) {
           channel.setMessageHandler { message, reply ->
             val args = message as List<Any?>
             val requestIdArg = args[0] as Long
             val wrapped: List<Any?> = try {
-              api.cancelRequest(requestIdArg)
+              api.cancelImageRequest(requestIdArg)
               listOf(null)
             } catch (exception: Throwable) {
-              LocalImagesPigeonUtils.wrapError(exception)
+              ThumbnailsPigeonUtils.wrapError(exception)
             }
             reply.reply(wrapped)
           }
@@ -115,7 +115,7 @@ interface LocalImageApi {
         }
       }
       run {
-        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.LocalImageApi.getThumbhash$separatedMessageChannelSuffix", codec)
+        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.ThumbnailApi.getThumbhash$separatedMessageChannelSuffix", codec)
         if (api != null) {
           channel.setMessageHandler { message, reply ->
             val args = message as List<Any?>
@@ -123,10 +123,10 @@ interface LocalImageApi {
             api.getThumbhash(thumbhashArg) { result: Result<Map<String, Long>> ->
               val error = result.exceptionOrNull()
               if (error != null) {
-                reply.reply(LocalImagesPigeonUtils.wrapError(error))
+                reply.reply(ThumbnailsPigeonUtils.wrapError(error))
               } else {
                 val data = result.getOrNull()
-                reply.reply(LocalImagesPigeonUtils.wrapResult(data))
+                reply.reply(ThumbnailsPigeonUtils.wrapResult(data))
               }
             }
           }

mobile/android/app/src/main/kotlin/app/alextran/immich/images/ThumbnailsImpl.kt

@@ -11,8 +11,7 @@ import android.os.OperationCanceledException
 import android.provider.MediaStore.Images
 import android.provider.MediaStore.Video
 import android.util.Size
-import androidx.annotation.RequiresApi
-import app.alextran.immich.NativeBuffer
+import java.nio.ByteBuffer
 import kotlin.math.*
 import java.util.concurrent.Executors
 import com.bumptech.glide.Glide
@@ -27,42 +26,10 @@ import java.util.concurrent.Future
 data class Request(
   val taskFuture: Future<*>,
   val cancellationSignal: CancellationSignal,
-  val callback: (Result<Map<String, Long>?>) -> Unit
+  val callback: (Result<Map<String, Long>>) -> Unit
 )
 
-@RequiresApi(Build.VERSION_CODES.Q)
-inline fun ImageDecoder.Source.decodeBitmap(target: Size = Size(0, 0)): Bitmap {
-  return ImageDecoder.decodeBitmap(this) { decoder, info, _ ->
-    if (target.width > 0 && target.height > 0) {
-      val sample = max(1, min(info.size.width / target.width, info.size.height / target.height))
-      decoder.setTargetSampleSize(sample)
-    }
-    decoder.allocator = ImageDecoder.ALLOCATOR_SOFTWARE
-    decoder.setTargetColorSpace(ColorSpace.get(ColorSpace.Named.SRGB))
-  }
-}
-
-fun Bitmap.toNativeBuffer(): Map<String, Long>  {
-  val size = width * height * 4
-  val pointer = NativeBuffer.allocate(size)
-  try {
-    val buffer = NativeBuffer.wrap(pointer, size)
-    copyPixelsToBuffer(buffer)
-    recycle()
-    return mapOf(
-      "pointer" to pointer,
-      "width" to width.toLong(),
-      "height" to height.toLong(),
-      "rowBytes" to (width * 4).toLong()
-    )
-  } catch (e: Exception) {
-    NativeBuffer.free(pointer)
-    recycle()
-    throw e
-  }
-}
-
-class LocalImagesImpl(context: Context) : LocalImageApi {
+class ThumbnailsImpl(context: Context) : ThumbnailApi {
   private val ctx: Context = context.applicationContext
   private val resolver: ContentResolver = ctx.contentResolver
   private val requestThread = Executors.newSingleThreadExecutor()
@@ -71,8 +38,21 @@ class LocalImagesImpl(context: Context) : LocalImageApi {
   private val requestMap = ConcurrentHashMap<Long, Request>()
 
   companion object {
-    val CANCELLED = Result.success<Map<String, Long>?>(null)
+    val CANCELLED = Result.success<Map<String, Long>>(mapOf())
     val OPTIONS = BitmapFactory.Options().apply { inPreferredConfig = Bitmap.Config.ARGB_8888 }
+
+    init {
+      System.loadLibrary("native_buffer")
+    }
+
+    @JvmStatic
+    external fun allocateNative(size: Int): Long
+
+    @JvmStatic
+    external fun freeNative(pointer: Long)
+
+    @JvmStatic
+    external fun wrapAsBuffer(address: Long, capacity: Int): ByteBuffer
   }
 
   override fun getThumbhash(thumbhash: String, callback: (Result<Map<String, Long>>) -> Unit) {
@@ -83,8 +63,7 @@ class LocalImagesImpl(context: Context) : LocalImageApi {
         val res = mapOf(
           "pointer" to image.pointer,
           "width" to image.width.toLong(),
-          "height" to image.height.toLong(),
-          "rowBytes" to (image.width * 4).toLong()
+          "height" to image.height.toLong()
         )
         callback(Result.success(res))
       } catch (e: Exception) {
@@ -99,7 +78,7 @@ class LocalImagesImpl(context: Context) : LocalImageApi {
     width: Long,
     height: Long,
     isVideo: Boolean,
-    callback: (Result<Map<String, Long>?>) -> Unit
+    callback: (Result<Map<String, Long>>) -> Unit
   ) {
     val signal = CancellationSignal()
     val task = threadPool.submit {
@@ -119,7 +98,7 @@ class LocalImagesImpl(context: Context) : LocalImageApi {
     requestMap[requestId] = request
   }
 
-  override fun cancelRequest(requestId: Long) {
+  override fun cancelImageRequest(requestId: Long) {
     val request = requestMap.remove(requestId) ?: return
     request.taskFuture.cancel(false)
     request.cancellationSignal.cancel()
@@ -138,7 +117,7 @@ class LocalImagesImpl(context: Context) : LocalImageApi {
     width: Long,
     height: Long,
     isVideo: Boolean,
-    callback: (Result<Map<String, Long>?>) -> Unit,
+    callback: (Result<Map<String, Long>>) -> Unit,
     signal: CancellationSignal
   ) {
     signal.throwIfCanceled()
@@ -152,12 +131,31 @@ class LocalImagesImpl(context: Context) : LocalImageApi {
       decodeImage(id, size, signal)
     }
 
+    processBitmap(bitmap, callback, signal)
+  }
+
+  private fun processBitmap(
+    bitmap: Bitmap, callback: (Result<Map<String, Long>>) -> Unit, signal: CancellationSignal
+  ) {
+    signal.throwIfCanceled()
+    val actualWidth = bitmap.width
+    val actualHeight = bitmap.height
+
+    val size = actualWidth * actualHeight * 4
+    val pointer = allocateNative(size)
+
     try {
       signal.throwIfCanceled()
-      val res = bitmap.toNativeBuffer()
+      val buffer = wrapAsBuffer(pointer, size)
+      bitmap.copyPixelsToBuffer(buffer)
+      bitmap.recycle()
       signal.throwIfCanceled()
+      val res = mapOf(
+        "pointer" to pointer, "width" to actualWidth.toLong(), "height" to actualHeight.toLong()
+      )
       callback(Result.success(res))
     } catch (e: Exception) {
+      freeNative(pointer)
       callback(if (e is OperationCanceledException) CANCELLED else Result.failure(e))
     }
   }
@@ -193,7 +191,16 @@ class LocalImagesImpl(context: Context) : LocalImageApi {
   private fun decodeSource(uri: Uri, target: Size, signal: CancellationSignal): Bitmap {
     signal.throwIfCanceled()
     return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-      ImageDecoder.createSource(resolver, uri).decodeBitmap(target)
+      val source = ImageDecoder.createSource(resolver, uri)
+      signal.throwIfCanceled()
+      ImageDecoder.decodeBitmap(source) { decoder, info, _ ->
+        if (target.width > 0 && target.height > 0) {
+          val sample = max(1, min(info.size.width / target.width, info.size.height / target.height))
+          decoder.setTargetSampleSize(sample)
+        }
+        decoder.allocator = ImageDecoder.ALLOCATOR_SOFTWARE
+        decoder.setTargetColorSpace(ColorSpace.get(ColorSpace.Named.SRGB))
+      }
     } else {
       val ref =
         Glide.with(ctx).asBitmap().priority(Priority.IMMEDIATE).load(uri).disallowHardwareConfig()

mobile/android/fastlane/Fastfile

@@ -35,8 +35,8 @@ platform :android do
       task: 'bundle', 
       build_type: 'Release',
       properties: {
-        "android.injected.version.code" => 3031,
-        "android.injected.version.name" => "2.5.0",
+        "android.injected.version.code" => 3030,
+        "android.injected.version.name" => "2.4.1",
       }
     )
     upload_to_play_store(skip_upload_apk: true, skip_upload_images: true, skip_upload_screenshots: true, aab: '../build/app/outputs/bundle/release/app-release.aab')

mobile/ios/Podfile.lock

@@ -6,9 +6,6 @@ PODS:
     - FlutterMacOS
   - connectivity_plus (0.0.1):
     - Flutter
-  - cupertino_http (0.0.1):
-    - Flutter
-    - FlutterMacOS
   - device_info_plus (0.0.1):
     - Flutter
   - DKImagePickerController/Core (4.3.9):
@@ -80,8 +77,6 @@ PODS:
     - Flutter
   - network_info_plus (0.0.1):
     - Flutter
-  - objective_c (0.0.1):
-    - Flutter
   - package_info_plus (0.4.5):
     - Flutter
   - path_provider_foundation (0.0.1):
@@ -141,7 +136,6 @@ DEPENDENCIES:
   - background_downloader (from `.symlinks/plugins/background_downloader/ios`)
   - bonsoir_darwin (from `.symlinks/plugins/bonsoir_darwin/darwin`)
   - connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`)
-  - cupertino_http (from `.symlinks/plugins/cupertino_http/darwin`)
   - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
   - file_picker (from `.symlinks/plugins/file_picker/ios`)
   - Flutter (from `Flutter`)
@@ -160,7 +154,6 @@ DEPENDENCIES:
   - maplibre_gl (from `.symlinks/plugins/maplibre_gl/ios`)
   - native_video_player (from `.symlinks/plugins/native_video_player/ios`)
   - network_info_plus (from `.symlinks/plugins/network_info_plus/ios`)
-  - objective_c (from `.symlinks/plugins/objective_c/ios`)
   - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
   - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
   - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
@@ -191,8 +184,6 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/bonsoir_darwin/darwin"
   connectivity_plus:
     :path: ".symlinks/plugins/connectivity_plus/ios"
-  cupertino_http:
-    :path: ".symlinks/plugins/cupertino_http/darwin"
   device_info_plus:
     :path: ".symlinks/plugins/device_info_plus/ios"
   file_picker:
@@ -229,8 +220,6 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/native_video_player/ios"
   network_info_plus:
     :path: ".symlinks/plugins/network_info_plus/ios"
-  objective_c:
-    :path: ".symlinks/plugins/objective_c/ios"
   package_info_plus:
     :path: ".symlinks/plugins/package_info_plus/ios"
   path_provider_foundation:
@@ -260,7 +249,6 @@ SPEC CHECKSUMS:
   background_downloader: 50e91d979067b82081aba359d7d916b3ba5fadad
   bonsoir_darwin: 29c7ccf356646118844721f36e1de4b61f6cbd0e
   connectivity_plus: cb623214f4e1f6ef8fe7403d580fdad517d2f7dd
-  cupertino_http: 94ac07f5ff090b8effa6c5e2c47871d48ab7c86c
   device_info_plus: 21fcca2080fbcd348be798aa36c3e5ed849eefbe
   DKImagePickerController: 946cec48c7873164274ecc4624d19e3da4c1ef3c
   DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60
@@ -282,7 +270,6 @@ SPEC CHECKSUMS:
   maplibre_gl: 3c924e44725147b03dda33430ad216005b40555f
   native_video_player: b65c58951ede2f93d103a25366bdebca95081265
   network_info_plus: cf61925ab5205dce05a4f0895989afdb6aade5fc
-  objective_c: 89e720c30d716b036faf9c9684022048eee1eee2
   package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499
   path_provider_foundation: bb55f6dbba17d0dccd6737fe6f7f34fbd0376880
   permission_handler_apple: 4ed2196e43d0651e8ff7ca3483a069d469701f2d

mobile/ios/Runner.xcodeproj/project.pbxproj

@@ -29,11 +29,9 @@
 		FAC6F89B2D287C890078CB2F /* ShareExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = FAC6F8902D287C890078CB2F /* ShareExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 		FAC6F8B72D287F120078CB2F /* ShareViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAC6F8B52D287F120078CB2F /* ShareViewController.swift */; };
 		FAC6F8B92D287F120078CB2F /* MainInterface.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = FAC6F8B32D287F120078CB2F /* MainInterface.storyboard */; };
-		FE5499F32F1197D8006016CB /* LocalImages.g.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE5499F12F1197D8006016CB /* LocalImages.g.swift */; };
-		FE5499F42F1197D8006016CB /* RemoteImages.g.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE5499F22F1197D8006016CB /* RemoteImages.g.swift */; };
-		FE5499F62F11980E006016CB /* LocalImagesImpl.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE5499F52F11980E006016CB /* LocalImagesImpl.swift */; };
-		FE5499F82F1198E2006016CB /* RemoteImagesImpl.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE5499F72F1198DE006016CB /* RemoteImagesImpl.swift */; };
 		FEAFA8732E4D42F4001E47FE /* Thumbhash.swift in Sources */ = {isa = PBXBuildFile; fileRef = FEAFA8722E4D42F4001E47FE /* Thumbhash.swift */; };
+		FED3B1962E253E9B0030FD97 /* ThumbnailsImpl.swift in Sources */ = {isa = PBXBuildFile; fileRef = FED3B1942E253E9B0030FD97 /* ThumbnailsImpl.swift */; };
+		FED3B1972E253E9B0030FD97 /* Thumbnails.g.swift in Sources */ = {isa = PBXBuildFile; fileRef = FED3B1932E253E9B0030FD97 /* Thumbnails.g.swift */; };
 		FEE084F82EC172460045228E /* SQLiteData in Frameworks */ = {isa = PBXBuildFile; productRef = FEE084F72EC172460045228E /* SQLiteData */; };
 		FEE084FB2EC1725A0045228E /* RawStructuredFieldValues in Frameworks */ = {isa = PBXBuildFile; productRef = FEE084FA2EC1725A0045228E /* RawStructuredFieldValues */; };
 		FEE084FD2EC1725A0045228E /* StructuredFieldValues in Frameworks */ = {isa = PBXBuildFile; productRef = FEE084FC2EC1725A0045228E /* StructuredFieldValues */; };
@@ -120,11 +118,9 @@
 		FAC6F8B42D287F120078CB2F /* ShareExtension.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = ShareExtension.entitlements; sourceTree = "<group>"; };
 		FAC6F8B52D287F120078CB2F /* ShareViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShareViewController.swift; sourceTree = "<group>"; };
 		FAC7416727DB9F5500C668D8 /* RunnerProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = RunnerProfile.entitlements; sourceTree = "<group>"; };
-		FE5499F12F1197D8006016CB /* LocalImages.g.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalImages.g.swift; sourceTree = "<group>"; };
-		FE5499F22F1197D8006016CB /* RemoteImages.g.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RemoteImages.g.swift; sourceTree = "<group>"; };
-		FE5499F52F11980E006016CB /* LocalImagesImpl.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalImagesImpl.swift; sourceTree = "<group>"; };
-		FE5499F72F1198DE006016CB /* RemoteImagesImpl.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RemoteImagesImpl.swift; sourceTree = "<group>"; };
 		FEAFA8722E4D42F4001E47FE /* Thumbhash.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Thumbhash.swift; sourceTree = "<group>"; };
+		FED3B1932E253E9B0030FD97 /* Thumbnails.g.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Thumbnails.g.swift; sourceTree = "<group>"; };
+		FED3B1942E253E9B0030FD97 /* ThumbnailsImpl.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThumbnailsImpl.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */
@@ -325,11 +321,9 @@
 		FED3B1952E253E9B0030FD97 /* Images */ = {
 			isa = PBXGroup;
 			children = (
-				FE5499F72F1198DE006016CB /* RemoteImagesImpl.swift */,
-				FE5499F52F11980E006016CB /* LocalImagesImpl.swift */,
-				FE5499F12F1197D8006016CB /* LocalImages.g.swift */,
-				FE5499F22F1197D8006016CB /* RemoteImages.g.swift */,
 				FEAFA8722E4D42F4001E47FE /* Thumbhash.swift */,
+				FED3B1932E253E9B0030FD97 /* Thumbnails.g.swift */,
+				FED3B1942E253E9B0030FD97 /* ThumbnailsImpl.swift */,
 			);
 			path = Images;
 			sourceTree = "<group>";
@@ -606,14 +600,12 @@
 				65F32F31299BD2F800CE9261 /* BackgroundServicePlugin.swift in Sources */,
 				74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */,
 				B21E34AC2E5B09190031FDB9 /* BackgroundWorker.swift in Sources */,
-				FE5499F32F1197D8006016CB /* LocalImages.g.swift in Sources */,
-				FE5499F62F11980E006016CB /* LocalImagesImpl.swift in Sources */,
-				FE5499F42F1197D8006016CB /* RemoteImages.g.swift in Sources */,
 				B25D377A2E72CA15008B6CA7 /* Connectivity.g.swift in Sources */,
-				FE5499F82F1198E2006016CB /* RemoteImagesImpl.swift in Sources */,
 				FEAFA8732E4D42F4001E47FE /* Thumbhash.swift in Sources */,
 				B25D377C2E72CA26008B6CA7 /* ConnectivityApiImpl.swift in Sources */,
+				FED3B1962E253E9B0030FD97 /* ThumbnailsImpl.swift in Sources */,
 				B21E34AA2E5AFD2B0031FDB9 /* BackgroundWorkerApiImpl.swift in Sources */,
+				FED3B1972E253E9B0030FD97 /* Thumbnails.g.swift in Sources */,
 				1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */,
 				B2BE315F2E5E5229006EEF88 /* BackgroundWorker.g.swift in Sources */,
 				65F32F33299D349D00CE9261 /* BackgroundSyncWorker.swift in Sources */,

mobile/ios/Runner/AppDelegate.swift

@@ -53,8 +53,7 @@ import UIKit
   
   public static func registerPlugins(with engine: FlutterEngine) {
     NativeSyncApiImpl.register(with: engine.registrar(forPlugin: NativeSyncApiImpl.name)!)
-    LocalImageApiSetup.setUp(binaryMessenger: engine.binaryMessenger, api: LocalImageApiImpl())
-    RemoteImageApiSetup.setUp(binaryMessenger: engine.binaryMessenger, api: RemoteImageApiImpl())
+    ThumbnailApiSetup.setUp(binaryMessenger: engine.binaryMessenger, api: ThumbnailApiImpl())
     BackgroundWorkerFgHostApiSetup.setUp(binaryMessenger: engine.binaryMessenger, api: BackgroundWorkerApiImpl())
     ConnectivityApiSetup.setUp(binaryMessenger: engine.binaryMessenger, api: ConnectivityApiImpl())
   }

mobile/ios/Runner/Images/RemoteImages.g.swift

@@ -1,134 +0,0 @@
-// Autogenerated from Pigeon (v26.0.2), do not edit directly.
-// See also: https://pub.dev/packages/pigeon
-
-import Foundation
-
-#if os(iOS)
-  import Flutter
-#elseif os(macOS)
-  import FlutterMacOS
-#else
-  #error("Unsupported platform.")
-#endif
-
-private func wrapResult(_ result: Any?) -> [Any?] {
-  return [result]
-}
-
-private func wrapError(_ error: Any) -> [Any?] {
-  if let pigeonError = error as? PigeonError {
-    return [
-      pigeonError.code,
-      pigeonError.message,
-      pigeonError.details,
-    ]
-  }
-  if let flutterError = error as? FlutterError {
-    return [
-      flutterError.code,
-      flutterError.message,
-      flutterError.details,
-    ]
-  }
-  return [
-    "\(error)",
-    "\(type(of: error))",
-    "Stacktrace: \(Thread.callStackSymbols)",
-  ]
-}
-
-private func isNullish(_ value: Any?) -> Bool {
-  return value is NSNull || value == nil
-}
-
-private func nilOrValue<T>(_ value: Any?) -> T? {
-  if value is NSNull { return nil }
-  return value as! T?
-}
-
-
-private class RemoteImagesPigeonCodecReader: FlutterStandardReader {
-}
-
-private class RemoteImagesPigeonCodecWriter: FlutterStandardWriter {
-}
-
-private class RemoteImagesPigeonCodecReaderWriter: FlutterStandardReaderWriter {
-  override func reader(with data: Data) -> FlutterStandardReader {
-    return RemoteImagesPigeonCodecReader(data: data)
-  }
-
-  override func writer(with data: NSMutableData) -> FlutterStandardWriter {
-    return RemoteImagesPigeonCodecWriter(data: data)
-  }
-}
-
-class RemoteImagesPigeonCodec: FlutterStandardMessageCodec, @unchecked Sendable {
-  static let shared = RemoteImagesPigeonCodec(readerWriter: RemoteImagesPigeonCodecReaderWriter())
-}
-
-
-/// Generated protocol from Pigeon that represents a handler of messages from Flutter.
-protocol RemoteImageApi {
-  func requestImage(url: String, headers: [String: String], requestId: Int64, completion: @escaping (Result<[String: Int64]?, Error>) -> Void)
-  func cancelRequest(requestId: Int64) throws
-  func clearCache(completion: @escaping (Result<Int64, Error>) -> Void)
-}
-
-/// Generated setup class from Pigeon to handle messages through the `binaryMessenger`.
-class RemoteImageApiSetup {
-  static var codec: FlutterStandardMessageCodec { RemoteImagesPigeonCodec.shared }
-  /// Sets up an instance of `RemoteImageApi` to handle messages through the `binaryMessenger`.
-  static func setUp(binaryMessenger: FlutterBinaryMessenger, api: RemoteImageApi?, messageChannelSuffix: String = "") {
-    let channelSuffix = messageChannelSuffix.count > 0 ? ".\(messageChannelSuffix)" : ""
-    let requestImageChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.RemoteImageApi.requestImage\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
-    if let api = api {
-      requestImageChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
-        let urlArg = args[0] as! String
-        let headersArg = args[1] as! [String: String]
-        let requestIdArg = args[2] as! Int64
-        api.requestImage(url: urlArg, headers: headersArg, requestId: requestIdArg) { result in
-          switch result {
-          case .success(let res):
-            reply(wrapResult(res))
-          case .failure(let error):
-            reply(wrapError(error))
-          }
-        }
-      }
-    } else {
-      requestImageChannel.setMessageHandler(nil)
-    }
-    let cancelRequestChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.RemoteImageApi.cancelRequest\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
-    if let api = api {
-      cancelRequestChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
-        let requestIdArg = args[0] as! Int64
-        do {
-          try api.cancelRequest(requestId: requestIdArg)
-          reply(wrapResult(nil))
-        } catch {
-          reply(wrapError(error))
-        }
-      }
-    } else {
-      cancelRequestChannel.setMessageHandler(nil)
-    }
-    let clearCacheChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.RemoteImageApi.clearCache\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
-    if let api = api {
-      clearCacheChannel.setMessageHandler { _, reply in
-        api.clearCache { result in
-          switch result {
-          case .success(let res):
-            reply(wrapResult(res))
-          case .failure(let error):
-            reply(wrapError(error))
-          }
-        }
-      }
-    } else {
-      clearCacheChannel.setMessageHandler(nil)
-    }
-  }
-}

mobile/ios/Runner/Images/RemoteImagesImpl.swift

@@ -1,184 +0,0 @@
-import Accelerate
-import Flutter
-import MobileCoreServices
-import Photos
-
-class RemoteImageRequest {
-  weak var task: URLSessionDataTask?
-  let id: Int64
-  var isCancelled = false
-  var data: CFMutableData?
-  let completion: (Result<[String: Int64]?, any Error>) -> Void
-  
-  init(id: Int64, task: URLSessionDataTask, completion: @escaping (Result<[String: Int64]?, any Error>) -> Void) {
-    self.id = id
-    self.task = task
-    self.data = nil
-    self.completion = completion
-  }
-}
-
-class RemoteImageApiImpl: NSObject, RemoteImageApi {
-  private static let delegate = RemoteImageApiDelegate()
-  static let session = {
-    let cacheDir = FileManager.default.temporaryDirectory.appendingPathComponent("thumbnails", isDirectory: true)
-    let config = URLSessionConfiguration.default
-    let version = Bundle.main.object(forInfoDictionaryKey: "CFBundleShortVersionString") as? String ?? "unknown"
-    config.httpAdditionalHeaders = ["User-Agent": "Immich_iOS_\(version)"]
-    try! FileManager.default.createDirectory(at: cacheDir, withIntermediateDirectories: true)
-    config.urlCache = URLCache(
-      memoryCapacity: 0,
-      diskCapacity: 1 << 30,
-      directory: cacheDir
-    )
-    config.httpMaximumConnectionsPerHost = 64
-    return URLSession(configuration: config, delegate: delegate, delegateQueue: nil)
-  }()
-  
-  func requestImage(url: String, headers: [String : String], requestId: Int64, completion: @escaping (Result<[String : Int64]?, any Error>) -> Void) {
-    var urlRequest = URLRequest(url: URL(string: url)!)
-    for (key, value) in headers {
-      urlRequest.setValue(value, forHTTPHeaderField: key)
-    }
-    let task = Self.session.dataTask(with: urlRequest)
-    
-    let imageRequest = RemoteImageRequest(id: requestId, task: task, completion: completion)
-    Self.delegate.add(taskId: task.taskIdentifier, request: imageRequest)
-    
-    task.resume()
-  }
-  
-  func cancelRequest(requestId: Int64) {
-    Self.delegate.cancel(requestId: requestId)
-  }
-  
-  func clearCache(completion: @escaping (Result<Int64, any Error>) -> Void) {
-    Task {
-      let cache = Self.session.configuration.urlCache!
-      let cacheSize = Int64(cache.currentDiskUsage)
-      cache.removeAllCachedResponses()
-      completion(.success(cacheSize))
-    }
-  }
-}
-
-class RemoteImageApiDelegate: NSObject, URLSessionDataDelegate {
-  private static let requestQueue = DispatchQueue(label: "thumbnail.requests", qos: .userInitiated, attributes: .concurrent)
-  private static var rgbaFormat = vImage_CGImageFormat(
-    bitsPerComponent: 8,
-    bitsPerPixel: 32,
-    colorSpace: CGColorSpaceCreateDeviceRGB(),
-    bitmapInfo: CGBitmapInfo(rawValue: CGImageAlphaInfo.premultipliedLast.rawValue),
-    renderingIntent: .perceptual
-  )!
-  private static var requestByTaskId = [Int: RemoteImageRequest]()
-  private static var taskIdByRequestId = [Int64: Int]()
-  private static let cancelledResult = Result<[String: Int64]?, any Error>.success(nil)
-  private static let decodeOptions = [
-    kCGImageSourceShouldCache: false,
-    kCGImageSourceShouldCacheImmediately: true,
-    kCGImageSourceCreateThumbnailWithTransform: true,
-  ] as CFDictionary
-  
-  func urlSession(
-    _ session: URLSession, dataTask: URLSessionDataTask,
-    didReceive response: URLResponse,
-    completionHandler: @escaping (URLSession.ResponseDisposition) -> Void
-  ) {
-    guard let request = get(taskId: dataTask.taskIdentifier)
-    else {
-      return completionHandler(.cancel)
-    }
-    
-    let capacity = max(Int(response.expectedContentLength), 0)
-    request.data = CFDataCreateMutable(nil, capacity)
-    
-    completionHandler(.allow)
-  }
-  
-  func urlSession(_ session: URLSession, dataTask: URLSessionDataTask,
-                  didReceive data: Data) {
-    guard let request = get(taskId: dataTask.taskIdentifier) else { return }
-    
-    data.withUnsafeBytes { bytes in
-      CFDataAppendBytes(request.data, bytes.bindMemory(to: UInt8.self).baseAddress, data.count)
-    }
-  }
-  
-  func urlSession(_ session: URLSession, task: URLSessionTask,
-                  didCompleteWithError error: Error?) {
-    guard let request = get(taskId: task.taskIdentifier) else { return }
-        
-    defer { remove(taskId: task.taskIdentifier, requestId: request.id) }
-    
-    if let error = error {
-      if request.isCancelled || (error as NSError).code == NSURLErrorCancelled {
-        return request.completion(Self.cancelledResult)
-      }
-      return request.completion(.failure(error))
-    }
-    
-    if request.isCancelled {
-      return request.completion(Self.cancelledResult)
-    }
-    
-    guard let data = request.data else {
-      return request.completion(.failure(PigeonError(code: "", message: "No data received", details: nil)))
-    }
-    
-    guard let imageSource = CGImageSourceCreateWithData(data, nil),
-          let cgImage = CGImageSourceCreateThumbnailAtIndex(imageSource, 0, Self.decodeOptions) else {
-      return request.completion(.failure(PigeonError(code: "", message: "Failed to decode image for request", details: nil)))
-    }
-    
-    if request.isCancelled {
-      return request.completion(Self.cancelledResult)
-    }
-    
-    do {
-      let buffer = try vImage_Buffer(cgImage: cgImage, format: Self.rgbaFormat)
-      
-      if request.isCancelled {
-        buffer.free()
-        return request.completion(Self.cancelledResult)
-      }
-      
-      request.completion(
-        .success([
-          "pointer": Int64(Int(bitPattern: buffer.data)),
-          "width": Int64(buffer.width),
-          "height": Int64(buffer.height),
-          "rowBytes": Int64(buffer.rowBytes),
-        ]))
-    } catch {
-      return request.completion(.failure(PigeonError(code: "", message: "Failed to convert image for request: \(error)", details: nil)))
-    }
-  }
-  
-  @inline(__always) func get(taskId: Int) -> RemoteImageRequest? {
-    Self.requestQueue.sync { Self.requestByTaskId[taskId] }
-  }
-  
-  @inline(__always) func add(taskId: Int, request: RemoteImageRequest) -> Void {
-    Self.requestQueue.async(flags: .barrier) {
-      Self.requestByTaskId[taskId] = request
-      Self.taskIdByRequestId[request.id] = taskId
-    }
-  }
-  
-  @inline(__always) func remove(taskId: Int, requestId: Int64) -> Void {
-    Self.requestQueue.async(flags: .barrier) {
-      Self.taskIdByRequestId[requestId] = nil
-      Self.requestByTaskId[taskId] = nil
-    }
-  }
-  
-  @inline(__always) func cancel(requestId: Int64) -> Void {
-    guard let request: RemoteImageRequest = (Self.requestQueue.sync {
-      guard let taskId = Self.taskIdByRequestId[requestId] else { return nil }
-      return Self.requestByTaskId[taskId]
-    }) else { return }
-    request.isCancelled = true
-    request.task?.cancel()
-  }
-}

mobile/ios/Runner/Images/Thumbnails.g.swift

@@ -47,41 +47,41 @@ private func nilOrValue<T>(_ value: Any?) -> T? {
 }
 
 
-private class LocalImagesPigeonCodecReader: FlutterStandardReader {
+private class ThumbnailsPigeonCodecReader: FlutterStandardReader {
 }
 
-private class LocalImagesPigeonCodecWriter: FlutterStandardWriter {
+private class ThumbnailsPigeonCodecWriter: FlutterStandardWriter {
 }
 
-private class LocalImagesPigeonCodecReaderWriter: FlutterStandardReaderWriter {
+private class ThumbnailsPigeonCodecReaderWriter: FlutterStandardReaderWriter {
   override func reader(with data: Data) -> FlutterStandardReader {
-    return LocalImagesPigeonCodecReader(data: data)
+    return ThumbnailsPigeonCodecReader(data: data)
   }
 
   override func writer(with data: NSMutableData) -> FlutterStandardWriter {
-    return LocalImagesPigeonCodecWriter(data: data)
+    return ThumbnailsPigeonCodecWriter(data: data)
   }
 }
 
-class LocalImagesPigeonCodec: FlutterStandardMessageCodec, @unchecked Sendable {
-  static let shared = LocalImagesPigeonCodec(readerWriter: LocalImagesPigeonCodecReaderWriter())
+class ThumbnailsPigeonCodec: FlutterStandardMessageCodec, @unchecked Sendable {
+  static let shared = ThumbnailsPigeonCodec(readerWriter: ThumbnailsPigeonCodecReaderWriter())
 }
 
 
 /// Generated protocol from Pigeon that represents a handler of messages from Flutter.
-protocol LocalImageApi {
-  func requestImage(assetId: String, requestId: Int64, width: Int64, height: Int64, isVideo: Bool, completion: @escaping (Result<[String: Int64]?, Error>) -> Void)
-  func cancelRequest(requestId: Int64) throws
+protocol ThumbnailApi {
+  func requestImage(assetId: String, requestId: Int64, width: Int64, height: Int64, isVideo: Bool, completion: @escaping (Result<[String: Int64], Error>) -> Void)
+  func cancelImageRequest(requestId: Int64) throws
   func getThumbhash(thumbhash: String, completion: @escaping (Result<[String: Int64], Error>) -> Void)
 }
 
 /// Generated setup class from Pigeon to handle messages through the `binaryMessenger`.
-class LocalImageApiSetup {
-  static var codec: FlutterStandardMessageCodec { LocalImagesPigeonCodec.shared }
-  /// Sets up an instance of `LocalImageApi` to handle messages through the `binaryMessenger`.
-  static func setUp(binaryMessenger: FlutterBinaryMessenger, api: LocalImageApi?, messageChannelSuffix: String = "") {
+class ThumbnailApiSetup {
+  static var codec: FlutterStandardMessageCodec { ThumbnailsPigeonCodec.shared }
+  /// Sets up an instance of `ThumbnailApi` to handle messages through the `binaryMessenger`.
+  static func setUp(binaryMessenger: FlutterBinaryMessenger, api: ThumbnailApi?, messageChannelSuffix: String = "") {
     let channelSuffix = messageChannelSuffix.count > 0 ? ".\(messageChannelSuffix)" : ""
-    let requestImageChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.LocalImageApi.requestImage\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
+    let requestImageChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.ThumbnailApi.requestImage\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       requestImageChannel.setMessageHandler { message, reply in
         let args = message as! [Any?]
@@ -102,22 +102,22 @@ class LocalImageApiSetup {
     } else {
       requestImageChannel.setMessageHandler(nil)
     }
-    let cancelRequestChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.LocalImageApi.cancelRequest\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
+    let cancelImageRequestChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.ThumbnailApi.cancelImageRequest\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
-      cancelRequestChannel.setMessageHandler { message, reply in
+      cancelImageRequestChannel.setMessageHandler { message, reply in
         let args = message as! [Any?]
         let requestIdArg = args[0] as! Int64
         do {
-          try api.cancelRequest(requestId: requestIdArg)
+          try api.cancelImageRequest(requestId: requestIdArg)
           reply(wrapResult(nil))
         } catch {
           reply(wrapError(error))
         }
       }
     } else {
-      cancelRequestChannel.setMessageHandler(nil)
+      cancelImageRequestChannel.setMessageHandler(nil)
     }
-    let getThumbhashChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.LocalImageApi.getThumbhash\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
+    let getThumbhashChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.ThumbnailApi.getThumbhash\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       getThumbhashChannel.setMessageHandler { message, reply in
         let args = message as! [Any?]

mobile/ios/Runner/Images/ThumbnailsImpl.swift

@@ -1,19 +1,19 @@
-import Accelerate
+import CryptoKit
 import Flutter
 import MobileCoreServices
 import Photos
 
-class LocalImageRequest {
+class Request {
   weak var workItem: DispatchWorkItem?
   var isCancelled = false
-  let callback: (Result<[String: Int64]?, any Error>) -> Void
+  let callback: (Result<[String: Int64], any Error>) -> Void
   
-  init(callback: @escaping (Result<[String: Int64]?, any Error>) -> Void) {
+  init(callback: @escaping (Result<[String: Int64], any Error>) -> Void) {
     self.callback = callback
   }
 }
 
-class LocalImageApiImpl: LocalImageApi {
+class ThumbnailApiImpl: ThumbnailApi {
   private static let imageManager = PHImageManager.default()
   private static let fetchOptions = {
     let fetchOptions = PHFetchOptions()
@@ -36,39 +36,47 @@ class LocalImageApiImpl: LocalImageApi {
   private static let cancelQueue = DispatchQueue(label: "thumbnail.cancellation", qos: .default)
   private static let processingQueue = DispatchQueue(label: "thumbnail.processing", qos: .userInteractive, attributes: .concurrent)
   
-  private static var rgbaFormat = vImage_CGImageFormat(
-    bitsPerComponent: 8,
-    bitsPerPixel: 32,
-    colorSpace: CGColorSpaceCreateDeviceRGB(),
-    bitmapInfo: CGBitmapInfo(rawValue: CGImageAlphaInfo.premultipliedLast.rawValue),
-    renderingIntent: .defaultIntent
-  )!
-  private static var requests = [Int64: LocalImageRequest]()
-  private static let cancelledResult = Result<[String: Int64]?, any Error>.success(nil)
+  private static let rgbColorSpace = CGColorSpaceCreateDeviceRGB()
+  private static let bitmapInfo = CGBitmapInfo(rawValue: CGImageAlphaInfo.premultipliedLast.rawValue).rawValue
+  private static var requests = [Int64: Request]()
+  private static let cancelledResult = Result<[String: Int64], any Error>.success([:])
   private static let concurrencySemaphore = DispatchSemaphore(value: ProcessInfo.processInfo.activeProcessorCount * 2)
   private static let assetCache = {
     let assetCache = NSCache<NSString, PHAsset>()
     assetCache.countLimit = 10000
     return assetCache
   }()
+  private static let activitySemaphore = DispatchSemaphore(value: 1)
+  private static let willResignActiveObserver = NotificationCenter.default.addObserver(
+    forName: UIApplication.willResignActiveNotification,
+    object: nil,
+    queue: .main
+  ) { _ in
+    processingQueue.suspend()
+    activitySemaphore.wait()
+  }
+  private static let didBecomeActiveObserver = NotificationCenter.default.addObserver(
+    forName: UIApplication.didBecomeActiveNotification,
+    object: nil,
+    queue: .main
+  ) { _ in
+    processingQueue.resume()
+    activitySemaphore.signal()
+  }
   
   func getThumbhash(thumbhash: String, completion: @escaping (Result<[String : Int64], any Error>) -> Void) {
     Self.processingQueue.async {
       guard let data = Data(base64Encoded: thumbhash)
       else { return completion(.failure(PigeonError(code: "", message: "Invalid base64 string: \(thumbhash)", details: nil)))}
-      
+
       let (width, height, pointer) = thumbHashToRGBA(hash: data)
-      completion(.success([
-        "pointer": Int64(Int(bitPattern: pointer.baseAddress)),
-        "width": Int64(width),
-        "height": Int64(height),
-        "rowBytes": Int64(width * 4)
-      ]))
+      self.waitForActiveState()
+      completion(.success(["pointer": Int64(Int(bitPattern: pointer.baseAddress)), "width": Int64(width), "height": Int64(height)]))
     }
   }
   
-  func requestImage(assetId: String, requestId: Int64, width: Int64, height: Int64, isVideo: Bool, completion: @escaping (Result<[String: Int64]?, any Error>) -> Void) {
-    let request = LocalImageRequest(callback: completion)
+  func requestImage(assetId: String, requestId: Int64, width: Int64, height: Int64, isVideo: Bool, completion: @escaping (Result<[String: Int64], any Error>) -> Void) {
+    let request = Request(callback: completion)
     let item = DispatchWorkItem {
       if request.isCancelled {
         return completion(Self.cancelledResult)
@@ -85,7 +93,7 @@ class LocalImageApiImpl: LocalImageApi {
       
       guard let asset = Self.requestAsset(assetId: assetId)
       else {
-        Self.remove(requestId: requestId)
+        Self.removeRequest(requestId: requestId)
         completion(.failure(PigeonError(code: "", message: "Could not get asset data for \(assetId)", details: nil)))
         return
       }
@@ -111,54 +119,70 @@ class LocalImageApiImpl: LocalImageApi {
       
       guard let image = image,
             let cgImage = image.cgImage else {
-        Self.remove(requestId: requestId)
+        Self.removeRequest(requestId: requestId)
         return completion(.failure(PigeonError(code: "", message: "Could not get pixel data for \(assetId)", details: nil)))
       }
       
+      let pointer = UnsafeMutableRawPointer.allocate(
+        byteCount: Int(cgImage.width) * Int(cgImage.height) * 4,
+        alignment: MemoryLayout<UInt8>.alignment
+      )
+      
       if request.isCancelled {
+        pointer.deallocate()
         return completion(Self.cancelledResult)
       }
       
-      do {
-        let buffer = try vImage_Buffer(cgImage: cgImage, format: Self.rgbaFormat)
-        
-        if request.isCancelled {
-          buffer.free()
-          return completion(Self.cancelledResult)
-        }
-        
-        request.callback(.success([
-          "pointer": Int64(Int(bitPattern: buffer.data)),
-          "width": Int64(buffer.width),
-          "height": Int64(buffer.height),
-          "rowBytes": Int64(buffer.rowBytes)
-        ]))
-        print("Successful response for \(requestId)")
-        Self.remove(requestId: requestId)
-      } catch {
-        Self.remove(requestId: requestId)
-        return completion(.failure(PigeonError(code: "", message: "Failed to convert image for \(assetId): \(error)", details: nil)))
+      guard let context = CGContext(
+        data: pointer,
+        width: cgImage.width,
+        height: cgImage.height,
+        bitsPerComponent: 8,
+        bytesPerRow: cgImage.width * 4,
+        space: Self.rgbColorSpace,
+        bitmapInfo: Self.bitmapInfo
+      ) else {
+        pointer.deallocate()
+        Self.removeRequest(requestId: requestId)
+        return completion(.failure(PigeonError(code: "", message: "Could not create context for \(assetId)", details: nil)))
       }
+      
+      if request.isCancelled {
+        pointer.deallocate()
+        return completion(Self.cancelledResult)
+      }
+      
+      context.interpolationQuality = .none
+      context.draw(cgImage, in: CGRect(x: 0, y: 0, width: cgImage.width, height: cgImage.height))
+      
+      if request.isCancelled {
+        pointer.deallocate()
+        return completion(Self.cancelledResult)
+      }
+      
+      self.waitForActiveState()
+      completion(.success(["pointer": Int64(Int(bitPattern: pointer)), "width": Int64(cgImage.width), "height": Int64(cgImage.height)]))
+      Self.removeRequest(requestId: requestId)
     }
     
     request.workItem = item
-    Self.add(requestId: requestId, request: request)
+    Self.addRequest(requestId: requestId, request: request)
     Self.processingQueue.async(execute: item)
   }
   
-  func cancelRequest(requestId: Int64) {
-    Self.cancel(requestId: requestId)
+  func cancelImageRequest(requestId: Int64) {
+    Self.cancelRequest(requestId: requestId)
   }
   
-  private static func add(requestId: Int64, request: LocalImageRequest) -> Void {
+  private static func addRequest(requestId: Int64, request: Request) -> Void {
     requestQueue.sync { requests[requestId] = request }
   }
   
-  private static func remove(requestId: Int64) -> Void {
+  private static func removeRequest(requestId: Int64) -> Void {
     requestQueue.sync { requests[requestId] = nil }
   }
   
-  private static func cancel(requestId: Int64) -> Void {
+  private static func cancelRequest(requestId: Int64) -> Void {
     requestQueue.async {
       guard let request = requests.removeValue(forKey: requestId) else { return }
       request.isCancelled = true
@@ -179,4 +203,9 @@ class LocalImageApiImpl: LocalImageApi {
     assetQueue.async { assetCache.setObject(asset, forKey: assetId as NSString) }
     return asset
   }
+  
+  func waitForActiveState() {
+    Self.activitySemaphore.wait()
+    Self.activitySemaphore.signal()
+  }
 }

mobile/ios/Runner/Info.plist

@@ -80,7 +80,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.5.0</string>
+	<string>2.4.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>

mobile/lib/constants/enums.dart

@@ -8,6 +8,6 @@ enum SortUserBy { id }
 
 enum ActionSource { timeline, viewer }
 
-enum CleanupStep { selectDate, scan, delete }
+enum CleanupStep { selectDate, filterOptions, scan, delete }
 
-enum AssetKeepType { none, photosOnly, videosOnly }
+enum AssetFilterType { all, photosOnly, videosOnly }

mobile/lib/domain/models/events.model.dart

@@ -30,8 +30,3 @@ class MultiSelectToggleEvent extends Event {
   final bool isEnabled;
   const MultiSelectToggleEvent(this.isEnabled);
 }
-
-// Map Events
-class MapMarkerReloadEvent extends Event {
-  const MapMarkerReloadEvent();
-}

mobile/lib/domain/models/exif.model.dart

@@ -6,7 +6,6 @@ class ExifInfo {
   final String? orientation;
   final String? timeZone;
   final DateTime? dateTimeOriginal;
-  final int? rating;
 
   // GPS
   final double? latitude;
@@ -47,7 +46,6 @@ class ExifInfo {
     this.orientation,
     this.timeZone,
     this.dateTimeOriginal,
-    this.rating,
     this.isFlipped = false,
     this.latitude,
     this.longitude,
@@ -73,7 +71,6 @@ class ExifInfo {
         other.orientation == orientation &&
         other.timeZone == timeZone &&
         other.dateTimeOriginal == dateTimeOriginal &&
-        other.rating == rating &&
         other.latitude == latitude &&
         other.longitude == longitude &&
         other.city == city &&
@@ -97,7 +94,6 @@ class ExifInfo {
         isFlipped.hashCode ^
         timeZone.hashCode ^
         dateTimeOriginal.hashCode ^
-        rating.hashCode ^
         latitude.hashCode ^
         longitude.hashCode ^
         city.hashCode ^
@@ -122,7 +118,6 @@ orientation: ${orientation ?? 'NA'},
 isFlipped: $isFlipped,
 timeZone: ${timeZone ?? 'NA'},
 dateTimeOriginal: ${dateTimeOriginal ?? 'NA'},
-rating: ${rating ?? 'NA'},
 latitude: ${latitude ?? 'NA'},
 longitude: ${longitude ?? 'NA'},
 city: ${city ?? 'NA'},
@@ -145,7 +140,6 @@ exposureSeconds: ${exposureSeconds ?? 'NA'},
     String? orientation,
     String? timeZone,
     DateTime? dateTimeOriginal,
-    int? rating,
     double? latitude,
     double? longitude,
     String? city,
@@ -167,7 +161,6 @@ exposureSeconds: ${exposureSeconds ?? 'NA'},
       orientation: orientation ?? this.orientation,
       timeZone: timeZone ?? this.timeZone,
       dateTimeOriginal: dateTimeOriginal ?? this.dateTimeOriginal,
-      rating: rating ?? this.rating,
       isFlipped: isFlipped ?? this.isFlipped,
       latitude: latitude ?? this.latitude,
       longitude: longitude ?? this.longitude,

mobile/lib/domain/models/store.model.dart

@@ -82,14 +82,7 @@ enum StoreKey<T> {
   useWifiForUploadPhotos<bool>._(1005),
   needBetaMigration<bool>._(1006),
   // TODO: Remove this after patching open-api
-  shouldResetSync<bool>._(1007),
-
-  // Free up space
-  cleanupKeepFavorites<bool>._(1008),
-  cleanupKeepMediaType<int>._(1009),
-  cleanupKeepAlbumIds<String>._(1010),
-  cleanupCutoffDaysAgo<int>._(1011),
-  cleanupDefaultsInitialized<bool>._(1012);
+  shouldResetSync<bool>._(1007);
 
   const StoreKey._(this.id);
   final int id;

mobile/lib/domain/services/map.service.dart

@@ -1,6 +1,5 @@
 import 'package:immich_mobile/domain/models/map.model.dart';
 import 'package:immich_mobile/infrastructure/repositories/map.repository.dart';
-import 'package:immich_mobile/infrastructure/repositories/timeline.repository.dart';
 import 'package:maplibre_gl/maplibre_gl.dart';
 
 typedef MapMarkerSource = Future<List<Marker>> Function(LatLngBounds? bounds);
@@ -12,8 +11,7 @@ class MapFactory {
 
   const MapFactory({required DriftMapRepository mapRepository}) : _mapRepository = mapRepository;
 
-  MapService remote(List<String> ownerIds, TimelineMapOptions options) =>
-      MapService(_mapRepository.remote(ownerIds, options));
+  MapService remote(String ownerId) => MapService(_mapRepository.remote(ownerId));
 }
 
 class MapService {

mobile/lib/domain/services/timeline.service.dart

@@ -11,6 +11,7 @@ import 'package:immich_mobile/domain/services/setting.service.dart';
 import 'package:immich_mobile/domain/utils/event_stream.dart';
 import 'package:immich_mobile/infrastructure/repositories/timeline.repository.dart';
 import 'package:immich_mobile/utils/async_mutex.dart';
+import 'package:maplibre_gl/maplibre_gl.dart';
 
 typedef TimelineAssetSource = Future<List<BaseAsset>> Function(int index, int count);
 
@@ -81,8 +82,8 @@ class TimelineFactory {
   TimelineService fromAssetsWithBuckets(List<BaseAsset> assets, TimelineOrigin type) =>
       TimelineService(_timelineRepository.fromAssetsWithBuckets(assets, type));
 
-  TimelineService map(List<String> userIds, TimelineMapOptions options) =>
-      TimelineService(_timelineRepository.map(userIds, options, groupBy));
+  TimelineService map(String userId, LatLngBounds bounds) =>
+      TimelineService(_timelineRepository.map(userId, bounds, groupBy));
 }
 
 class TimelineService {

mobile/lib/infrastructure/entities/exif.entity.dart

@@ -151,7 +151,6 @@ extension RemoteExifEntityDataDomainEx on RemoteExifEntityData {
   domain.ExifInfo toDto() => domain.ExifInfo(
     fileSize: fileSize,
     dateTimeOriginal: dateTimeOriginal,
-    rating: rating,
     timeZone: timeZone,
     make: make,
     model: model,

mobile/lib/infrastructure/loaders/image_request.dart

@@ -1,12 +1,15 @@
 import 'dart:async';
 import 'dart:ffi';
+import 'dart:io';
 import 'dart:ui' as ui;
 
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:ffi/ffi.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/providers/image/cache/remote_image_cache_manager.dart';
 import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
+import 'package:logging/logging.dart';
 
 part 'local_image_request.dart';
 part 'thumbhash_image_request.dart';
@@ -34,61 +37,27 @@ abstract class ImageRequest {
 
   void _onCancelled();
 
-  Future<ui.FrameInfo?> _fromEncodedPlatformImage(int address, int length) async {
+  Future<ui.FrameInfo?> _fromPlatformImage(Map<String, int> info) async {
+    final address = info['pointer'];
+    if (address == null) {
+      return null;
+    }
+
     final pointer = Pointer<Uint8>.fromAddress(address);
     if (_isCancelled) {
       malloc.free(pointer);
       return null;
     }
 
+    final int actualWidth;
+    final int actualHeight;
+    final int actualSize;
     final ui.ImmutableBuffer buffer;
     try {
-      buffer = await ImmutableBuffer.fromUint8List(pointer.asTypedList(length));
-    } finally {
-      malloc.free(pointer);
-    }
-
-    if (_isCancelled) {
-      buffer.dispose();
-      return null;
-    }
-
-    final descriptor = await ui.ImageDescriptor.encoded(buffer);
-    buffer.dispose();
-    if (_isCancelled) {
-      descriptor.dispose();
-      return null;
-    }
-
-    final codec = await descriptor.instantiateCodec();
-    if (_isCancelled) {
-      descriptor.dispose();
-      codec.dispose();
-      return null;
-    }
-
-    final frame = await codec.getNextFrame();
-    descriptor.dispose();
-    codec.dispose();
-    if (_isCancelled) {
-      frame.image.dispose();
-      return null;
-    }
-
-    return frame;
-  }
-
-  Future<ui.FrameInfo?> _fromDecodedPlatformImage(int address, int width, int height, int rowBytes) async {
-    final pointer = Pointer<Uint8>.fromAddress(address);
-    if (_isCancelled) {
-      malloc.free(pointer);
-      return null;
-    }
-
-    final size = rowBytes * height;
-    final ui.ImmutableBuffer buffer;
-    try {
-      buffer = await ImmutableBuffer.fromUint8List(pointer.asTypedList(size));
+      actualWidth = info['width']!;
+      actualHeight = info['height']!;
+      actualSize = actualWidth * actualHeight * 4;
+      buffer = await ImmutableBuffer.fromUint8List(pointer.asTypedList(actualSize));
     } finally {
       malloc.free(pointer);
     }
@@ -100,28 +69,18 @@ abstract class ImageRequest {
 
     final descriptor = ui.ImageDescriptor.raw(
       buffer,
-      width: width,
-      height: height,
-      rowBytes: rowBytes,
+      width: actualWidth,
+      height: actualHeight,
       pixelFormat: ui.PixelFormat.rgba8888,
     );
-    buffer.dispose();
-
     final codec = await descriptor.instantiateCodec();
     if (_isCancelled) {
+      buffer.dispose();
       descriptor.dispose();
       codec.dispose();
       return null;
     }
 
-    final frame = await codec.getNextFrame();
-    descriptor.dispose();
-    codec.dispose();
-    if (_isCancelled) {
-      frame.image.dispose();
-      return null;
-    }
-
-    return frame;
+    return await codec.getNextFrame();
   }
 }

mobile/lib/infrastructure/loaders/local_image_request.dart

@@ -16,23 +16,20 @@ class LocalImageRequest extends ImageRequest {
       return null;
     }
 
-    final info = await localImageApi.requestImage(
+    final Map<String, int> info = await thumbnailApi.requestImage(
       localId,
       requestId: requestId,
       width: width,
       height: height,
       isVideo: assetType == AssetType.video,
     );
-    if (info == null) {
-      return null;
-    }
 
-    final frame = await _fromDecodedPlatformImage(info["pointer"]!, info["width"]!, info["height"]!, info["rowBytes"]!);
+    final frame = await _fromPlatformImage(info);
     return frame == null ? null : ImageInfo(image: frame.image, scale: scale);
   }
 
   @override
   Future<void> _onCancelled() {
-    return localImageApi.cancelRequest(requestId);
+    return thumbnailApi.cancelImageRequest(requestId);
   }
 }

mobile/lib/infrastructure/loaders/remote_image_request.dart

@@ -1,10 +1,14 @@
 part of 'image_request.dart';
 
 class RemoteImageRequest extends ImageRequest {
+  static final log = Logger('RemoteImageRequest');
+  static final client = HttpClient()..maxConnectionsPerHost = 16;
+  final RemoteCacheManager? cacheManager;
   final String uri;
   final Map<String, String> headers;
+  HttpClientRequest? _request;
 
-  RemoteImageRequest({required this.uri, required this.headers});
+  RemoteImageRequest({required this.uri, required this.headers, this.cacheManager});
 
   @override
   Future<ImageInfo?> load(ImageDecoderCallback decode, {double scale = 1.0}) async {
@@ -12,18 +16,164 @@ class RemoteImageRequest extends ImageRequest {
       return null;
     }
 
-    final info = await remoteImageApi.requestImage(uri, headers: headers, requestId: requestId);
-    final frame = switch (info) {
-      {'pointer': int pointer, 'length': int length} => await _fromEncodedPlatformImage(pointer, length),
-      {'pointer': int pointer, 'width': int width, 'height': int height, 'rowBytes': int rowBytes} =>
-        await _fromDecodedPlatformImage(pointer, width, height, rowBytes),
-      _ => null,
-    };
-    return frame == null ? null : ImageInfo(image: frame.image, scale: scale);
+    // TODO: the cache manager makes everything sequential with its DB calls and its operations cannot be cancelled,
+    //  so it ends up being a bottleneck.  We only prefer fetching from it when it can skip the DB call.
+    final cachedFileImage = await _loadCachedFile(uri, decode, scale, inMemoryOnly: true);
+    if (cachedFileImage != null) {
+      return cachedFileImage;
+    }
+
+    try {
+      final buffer = await _downloadImage(uri);
+      if (buffer == null) {
+        return null;
+      }
+
+      return await _decodeBuffer(buffer, decode, scale);
+    } catch (e) {
+      if (_isCancelled) {
+        return null;
+      }
+
+      final cachedFileImage = await _loadCachedFile(uri, decode, scale, inMemoryOnly: false);
+      if (cachedFileImage != null) {
+        return cachedFileImage;
+      }
+
+      rethrow;
+    } finally {
+      _request = null;
+    }
+  }
+
+  Future<ImmutableBuffer?> _downloadImage(String url) async {
+    if (_isCancelled) {
+      return null;
+    }
+
+    final request = _request = await client.getUrl(Uri.parse(url));
+    if (_isCancelled) {
+      request.abort();
+      return _request = null;
+    }
+
+    for (final entry in headers.entries) {
+      request.headers.set(entry.key, entry.value);
+    }
+    final response = await request.close();
+    if (_isCancelled) {
+      return null;
+    }
+
+    final cacheManager = this.cacheManager;
+    final streamController = StreamController<List<int>>(sync: true);
+    final Stream<List<int>> stream;
+    unawaited(cacheManager?.putStreamedFile(url, streamController.stream));
+    stream = response.map((chunk) {
+      if (_isCancelled) {
+        throw StateError('Cancelled request');
+      }
+      if (cacheManager != null) {
+        streamController.add(chunk);
+      }
+      return chunk;
+    });
+
+    try {
+      final Uint8List bytes = await _downloadBytes(stream, response.contentLength);
+      unawaited(streamController.close());
+      return await ImmutableBuffer.fromUint8List(bytes);
+    } catch (e) {
+      streamController.addError(e);
+      unawaited(streamController.close());
+      if (_isCancelled) {
+        return null;
+      }
+      rethrow;
+    }
+  }
+
+  Future<Uint8List> _downloadBytes(Stream<List<int>> stream, int length) async {
+    final Uint8List bytes;
+    int offset = 0;
+    if (length > 0) {
+      // Known content length - use pre-allocated buffer
+      bytes = Uint8List(length);
+      await stream.listen((chunk) {
+        bytes.setAll(offset, chunk);
+        offset += chunk.length;
+      }, cancelOnError: true).asFuture();
+    } else {
+      // Unknown content length - collect chunks dynamically
+      final chunks = <List<int>>[];
+      int totalLength = 0;
+      await stream.listen((chunk) {
+        chunks.add(chunk);
+        totalLength += chunk.length;
+      }, cancelOnError: true).asFuture();
+
+      bytes = Uint8List(totalLength);
+      for (final chunk in chunks) {
+        bytes.setAll(offset, chunk);
+        offset += chunk.length;
+      }
+    }
+
+    return bytes;
+  }
+
+  Future<ImageInfo?> _loadCachedFile(
+    String url,
+    ImageDecoderCallback decode,
+    double scale, {
+    required bool inMemoryOnly,
+  }) async {
+    final cacheManager = this.cacheManager;
+    if (_isCancelled || cacheManager == null) {
+      return null;
+    }
+
+    final file = await (inMemoryOnly ? cacheManager.getFileFromMemory(url) : cacheManager.getFileFromCache(url));
+    if (_isCancelled || file == null) {
+      return null;
+    }
+
+    try {
+      final buffer = await ImmutableBuffer.fromFilePath(file.file.path);
+      return await _decodeBuffer(buffer, decode, scale);
+    } catch (e) {
+      log.severe('Failed to decode cached image', e);
+      unawaited(_evictFile(url));
+      return null;
+    }
+  }
+
+  Future<void> _evictFile(String url) async {
+    try {
+      await cacheManager?.removeFile(url);
+    } catch (e) {
+      log.severe('Failed to remove cached image', e);
+    }
+  }
+
+  Future<ImageInfo?> _decodeBuffer(ImmutableBuffer buffer, ImageDecoderCallback decode, scale) async {
+    if (_isCancelled) {
+      buffer.dispose();
+      return null;
+    }
+    final codec = await decode(buffer);
+    if (_isCancelled) {
+      buffer.dispose();
+      codec.dispose();
+      return null;
+    }
+    final frame = await codec.getNextFrame();
+    return ImageInfo(image: frame.image, scale: scale);
   }
 
   @override
-  Future<void> _onCancelled() {
-    return remoteImageApi.cancelRequest(requestId);
+  void _onCancelled() {
+    _request?.abort();
+    _request = null;
   }
 }

mobile/lib/infrastructure/loaders/thumbhash_image_request.dart

@@ -11,8 +11,8 @@ class ThumbhashImageRequest extends ImageRequest {
       return null;
     }
 
-    final Map<String, int> info = await localImageApi.getThumbhash(thumbhash);
-    final frame = await _fromDecodedPlatformImage(info["pointer"]!, info["width"]!, info["height"]!, info["rowBytes"]!);
+    final Map<String, int> info = await thumbnailApi.getThumbhash(thumbhash);
+    final frame = await _fromPlatformImage(info);
     return frame == null ? null : ImageInfo(image: frame.image, scale: scale);
   }
 

mobile/lib/infrastructure/repositories/local_asset.repository.dart

@@ -11,13 +11,6 @@ import 'package:immich_mobile/infrastructure/entities/local_asset.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/local_asset.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 
-class RemovalCandidatesResult {
-  final List<LocalAsset> assets;
-  final int totalBytes;
-
-  const RemovalCandidatesResult({required this.assets, required this.totalBytes});
-}
-
 class DriftLocalAssetRepository extends DriftDatabaseRepository {
   final Drift _db;
 
@@ -137,12 +130,11 @@ class DriftLocalAssetRepository extends DriftDatabaseRepository {
     return result;
   }
 
-  Future<RemovalCandidatesResult> getRemovalCandidates(
+  Future<List<LocalAsset>> getRemovalCandidates(
     String userId,
     DateTime cutoffDate, {
-    AssetKeepType keepMediaType = AssetKeepType.none,
+    AssetFilterType filterType = AssetFilterType.all,
     bool keepFavorites = true,
-    Set<String> keepAlbumIds = const {},
   }) async {
     final iosSharedAlbumAssets = _db.localAlbumAssetEntity.selectOnly()
       ..addColumns([_db.localAlbumAssetEntity.assetId])
@@ -157,7 +149,6 @@ class DriftLocalAssetRepository extends DriftDatabaseRepository {
 
     final query = _db.localAssetEntity.select().join([
       innerJoin(_db.remoteAssetEntity, _db.localAssetEntity.checksum.equalsExp(_db.remoteAssetEntity.checksum)),
-      leftOuterJoin(_db.remoteExifEntity, _db.remoteAssetEntity.id.equalsExp(_db.remoteExifEntity.assetId)),
     ]);
 
     Expression<bool> whereClause =
@@ -168,19 +159,10 @@ class DriftLocalAssetRepository extends DriftDatabaseRepository {
     // Exclude assets that are in iOS shared albums
     whereClause = whereClause & _db.localAssetEntity.id.isNotInQuery(iosSharedAlbumAssets);
 
-    if (keepAlbumIds.isNotEmpty) {
-      final keepAlbumAssets = _db.localAlbumAssetEntity.selectOnly()
-        ..addColumns([_db.localAlbumAssetEntity.assetId])
-        ..where(_db.localAlbumAssetEntity.albumId.isIn(keepAlbumIds));
-      whereClause = whereClause & _db.localAssetEntity.id.isNotInQuery(keepAlbumAssets);
-    }
-
-    if (keepMediaType == AssetKeepType.photosOnly) {
-      // Keep photos = delete only videos
-      whereClause = whereClause & _db.localAssetEntity.type.equalsValue(AssetType.video);
-    } else if (keepMediaType == AssetKeepType.videosOnly) {
-      // Keep videos = delete only photos
+    if (filterType == AssetFilterType.photosOnly) {
       whereClause = whereClause & _db.localAssetEntity.type.equalsValue(AssetType.image);
+    } else if (filterType == AssetFilterType.videosOnly) {
+      whereClause = whereClause & _db.localAssetEntity.type.equalsValue(AssetType.video);
     }
 
     if (keepFavorites) {
@@ -190,13 +172,7 @@ class DriftLocalAssetRepository extends DriftDatabaseRepository {
     query.where(whereClause);
 
     final rows = await query.get();
-    final assets = rows.map((row) => row.readTable(_db.localAssetEntity).toDto()).toList();
-    final totalBytes = rows.fold<int>(0, (sum, row) {
-      final fileSize = row.readTableOrNull(_db.remoteExifEntity)?.fileSize;
-      return sum + (fileSize ?? 0);
-    });
-
-    return RemovalCandidatesResult(assets: assets, totalBytes: totalBytes);
+    return rows.map((row) => row.readTable(_db.localAssetEntity).toDto()).toList();
   }
 
   Future<List<LocalAsset>> getEmptyCloudIdAssets() {

mobile/lib/infrastructure/repositories/map.repository.dart

@@ -5,7 +5,6 @@ import 'package:immich_mobile/domain/services/map.service.dart';
 import 'package:immich_mobile/infrastructure/entities/exif.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
-import 'package:immich_mobile/infrastructure/repositories/timeline.repository.dart';
 import 'package:maplibre_gl/maplibre_gl.dart';
 
 class DriftMapRepository extends DriftDatabaseRepository {
@@ -13,27 +12,9 @@ class DriftMapRepository extends DriftDatabaseRepository {
 
   const DriftMapRepository(super._db) : _db = _db;
 
-  MapQuery remote(List<String> ownerIds, TimelineMapOptions options) => _mapQueryBuilder(
-    assetFilter: (row) {
-      Expression<bool> condition =
-          row.deletedAt.isNull() &
-          row.ownerId.isIn(ownerIds) &
-          _db.remoteAssetEntity.visibility.isIn([
-            AssetVisibility.timeline.index,
-            if (options.includeArchived) AssetVisibility.archive.index,
-          ]);
-
-      if (options.onlyFavorites) {
-        condition = condition & _db.remoteAssetEntity.isFavorite.equals(true);
-      }
-
-      if (options.relativeDays != 0) {
-        final cutoffDate = DateTime.now().toUtc().subtract(Duration(days: options.relativeDays));
-        condition = condition & _db.remoteAssetEntity.createdAt.isBiggerOrEqualValue(cutoffDate);
-      }
-
-      return condition;
-    },
+  MapQuery remote(String ownerId) => _mapQueryBuilder(
+    assetFilter: (row) =>
+        row.deletedAt.isNull() & row.visibility.equalsValue(AssetVisibility.timeline) & row.ownerId.equals(ownerId),
   );
 
   MapQuery _mapQueryBuilder({Expression<bool> Function($RemoteAssetEntityTable row)? assetFilter}) {

mobile/lib/infrastructure/repositories/network.repository.dart

@@ -1,67 +0,0 @@
-import 'dart:io';
-
-import 'package:cronet_http/cronet_http.dart';
-import 'package:cupertino_http/cupertino_http.dart';
-import 'package:http/http.dart' as http;
-import 'package:immich_mobile/utils/user_agent.dart';
-import 'package:path_provider/path_provider.dart';
-
-class NetworkRepository {
-  static late Directory _cachePath;
-  static late String _userAgent;
-  static final _clients = <String, http.Client>{};
-
-  static Future<void> init() {
-    return (
-      getTemporaryDirectory().then((cachePath) => _cachePath = cachePath),
-      getUserAgentString().then((userAgent) => _userAgent = userAgent),
-    ).wait;
-  }
-
-  static void reset() {
-    Future.microtask(init);
-    for (final client in _clients.values) {
-      client.close();
-    }
-    _clients.clear();
-  }
-
-  const NetworkRepository();
-
-  /// Note: when disk caching is enabled, only one client may use a given directory at a time.
-  /// Different isolates or engines must use different directories.
-  http.Client getHttpClient(
-    String directoryName, {
-    CacheMode cacheMode = CacheMode.memory,
-    int diskCapacity = 0,
-    int maxConnections = 6,
-    int memoryCapacity = 10 << 20,
-  }) {
-    final cachedClient = _clients[directoryName];
-    if (cachedClient != null) {
-      return cachedClient;
-    }
-
-    final directory = Directory('${_cachePath.path}/$directoryName');
-    directory.createSync(recursive: true);
-    if (Platform.isAndroid) {
-      final engine = CronetEngine.build(
-        cacheMode: cacheMode,
-        cacheMaxSize: diskCapacity,
-        storagePath: directory.path,
-        userAgent: _userAgent,
-      );
-      return _clients[directoryName] = CronetClient.fromCronetEngine(engine, closeEngine: true);
-    }
-
-    final config = URLSessionConfiguration.defaultSessionConfiguration()
-      ..httpMaximumConnectionsPerHost = maxConnections
-      ..cache = URLCache.withCapacity(
-        diskCapacity: diskCapacity,
-        memoryCapacity: memoryCapacity,
-        directory: directory.uri,
-      )
-      ..httpAdditionalHeaders = {'User-Agent': _userAgent};
-    return _clients[directoryName] = CupertinoClient.fromSessionConfiguration(config);
-  }
-}

mobile/lib/infrastructure/repositories/remote_asset.repository.dart

@@ -255,12 +255,6 @@ class RemoteAssetRepository extends DriftDatabaseRepository {
     );
   }
 
-  Future<void> updateRating(String assetId, int rating) async {
-    await (_db.remoteExifEntity.update()..where((row) => row.assetId.equals(assetId))).write(
-      RemoteExifEntityCompanion(rating: Value(rating)),
-    );
-  }
-
   Future<int> getCount() {
     return _db.managers.remoteAssetEntity.count();
   }

mobile/lib/infrastructure/repositories/search_api.repository.dart

@@ -31,7 +31,6 @@ class SearchApiRepository extends ApiRepository {
           takenAfter: filter.date.takenAfter,
           takenBefore: filter.date.takenBefore,
           visibility: filter.display.isArchive ? AssetVisibility.archive : AssetVisibility.timeline,
-          rating: filter.rating.rating,
           isFavorite: filter.display.isFavorite ? true : null,
           isNotInAlbum: filter.display.isNotInAlbum ? true : null,
           personIds: filter.people.map((e) => e.id).toList(),
@@ -55,7 +54,6 @@ class SearchApiRepository extends ApiRepository {
         takenAfter: filter.date.takenAfter,
         takenBefore: filter.date.takenBefore,
         visibility: filter.display.isArchive ? AssetVisibility.archive : AssetVisibility.timeline,
-        rating: filter.rating.rating,
         isFavorite: filter.display.isFavorite ? true : null,
         isNotInAlbum: filter.display.isNotInAlbum ? true : null,
         personIds: filter.people.map((e) => e.id).toList(),

mobile/lib/infrastructure/repositories/sync_stream.repository.dart

@@ -240,8 +240,6 @@ class SyncStreamRepository extends DriftDatabaseRepository {
             rating: Value(exif.rating),
             projectionType: Value(exif.projectionType),
             lens: Value(exif.lensModel),
-            width: Value(exif.exifImageWidth),
-            height: Value(exif.exifImageHeight),
           );
 
           batch.insert(

mobile/lib/infrastructure/repositories/timeline.repository.dart

@@ -15,22 +15,6 @@ import 'package:immich_mobile/infrastructure/repositories/map.repository.dart';
 import 'package:maplibre_gl/maplibre_gl.dart';
 import 'package:stream_transform/stream_transform.dart';
 
-class TimelineMapOptions {
-  final LatLngBounds bounds;
-  final bool onlyFavorites;
-  final bool includeArchived;
-  final bool withPartners;
-  final int relativeDays;
-
-  const TimelineMapOptions({
-    required this.bounds,
-    this.onlyFavorites = false,
-    this.includeArchived = false,
-    this.withPartners = false,
-    this.relativeDays = 0,
-  });
-}
-
 class DriftTimelineRepository extends DriftDatabaseRepository {
   final Drift _db;
 
@@ -483,15 +467,15 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
     return query.map((row) => row.readTable(_db.remoteAssetEntity).toDto()).get();
   }
 
-  TimelineQuery map(List<String> userIds, TimelineMapOptions options, GroupAssetsBy groupBy) => (
-    bucketSource: () => _watchMapBucket(userIds, options, groupBy: groupBy),
-    assetSource: (offset, count) => _getMapBucketAssets(userIds, options, offset: offset, count: count),
+  TimelineQuery map(String userId, LatLngBounds bounds, GroupAssetsBy groupBy) => (
+    bucketSource: () => _watchMapBucket(userId, bounds, groupBy: groupBy),
+    assetSource: (offset, count) => _getMapBucketAssets(userId, bounds, offset: offset, count: count),
     origin: TimelineOrigin.map,
   );
 
   Stream<List<Bucket>> _watchMapBucket(
-    List<String> userId,
-    TimelineMapOptions options, {
+    String userId,
+    LatLngBounds bounds, {
     GroupAssetsBy groupBy = GroupAssetsBy.day,
   }) {
     if (groupBy == GroupAssetsBy.none) {
@@ -512,26 +496,14 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
         ),
       ])
       ..where(
-        _db.remoteAssetEntity.ownerId.isIn(userId) &
-            _db.remoteExifEntity.inBounds(options.bounds) &
-            _db.remoteAssetEntity.visibility.isIn([
-              AssetVisibility.timeline.index,
-              if (options.includeArchived) AssetVisibility.archive.index,
-            ]) &
+        _db.remoteAssetEntity.ownerId.equals(userId) &
+            _db.remoteExifEntity.inBounds(bounds) &
+            _db.remoteAssetEntity.visibility.equalsValue(AssetVisibility.timeline) &
             _db.remoteAssetEntity.deletedAt.isNull(),
       )
       ..groupBy([dateExp])
       ..orderBy([OrderingTerm.desc(dateExp)]);
 
-    if (options.onlyFavorites) {
-      query.where(_db.remoteAssetEntity.isFavorite.equals(true));
-    }
-
-    if (options.relativeDays != 0) {
-      final cutoffDate = DateTime.now().toUtc().subtract(Duration(days: options.relativeDays));
-      query.where(_db.remoteAssetEntity.createdAt.isBiggerOrEqualValue(cutoffDate));
-    }
-
     return query.map((row) {
       final timeline = row.read(dateExp)!.truncateDate(groupBy);
       final assetCount = row.read(assetCountExp)!;
@@ -540,8 +512,8 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
   }
 
   Future<List<BaseAsset>> _getMapBucketAssets(
-    List<String> userId,
-    TimelineMapOptions options, {
+    String userId,
+    LatLngBounds bounds, {
     required int offset,
     required int count,
   }) {
@@ -554,26 +526,13 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
             ),
           ])
           ..where(
-            _db.remoteAssetEntity.ownerId.isIn(userId) &
-                _db.remoteExifEntity.inBounds(options.bounds) &
-                _db.remoteAssetEntity.visibility.isIn([
-                  AssetVisibility.timeline.index,
-                  if (options.includeArchived) AssetVisibility.archive.index,
-                ]) &
+            _db.remoteAssetEntity.ownerId.equals(userId) &
+                _db.remoteExifEntity.inBounds(bounds) &
+                _db.remoteAssetEntity.visibility.equalsValue(AssetVisibility.timeline) &
                 _db.remoteAssetEntity.deletedAt.isNull(),
           )
           ..orderBy([OrderingTerm.desc(_db.remoteAssetEntity.createdAt)])
           ..limit(count, offset: offset);
-
-    if (options.onlyFavorites) {
-      query.where(_db.remoteAssetEntity.isFavorite.equals(true));
-    }
-
-    if (options.relativeDays != 0) {
-      final cutoffDate = DateTime.now().toUtc().subtract(Duration(days: options.relativeDays));
-      query.where(_db.remoteAssetEntity.createdAt.isBiggerOrEqualValue(cutoffDate));
-    }
-
     return query.map((row) => row.readTable(_db.remoteAssetEntity).toDto()).get();
   }
 

mobile/lib/main.dart

@@ -19,7 +19,6 @@ import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/generated/codegen_loader.g.dart';
 import 'package:immich_mobile/generated/intl_keys.g.dart';
-import 'package:immich_mobile/infrastructure/repositories/network.repository.dart';
 import 'package:immich_mobile/platform/background_worker_lock_api.g.dart';
 import 'package:immich_mobile/providers/app_life_cycle.provider.dart';
 import 'package:immich_mobile/providers/asset_viewer/share_intent_upload.provider.dart';
@@ -238,14 +237,6 @@ class ImmichAppState extends ConsumerState<ImmichApp> with WidgetsBindingObserve
     super.dispose();
   }
 
-  @override
-  void reassemble() {
-    if (kDebugMode) {
-      NetworkRepository.reset();
-    }
-    super.reassemble();
-  }
-
   @override
   Widget build(BuildContext context) {
     final router = ref.watch(appRouterProvider);

mobile/lib/models/search/search_filter.model.dart

@@ -126,41 +126,6 @@ class SearchDateFilter {
   int get hashCode => takenBefore.hashCode ^ takenAfter.hashCode;
 }
 
-class SearchRatingFilter {
-  int? rating;
-  SearchRatingFilter({this.rating});
-
-  SearchRatingFilter copyWith({int? rating}) {
-    return SearchRatingFilter(rating: rating ?? this.rating);
-  }
-
-  Map<String, dynamic> toMap() {
-    return <String, dynamic>{'rating': rating};
-  }
-
-  factory SearchRatingFilter.fromMap(Map<String, dynamic> map) {
-    return SearchRatingFilter(rating: map['rating'] != null ? map['rating'] as int : null);
-  }
-
-  String toJson() => json.encode(toMap());
-
-  factory SearchRatingFilter.fromJson(String source) =>
-      SearchRatingFilter.fromMap(json.decode(source) as Map<String, dynamic>);
-
-  @override
-  String toString() => 'SearchRatingFilter(rating: $rating)';
-
-  @override
-  bool operator ==(covariant SearchRatingFilter other) {
-    if (identical(this, other)) return true;
-
-    return other.rating == rating;
-  }
-
-  @override
-  int get hashCode => rating.hashCode;
-}
-
 class SearchDisplayFilters {
   bool isNotInAlbum = false;
   bool isArchive = false;
@@ -218,7 +183,6 @@ class SearchFilter {
   SearchLocationFilter location;
   SearchCameraFilter camera;
   SearchDateFilter date;
-  SearchRatingFilter rating;
   SearchDisplayFilters display;
 
   // Enum
@@ -236,7 +200,6 @@ class SearchFilter {
     required this.camera,
     required this.date,
     required this.display,
-    required this.rating,
     required this.mediaType,
   });
 
@@ -257,7 +220,6 @@ class SearchFilter {
         display.isNotInAlbum == false &&
         display.isArchive == false &&
         display.isFavorite == false &&
-        rating.rating == null &&
         mediaType == AssetType.other;
   }
 
@@ -273,7 +235,6 @@ class SearchFilter {
     SearchCameraFilter? camera,
     SearchDateFilter? date,
     SearchDisplayFilters? display,
-    SearchRatingFilter? rating,
     AssetType? mediaType,
   }) {
     return SearchFilter(
@@ -288,14 +249,13 @@ class SearchFilter {
       camera: camera ?? this.camera,
       date: date ?? this.date,
       display: display ?? this.display,
-      rating: rating ?? this.rating,
       mediaType: mediaType ?? this.mediaType,
     );
   }
 
   @override
   String toString() {
-    return 'SearchFilter(context: $context, filename: $filename, description: $description, language: $language, ocr: $ocr, people: $people, location: $location, camera: $camera, date: $date, display: $display, rating: $rating, mediaType: $mediaType, assetId: $assetId)';
+    return 'SearchFilter(context: $context, filename: $filename, description: $description, language: $language, ocr: $ocr, people: $people, location: $location, camera: $camera, date: $date, display: $display, mediaType: $mediaType, assetId: $assetId)';
   }
 
   @override
@@ -313,7 +273,6 @@ class SearchFilter {
         other.camera == camera &&
         other.date == date &&
         other.display == display &&
-        other.rating == rating &&
         other.mediaType == mediaType;
   }
 
@@ -330,7 +289,6 @@ class SearchFilter {
         camera.hashCode ^
         date.hashCode ^
         display.hashCode ^
-        rating.hashCode ^
         mediaType.hashCode;
   }
 }

mobile/lib/pages/common/settings.page.dart

@@ -92,7 +92,7 @@ class _MobileLayout extends StatelessWidget {
                 ],
         )
         .toList();
-    return ListView(padding: const EdgeInsets.only(top: 10.0, bottom: 60), children: [...settings]);
+    return ListView(padding: const EdgeInsets.only(top: 10.0, bottom: 16), children: [...settings]);
   }
 }
 

mobile/lib/pages/common/splash_screen.page.dart

@@ -10,7 +10,6 @@ import 'package:immich_mobile/providers/background_sync.provider.dart';
 import 'package:immich_mobile/providers/backup/backup.provider.dart';
 import 'package:immich_mobile/providers/backup/drift_backup.provider.dart';
 import 'package:immich_mobile/providers/gallery_permission.provider.dart';
-import 'package:immich_mobile/providers/server_info.provider.dart';
 import 'package:immich_mobile/providers/websocket.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:logging/logging.dart';
@@ -50,7 +49,6 @@ class SplashScreenPageState extends ConsumerState<SplashScreenPage> {
     final accessToken = Store.tryGet(StoreKey.accessToken);
 
     if (accessToken != null && serverUrl != null && endpoint != null) {
-      final infoProvider = ref.read(serverInfoProvider.notifier);
       final wsProvider = ref.read(websocketProvider.notifier);
       final backgroundManager = ref.read(backgroundSyncProvider);
       final backupProvider = ref.read(driftBackupProvider.notifier);
@@ -60,7 +58,6 @@ class SplashScreenPageState extends ConsumerState<SplashScreenPage> {
           (_) async {
             try {
               wsProvider.connect();
-              unawaited(infoProvider.getServerInfo());
 
               if (Store.isBetaTimelineEnabled) {
                 bool syncSuccess = false;

mobile/lib/pages/library/places/places_collection.page.dart

@@ -113,7 +113,6 @@ class PlaceTile extends StatelessWidget {
             camera: SearchCameraFilter(),
             date: SearchDateFilter(),
             display: SearchDisplayFilters(isNotInAlbum: false, isArchive: false, isFavorite: false),
-            rating: SearchRatingFilter(),
             mediaType: AssetType.other,
           ),
         ),

mobile/lib/pages/search/search.page.dart

@@ -43,7 +43,6 @@ class SearchPage extends HookConsumerWidget {
         date: prefilter?.date ?? SearchDateFilter(),
         display: prefilter?.display ?? SearchDisplayFilters(isNotInAlbum: false, isArchive: false, isFavorite: false),
         mediaType: prefilter?.mediaType ?? AssetType.other,
-        rating: prefilter?.rating ?? SearchRatingFilter(),
         language: "${context.locale.languageCode}-${context.locale.countryCode}",
       ),
     );

mobile/lib/pages/settings/sync_status.page.dart

@@ -18,7 +18,6 @@ class SyncStatusPage extends StatelessWidget {
           splashRadius: 24,
           icon: const Icon(Icons.arrow_back_ios_rounded),
         ),
-        centerTitle: false,
       ),
       body: const SyncStatusAndActions(),
     );

mobile/lib/platform/local_image_api.g.dart

@@ -1,137 +0,0 @@
-// Autogenerated from Pigeon (v26.0.2), do not edit directly.
-// See also: https://pub.dev/packages/pigeon
-// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import, no_leading_underscores_for_local_identifiers
-
-import 'dart:async';
-import 'dart:typed_data' show Float64List, Int32List, Int64List, Uint8List;
-
-import 'package:flutter/foundation.dart' show ReadBuffer, WriteBuffer;
-import 'package:flutter/services.dart';
-
-PlatformException _createConnectionError(String channelName) {
-  return PlatformException(
-    code: 'channel-error',
-    message: 'Unable to establish connection on channel: "$channelName".',
-  );
-}
-
-class _PigeonCodec extends StandardMessageCodec {
-  const _PigeonCodec();
-  @override
-  void writeValue(WriteBuffer buffer, Object? value) {
-    if (value is int) {
-      buffer.putUint8(4);
-      buffer.putInt64(value);
-    } else {
-      super.writeValue(buffer, value);
-    }
-  }
-
-  @override
-  Object? readValueOfType(int type, ReadBuffer buffer) {
-    switch (type) {
-      default:
-        return super.readValueOfType(type, buffer);
-    }
-  }
-}
-
-class LocalImageApi {
-  /// Constructor for [LocalImageApi].  The [binaryMessenger] named argument is
-  /// available for dependency injection.  If it is left null, the default
-  /// BinaryMessenger will be used which routes to the host platform.
-  LocalImageApi({BinaryMessenger? binaryMessenger, String messageChannelSuffix = ''})
-    : pigeonVar_binaryMessenger = binaryMessenger,
-      pigeonVar_messageChannelSuffix = messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : '';
-  final BinaryMessenger? pigeonVar_binaryMessenger;
-
-  static const MessageCodec<Object?> pigeonChannelCodec = _PigeonCodec();
-
-  final String pigeonVar_messageChannelSuffix;
-
-  Future<Map<String, int>?> requestImage(
-    String assetId, {
-    required int requestId,
-    required int width,
-    required int height,
-    required bool isVideo,
-  }) async {
-    final String pigeonVar_channelName =
-        'dev.flutter.pigeon.immich_mobile.LocalImageApi.requestImage$pigeonVar_messageChannelSuffix';
-    final BasicMessageChannel<Object?> pigeonVar_channel = BasicMessageChannel<Object?>(
-      pigeonVar_channelName,
-      pigeonChannelCodec,
-      binaryMessenger: pigeonVar_binaryMessenger,
-    );
-    final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(<Object?>[
-      assetId,
-      requestId,
-      width,
-      height,
-      isVideo,
-    ]);
-    final List<Object?>? pigeonVar_replyList = await pigeonVar_sendFuture as List<Object?>?;
-    if (pigeonVar_replyList == null) {
-      throw _createConnectionError(pigeonVar_channelName);
-    } else if (pigeonVar_replyList.length > 1) {
-      throw PlatformException(
-        code: pigeonVar_replyList[0]! as String,
-        message: pigeonVar_replyList[1] as String?,
-        details: pigeonVar_replyList[2],
-      );
-    } else {
-      return (pigeonVar_replyList[0] as Map<Object?, Object?>?)?.cast<String, int>();
-    }
-  }
-
-  Future<void> cancelRequest(int requestId) async {
-    final String pigeonVar_channelName =
-        'dev.flutter.pigeon.immich_mobile.LocalImageApi.cancelRequest$pigeonVar_messageChannelSuffix';
-    final BasicMessageChannel<Object?> pigeonVar_channel = BasicMessageChannel<Object?>(
-      pigeonVar_channelName,
-      pigeonChannelCodec,
-      binaryMessenger: pigeonVar_binaryMessenger,
-    );
-    final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(<Object?>[requestId]);
-    final List<Object?>? pigeonVar_replyList = await pigeonVar_sendFuture as List<Object?>?;
-    if (pigeonVar_replyList == null) {
-      throw _createConnectionError(pigeonVar_channelName);
-    } else if (pigeonVar_replyList.length > 1) {
-      throw PlatformException(
-        code: pigeonVar_replyList[0]! as String,
-        message: pigeonVar_replyList[1] as String?,
-        details: pigeonVar_replyList[2],
-      );
-    } else {
-      return;
-    }
-  }
-
-  Future<Map<String, int>> getThumbhash(String thumbhash) async {
-    final String pigeonVar_channelName =
-        'dev.flutter.pigeon.immich_mobile.LocalImageApi.getThumbhash$pigeonVar_messageChannelSuffix';
-    final BasicMessageChannel<Object?> pigeonVar_channel = BasicMessageChannel<Object?>(
-      pigeonVar_channelName,
-      pigeonChannelCodec,
-      binaryMessenger: pigeonVar_binaryMessenger,
-    );
-    final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(<Object?>[thumbhash]);
-    final List<Object?>? pigeonVar_replyList = await pigeonVar_sendFuture as List<Object?>?;
-    if (pigeonVar_replyList == null) {
-      throw _createConnectionError(pigeonVar_channelName);
-    } else if (pigeonVar_replyList.length > 1) {
-      throw PlatformException(
-        code: pigeonVar_replyList[0]! as String,
-        message: pigeonVar_replyList[1] as String?,
-        details: pigeonVar_replyList[2],
-      );
-    } else if (pigeonVar_replyList[0] == null) {
-      throw PlatformException(
-        code: 'null-error',
-        message: 'Host platform returned null value for non-null return value.',
-      );
-    } else {
-      return (pigeonVar_replyList[0] as Map<Object?, Object?>?)!.cast<String, int>();
-    }
-  }
-}

mobile/lib/platform/remote_image_api.g.dart

@@ -1,129 +0,0 @@
-// Autogenerated from Pigeon (v26.0.2), do not edit directly.
-// See also: https://pub.dev/packages/pigeon
-// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import, no_leading_underscores_for_local_identifiers
-
-import 'dart:async';
-import 'dart:typed_data' show Float64List, Int32List, Int64List, Uint8List;
-
-import 'package:flutter/foundation.dart' show ReadBuffer, WriteBuffer;
-import 'package:flutter/services.dart';
-
-PlatformException _createConnectionError(String channelName) {
-  return PlatformException(
-    code: 'channel-error',
-    message: 'Unable to establish connection on channel: "$channelName".',
-  );
-}
-
-class _PigeonCodec extends StandardMessageCodec {
-  const _PigeonCodec();
-  @override
-  void writeValue(WriteBuffer buffer, Object? value) {
-    if (value is int) {
-      buffer.putUint8(4);
-      buffer.putInt64(value);
-    } else {
-      super.writeValue(buffer, value);
-    }
-  }
-
-  @override
-  Object? readValueOfType(int type, ReadBuffer buffer) {
-    switch (type) {
-      default:
-        return super.readValueOfType(type, buffer);
-    }
-  }
-}
-
-class RemoteImageApi {
-  /// Constructor for [RemoteImageApi].  The [binaryMessenger] named argument is
-  /// available for dependency injection.  If it is left null, the default
-  /// BinaryMessenger will be used which routes to the host platform.
-  RemoteImageApi({BinaryMessenger? binaryMessenger, String messageChannelSuffix = ''})
-    : pigeonVar_binaryMessenger = binaryMessenger,
-      pigeonVar_messageChannelSuffix = messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : '';
-  final BinaryMessenger? pigeonVar_binaryMessenger;
-
-  static const MessageCodec<Object?> pigeonChannelCodec = _PigeonCodec();
-
-  final String pigeonVar_messageChannelSuffix;
-
-  Future<Map<String, int>?> requestImage(
-    String url, {
-    required Map<String, String> headers,
-    required int requestId,
-  }) async {
-    final String pigeonVar_channelName =
-        'dev.flutter.pigeon.immich_mobile.RemoteImageApi.requestImage$pigeonVar_messageChannelSuffix';
-    final BasicMessageChannel<Object?> pigeonVar_channel = BasicMessageChannel<Object?>(
-      pigeonVar_channelName,
-      pigeonChannelCodec,
-      binaryMessenger: pigeonVar_binaryMessenger,
-    );
-    final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(<Object?>[url, headers, requestId]);
-    final List<Object?>? pigeonVar_replyList = await pigeonVar_sendFuture as List<Object?>?;
-    if (pigeonVar_replyList == null) {
-      throw _createConnectionError(pigeonVar_channelName);
-    } else if (pigeonVar_replyList.length > 1) {
-      throw PlatformException(
-        code: pigeonVar_replyList[0]! as String,
-        message: pigeonVar_replyList[1] as String?,
-        details: pigeonVar_replyList[2],
-      );
-    } else {
-      return (pigeonVar_replyList[0] as Map<Object?, Object?>?)?.cast<String, int>();
-    }
-  }
-
-  Future<void> cancelRequest(int requestId) async {
-    final String pigeonVar_channelName =
-        'dev.flutter.pigeon.immich_mobile.RemoteImageApi.cancelRequest$pigeonVar_messageChannelSuffix';
-    final BasicMessageChannel<Object?> pigeonVar_channel = BasicMessageChannel<Object?>(
-      pigeonVar_channelName,
-      pigeonChannelCodec,
-      binaryMessenger: pigeonVar_binaryMessenger,
-    );
-    final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(<Object?>[requestId]);
-    final List<Object?>? pigeonVar_replyList = await pigeonVar_sendFuture as List<Object?>?;
-    if (pigeonVar_replyList == null) {
-      throw _createConnectionError(pigeonVar_channelName);
-    } else if (pigeonVar_replyList.length > 1) {
-      throw PlatformException(
-        code: pigeonVar_replyList[0]! as String,
-        message: pigeonVar_replyList[1] as String?,
-        details: pigeonVar_replyList[2],
-      );
-    } else {
-      return;
-    }
-  }
-
-  Future<int> clearCache() async {
-    final String pigeonVar_channelName =
-        'dev.flutter.pigeon.immich_mobile.RemoteImageApi.clearCache$pigeonVar_messageChannelSuffix';
-    final BasicMessageChannel<Object?> pigeonVar_channel = BasicMessageChannel<Object?>(
-      pigeonVar_channelName,
-      pigeonChannelCodec,
-      binaryMessenger: pigeonVar_binaryMessenger,
-    );
-    final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(null);
-    final List<Object?>? pigeonVar_replyList = await pigeonVar_sendFuture as List<Object?>?;
-    if (pigeonVar_replyList == null) {
-      throw _createConnectionError(pigeonVar_channelName);
-    } else if (pigeonVar_replyList.length > 1) {
-      throw PlatformException(
-        code: pigeonVar_replyList[0]! as String,
-        message: pigeonVar_replyList[1] as String?,
-        details: pigeonVar_replyList[2],
-      );
-    } else if (pigeonVar_replyList[0] == null) {
-      throw PlatformException(
-        code: 'null-error',
-        message: 'Host platform returned null value for non-null return value.',
-      );
-    } else {
-      return (pigeonVar_replyList[0] as int?)!;
-    }
-  }
-}

mobile/lib/presentation/pages/drift_map.page.dart

@@ -2,7 +2,6 @@ import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/map/map.widget.dart';
-import 'package:immich_mobile/presentation/widgets/map/map_settings_sheet.dart';
 import 'package:maplibre_gl/maplibre_gl.dart';
 
 @RoutePage()
@@ -11,16 +10,6 @@ class DriftMapPage extends StatelessWidget {
 
   const DriftMapPage({super.key, this.initialLocation});
 
-  void onSettingsPressed(BuildContext context) {
-    showModalBottomSheet(
-      elevation: 0.0,
-      showDragHandle: true,
-      isScrollControlled: true,
-      context: context,
-      builder: (_) => const DriftMapSettingsSheet(),
-    );
-  }
-
   @override
   Widget build(BuildContext context) {
     return Scaffold(
@@ -29,8 +18,8 @@ class DriftMapPage extends StatelessWidget {
         children: [
           DriftMap(initialLocation: initialLocation),
           Positioned(
-            left: 20,
-            top: 70,
+            left: 16,
+            top: 60,
             child: IconButton.filled(
               color: Colors.white,
               onPressed: () => context.pop(),
@@ -43,21 +32,6 @@ class DriftMapPage extends StatelessWidget {
               ),
             ),
           ),
-          Positioned(
-            right: 20,
-            top: 70,
-            child: IconButton.filled(
-              color: Colors.white,
-              onPressed: () => onSettingsPressed(context),
-              icon: const Icon(Icons.more_vert_rounded),
-              style: IconButton.styleFrom(
-                padding: const EdgeInsets.all(8),
-                backgroundColor: Colors.indigo,
-                shadowColor: Colors.black26,
-                elevation: 4,
-              ),
-            ),
-          ),
         ],
       ),
     );

mobile/lib/presentation/pages/search/drift_search.page.dart

@@ -18,7 +18,6 @@ import 'package:immich_mobile/presentation/widgets/bottom_sheet/general_bottom_s
 import 'package:immich_mobile/presentation/widgets/search/quick_date_picker.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/timeline.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/user_metadata.provider.dart';
 import 'package:immich_mobile/providers/search/search_input_focus.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/widgets/common/feature_check.dart';
@@ -31,7 +30,6 @@ import 'package:immich_mobile/widgets/search/search_filter/media_type_picker.dar
 import 'package:immich_mobile/widgets/search/search_filter/people_picker.dart';
 import 'package:immich_mobile/widgets/search/search_filter/search_filter_chip.dart';
 import 'package:immich_mobile/widgets/search/search_filter/search_filter_utils.dart';
-import 'package:immich_mobile/widgets/search/search_filter/star_rating_picker.dart';
 
 @RoutePage()
 class DriftSearchPage extends HookConsumerWidget {
@@ -50,7 +48,6 @@ class DriftSearchPage extends HookConsumerWidget {
         camera: preFilter?.camera ?? SearchCameraFilter(),
         date: preFilter?.date ?? SearchDateFilter(),
         display: preFilter?.display ?? SearchDisplayFilters(isNotInAlbum: false, isArchive: false, isFavorite: false),
-        rating: preFilter?.rating ?? SearchRatingFilter(),
         mediaType: preFilter?.mediaType ?? AssetType.other,
         language: "${context.locale.languageCode}-${context.locale.countryCode}",
         assetId: preFilter?.assetId,
@@ -65,15 +62,10 @@ class DriftSearchPage extends HookConsumerWidget {
     final cameraCurrentFilterWidget = useState<Widget?>(null);
     final locationCurrentFilterWidget = useState<Widget?>(null);
     final mediaTypeCurrentFilterWidget = useState<Widget?>(null);
-    final ratingCurrentFilterWidget = useState<Widget?>(null);
     final displayOptionCurrentFilterWidget = useState<Widget?>(null);
 
     final isSearching = useState(false);
 
-    final isRatingEnabled = ref
-        .watch(userMetadataPreferencesProvider)
-        .maybeWhen(data: (prefs) => prefs?.ratingsEnabled ?? false, orElse: () => false);
-
     SnackBar searchInfoSnackBar(String message) {
       return SnackBar(
         content: Text(message, style: context.textTheme.labelLarge),
@@ -377,35 +369,6 @@ class DriftSearchPage extends HookConsumerWidget {
       );
     }
 
-    // STAR RATING PICKER
-    showStarRatingPicker() {
-      handleOnSelected(SearchRatingFilter rating) {
-        filter.value = filter.value.copyWith(rating: rating);
-
-        ratingCurrentFilterWidget.value = Text(
-          'rating_count'.t(args: {'count': rating.rating!}),
-          style: context.textTheme.labelLarge,
-        );
-      }
-
-      handleClear() {
-        filter.value = filter.value.copyWith(rating: SearchRatingFilter(rating: null));
-        ratingCurrentFilterWidget.value = null;
-        search();
-      }
-
-      showFilterBottomSheet(
-        context: context,
-        isScrollControlled: true,
-        child: FilterBottomSheetScaffold(
-          title: 'rating'.t(context: context),
-          onSearch: search,
-          onClear: handleClear,
-          child: StarRatingPicker(onSelect: handleOnSelected, filter: filter.value.rating),
-        ),
-      );
-    }
-
     // DISPLAY OPTION
     showDisplayOptionPicker() {
       handleOnSelect(Map<DisplayOption, bool> value) {
@@ -666,14 +629,6 @@ class DriftSearchPage extends HookConsumerWidget {
                       label: 'search_filter_media_type'.t(context: context),
                       currentFilter: mediaTypeCurrentFilterWidget.value,
                     ),
-                    if (isRatingEnabled) ...[
-                      SearchFilterChip(
-                        icon: Icons.star_outline_rounded,
-                        onTap: showStarRatingPicker,
-                        label: 'search_filter_star_rating'.t(context: context),
-                        currentFilter: ratingCurrentFilterWidget.value,
-                      ),
-                    ],
                     SearchFilterChip(
                       icon: Icons.display_settings_outlined,
                       onTap: showDisplayOptionPicker,

mobile/lib/presentation/widgets/action_buttons/similar_photos_action_button.widget.dart

@@ -34,7 +34,6 @@ class SimilarPhotosActionButton extends ConsumerWidget {
             camera: SearchCameraFilter(),
             date: SearchDateFilter(),
             display: SearchDisplayFilters(isNotInAlbum: false, isArchive: false, isFavorite: false),
-            rating: SearchRatingFilter(),
             mediaType: AssetType.image,
           ),
         );

mobile/lib/presentation/widgets/album/album_selector.widget.dart

@@ -311,17 +311,18 @@ class _SortButtonState extends ConsumerState<_SortButton> {
                   : const Icon(Icons.abc, color: Colors.transparent),
               onPressed: () => onMenuTapped(sortMode),
               style: ButtonStyle(
-                padding: WidgetStateProperty.all(const EdgeInsets.fromLTRB(12, 12, 24, 12)),
+                padding: WidgetStateProperty.all(const EdgeInsets.fromLTRB(16, 16, 32, 16)),
                 backgroundColor: WidgetStateProperty.all(
                   albumSortOption == sortMode ? context.colorScheme.primary : Colors.transparent,
                 ),
                 shape: WidgetStateProperty.all(
-                  const RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(12))),
+                  const RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(24))),
                 ),
               ),
               child: Text(
                 sortMode.label.t(context: context),
-                style: context.textTheme.labelLarge?.copyWith(
+                style: context.textTheme.titleSmall?.copyWith(
+                  fontWeight: FontWeight.w600,
                   color: albumSortOption == sortMode
                       ? context.colorScheme.onPrimary
                       : context.colorScheme.onSurface.withAlpha(185),
@@ -349,7 +350,10 @@ class _SortButtonState extends ConsumerState<_SortButton> {
               ),
               Text(
                 albumSortOption.label.t(context: context),
-                style: context.textTheme.labelLarge?.copyWith(color: context.colorScheme.onSurface.withAlpha(225)),
+                style: context.textTheme.bodyLarge?.copyWith(
+                  fontWeight: FontWeight.w500,
+                  color: context.colorScheme.onSurface.withAlpha(225),
+                ),
               ),
               isSorting
                   ? SizedBox(

mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart

@@ -118,6 +118,7 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
   bool dragInProgress = false;
   bool shouldPopOnDrag = false;
   bool assetReloadRequested = false;
+  double? initialScale;
   double previousExtent = _kBottomSheetMinimumExtent;
   Offset dragDownPosition = Offset.zero;
   int totalAssets = 0;
@@ -263,6 +264,7 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
           (context.height * bottomSheetController.size) - (context.height * _kBottomSheetMinimumExtent);
       controller.position = Offset(0, -verticalOffset);
       // Apply the zoom effect when the bottom sheet is showing
+      initialScale = controller.scale;
       controller.scale = (controller.scale ?? 1.0) + 0.01;
     }
   }
@@ -314,7 +316,7 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
     hasDraggedDown = null;
     viewController?.animateMultiple(
       position: initialPhotoViewState.position,
-      scale: viewController?.initialScale ?? initialPhotoViewState.scale,
+      scale: initialPhotoViewState.scale,
       rotation: initialPhotoViewState.rotation,
     );
     ref.read(assetViewerProvider.notifier).setOpacity(255);
@@ -364,9 +366,8 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
     final maxScaleDistance = ctx.height * 0.5;
     final scaleReduction = (distance / maxScaleDistance).clamp(0.0, dragRatio);
     double? updatedScale;
-    double? initialScale = viewController?.initialScale ?? initialPhotoViewState.scale;
-    if (initialScale != null) {
-      updatedScale = initialScale * (1.0 - scaleReduction);
+    if (initialPhotoViewState.scale != null) {
+      updatedScale = initialPhotoViewState.scale! * (1.0 - scaleReduction);
     }
 
     final backgroundOpacity = (255 * (1.0 - (scaleReduction / dragRatio))).round();
@@ -480,6 +481,8 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
 
   void _openBottomSheet(BuildContext ctx, {double extent = _kBottomSheetMinimumExtent, bool activitiesMode = false}) {
     ref.read(assetViewerProvider.notifier).setBottomSheet(true);
+    initialScale = viewController?.scale;
+    // viewController?.updateMultiple(scale: (viewController?.scale ?? 1.0) + 0.01);
     previousExtent = _kBottomSheetMinimumExtent;
     sheetCloseController = showBottomSheet(
       context: ctx,
@@ -501,7 +504,7 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
 
   void _handleSheetClose() {
     viewController?.animateMultiple(position: Offset.zero);
-    viewController?.updateMultiple(scale: viewController?.initialScale);
+    viewController?.updateMultiple(scale: initialScale);
     ref.read(assetViewerProvider.notifier).setBottomSheet(false);
     sheetCloseController = null;
     shouldPopOnDrag = false;

mobile/lib/presentation/widgets/asset_viewer/bottom_sheet.widget.dart

@@ -10,19 +10,16 @@ import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/exif.model.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/duration_extensions.dart';
-import 'package:immich_mobile/extensions/theme_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/album/album_tile.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_viewer.state.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/bottom_sheet/sheet_location_details.widget.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/bottom_sheet/sheet_people_details.widget.dart';
-import 'package:immich_mobile/presentation/widgets/asset_viewer/rating_bar.widget.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/sheet_tile.widget.dart';
 import 'package:immich_mobile/presentation/widgets/bottom_sheet/base_bottom_sheet.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asset.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/user_metadata.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/repositories/asset_media.repository.dart';
 import 'package:immich_mobile/routing/router.dart';
@@ -167,8 +164,11 @@ class _AssetDetailBottomSheet extends ConsumerWidget {
           children: [
             if (albums.isNotEmpty)
               SheetTile(
-                title: 'appears_in'.t(context: context),
-                titleStyle: context.textTheme.labelLarge?.copyWith(color: context.colorScheme.onSurfaceSecondary),
+                title: 'appears_in'.t(context: context).toUpperCase(),
+                titleStyle: context.textTheme.labelMedium?.copyWith(
+                  color: context.textTheme.labelMedium?.color?.withAlpha(200),
+                  fontWeight: FontWeight.w600,
+                ),
               ),
             Padding(
               padding: const EdgeInsets.only(left: 24),
@@ -206,9 +206,6 @@ class _AssetDetailBottomSheet extends ConsumerWidget {
     final cameraTitle = _getCameraInfoTitle(exifInfo);
     final lensTitle = exifInfo?.lens != null && exifInfo!.lens!.isNotEmpty ? exifInfo.lens : null;
     final isOwner = ref.watch(currentUserProvider)?.id == (asset is RemoteAsset ? asset.ownerId : null);
-    final isRatingEnabled = ref
-        .watch(userMetadataPreferencesProvider)
-        .maybeWhen(data: (prefs) => prefs?.ratingsEnabled ?? false, orElse: () => false);
 
     // Build file info tile based on asset type
     Widget buildFileInfoTile() {
@@ -227,7 +224,9 @@ class _AssetDetailBottomSheet extends ConsumerWidget {
                 color: context.textTheme.labelLarge?.color,
               ),
               subtitle: _getFileInfo(asset, exifInfo),
-              subtitleStyle: context.textTheme.bodyMedium?.copyWith(color: context.colorScheme.onSurfaceSecondary),
+              subtitleStyle: context.textTheme.labelMedium?.copyWith(
+                color: context.textTheme.labelMedium?.color?.withAlpha(200),
+              ),
             );
           },
         );
@@ -242,7 +241,9 @@ class _AssetDetailBottomSheet extends ConsumerWidget {
             color: context.textTheme.labelLarge?.color,
           ),
           subtitle: _getFileInfo(asset, exifInfo),
-          subtitleStyle: context.textTheme.bodyMedium?.copyWith(color: context.colorScheme.onSurfaceSecondary),
+          subtitleStyle: context.textTheme.labelMedium?.copyWith(
+            color: context.textTheme.labelMedium?.color?.withAlpha(200),
+          ),
         );
       }
     }
@@ -261,8 +262,11 @@ class _AssetDetailBottomSheet extends ConsumerWidget {
         const SheetLocationDetails(),
         // Details header
         SheetTile(
-          title: 'details'.t(context: context),
-          titleStyle: context.textTheme.labelLarge?.copyWith(color: context.colorScheme.onSurfaceSecondary),
+          title: 'details'.t(context: context).toUpperCase(),
+          titleStyle: context.textTheme.labelMedium?.copyWith(
+            color: context.textTheme.labelMedium?.color?.withAlpha(200),
+            fontWeight: FontWeight.w600,
+          ),
         ),
         // File info
         buildFileInfoTile(),
@@ -274,7 +278,9 @@ class _AssetDetailBottomSheet extends ConsumerWidget {
             titleStyle: context.textTheme.labelLarge,
             leading: Icon(Icons.camera_alt_outlined, size: 24, color: context.textTheme.labelLarge?.color),
             subtitle: _getCameraInfoSubtitle(exifInfo),
-            subtitleStyle: context.textTheme.bodyMedium?.copyWith(color: context.colorScheme.onSurfaceSecondary),
+            subtitleStyle: context.textTheme.labelMedium?.copyWith(
+              color: context.textTheme.labelMedium?.color?.withAlpha(200),
+            ),
           ),
         ],
         // Lens info
@@ -285,45 +291,15 @@ class _AssetDetailBottomSheet extends ConsumerWidget {
             titleStyle: context.textTheme.labelLarge,
             leading: Icon(Icons.camera_outlined, size: 24, color: context.textTheme.labelLarge?.color),
             subtitle: _getLensInfoSubtitle(exifInfo),
-            subtitleStyle: context.textTheme.bodyMedium?.copyWith(color: context.colorScheme.onSurfaceSecondary),
-          ),
-        ],
-        // Rating bar
-        if (isRatingEnabled) ...[
-          Padding(
-            padding: const EdgeInsets.only(left: 16.0, top: 16.0),
-            child: Column(
-              mainAxisSize: MainAxisSize.min,
-              crossAxisAlignment: CrossAxisAlignment.start,
-              spacing: 8,
-              children: [
-                Text(
-                  'rating'.t(context: context).toUpperCase(),
-                  style: context.textTheme.labelMedium?.copyWith(
-                    color: context.textTheme.labelMedium?.color?.withAlpha(200),
-                    fontWeight: FontWeight.w600,
-                  ),
-                ),
-                RatingBar(
-                  initialRating: exifInfo?.rating?.toDouble() ?? 0,
-                  filledColor: context.themeData.colorScheme.primary,
-                  unfilledColor: context.themeData.colorScheme.onSurface.withAlpha(100),
-                  itemSize: 40,
-                  onRatingUpdate: (rating) async {
-                    await ref.read(actionProvider.notifier).updateRating(ActionSource.viewer, rating.round());
-                  },
-                  onClearRating: () async {
-                    await ref.read(actionProvider.notifier).updateRating(ActionSource.viewer, 0);
-                  },
-                ),
-              ],
+            subtitleStyle: context.textTheme.labelMedium?.copyWith(
+              color: context.textTheme.labelMedium?.color?.withAlpha(200),
             ),
           ),
         ],
         // Appears in (Albums)
         Padding(padding: const EdgeInsets.only(top: 16.0), child: _buildAppearsInList(ref, context)),
         // padding at the bottom to avoid cut-off
-        const SizedBox(height: 60),
+        const SizedBox(height: 30),
       ],
     );
   }

mobile/lib/presentation/widgets/asset_viewer/bottom_sheet/sheet_location_details.widget.dart

@@ -4,7 +4,6 @@ import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/exif.model.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/extensions/theme_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/sheet_tile.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
@@ -78,8 +77,11 @@ class _SheetLocationDetailsState extends ConsumerState<SheetLocationDetails> {
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
           SheetTile(
-            title: 'location'.t(context: context),
-            titleStyle: context.textTheme.labelLarge?.copyWith(color: context.colorScheme.onSurfaceSecondary),
+            title: 'location'.t(context: context).toUpperCase(),
+            titleStyle: context.textTheme.labelMedium?.copyWith(
+              color: context.textTheme.labelMedium?.color?.withAlpha(200),
+              fontWeight: FontWeight.w600,
+            ),
             trailing: hasCoordinates ? const Icon(Icons.edit_location_alt, size: 20) : null,
             onTap: editLocation,
           ),
@@ -103,7 +105,9 @@ class _SheetLocationDetailsState extends ConsumerState<SheetLocationDetails> {
                     ),
                   Text(
                     coordinates,
-                    style: context.textTheme.bodySmall?.copyWith(color: context.colorScheme.onSurfaceSecondary),
+                    style: context.textTheme.labelMedium?.copyWith(
+                      color: context.textTheme.labelMedium?.color?.withAlpha(200),
+                    ),
                   ),
                 ],
               ),

mobile/lib/presentation/widgets/asset_viewer/bottom_sheet/sheet_people_details.widget.dart

@@ -4,7 +4,6 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/person.model.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/extensions/theme_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/people/person_edit_name_modal.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asset.provider.dart';
@@ -54,8 +53,11 @@ class _SheetPeopleDetailsState extends ConsumerState<SheetPeopleDetails> {
               Padding(
                 padding: const EdgeInsets.only(left: 16, top: 16, bottom: 16),
                 child: Text(
-                  "people".t(context: context),
-                  style: context.textTheme.labelLarge?.copyWith(color: context.colorScheme.onSurfaceSecondary),
+                  "people".t(context: context).toUpperCase(),
+                  style: context.textTheme.labelMedium?.copyWith(
+                    color: context.textTheme.labelMedium?.color?.withAlpha(200),
+                    fontWeight: FontWeight.w600,
+                  ),
                 ),
               ),
               SizedBox(

mobile/lib/presentation/widgets/asset_viewer/rating_bar.widget.dart

@@ -1,125 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/extensions/translate_extensions.dart';
-
-class RatingBar extends StatefulWidget {
-  final double initialRating;
-  final int itemCount;
-  final double itemSize;
-  final Color filledColor;
-  final Color unfilledColor;
-  final ValueChanged<int>? onRatingUpdate;
-  final VoidCallback? onClearRating;
-  final Widget? itemBuilder;
-  final double starPadding;
-
-  const RatingBar({
-    super.key,
-    this.initialRating = 0.0,
-    this.itemCount = 5,
-    this.itemSize = 40.0,
-    this.filledColor = Colors.amber,
-    this.unfilledColor = Colors.grey,
-    this.onRatingUpdate,
-    this.onClearRating,
-    this.itemBuilder,
-    this.starPadding = 4.0,
-  });
-
-  @override
-  State<RatingBar> createState() => _RatingBarState();
-}
-
-class _RatingBarState extends State<RatingBar> {
-  late double _currentRating;
-
-  @override
-  void initState() {
-    super.initState();
-    _currentRating = widget.initialRating;
-  }
-
-  void _updateRating(Offset localPosition, bool isRTL, {bool isTap = false}) {
-    final totalWidth = widget.itemCount * widget.itemSize + (widget.itemCount - 1) * widget.starPadding;
-    double dx = localPosition.dx;
-
-    if (isRTL) dx = totalWidth - dx;
-
-    double newRating;
-
-    if (dx <= 0) {
-      newRating = 0;
-    } else if (dx >= totalWidth) {
-      newRating = widget.itemCount.toDouble();
-    } else {
-      double starWithPadding = widget.itemSize + widget.starPadding;
-      int tappedIndex = (dx / starWithPadding).floor().clamp(0, widget.itemCount - 1);
-      newRating = tappedIndex + 1.0;
-
-      if (isTap && newRating == _currentRating && _currentRating != 0) {
-        newRating = 0;
-      }
-    }
-
-    if (_currentRating != newRating) {
-      setState(() {
-        _currentRating = newRating;
-      });
-      widget.onRatingUpdate?.call(newRating.round());
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final isRTL = Directionality.of(context) == TextDirection.rtl;
-    final double visualAlignmentOffset = 5.0;
-
-    return Column(
-      mainAxisSize: MainAxisSize.min,
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        Transform.translate(
-          offset: Offset(isRTL ? visualAlignmentOffset : -visualAlignmentOffset, 0),
-          child: GestureDetector(
-            behavior: HitTestBehavior.opaque,
-            onTapDown: (details) => _updateRating(details.localPosition, isRTL, isTap: true),
-            onPanUpdate: (details) => _updateRating(details.localPosition, isRTL, isTap: false),
-            child: Row(
-              mainAxisSize: MainAxisSize.min,
-              textDirection: isRTL ? TextDirection.rtl : TextDirection.ltr,
-              children: List.generate(widget.itemCount * 2 - 1, (i) {
-                if (i.isOdd) {
-                  return SizedBox(width: widget.starPadding);
-                }
-                int index = i ~/ 2;
-                bool filled = _currentRating > index;
-                return widget.itemBuilder ??
-                    Icon(
-                      Icons.star_rounded,
-                      size: widget.itemSize,
-                      color: filled ? widget.filledColor : widget.unfilledColor,
-                    );
-              }),
-            ),
-          ),
-        ),
-        if (_currentRating > 0)
-          Padding(
-            padding: const EdgeInsets.only(top: 12.0),
-            child: GestureDetector(
-              onTap: () {
-                setState(() {
-                  _currentRating = 0;
-                });
-                widget.onClearRating?.call();
-              },
-              child: Text(
-                'rating_clear'.t(context: context),
-                style: TextStyle(color: context.themeData.colorScheme.primary),
-              ),
-            ),
-          ),
-      ],
-    );
-  }
-}

mobile/lib/presentation/widgets/bottom_sheet/map_bottom_sheet.widget.dart

@@ -14,7 +14,7 @@ class MapBottomSheet extends StatelessWidget {
   Widget build(BuildContext context) {
     return BaseBottomSheet(
       initialChildSize: 0.25,
-      maxChildSize: 0.75,
+      maxChildSize: 0.9,
       shouldCloseOnMinExtent: false,
       resizeOnScroll: false,
       actions: [],
@@ -38,13 +38,8 @@ class _ScopedMapTimeline extends StatelessWidget {
             throw Exception('User must be logged in to access archive');
           }
 
-          final users = ref.watch(mapStateProvider).withPartners
-              ? ref.watch(timelineUsersProvider).valueOrNull ?? [user.id]
-              : [user.id];
-
-          final timelineService = ref
-              .watch(timelineFactoryProvider)
-              .map(users, ref.watch(mapStateProvider).toOptions());
+          final bounds = ref.watch(mapStateProvider).bounds;
+          final timelineService = ref.watch(timelineFactoryProvider).map(user.id, bounds);
           ref.onDispose(timelineService.dispose);
           return timelineService;
         }),

mobile/lib/presentation/widgets/images/image_provider.dart

@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:async/async.dart';
 import 'package:flutter/widgets.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
@@ -51,14 +53,14 @@ mixin CancellableImageProviderMixin<T extends Object> on CancellableImageProvide
   Stream<ImageInfo> loadRequest(ImageRequest request, ImageDecoderCallback decode) async* {
     if (isCancelled) {
       this.request = null;
-      PaintingBinding.instance.imageCache.evict(this);
+      unawaited(evict());
       return;
     }
 
     try {
       final image = await request.load(decode);
       if (image == null || isCancelled) {
-        PaintingBinding.instance.imageCache.evict(this);
+        unawaited(evict());
         return;
       }
       yield image;
@@ -120,7 +122,7 @@ ImageProvider getFullImageProvider(BaseAsset asset, {Size size = const Size(1080
     } else {
       throw ArgumentError("Unsupported asset type: ${asset.runtimeType}");
     }
-    provider = RemoteFullImageProvider(assetId: assetId, thumbhash: thumbhash, assetType: asset.type);
+    provider = RemoteFullImageProvider(assetId: assetId, thumbhash: thumbhash);
   }
 
   return provider;

mobile/lib/presentation/widgets/images/local_image_provider.dart

@@ -1,3 +1,4 @@
+import 'dart:async';
 import 'dart:ui';
 
 import 'package:flutter/foundation.dart';
@@ -84,7 +85,7 @@ class LocalFullImageProvider extends CancellableImageProvider<LocalFullImageProv
     yield* initialImageStream();
 
     if (isCancelled) {
-      PaintingBinding.instance.imageCache.evict(this);
+      unawaited(evict());
       return;
     }
 
@@ -102,7 +103,7 @@ class LocalFullImageProvider extends CancellableImageProvider<LocalFullImageProv
     }
 
     if (isCancelled) {
-      PaintingBinding.instance.imageCache.evict(this);
+      unawaited(evict());
       return;
     }
 

mobile/lib/presentation/widgets/images/remote_image_provider.dart

@@ -1,17 +1,20 @@
+import 'dart:async';
+
 import 'package:flutter/foundation.dart';
 import 'package:flutter/painting.dart';
-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/setting.model.dart';
 import 'package:immich_mobile/domain/services/setting.service.dart';
 import 'package:immich_mobile/infrastructure/loaders/image_request.dart';
 import 'package:immich_mobile/presentation/widgets/images/image_provider.dart';
 import 'package:immich_mobile/presentation/widgets/images/one_frame_multi_image_stream_completer.dart';
+import 'package:immich_mobile/providers/image/cache/remote_image_cache_manager.dart';
 import 'package:immich_mobile/services/api.service.dart';
 import 'package:immich_mobile/utils/image_url_builder.dart';
 import 'package:openapi/api.dart';
 
 class RemoteThumbProvider extends CancellableImageProvider<RemoteThumbProvider>
     with CancellableImageProviderMixin<RemoteThumbProvider> {
+  static final cacheManager = RemoteThumbnailCacheManager();
   final String assetId;
   final String thumbhash;
 
@@ -38,6 +41,7 @@ class RemoteThumbProvider extends CancellableImageProvider<RemoteThumbProvider>
     final request = this.request = RemoteImageRequest(
       uri: getThumbnailUrlForRemoteId(key.assetId, thumbhash: key.thumbhash),
       headers: ApiService.getRequestHeaders(),
+      cacheManager: cacheManager,
     );
     return loadRequest(request, decode);
   }
@@ -58,11 +62,11 @@ class RemoteThumbProvider extends CancellableImageProvider<RemoteThumbProvider>
 
 class RemoteFullImageProvider extends CancellableImageProvider<RemoteFullImageProvider>
     with CancellableImageProviderMixin<RemoteFullImageProvider> {
+  static final cacheManager = RemoteThumbnailCacheManager();
   final String assetId;
   final String thumbhash;
-  final AssetType assetType;
 
-  RemoteFullImageProvider({required this.assetId, required this.thumbhash, required this.assetType});
+  RemoteFullImageProvider({required this.assetId, required this.thumbhash});
 
   @override
   Future<RemoteFullImageProvider> obtainKey(ImageConfiguration configuration) {
@@ -86,28 +90,27 @@ class RemoteFullImageProvider extends CancellableImageProvider<RemoteFullImagePr
     yield* initialImageStream();
 
     if (isCancelled) {
-      PaintingBinding.instance.imageCache.evict(this);
+      unawaited(evict());
       return;
     }
 
     final headers = ApiService.getRequestHeaders();
-    final previewRequest = request = RemoteImageRequest(
+    final request = this.request = RemoteImageRequest(
       uri: getThumbnailUrlForRemoteId(key.assetId, type: AssetMediaSize.preview, thumbhash: key.thumbhash),
       headers: headers,
+      cacheManager: cacheManager,
     );
-    yield* loadRequest(previewRequest, decode);
-
-    if (assetType != AssetType.image || !AppSetting.get(Setting.loadOriginal)) {
-      return;
-    }
+    yield* loadRequest(request, decode);
 
     if (isCancelled) {
-      PaintingBinding.instance.imageCache.evict(this);
+      unawaited(evict());
       return;
     }
 
-    final originalRequest = request = RemoteImageRequest(uri: getOriginalUrlForRemoteId(key.assetId), headers: headers);
-    yield* loadRequest(originalRequest, decode);
+    if (AppSetting.get(Setting.loadOriginal)) {
+      final request = this.request = RemoteImageRequest(uri: getOriginalUrlForRemoteId(key.assetId), headers: headers);
+      yield* loadRequest(request, decode);
+    }
   }
 
   @override

mobile/lib/presentation/widgets/images/thumbnail_tile.widget.dart

@@ -6,7 +6,6 @@ import 'package:immich_mobile/domain/models/setting.model.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/duration_extensions.dart';
 import 'package:immich_mobile/extensions/theme_extensions.dart';
-import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_viewer.state.dart';
 import 'package:immich_mobile/presentation/widgets/images/thumbnail.widget.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/constants.dart';
 import 'package:immich_mobile/providers/backup/asset_upload_progress.provider.dart';
@@ -48,7 +47,6 @@ class _ThumbnailTileState extends ConsumerState<ThumbnailTile> {
   Widget build(BuildContext context) {
     final asset = widget.asset;
     final heroIndex = widget.heroOffset ?? TabsRouterScope.of(context)?.controller.activeIndex ?? 0;
-    final isCurrentAsset = ref.watch(assetViewerProvider.select((current) => current.currentAsset == asset));
 
     final assetContainerColor = context.isDarkTheme
         ? context.primaryColor.darken(amount: 0.4)
@@ -61,10 +59,6 @@ class _ThumbnailTileState extends ConsumerState<ThumbnailTile> {
     final bool storageIndicator =
         ref.watch(settingsProvider.select((s) => s.get(Setting.showStorageIndicator))) && widget.showStorageIndicator;
 
-    if (!isCurrentAsset) {
-      _hideIndicators = false;
-    }
-
     if (isSelected) {
       _showSelectionContainer = true;
     }
@@ -102,11 +96,7 @@ class _ThumbnailTileState extends ConsumerState<ThumbnailTile> {
               children: [
                 Positioned.fill(
                   child: Hero(
-                    // This key resets the hero animation when the asset is changed in the asset viewer.
-                    // It doesn't seem like the best solution, and only works to reset the hero, not prime the hero of the new active asset for animation,
-                    // but other solutions have failed thus far.
-                    key: ValueKey(isCurrentAsset),
-                    tag: '${asset?.heroTag}_$heroIndex',
+                    tag: '${asset?.heroTag ?? ''}_$heroIndex',
                     child: Thumbnail.fromAsset(asset: asset, size: widget.size),
                     // Placeholderbuilder used to hide indicators on first hero animation, since flightShuttleBuilder isn't called until both source and destination hero exist in widget tree.
                     placeholderBuilder: (context, heroSize, child) {

mobile/lib/presentation/widgets/map/map.state.dart

@@ -1,30 +1,11 @@
-import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/domain/models/events.model.dart';
-import 'package:immich_mobile/domain/utils/event_stream.dart';
-import 'package:immich_mobile/infrastructure/repositories/timeline.repository.dart';
-import 'package:immich_mobile/providers/app_settings.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/map.provider.dart';
-import 'package:immich_mobile/providers/map/map_state.provider.dart';
-import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:maplibre_gl/maplibre_gl.dart';
 
 class MapState {
-  final ThemeMode themeMode;
   final LatLngBounds bounds;
-  final bool onlyFavorites;
-  final bool includeArchived;
-  final bool withPartners;
-  final int relativeDays;
 
-  const MapState({
-    this.themeMode = ThemeMode.system,
-    required this.bounds,
-    this.onlyFavorites = false,
-    this.includeArchived = false,
-    this.withPartners = false,
-    this.relativeDays = 0,
-  });
+  const MapState({required this.bounds});
 
   @override
   bool operator ==(covariant MapState other) {
@@ -34,31 +15,9 @@ class MapState {
   @override
   int get hashCode => bounds.hashCode;
 
-  MapState copyWith({
-    LatLngBounds? bounds,
-    ThemeMode? themeMode,
-    bool? onlyFavorites,
-    bool? includeArchived,
-    bool? withPartners,
-    int? relativeDays,
-  }) {
-    return MapState(
-      bounds: bounds ?? this.bounds,
-      themeMode: themeMode ?? this.themeMode,
-      onlyFavorites: onlyFavorites ?? this.onlyFavorites,
-      includeArchived: includeArchived ?? this.includeArchived,
-      withPartners: withPartners ?? this.withPartners,
-      relativeDays: relativeDays ?? this.relativeDays,
-    );
+  MapState copyWith({LatLngBounds? bounds}) {
+    return MapState(bounds: bounds ?? this.bounds);
   }
-
-  TimelineMapOptions toOptions() => TimelineMapOptions(
-    bounds: bounds,
-    onlyFavorites: onlyFavorites,
-    includeArchived: includeArchived,
-    withPartners: withPartners,
-    relativeDays: relativeDays,
-  );
 }
 
 class MapStateNotifier extends Notifier<MapState> {
@@ -72,50 +31,11 @@ class MapStateNotifier extends Notifier<MapState> {
     return true;
   }
 
-  void switchTheme(ThemeMode mode) {
-    // TODO: Remove this line when map theme provider is removed
-    // Until then, keep both in sync as MapThemeOverride uses map state provider
-    // ref.read(appSettingsServiceProvider).setSetting(AppSettingsEnum.mapThemeMode, mode.index);
-    ref.read(mapStateNotifierProvider.notifier).switchTheme(mode);
-    state = state.copyWith(themeMode: mode);
-  }
-
-  void switchFavoriteOnly(bool isFavoriteOnly) {
-    ref.read(appSettingsServiceProvider).setSetting(AppSettingsEnum.mapShowFavoriteOnly, isFavoriteOnly);
-    state = state.copyWith(onlyFavorites: isFavoriteOnly);
-    EventStream.shared.emit(const MapMarkerReloadEvent());
-  }
-
-  void switchIncludeArchived(bool isIncludeArchived) {
-    ref.read(appSettingsServiceProvider).setSetting(AppSettingsEnum.mapIncludeArchived, isIncludeArchived);
-    state = state.copyWith(includeArchived: isIncludeArchived);
-    EventStream.shared.emit(const MapMarkerReloadEvent());
-  }
-
-  void switchWithPartners(bool isWithPartners) {
-    ref.read(appSettingsServiceProvider).setSetting(AppSettingsEnum.mapwithPartners, isWithPartners);
-    state = state.copyWith(withPartners: isWithPartners);
-    EventStream.shared.emit(const MapMarkerReloadEvent());
-  }
-
-  void setRelativeTime(int relativeDays) {
-    ref.read(appSettingsServiceProvider).setSetting(AppSettingsEnum.mapRelativeDate, relativeDays);
-    state = state.copyWith(relativeDays: relativeDays);
-    EventStream.shared.emit(const MapMarkerReloadEvent());
-  }
-
   @override
-  MapState build() {
-    final appSettingsService = ref.read(appSettingsServiceProvider);
-    return MapState(
-      themeMode: ThemeMode.values[appSettingsService.getSetting(AppSettingsEnum.mapThemeMode)],
-      onlyFavorites: appSettingsService.getSetting(AppSettingsEnum.mapShowFavoriteOnly),
-      includeArchived: appSettingsService.getSetting(AppSettingsEnum.mapIncludeArchived),
-      withPartners: appSettingsService.getSetting(AppSettingsEnum.mapwithPartners),
-      relativeDays: appSettingsService.getSetting(AppSettingsEnum.mapRelativeDate),
-      bounds: LatLngBounds(northeast: const LatLng(0, 0), southwest: const LatLng(0, 0)),
-    );
-  }
+  MapState build() => MapState(
+    // TODO: set default bounds
+    bounds: LatLngBounds(northeast: const LatLng(0, 0), southwest: const LatLng(0, 0)),
+  );
 }
 
 // This provider watches the markers from the map service and serves the markers.

mobile/lib/presentation/widgets/map/map.widget.dart

@@ -6,8 +6,6 @@ import 'package:flutter/material.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:geolocator/geolocator.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/domain/models/events.model.dart';
-import 'package:immich_mobile/domain/utils/event_stream.dart';
 import 'package:immich_mobile/extensions/asyncvalue_extensions.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
@@ -53,19 +51,11 @@ class _DriftMapState extends ConsumerState<DriftMap> {
   final _reloadMutex = AsyncMutex();
   final _debouncer = Debouncer(interval: const Duration(milliseconds: 500), maxWaitTime: const Duration(seconds: 2));
   final ValueNotifier<double> bottomSheetOffset = ValueNotifier(0.25);
-  StreamSubscription? _eventSubscription;
-
-  @override
-  void initState() {
-    super.initState();
-    _eventSubscription = EventStream.shared.listen<MapMarkerReloadEvent>(_onEvent);
-  }
 
   @override
   void dispose() {
     _debouncer.dispose();
     bottomSheetOffset.dispose();
-    _eventSubscription?.cancel();
     super.dispose();
   }
 
@@ -73,8 +63,6 @@ class _DriftMapState extends ConsumerState<DriftMap> {
     mapController = controller;
   }
 
-  void _onEvent(_) => _debouncer.run(() => setBounds(forceReload: true));
-
   Future<void> onMapReady() async {
     final controller = mapController;
     if (controller == null) {
@@ -110,7 +98,7 @@ class _DriftMapState extends ConsumerState<DriftMap> {
       );
     }
 
-    _debouncer.run(() => setBounds(forceReload: true));
+    _debouncer.run(setBounds);
     controller.addListener(onMapMoved);
   }
 
@@ -122,7 +110,7 @@ class _DriftMapState extends ConsumerState<DriftMap> {
     _debouncer.run(setBounds);
   }
 
-  Future<void> setBounds({bool forceReload = false}) async {
+  Future<void> setBounds() async {
     final controller = mapController;
     if (controller == null || !mounted) {
       return;
@@ -139,7 +127,7 @@ class _DriftMapState extends ConsumerState<DriftMap> {
     final bounds = await controller.getVisibleRegion();
     unawaited(
       _reloadMutex.run(() async {
-        if (mounted && (ref.read(mapStateProvider.notifier).setBounds(bounds) || forceReload)) {
+        if (mounted && ref.read(mapStateProvider.notifier).setBounds(bounds)) {
           final markers = await ref.read(mapMarkerProvider(bounds).future);
           await reloadMarkers(markers);
         }
@@ -215,7 +203,7 @@ class _Map extends StatelessWidget {
           onMapCreated: onMapCreated,
           onStyleLoadedCallback: onMapReady,
           attributionButtonPosition: AttributionButtonPosition.topRight,
-          attributionButtonMargins: const Point(8, kToolbarHeight),
+          attributionButtonMargins: Platform.isIOS ? const Point(40, 12) : const Point(40, 72),
         ),
       ),
     );
@@ -256,7 +244,7 @@ class _DynamicMyLocationButton extends StatelessWidget {
       valueListenable: bottomSheetOffset,
       builder: (context, offset, child) {
         return Positioned(
-          right: 20,
+          right: 16,
           bottom: context.height * (offset - 0.02) + context.padding.bottom,
           child: AnimatedOpacity(
             opacity: offset < 0.8 ? 1 : 0,

mobile/lib/presentation/widgets/map/map_settings_sheet.dart

@@ -1,61 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/extensions/translate_extensions.dart';
-import 'package:immich_mobile/presentation/widgets/map/map.state.dart';
-import 'package:immich_mobile/widgets/map/map_settings/map_settings_list_tile.dart';
-import 'package:immich_mobile/widgets/map/map_settings/map_settings_time_dropdown.dart';
-import 'package:immich_mobile/widgets/map/map_settings/map_theme_picker.dart';
-
-class DriftMapSettingsSheet extends HookConsumerWidget {
-  const DriftMapSettingsSheet({super.key});
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final mapState = ref.watch(mapStateProvider);
-
-    return DraggableScrollableSheet(
-      expand: false,
-      initialChildSize: 0.6,
-      builder: (ctx, scrollController) => SingleChildScrollView(
-        controller: scrollController,
-        child: Card(
-          elevation: 0.0,
-          shadowColor: Colors.transparent,
-          color: Colors.transparent,
-          margin: EdgeInsets.zero,
-          child: Column(
-            mainAxisSize: MainAxisSize.max,
-            children: [
-              MapThemePicker(
-                themeMode: mapState.themeMode,
-                onThemeChange: (mode) => ref.read(mapStateProvider.notifier).switchTheme(mode),
-              ),
-              const Divider(height: 30, thickness: 1),
-              MapSettingsListTile(
-                title: "map_settings_only_show_favorites".t(context: context),
-                selected: mapState.onlyFavorites,
-                onChanged: (favoriteOnly) => ref.read(mapStateProvider.notifier).switchFavoriteOnly(favoriteOnly),
-              ),
-              MapSettingsListTile(
-                title: "map_settings_include_show_archived".t(context: context),
-                selected: mapState.includeArchived,
-                onChanged: (includeArchive) =>
-                    ref.read(mapStateProvider.notifier).switchIncludeArchived(includeArchive),
-              ),
-              MapSettingsListTile(
-                title: "map_settings_include_show_partners".t(context: context),
-                selected: mapState.withPartners,
-                onChanged: (withPartners) => ref.read(mapStateProvider.notifier).switchWithPartners(withPartners),
-              ),
-              MapTimeDropDown(
-                relativeTime: mapState.relativeDays,
-                onTimeChange: (time) => ref.read(mapStateProvider.notifier).setRelativeTime(time),
-              ),
-              const SizedBox(height: 20),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-}

mobile/lib/presentation/widgets/timeline/constants.dart

@@ -2,11 +2,9 @@ import 'dart:ui';
 
 const double kTimelineHeaderExtent = 80.0;
 const Size kTimelineFixedTileExtent = Size.square(256);
+const Size kThumbnailResolution = Size.square(320); // TODO: make the resolution vary based on actual tile size
 const double kTimelineSpacing = 2.0;
 const int kTimelineColumnCount = 3;
 
 const Duration kTimelineScrubberFadeInDuration = Duration(milliseconds: 300);
 const Duration kTimelineScrubberFadeOutDuration = Duration(milliseconds: 800);
-
-const Size kThumbnailResolution = Size.square(320); // TODO: make the resolution vary based on actual tile size
-const kThumbnailDiskCacheSize = 1024 << 20; // 1GiB

mobile/lib/providers/app_life_cycle.provider.dart

@@ -160,7 +160,7 @@ class AppLifeCycleNotifier extends StateNotifier<AppLifeCycleEnum> {
             _resumeBackup();
           }),
           _resumeBackup(),
-          _safeRun(backgroundManager.syncCloudIds(), "syncCloudIds"),
+          backgroundManager.syncCloudIds(),
         ]);
       } else {
         await _safeRun(backgroundManager.hashAssets(), "hashAssets");

mobile/lib/providers/cleanup.provider.dart

@@ -1,150 +1,65 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/providers/app_settings.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
-import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:immich_mobile/services/cleanup.service.dart';
 
 class CleanupState {
   final DateTime? selectedDate;
   final List<LocalAsset> assetsToDelete;
-  final int totalBytes;
   final bool isScanning;
   final bool isDeleting;
-  final AssetKeepType keepMediaType;
+  final AssetFilterType filterType;
   final bool keepFavorites;
-  final Set<String> keepAlbumIds;
 
   const CleanupState({
     this.selectedDate,
     this.assetsToDelete = const [],
-    this.totalBytes = 0,
     this.isScanning = false,
     this.isDeleting = false,
-    this.keepMediaType = AssetKeepType.none,
+    this.filterType = AssetFilterType.all,
     this.keepFavorites = true,
-    this.keepAlbumIds = const {},
   });
 
   CleanupState copyWith({
     DateTime? selectedDate,
     List<LocalAsset>? assetsToDelete,
-    int? totalBytes,
     bool? isScanning,
     bool? isDeleting,
-    AssetKeepType? keepMediaType,
+    AssetFilterType? filterType,
     bool? keepFavorites,
-    Set<String>? keepAlbumIds,
   }) {
     return CleanupState(
       selectedDate: selectedDate ?? this.selectedDate,
       assetsToDelete: assetsToDelete ?? this.assetsToDelete,
-      totalBytes: totalBytes ?? this.totalBytes,
       isScanning: isScanning ?? this.isScanning,
       isDeleting: isDeleting ?? this.isDeleting,
-      keepMediaType: keepMediaType ?? this.keepMediaType,
+      filterType: filterType ?? this.filterType,
       keepFavorites: keepFavorites ?? this.keepFavorites,
-      keepAlbumIds: keepAlbumIds ?? this.keepAlbumIds,
     );
   }
 }
 
 final cleanupProvider = StateNotifierProvider<CleanupNotifier, CleanupState>((ref) {
-  return CleanupNotifier(
-    ref.watch(cleanupServiceProvider),
-    ref.watch(currentUserProvider)?.id,
-    ref.watch(appSettingsServiceProvider),
-  );
+  return CleanupNotifier(ref.watch(cleanupServiceProvider), ref.watch(currentUserProvider)?.id);
 });
 
 class CleanupNotifier extends StateNotifier<CleanupState> {
   final CleanupService _cleanupService;
   final String? _userId;
-  final AppSettingsService _appSettingsService;
 
-  CleanupNotifier(this._cleanupService, this._userId, this._appSettingsService) : super(const CleanupState()) {
-    _loadPersistedSettings();
-  }
-
-  void _loadPersistedSettings() {
-    final keepFavorites = _appSettingsService.getSetting(AppSettingsEnum.cleanupKeepFavorites);
-    final keepMediaTypeIndex = _appSettingsService.getSetting(AppSettingsEnum.cleanupKeepMediaType);
-    final keepAlbumIdsString = _appSettingsService.getSetting(AppSettingsEnum.cleanupKeepAlbumIds);
-    final cutoffDaysAgo = _appSettingsService.getSetting(AppSettingsEnum.cleanupCutoffDaysAgo);
-
-    final keepMediaType = AssetKeepType.values[keepMediaTypeIndex.clamp(0, AssetKeepType.values.length - 1)];
-    final keepAlbumIds = keepAlbumIdsString.isEmpty ? <String>{} : keepAlbumIdsString.split(',').toSet();
-    final selectedDate = cutoffDaysAgo >= 0 ? DateTime.now().subtract(Duration(days: cutoffDaysAgo)) : null;
-
-    state = state.copyWith(
-      keepFavorites: keepFavorites,
-      keepMediaType: keepMediaType,
-      keepAlbumIds: keepAlbumIds,
-      selectedDate: selectedDate,
-    );
-  }
+  CleanupNotifier(this._cleanupService, this._userId) : super(const CleanupState());
 
   void setSelectedDate(DateTime? date) {
     state = state.copyWith(selectedDate: date, assetsToDelete: []);
-    if (date != null) {
-      final daysAgo = DateTime.now().difference(date).inDays;
-      _appSettingsService.setSetting(AppSettingsEnum.cleanupCutoffDaysAgo, daysAgo);
-    }
   }
 
-  void setKeepMediaType(AssetKeepType keepMediaType) {
-    state = state.copyWith(keepMediaType: keepMediaType, assetsToDelete: []);
-    _appSettingsService.setSetting(AppSettingsEnum.cleanupKeepMediaType, keepMediaType.index);
+  void setFilterType(AssetFilterType filterType) {
+    state = state.copyWith(filterType: filterType, assetsToDelete: []);
   }
 
   void setKeepFavorites(bool keepFavorites) {
     state = state.copyWith(keepFavorites: keepFavorites, assetsToDelete: []);
-    _appSettingsService.setSetting(AppSettingsEnum.cleanupKeepFavorites, keepFavorites);
-  }
-
-  void toggleKeepAlbum(String albumId) {
-    final newKeepAlbumIds = Set<String>.from(state.keepAlbumIds);
-    if (newKeepAlbumIds.contains(albumId)) {
-      newKeepAlbumIds.remove(albumId);
-    } else {
-      newKeepAlbumIds.add(albumId);
-    }
-    state = state.copyWith(keepAlbumIds: newKeepAlbumIds, assetsToDelete: []);
-    _persistExcludedAlbumIds(newKeepAlbumIds);
-  }
-
-  void setExcludedAlbumIds(Set<String> albumIds) {
-    state = state.copyWith(keepAlbumIds: albumIds, assetsToDelete: []);
-    _persistExcludedAlbumIds(albumIds);
-  }
-
-  void _persistExcludedAlbumIds(Set<String> albumIds) {
-    _appSettingsService.setSetting(AppSettingsEnum.cleanupKeepAlbumIds, albumIds.join(','));
-  }
-
-  void cleanupStaleAlbumIds(Set<String> existingAlbumIds) {
-    final staleIds = state.keepAlbumIds.difference(existingAlbumIds);
-    if (staleIds.isNotEmpty) {
-      final cleanedIds = state.keepAlbumIds.intersection(existingAlbumIds);
-      state = state.copyWith(keepAlbumIds: cleanedIds);
-      _persistExcludedAlbumIds(cleanedIds);
-    }
-  }
-
-  void applyDefaultAlbumSelections(List<(String id, String name)> albums) {
-    final isInitialized = _appSettingsService.getSetting(AppSettingsEnum.cleanupDefaultsInitialized);
-    if (isInitialized) return;
-
-    final toKeep = _cleanupService.getDefaultKeepAlbumIds(albums);
-
-    if (toKeep.isNotEmpty) {
-      final keepAlbumIds = {...state.keepAlbumIds, ...toKeep};
-      state = state.copyWith(keepAlbumIds: keepAlbumIds);
-      _persistExcludedAlbumIds(keepAlbumIds);
-    }
-
-    _appSettingsService.setSetting(AppSettingsEnum.cleanupDefaultsInitialized, true);
   }
 
   Future<void> scanAssets() async {
@@ -154,15 +69,13 @@ class CleanupNotifier extends StateNotifier<CleanupState> {
 
     state = state.copyWith(isScanning: true);
     try {
-      final result = await _cleanupService.getRemovalCandidates(
+      final assets = await _cleanupService.getRemovalCandidates(
         _userId,
         state.selectedDate!,
-        keepMediaType: state.keepMediaType,
+        filterType: state.filterType,
         keepFavorites: state.keepFavorites,
-        keepAlbumIds: state.keepAlbumIds,
       );
-
-      state = state.copyWith(assetsToDelete: result.assets, totalBytes: result.totalBytes, isScanning: false);
+      state = state.copyWith(assetsToDelete: assets, isScanning: false);
     } catch (e) {
       state = state.copyWith(isScanning: false);
       rethrow;
@@ -188,7 +101,6 @@ class CleanupNotifier extends StateNotifier<CleanupState> {
   }
 
   void reset() {
-    // Only reset transient state, keep the persisted filter settings
-    state = state.copyWith(selectedDate: null, assetsToDelete: [], isScanning: false, isDeleting: false);
+    state = const CleanupState();
   }
 }

mobile/lib/providers/image/cache/remote_image_cache_manager.dart

@@ -1,25 +1,148 @@
 import 'package:flutter_cache_manager/flutter_cache_manager.dart';
+// ignore: implementation_imports
+import 'package:flutter_cache_manager/src/cache_store.dart';
+import 'package:logging/logging.dart';
+import 'package:uuid/uuid.dart';
 
-class RemoteImageCacheManager extends CacheManager {
+abstract class RemoteCacheManager extends CacheManager {
+  static final _log = Logger('RemoteCacheManager');
+
+  RemoteCacheManager.custom(super.config, CacheStore store)
+    // Unfortunately, CacheStore is not a public API
+    // ignore: invalid_use_of_visible_for_testing_member
+    : super.custom(cacheStore: store);
+
+  Future<void> putStreamedFile(
+    String url,
+    Stream<List<int>> source, {
+    String? key,
+    String? eTag,
+    Duration maxAge = const Duration(days: 30),
+    String fileExtension = 'file',
+  });
+
+  // Unlike `putFileStream`, this method handles request cancellation,
+  // does not make a (slow) DB call checking if the file is already cached,
+  // does not synchronously check if a file exists,
+  // and deletes the file on cancellation without making these checks again.
+  Future<void> putStreamedFileToStore(
+    CacheStore store,
+    String url,
+    Stream<List<int>> source, {
+    String? key,
+    String? eTag,
+    Duration maxAge = const Duration(days: 30),
+    String fileExtension = 'file',
+  }) async {
+    final path = '${const Uuid().v1()}.$fileExtension';
+    final file = await store.fileSystem.createFile(path);
+    final sink = file.openWrite();
+    try {
+      await source.listen(sink.add, cancelOnError: true).asFuture();
+    } catch (e) {
+      try {
+        await sink.close();
+        await file.delete();
+      } catch (e) {
+        _log.severe('Failed to delete incomplete cache file: $e');
+      }
+      return;
+    }
+
+    try {
+      await sink.flush();
+      await sink.close();
+    } catch (e) {
+      try {
+        await file.delete();
+      } catch (e) {
+        _log.severe('Failed to delete incomplete cache file: $e');
+      }
+      return;
+    }
+
+    final cacheObject = CacheObject(
+      url,
+      key: key,
+      relativePath: path,
+      validTill: DateTime.now().add(maxAge),
+      eTag: eTag,
+    );
+    try {
+      await store.putFile(cacheObject);
+    } catch (e) {
+      try {
+        await file.delete();
+      } catch (e) {
+        _log.severe('Failed to delete untracked cache file: $e');
+      }
+    }
+  }
+}
+
+class RemoteImageCacheManager extends RemoteCacheManager {
   static const key = 'remoteImageCacheKey';
   static final RemoteImageCacheManager _instance = RemoteImageCacheManager._();
   static final _config = Config(key, maxNrOfCacheObjects: 500, stalePeriod: const Duration(days: 30));
+  static final _store = CacheStore(_config);
 
   factory RemoteImageCacheManager() {
     return _instance;
   }
 
-  RemoteImageCacheManager._() : super(_config);
+  RemoteImageCacheManager._() : super.custom(_config, _store);
+
+  @override
+  Future<void> putStreamedFile(
+    String url,
+    Stream<List<int>> source, {
+    String? key,
+    String? eTag,
+    Duration maxAge = const Duration(days: 30),
+    String fileExtension = 'file',
+  }) {
+    return putStreamedFileToStore(
+      _store,
+      url,
+      source,
+      key: key,
+      eTag: eTag,
+      maxAge: maxAge,
+      fileExtension: fileExtension,
+    );
+  }
 }
 
-class RemoteThumbnailCacheManager extends CacheManager {
+/// The cache manager for full size images [ImmichRemoteImageProvider]
+class RemoteThumbnailCacheManager extends RemoteCacheManager {
   static const key = 'remoteThumbnailCacheKey';
   static final RemoteThumbnailCacheManager _instance = RemoteThumbnailCacheManager._();
   static final _config = Config(key, maxNrOfCacheObjects: 5000, stalePeriod: const Duration(days: 30));
+  static final _store = CacheStore(_config);
 
   factory RemoteThumbnailCacheManager() {
     return _instance;
   }
 
-  RemoteThumbnailCacheManager._() : super(_config);
+  RemoteThumbnailCacheManager._() : super.custom(_config, _store);
+
+  @override
+  Future<void> putStreamedFile(
+    String url,
+    Stream<List<int>> source, {
+    String? key,
+    String? eTag,
+    Duration maxAge = const Duration(days: 30),
+    String fileExtension = 'file',
+  }) {
+    return putStreamedFileToStore(
+      _store,
+      url,
+      source,
+      key: key,
+      eTag: eTag,
+      maxAge: maxAge,
+      fileExtension: fileExtension,
+    );
+  }
 }

mobile/lib/providers/infrastructure/action.provider.dart

@@ -359,22 +359,6 @@ class ActionNotifier extends Notifier<void> {
     }
   }
 
-  Future<ActionResult> updateRating(ActionSource source, int rating) async {
-    final ids = _getRemoteIdsForSource(source);
-    if (ids.length != 1) {
-      _logger.warning('updateRating called with multiple assets, expected single asset');
-      return ActionResult(count: ids.length, success: false, error: 'Expected single asset for rating update');
-    }
-
-    try {
-      final isUpdated = await _service.updateRating(ids.first, rating);
-      return ActionResult(count: 1, success: isUpdated);
-    } catch (error, stack) {
-      _logger.severe('Failed to update rating for asset', error, stack);
-      return ActionResult(count: 1, success: false, error: error.toString());
-    }
-  }
-
   Future<ActionResult> stack(String userId, ActionSource source) async {
     final ids = _getOwnedRemoteIdsForSource(source);
     try {

mobile/lib/providers/infrastructure/map.provider.dart

@@ -1,9 +1,7 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/domain/services/map.service.dart';
 import 'package:immich_mobile/infrastructure/repositories/map.repository.dart';
-import 'package:immich_mobile/presentation/widgets/map/map.state.dart';
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
+import 'package:immich_mobile/domain/services/map.service.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
 
 final mapRepositoryProvider = Provider<DriftMapRepository>((ref) => DriftMapRepository(ref.watch(driftProvider)));
@@ -15,11 +13,7 @@ final mapServiceProvider = Provider<MapService>(
       throw Exception('User must be logged in to access map');
     }
 
-    final users = ref.watch(mapStateProvider).withPartners
-        ? ref.watch(timelineUsersProvider).valueOrNull ?? [user.id]
-        : [user.id];
-
-    final mapService = ref.watch(mapFactoryProvider).remote(users, ref.watch(mapStateProvider).toOptions());
+    final mapService = ref.watch(mapFactoryProvider).remote(user.id);
     return mapService;
   },
   // Empty dependencies to inform the framework that this provider

mobile/lib/providers/infrastructure/platform.provider.dart

@@ -4,8 +4,7 @@ import 'package:immich_mobile/platform/background_worker_api.g.dart';
 import 'package:immich_mobile/platform/background_worker_lock_api.g.dart';
 import 'package:immich_mobile/platform/connectivity_api.g.dart';
 import 'package:immich_mobile/platform/native_sync_api.g.dart';
-import 'package:immich_mobile/platform/local_image_api.g.dart';
-import 'package:immich_mobile/platform/remote_image_api.g.dart';
+import 'package:immich_mobile/platform/thumbnail_api.g.dart';
 
 final backgroundWorkerFgServiceProvider = Provider((_) => BackgroundWorkerFgService(BackgroundWorkerFgHostApi()));
 
@@ -17,6 +16,4 @@ final nativeSyncApiProvider = Provider<NativeSyncApi>((_) => NativeSyncApi());
 
 final connectivityApiProvider = Provider<ConnectivityApi>((_) => ConnectivityApi());
 
-final localImageApi = LocalImageApi();
-
-final remoteImageApi = RemoteImageApi();
+final thumbnailApi = ThumbnailApi();

mobile/lib/providers/infrastructure/user_metadata.provider.dart

@@ -1,22 +1,7 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/domain/models/user_metadata.model.dart';
 import 'package:immich_mobile/infrastructure/repositories/user_metadata.repository.dart';
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
-import 'package:immich_mobile/providers/user.provider.dart';
 
 final userMetadataRepository = Provider<DriftUserMetadataRepository>(
   (ref) => DriftUserMetadataRepository(ref.watch(driftProvider)),
 );
-
-final userMetadataProvider = FutureProvider<List<UserMetadata>>((ref) async {
-  final repository = ref.watch(userMetadataRepository);
-  final user = ref.watch(currentUserProvider);
-  if (user == null) return [];
-  return repository.getUserMetadata(user.id);
-});
-
-final userMetadataPreferencesProvider = FutureProvider<Preferences?>((ref) async {
-  final metadataList = await ref.watch(userMetadataProvider.future);
-  final metadataWithPrefs = metadataList.firstWhere((meta) => meta.preferences != null);
-  return metadataWithPrefs.preferences;
-});

mobile/lib/repositories/asset_api.repository.dart

@@ -80,8 +80,8 @@ class AssetApiRepository extends ApiRepository {
     return _stacksApi.deleteStacks(BulkIdsDto(ids: ids));
   }
 
-  Future<Response> downloadAsset(String id, {required bool edited}) {
-    return _api.downloadAssetWithHttpInfo(id, edited: edited);
+  Future<Response> downloadAsset(String id) {
+    return _api.downloadAssetWithHttpInfo(id);
   }
 
   _mapVisibility(AssetVisibilityEnum visibility) => switch (visibility) {
@@ -101,10 +101,6 @@ class AssetApiRepository extends ApiRepository {
   Future<void> updateDescription(String assetId, String description) {
     return _api.updateAsset(assetId, UpdateAssetDto(description: description));
   }
-
-  Future<void> updateRating(String assetId, int rating) {
-    return _api.updateAsset(assetId, UpdateAssetDto(rating: rating));
-  }
 }
 
 extension on StackResponseDto {

mobile/lib/repositories/asset_media.repository.dart

@@ -112,23 +112,17 @@ class AssetMediaRepository {
           : asset is RemoteAsset
           ? asset.localId
           : null;
-      if (localId != null && !asset.isEdited) {
+      if (localId != null) {
         File? f = await AssetEntity(id: localId, width: 1, height: 1, typeInt: 0).originFile;
         downloadedXFiles.add(XFile(f!.path));
         if (CurrentPlatform.isIOS) {
           tempFiles.add(f);
         }
-      } else {
-        final remoteId = (asset is RemoteAsset) ? asset.id : asset.remoteId;
-        if (remoteId == null) {
-          _log.warning("Asset has no remote ID for sharing: $asset");
-          continue;
-        }
-
+      } else if (asset is RemoteAsset) {
         final tempDir = await getTemporaryDirectory();
         final name = asset.name;
         final tempFile = await File('${tempDir.path}/$name').create();
-        final res = await _assetApiRepository.downloadAsset(remoteId, edited: true);
+        final res = await _assetApiRepository.downloadAsset(asset.id);
 
         if (res.statusCode != 200) {
           _log.severe("Download for $name failed", res.toLoggerString());
@@ -138,6 +132,9 @@ class AssetMediaRepository {
         await tempFile.writeAsBytes(res.bodyBytes);
         downloadedXFiles.add(XFile(tempFile.path));
         tempFiles.add(tempFile);
+      } else {
+        _log.warning("Asset type not supported for sharing: $asset");
+        continue;
       }
     }
 

mobile/lib/services/action.service.dart

@@ -214,14 +214,6 @@ class ActionService {
     return true;
   }
 
-  Future<bool> updateRating(String assetId, int rating) async {
-    // update remote first, then local to ensure consistency
-    await _assetApiRepository.updateRating(assetId, rating);
-    await _remoteAssetRepository.updateRating(assetId, rating);
-
-    return true;
-  }
-
   Future<void> stack(String userId, List<String> remoteIds) async {
     final stack = await _assetApiRepository.stack(remoteIds);
     await _remoteAssetRepository.stack(userId, stack);

mobile/lib/services/app_settings.service.dart

@@ -54,12 +54,7 @@ enum AppSettingsEnum<T> {
   readonlyModeEnabled<bool>(StoreKey.readonlyModeEnabled, "readonlyModeEnabled", false),
   albumGridView<bool>(StoreKey.albumGridView, "albumGridView", false),
   backupRequireCharging<bool>(StoreKey.backupRequireCharging, null, false),
-  backupTriggerDelay<int>(StoreKey.backupTriggerDelay, null, 30),
-  cleanupKeepFavorites<bool>(StoreKey.cleanupKeepFavorites, null, true),
-  cleanupKeepMediaType<int>(StoreKey.cleanupKeepMediaType, null, 0),
-  cleanupKeepAlbumIds<String>(StoreKey.cleanupKeepAlbumIds, null, ""),
-  cleanupCutoffDaysAgo<int>(StoreKey.cleanupCutoffDaysAgo, null, -1),
-  cleanupDefaultsInitialized<bool>(StoreKey.cleanupDefaultsInitialized, null, false);
+  backupTriggerDelay<int>(StoreKey.backupTriggerDelay, null, 30);
 
   const AppSettingsEnum(this.storeKey, this.hiveKey, this.defaultValue);
 

mobile/lib/services/background_upload.service.dart

@@ -285,12 +285,7 @@ class BackgroundUploadService {
       return null;
     }
 
-    String fileName = await _assetMediaRepository.getOriginalFilename(asset.id) ?? asset.name;
-    final hasExtension = p.extension(fileName).isNotEmpty;
-    if (!hasExtension) {
-      fileName = p.setExtension(fileName, p.extension(asset.name));
-    }
-
+    final fileName = await _assetMediaRepository.getOriginalFilename(asset.id) ?? asset.name;
     final originalFileName = entity.isLivePhoto ? p.setExtension(fileName, p.extension(file.path)) : fileName;
 
     String metadata = UploadTaskMetadata(
@@ -312,10 +307,10 @@ class BackgroundUploadService {
       priority: priority,
       isFavorite: asset.isFavorite,
       requiresWiFi: requiresWiFi,
-      cloudId: entity.isLivePhoto ? null : asset.cloudId,
-      adjustmentTime: entity.isLivePhoto ? null : asset.adjustmentTime?.toIso8601String(),
-      latitude: entity.isLivePhoto ? null : asset.latitude?.toString(),
-      longitude: entity.isLivePhoto ? null : asset.longitude?.toString(),
+      cloudId: asset.cloudId,
+      adjustmentTime: asset.adjustmentTime?.toIso8601String(),
+      latitude: asset.latitude?.toString(),
+      longitude: asset.longitude?.toString(),
     );
   }