chore: test cases for file extension naming

The livephoto case can also happen with other files; for example, we
receive a DNG file as JPEG but then still call it .dng

Fixes #29805, partially addresses #28602

.devcontainer/devcontainer.json

@@ -83,7 +83,7 @@
     }
   },
   "features": {
-    "ghcr.io/devcontainers/features/docker-in-docker:4": {
+    "ghcr.io/devcontainers/features/docker-in-docker:2": {
       // https://github.com/devcontainers/features/issues/1466
       "moby": false
     }

.github/workflows/auto-close.yml

@@ -15,7 +15,7 @@ jobs:
     outputs:
       uses_template: ${{ steps.check.outputs.uses_template }}
     steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           sparse-checkout: .github/pull_request_template.md
           sparse-checkout-cone-mode: false

.github/workflows/build-mobile.yml

@@ -87,7 +87,7 @@ jobs:
           permission-contents: read
           permission-pull-requests: write
 
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           ref: ${{ inputs.ref }}
           persist-credentials: false
@@ -106,14 +106,14 @@ jobs:
         working-directory: ./mobile
         run: printf "%s" $KEY_JKS | base64 -d > android/key.jks
 
-      - uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5.6.0
+      - uses: actions/setup-java@0f481fcb613427c0f801b606911222b5b6f3083a # v5.5.0
         with:
           distribution: 'zulu'
           java-version: '17'
 
       - name: Restore Gradle Cache
         id: cache-gradle-restore
-        uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
+        uses: actions/cache/restore@caa296126883cff596d87d8935842f9db880ef25 # v5.1.0
         with:
           path: |
             ~/.gradle/caches
@@ -184,7 +184,7 @@ jobs:
 
       - name: Save Gradle Cache
         id: cache-gradle-save
-        uses: actions/cache/save@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
+        uses: actions/cache/save@caa296126883cff596d87d8935842f9db880ef25 # v5.1.0
         if: github.ref == 'refs/heads/main'
         with:
           path: |
@@ -201,7 +201,7 @@ jobs:
       contents: read
     # Run on main branch or workflow_dispatch, or on PRs/other branches (build only, no upload)
     if: ${{ !github.event.pull_request.head.repo.fork && fromJSON(needs.pre-job.outputs.should_run).mobile == true }}
-    runs-on: macos-26
+    runs-on: macos-15
 
     steps:
       - id: token
@@ -215,7 +215,7 @@ jobs:
         run: sudo xcode-select -s /Applications/Xcode_26.2.app/Contents/Developer
 
       - name: Checkout code
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           ref: ${{ inputs.ref || github.sha }}
           persist-credentials: false
@@ -241,7 +241,7 @@ jobs:
         run: flutter build ios --config-only --no-codesign
 
       - name: Setup Ruby
-        uses: ruby/setup-ruby@003a5c4d8d6321bd302e38f6f0ec593f77f06600 # v1.319.0
+        uses: ruby/setup-ruby@d45b1a4e94b71acab930e56e79c6aa188764e7f9 # v1.316.0
         with:
           ruby-version: '3.3'
           bundler-cache: true

.github/workflows/cache-cleanup.yml

@@ -27,7 +27,7 @@ jobs:
           permission-actions: write
 
       - name: Check out code
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           persist-credentials: false
           token: ${{ steps.token.outputs.token }}

.github/workflows/check-openapi.yml

@@ -20,12 +20,12 @@ jobs:
       contents: read
     steps:
       - name: Checkout
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           persist-credentials: false
 
       - name: Check for breaking API changes
-        uses: oasdiff/oasdiff-action/breaking@024f6c399f9a21ada1addb0f9a36ce1bfac995f1 # v0.1.6
+        uses: oasdiff/oasdiff-action/breaking@291b6594ce617f22f49af5898ee038ed0b46e8fe # v0.1.5
         with:
           base: https://raw.githubusercontent.com/${{ github.repository }}/main/open-api/immich-openapi-specs.json
           revision: open-api/immich-openapi-specs.json
@@ -38,7 +38,7 @@ jobs:
       contents: read
     steps:
       - name: Checkout
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           persist-credentials: false
 

.github/workflows/cli.yml

@@ -38,7 +38,7 @@ jobs:
           permission-contents: read
 
       - name: Checkout code
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           persist-credentials: false
           token: ${{ steps.token.outputs.token }}
@@ -71,7 +71,7 @@ jobs:
           permission-contents: read
 
       - name: Checkout
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           persist-credentials: false
           token: ${{ steps.token.outputs.token }}

.github/workflows/close-duplicates.yml

@@ -39,7 +39,7 @@ jobs:
     needs: [get_body, should_run]
     if: ${{ needs.should_run.outputs.should_run == 'true' }}
     container:
-      image: ghcr.io/immich-app/mdq:main@sha256:d603f5618c1fc9f2b4d506ffed54ba6bcfec83d56b893b5fa8b3f899a402fa0a
+      image: ghcr.io/immich-app/mdq:main@sha256:e3fe456f346b02c2f479462100763aee3ba8245768dfeac3c4262acb068e5c62
     outputs:
       checked: ${{ steps.get_checkbox.outputs.checked }}
     steps:

.github/workflows/codeql-analysis.yml

@@ -51,14 +51,14 @@ jobs:
           permission-contents: read
 
       - name: Checkout repository
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           persist-credentials: false
           token: ${{ steps.token.outputs.token }}
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@7188fc363630916deb702c7fdcf4e481b751f97a # v4.37.1
+        uses: github/codeql-action/init@99df26d4f13ea111d4ec1a7dddef6063f76b97e9 # v4.37.0
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -71,7 +71,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@7188fc363630916deb702c7fdcf4e481b751f97a # v4.37.1
+        uses: github/codeql-action/autobuild@99df26d4f13ea111d4ec1a7dddef6063f76b97e9 # v4.37.0
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -84,6 +84,6 @@ jobs:
       #   ./location_of_script_within_repo/buildscript.sh
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@7188fc363630916deb702c7fdcf4e481b751f97a # v4.37.1
+        uses: github/codeql-action/analyze@99df26d4f13ea111d4ec1a7dddef6063f76b97e9 # v4.37.0
         with:
           category: '/language:${{matrix.language}}'

.github/workflows/docs-build.yml

@@ -62,7 +62,7 @@ jobs:
           permission-contents: read
 
       - name: Checkout code
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           persist-credentials: false
           token: ${{ steps.token.outputs.token }}

.github/workflows/docs-deploy.yml

@@ -137,7 +137,7 @@ jobs:
           permission-pull-requests: write
 
       - name: Checkout code
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           persist-credentials: false
           token: ${{ steps.token.outputs.token }}

.github/workflows/docs-destroy.yml

@@ -25,7 +25,7 @@ jobs:
           permission-pull-requests: write
 
       - name: Checkout code
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           persist-credentials: false
           token: ${{ steps.token.outputs.token }}

.github/workflows/fdroid.yml

@@ -14,7 +14,7 @@ jobs:
       contents: read
     steps:
       - name: Checkout pubspec for versionCode
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           ref: ${{ github.event.release.tag_name }}
           persist-credentials: false

.github/workflows/fix-format.yml

@@ -23,7 +23,7 @@ jobs:
           permission-pull-requests: write
 
       - name: Checkout code
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           ref: ${{ github.event.pull_request.head.ref }}
           persist-credentials: true

.github/workflows/prepare-release.yml

@@ -61,7 +61,7 @@ jobs:
           permission-contents: write
 
       - name: Checkout code
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           token: ${{ steps.token.outputs.token }}
           persist-credentials: true
@@ -140,7 +140,7 @@ jobs:
           permission-actions: read
 
       - name: Checkout
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           token: ${{ steps.generate-token.outputs.token }}
           persist-credentials: false
@@ -152,7 +152,7 @@ jobs:
           github-token: ${{ steps.generate-token.outputs.token }}
 
       - name: Create draft release
-        uses: softprops/action-gh-release@3d0d9888cb7fd7b750713d6e236d1fcb99157228 # v3.0.2
+        uses: softprops/action-gh-release@718ea10b132b3b2eba29c1007bb80653f286566b # v3.0.1
         with:
           draft: true
           prerelease: ${{ needs.bump_version.outputs.rc }}

.github/workflows/sdk.yml

@@ -23,7 +23,7 @@ jobs:
           permission-contents: read
 
       - name: Checkout code
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           persist-credentials: false
           token: ${{ steps.token.outputs.token }}

.github/workflows/static_analysis.yml

@@ -58,7 +58,7 @@ jobs:
           permission-contents: read
 
       - name: Checkout code
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           persist-credentials: false
           token: ${{ steps.token.outputs.token }}

.github/workflows/test.yml

@@ -85,7 +85,7 @@ jobs:
           permission-contents: read
 
       - name: Checkout code
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           persist-credentials: false
           token: ${{ steps.token.outputs.token }}
@@ -114,7 +114,7 @@ jobs:
           permission-contents: read
 
       - name: Checkout code
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           persist-credentials: false
           token: ${{ steps.token.outputs.token }}
@@ -146,7 +146,7 @@ jobs:
           permission-contents: read
 
       - name: Checkout code
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           persist-credentials: false
           token: ${{ steps.token.outputs.token }}
@@ -178,7 +178,7 @@ jobs:
           permission-contents: read
 
       - name: Checkout code
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           persist-credentials: false
           token: ${{ steps.token.outputs.token }}
@@ -223,7 +223,7 @@ jobs:
           permission-contents: read
 
       - name: Checkout code
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           persist-credentials: false
           token: ${{ steps.token.outputs.token }}
@@ -262,7 +262,7 @@ jobs:
           permission-contents: read
 
       - name: Checkout code
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           persist-credentials: false
           token: ${{ steps.token.outputs.token }}
@@ -291,7 +291,7 @@ jobs:
           permission-contents: read
 
       - name: Checkout code
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           persist-credentials: false
           token: ${{ steps.token.outputs.token }}
@@ -342,7 +342,7 @@ jobs:
           permission-contents: read
 
       - name: Checkout code
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           persist-credentials: false
           token: ${{ steps.token.outputs.token }}
@@ -375,7 +375,7 @@ jobs:
           permission-contents: read
 
       - name: Checkout code
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           persist-credentials: false
           submodules: 'recursive'
@@ -412,7 +412,7 @@ jobs:
           permission-contents: read
 
       - name: Checkout code
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           persist-credentials: false
           submodules: 'recursive'
@@ -422,7 +422,7 @@ jobs:
         uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
 
       - name: Setup Node
-        uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
           node-version-file: '.nvmrc'
           cache: 'pnpm'
@@ -490,7 +490,7 @@ jobs:
           permission-contents: read
 
       - name: Checkout code
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           persist-credentials: false
           submodules: 'recursive'
@@ -500,7 +500,7 @@ jobs:
         uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
 
       - name: Setup Node
-        uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
           node-version-file: '.nvmrc'
           cache: 'pnpm'
@@ -598,7 +598,7 @@ jobs:
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
           permission-contents: read
 
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           persist-credentials: false
           token: ${{ steps.token.outputs.token }}
@@ -637,7 +637,7 @@ jobs:
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
           permission-contents: read
 
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           persist-credentials: false
           token: ${{ steps.token.outputs.token }}
@@ -669,7 +669,7 @@ jobs:
           permission-contents: read
 
       - name: Checkout code
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           persist-credentials: false
           token: ${{ steps.token.outputs.token }}
@@ -699,7 +699,7 @@ jobs:
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
           permission-contents: read
 
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           persist-credentials: false
           token: ${{ steps.token.outputs.token }}
@@ -722,7 +722,7 @@ jobs:
           permission-contents: read
 
       - name: Checkout code
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           persist-credentials: false
           token: ${{ steps.token.outputs.token }}
@@ -733,7 +733,7 @@ jobs:
           github_token: ${{ steps.token.outputs.token }}
 
       - name: Install server dependencies
-        run: pnpm --filter immich install --frozen-lockfile
+        run: SHARP_IGNORE_GLOBAL_LIBVIPS=true pnpm --filter immich install --frozen-lockfile
       - name: Run API generation
         run: mise //:open-api
         working-directory: open-api
@@ -781,7 +781,7 @@ jobs:
           permission-contents: read
 
       - name: Checkout code
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           persist-credentials: false
           token: ${{ steps.token.outputs.token }}
@@ -792,7 +792,7 @@ jobs:
           github_token: ${{ steps.token.outputs.token }}
 
       - name: Install server dependencies
-        run: pnpm install --frozen-lockfile
+        run: SHARP_IGNORE_GLOBAL_LIBVIPS=true pnpm install --frozen-lockfile
 
       - name: Build plugins
         run: mise //:plugins

docker/docker-compose.dev.yml

@@ -154,7 +154,7 @@ services:
 
   redis:
     container_name: immich_redis
-    image: docker.io/valkey/valkey:9@sha256:8e8d64b405ce18f41b8e5ee20aa4687a8ed0022d1298f2ce31cdcf3a76e09411
+    image: docker.io/valkey/valkey:9@sha256:4963247afc4cd33c7d3b2d2816b9f7f8eeebab148d29056c2ca4d7cbc966f2d9
     healthcheck:
       test: redis-cli ping || exit 1
 

docker/docker-compose.prod.yml

@@ -56,7 +56,7 @@ services:
 
   redis:
     container_name: immich_redis
-    image: docker.io/valkey/valkey:9@sha256:8e8d64b405ce18f41b8e5ee20aa4687a8ed0022d1298f2ce31cdcf3a76e09411
+    image: docker.io/valkey/valkey:9@sha256:4963247afc4cd33c7d3b2d2816b9f7f8eeebab148d29056c2ca4d7cbc966f2d9
     healthcheck:
       test: redis-cli ping || exit 1
     restart: always

docker/docker-compose.rootless.yml

@@ -61,7 +61,7 @@ services:
 
   redis:
     container_name: immich_redis
-    image: docker.io/valkey/valkey:9@sha256:8e8d64b405ce18f41b8e5ee20aa4687a8ed0022d1298f2ce31cdcf3a76e09411
+    image: docker.io/valkey/valkey:9@sha256:4963247afc4cd33c7d3b2d2816b9f7f8eeebab148d29056c2ca4d7cbc966f2d9
     user: '1000:1000'
     security_opt:
       - no-new-privileges:true

docker/docker-compose.yml

@@ -49,7 +49,7 @@ services:
 
   redis:
     container_name: immich_redis
-    image: docker.io/valkey/valkey:9@sha256:8e8d64b405ce18f41b8e5ee20aa4687a8ed0022d1298f2ce31cdcf3a76e09411
+    image: docker.io/valkey/valkey:9@sha256:4963247afc4cd33c7d3b2d2816b9f7f8eeebab148d29056c2ca4d7cbc966f2d9
     healthcheck:
       test: redis-cli ping || exit 1
     restart: always

docs/mise.toml

@@ -28,4 +28,4 @@ run = "prettier --write ."
 run = "wrangler pages deploy build --project-name=${PROJECT_NAME} --branch=${BRANCH_NAME}"
 
 [tools]
-wrangler = "4.111.0"
+wrangler = "4.110.0"

docs/package.json

@@ -40,8 +40,7 @@
     "@docusaurus/tsconfig": "^3.10.0",
     "@docusaurus/types": "^3.10.0",
     "prettier": "^3.7.4",
-    "@typescript/native": "npm:typescript@^7.0.2",
-    "typescript": "npm:@typescript/typescript6@^6.0.2"
+    "typescript": "^6.0.0"
   },
   "browserslist": {
     "production": [

e2e/docker-compose.yml

@@ -45,7 +45,7 @@ services:
 
   redis:
     container_name: immich-e2e-redis
-    image: docker.io/valkey/valkey:9@sha256:8e8d64b405ce18f41b8e5ee20aa4687a8ed0022d1298f2ce31cdcf3a76e09411
+    image: docker.io/valkey/valkey:9@sha256:4963247afc4cd33c7d3b2d2816b9f7f8eeebab148d29056c2ca4d7cbc966f2d9
     healthcheck:
       test: redis-cli ping || exit 1
 

e2e/eslint.config.mjs

@@ -49,7 +49,6 @@ export default typescriptEslint.config([
       'unicorn/isolated-functions': 'off',
       'unicorn/prefer-promise-with-resolvers': 'off',
       'unicorn/no-declarations-before-early-exit': 'off',
-      'unicorn/prefer-simple-condition-first': 'off',
       curly: 2,
       'prettier/prettier': 0,
       'unicorn/name-replacements': 'off',

e2e/package.json

@@ -40,7 +40,7 @@
     "eslint": "^10.0.0",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-prettier": "^5.1.3",
-    "eslint-plugin-unicorn": "^72.0.0",
+    "eslint-plugin-unicorn": "^70.0.0",
     "exiftool-vendored": "^35.0.0",
     "globals": "^17.0.0",
     "luxon": "^3.4.4",
@@ -48,11 +48,10 @@
     "pngjs": "^7.0.0",
     "prettier": "^3.7.4",
     "prettier-plugin-organize-imports": "^4.0.0",
-    "sharp": "^0.35.2",
+    "sharp": "^0.34.5",
     "socket.io-client": "^4.7.4",
     "supertest": "^7.0.0",
-    "@typescript/native": "npm:typescript@^7.0.2",
-    "typescript": "npm:@typescript/typescript6@^6.0.2",
+    "typescript": "^6.0.0",
     "typescript-eslint": "^8.28.0",
     "utimes": "^5.2.1",
     "vitest": "^4.0.0"

e2e/src/ui/specs/asset-viewer/asset-viewer.e2e-spec.ts

@@ -38,7 +38,7 @@ test.describe('asset-viewer', () => {
       assets.push(...timeBucket);
     }
     for (const yearMonth of timelineRestData.buckets.keys()) {
-      const [year, month] = yearMonth.split('-', 2);
+      const [year, month] = yearMonth.split('-');
       yearMonths.push(`${year}-${Number(month)}`);
     }
   });

e2e/src/ui/specs/timeline/timeline.e2e-spec.ts

@@ -49,7 +49,7 @@ test.describe('Timeline', () => {
       assets.push(...timeBucket);
     }
     for (const yearMonth of timelineRestData.buckets.keys()) {
-      const [year, month] = yearMonth.split('-', 2);
+      const [year, month] = yearMonth.split('-');
       yearMonths.push(`${year}-${Number(month)}`);
     }
   });

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

@@ -7,7 +7,7 @@ export const sleep = (ms: number) => {
 };
 
 export const padYearMonth = (yearMonth: string) => {
-  const [year, month] = yearMonth.split('-', 2);
+  const [year, month] = yearMonth.split('-');
   return `${year}-${month.padStart(2, '0')}`;
 };
 

mise.lock

@@ -287,43 +287,43 @@ url = "https://github.com/opentofu/opentofu/releases/download/v1.11.6/tofu_1.11.
 url_api = "https://api.github.com/repos/opentofu/opentofu/releases/assets/391536406"
 
 [[tools.pnpm]]
-version = "11.13.1"
+version = "11.11.0"
 backend = "aqua:pnpm/pnpm"
 
 [tools.pnpm."platforms.linux-arm64"]
-checksum = "sha256:b52db99d215ed7dc9563aed815953c62a6c1ffd7cd75803d3a07ad7e4f246aed"
-url = "https://github.com/pnpm/pnpm/releases/download/v11.13.1/pnpm-linux-arm64.tar.gz"
-url_api = "https://api.github.com/repos/pnpm/pnpm/releases/assets/478563983"
+checksum = "sha256:4871093439f036b3082df6102255ac119f3b6f4f50c51c5711fc7c358b8b22d7"
+url = "https://github.com/pnpm/pnpm/releases/download/v11.11.0/pnpm-linux-arm64.tar.gz"
+url_api = "https://api.github.com/repos/pnpm/pnpm/releases/assets/471734816"
 provenance = "github-attestations"
 
 [tools.pnpm."platforms.linux-arm64-musl"]
-checksum = "sha256:2cadd4fc815c591f498a0a84c9e74a836e3e8c1236275f6e1cfd355bae6ae957"
-url = "https://github.com/pnpm/pnpm/releases/download/v11.13.1/pnpm-linux-arm64-musl.tar.gz"
-url_api = "https://api.github.com/repos/pnpm/pnpm/releases/assets/478563985"
+checksum = "sha256:f97316cee0deb3ae3fd64e8a09e1c8c88a76da33373a2b465bd6a4c3e85e0690"
+url = "https://github.com/pnpm/pnpm/releases/download/v11.11.0/pnpm-linux-arm64-musl.tar.gz"
+url_api = "https://api.github.com/repos/pnpm/pnpm/releases/assets/471734819"
 provenance = "github-attestations"
 
 [tools.pnpm."platforms.linux-x64"]
-checksum = "sha256:bd6d4b0e14536207ad76bc838f5980cecd968da15f69aae0b207380cca3f2e98"
-url = "https://github.com/pnpm/pnpm/releases/download/v11.13.1/pnpm-linux-x64.tar.gz"
-url_api = "https://api.github.com/repos/pnpm/pnpm/releases/assets/478563986"
+checksum = "sha256:df4699e897012ab14df2cc6eaa942910e830eb7fcaa420a2a1421a9461fd9108"
+url = "https://github.com/pnpm/pnpm/releases/download/v11.11.0/pnpm-linux-x64.tar.gz"
+url_api = "https://api.github.com/repos/pnpm/pnpm/releases/assets/471734818"
 provenance = "github-attestations"
 
 [tools.pnpm."platforms.linux-x64-musl"]
-checksum = "sha256:ba19690f4ed1b64f1203ade14e9216352b46232d5582468b26a0160e0c9618c5"
-url = "https://github.com/pnpm/pnpm/releases/download/v11.13.1/pnpm-linux-x64-musl.tar.gz"
-url_api = "https://api.github.com/repos/pnpm/pnpm/releases/assets/478563980"
+checksum = "sha256:aad186f8a8ae72d827d5efe63e99e801456715fb7f2798949405fa33f20260db"
+url = "https://github.com/pnpm/pnpm/releases/download/v11.11.0/pnpm-linux-x64-musl.tar.gz"
+url_api = "https://api.github.com/repos/pnpm/pnpm/releases/assets/471734821"
 provenance = "github-attestations"
 
 [tools.pnpm."platforms.macos-arm64"]
-checksum = "sha256:765c2bf04e8129cb58c0f946e324262e418370b35a203b50b1f06a0567ef8bc1"
-url = "https://github.com/pnpm/pnpm/releases/download/v11.13.1/pnpm-darwin-arm64.tar.gz"
-url_api = "https://api.github.com/repos/pnpm/pnpm/releases/assets/478563984"
+checksum = "sha256:ad46ad16c2376c2b78354ac488c1b166e076aa59bfcbcfd567d55957d755a690"
+url = "https://github.com/pnpm/pnpm/releases/download/v11.11.0/pnpm-darwin-arm64.tar.gz"
+url_api = "https://api.github.com/repos/pnpm/pnpm/releases/assets/471734814"
 provenance = "github-attestations"
 
 [tools.pnpm."platforms.windows-x64"]
-checksum = "sha256:d8bebbc71df2702961c1d34a5e61196bc0aa3bbde33c33253f6afa3dd4546a6d"
-url = "https://github.com/pnpm/pnpm/releases/download/v11.13.1/pnpm-win32-x64.zip"
-url_api = "https://api.github.com/repos/pnpm/pnpm/releases/assets/478563981"
+checksum = "sha256:13ad8a9b139c4c829fea33462cf04d061d72f0926b2b76a92ac03c9a36e405f9"
+url = "https://github.com/pnpm/pnpm/releases/download/v11.11.0/pnpm-win32-x64.zip"
+url_api = "https://api.github.com/repos/pnpm/pnpm/releases/assets/471734820"
 provenance = "github-attestations"
 
 [[tools.terragrunt]]

mise.toml

@@ -16,7 +16,7 @@ config_roots = [
 
 [tools]
 node = "24.15.0"
-pnpm = "11.13.1"
+pnpm = "11.11.0"
 terragrunt = "1.0.3"
 opentofu = "1.11.6"
 "npm:oazapfts" = "7.5.0"
@@ -65,6 +65,7 @@ dir = "open-api"
 run = "bash ./bin/generate-dart-sdk.sh"
 
 [tasks.open-api]
+env = { SHARP_IGNORE_GLOBAL_LIBVIPS = true }
 run = [
   { task = "//:plugins" },
   { task = "//server:install" },

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

@@ -23,6 +23,6 @@ class ImmichApp : Application() {
       // as the previous start might have been killed without unlocking.
       if (BackgroundEngineLock.connectEngines > 0) return@postDelayed
       BackgroundWorkerApiImpl.enqueueBackgroundWorker(this)
-    }, 15000)
+    }, 5000)
   }
 }

mobile/android/app/src/main/kotlin/app/alextran/immich/background/BackgroundWorker.kt

@@ -15,7 +15,6 @@ import androidx.work.ListenableWorker
 import androidx.work.WorkerParameters
 import app.alextran.immich.MainActivity
 import app.alextran.immich.R
-import com.google.common.util.concurrent.Futures
 import com.google.common.util.concurrent.ListenableFuture
 import com.google.common.util.concurrent.SettableFuture
 import io.flutter.FlutterInjector
@@ -62,11 +61,6 @@ class BackgroundWorker(context: Context, params: WorkerParameters) :
   }
 
   override fun startWork(): ListenableFuture<Result> {
-    if (BackgroundWorkerPreferences(ctx).isLocked() && BackgroundEngineLock.connectEngines > 0) {
-      Log.i(TAG, "Foreground engine active, skipping background worker")
-      return Futures.immediateFuture(Result.success())
-    }
-
     Log.i(TAG, "Starting background upload worker")
 
     if (!loader.initialized()) {
@@ -83,10 +77,6 @@ class BackgroundWorker(context: Context, params: WorkerParameters) :
     showNotification(notificationConfig.first, notificationConfig.second)
 
     loader.ensureInitializationCompleteAsync(ctx, null, Handler(Looper.getMainLooper())) {
-      if (isStopped || isComplete) {
-        return@ensureInitializationCompleteAsync
-      }
-
       engine = FlutterEngine(ctx)
       FlutterEngineCache.getInstance().put(BackgroundWorkerApiImpl.ENGINE_CACHE_KEY, engine!!)
 
@@ -153,17 +143,11 @@ class BackgroundWorker(context: Context, params: WorkerParameters) :
       return
     }
 
-    val api = flutterApi
-    if (api == null) {
-      Handler(Looper.getMainLooper()).postAtFrontOfQueue {
-        complete(Result.failure())
-      }
-      return
-    }
-
     Handler(Looper.getMainLooper()).postAtFrontOfQueue {
-      api.cancel {
-        complete(Result.failure())
+      if (flutterApi != null) {
+        flutterApi?.cancel {
+          complete(Result.failure())
+        }
       }
     }
 

mobile/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -32,8 +32,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/maplibre/maplibre-gl-native-distribution.git",
       "state" : {
-        "revision" : "84a79bc375a301169390ac110c868f06c857b83f",
-        "version" : "6.27.0"
+        "revision" : "60d9bb85c94ce6e7fc4406cd32529fd12bdb7809",
+        "version" : "6.14.0"
       }
     },
     {

mobile/ios/Runner/Connectivity/ConnectivityApiImpl.swift

@@ -43,16 +43,15 @@ class ConnectivityApiImpl: ConnectivityApi {
       capabilities.append(.vpn)
     }
     
-    // Determine if connection is unmetered from the OS metered flags rather than
-    // the interface type, so wired ethernet (iPhone USB adapters, Apple Silicon
-    // Macs) is treated as unmetered like Wi-Fi:
-    // - Not on cellular
-    // - Not expensive (also rules out cellular and personal hotspot)
-    // - Not constrained (Low Data Mode)
-    // Note: VPN over cellular stays metered because the path is still expensive.
+    // Determine if connection is unmetered:
+    // - Must be on WiFi (not cellular)
+    // - Must not be expensive (rules out personal hotspot)
+    // - Must not be constrained (Low Data Mode)
+    // Note: VPN over cellular should still be considered metered
     let isOnCellular = path.usesInterfaceType(.cellular)
-
-    if !isOnCellular && !path.isExpensive && !path.isConstrained {
+    let isOnWifi = path.usesInterfaceType(.wifi)
+    
+    if isOnWifi && !isOnCellular && !path.isExpensive && !path.isConstrained {
       capabilities.append(.unmetered)
     }
     

mobile/ios/WidgetExtension/ImmichAPI.swift

@@ -203,10 +203,7 @@ class ImmichAPI {
 
   func fetchMemory(for date: Date) async throws -> [MemoryResult] {
     // get URL
-    let localDay = date.formatted(
-      Date.ISO8601FormatStyle(timeZone: .current).year().month().day().dateSeparator(.dash)
-    )
-    let memoryParams = [URLQueryItem(name: "for", value: localDay)]
+    let memoryParams = [URLQueryItem(name: "for", value: date.ISO8601Format())]
     guard
       let searchURL = buildRequestURL(
         serverConfig: serverConfig,

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

@@ -24,12 +24,6 @@ class ViewerReloadAssetEvent extends Event {
   const ViewerReloadAssetEvent();
 }
 
-class ViewerStackAssetDeletedEvent extends Event {
-  final int stackIndex;
-
-  const ViewerStackAssetDeletedEvent({required this.stackIndex});
-}
-
 // Multi-Select Events
 class MultiSelectToggleEvent extends Event {
   final bool isEnabled;

mobile/lib/domain/models/settings_key.dart

@@ -1,16 +1,17 @@
+import 'dart:convert';
+
 import 'package:flutter/material.dart';
 import 'package:immich_mobile/constants/colors.dart';
 import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/log.model.dart';
 import 'package:immich_mobile/domain/models/timeline.model.dart';
-import 'package:immich_mobile/domain/models/value_codec.dart';
 import 'package:immich_mobile/providers/album/album_sort_by_options.provider.dart';
 import 'package:immich_mobile/utils/semver.dart';
 
 enum SettingsKey<T> {
   // Theme
-  themePrimaryColor<ImmichColorPreset>(codec: EnumCodec(ImmichColorPreset.values)),
-  themeMode<ThemeMode>(codec: EnumCodec(ThemeMode.values)),
+  themePrimaryColor<ImmichColorPreset>(codec: _EnumCodec(ImmichColorPreset.values)),
+  themeMode<ThemeMode>(codec: _EnumCodec(ThemeMode.values)),
   themeDynamic<bool>(),
   themeColorfulInterface<bool>(),
 
@@ -26,13 +27,13 @@ enum SettingsKey<T> {
 
   // Network
   networkAutoEndpointSwitching<bool>(),
-  networkExternalEndpointList<List<String>>(codec: ListCodec(PrimitiveCodec.string)),
-  networkCustomHeaders<Map<String, String>>(codec: MapCodec(PrimitiveCodec.string, PrimitiveCodec.string)),
   networkPreferredWifiName<String?>(),
   networkLocalEndpoint<String?>(),
+  networkExternalEndpointList<List<String>>(codec: _ListCodec(_PrimitiveCodec.string)),
+  networkCustomHeaders<Map<String, String>>(codec: _MapCodec(_PrimitiveCodec.string, _PrimitiveCodec.string)),
 
   // Album
-  albumSortMode<AlbumSortMode>(codec: EnumCodec(AlbumSortMode.values)),
+  albumSortMode<AlbumSortMode>(codec: _EnumCodec(AlbumSortMode.values)),
   albumIsReverse<bool>(),
   albumIsGrid<bool>(),
 
@@ -46,45 +47,195 @@ enum SettingsKey<T> {
 
   // Timeline
   timelineTilesPerRow<int>(),
-  timelineGroupAssetsBy<GroupAssetsBy>(codec: EnumCodec(GroupAssetsBy.values)),
+  timelineGroupAssetsBy<GroupAssetsBy>(codec: _EnumCodec(GroupAssetsBy.values)),
   timelineStorageIndicator<bool>(),
 
   // Log
-  logLevel<LogLevel>(codec: EnumCodec(LogLevel.values)),
+  logLevel<LogLevel>(codec: _EnumCodec(LogLevel.values)),
 
   // Map
   mapShowFavoriteOnly<bool>(),
   mapRelativeDate<int>(),
   mapIncludeArchived<bool>(),
-  mapThemeMode<ThemeMode>(codec: EnumCodec(ThemeMode.values)),
+  mapThemeMode<ThemeMode>(codec: _EnumCodec(ThemeMode.values)),
   mapWithPartners<bool>(),
 
   // Cleanup
   cleanupKeepFavorites<bool>(),
-  cleanupKeepMediaType<AssetKeepType>(codec: EnumCodec(AssetKeepType.values)),
-  cleanupKeepAlbumIds<List<String>>(codec: ListCodec(PrimitiveCodec.string)),
+  cleanupKeepMediaType<AssetKeepType>(codec: _EnumCodec(AssetKeepType.values)),
+  cleanupKeepAlbumIds<List<String>>(codec: _ListCodec(_PrimitiveCodec.string)),
   cleanupCutoffDaysAgo<int>(),
   cleanupDefaultsInitialized<bool>(),
 
   // Share
-  shareFileType<ShareAssetType>(codec: EnumCodec(ShareAssetType.values)),
+  shareFileType<ShareAssetType>(codec: _EnumCodec(ShareAssetType.values)),
 
   // Slideshow
   slideshowRepeat<bool>(),
   slideshowDuration<int>(),
-  slideshowLook<SlideshowLook>(codec: EnumCodec(SlideshowLook.values)),
-  slideshowDirection<SlideshowDirection>(codec: EnumCodec(SlideshowDirection.values)),
+  slideshowLook<SlideshowLook>(codec: _EnumCodec(SlideshowLook.values)),
+  slideshowDirection<SlideshowDirection>(codec: _EnumCodec(SlideshowDirection.values)),
 
   // Feature message
-  featureMessageSeenRelease<SemVer>(codec: SemVerCodec());
+  featureMessageSeenRelease<SemVer>(codec: _SemVerCodec());
 
-  final ValueCodec<T>? _codecOverride;
+  final _SettingsCodec<T>? _codecOverride;
 
-  const SettingsKey({ValueCodec<T>? codec}) : _codecOverride = codec;
+  const SettingsKey({_SettingsCodec<T>? codec}) : _codecOverride = codec;
 
-  ValueCodec<T> get _codec => _codecOverride ?? ValueCodec.forType(T);
+  _SettingsCodec<T> get _codec => _codecOverride ?? _SettingsCodec.forType(T);
 
   String encode(T value) => _codec.encode(value);
 
   T decode(String raw) => _codec.decode(raw);
 }
+
+sealed class _SettingsCodec<T> {
+  const _SettingsCodec();
+
+  String encode(T value);
+  T decode(String raw);
+
+  static final Map<Type, _SettingsCodec<Object>> _primitives = {
+    ..._register<int>(_PrimitiveCodec.integer),
+    ..._register<double>(_PrimitiveCodec.real),
+    ..._register<bool>(_PrimitiveCodec.boolean),
+    ..._register<String>(_PrimitiveCodec.string),
+    ..._register<DateTime>(const _DateTimeCodec()),
+  };
+
+  static Map<Type, _SettingsCodec<Object>> _register<T>(_SettingsCodec<Object> codec) => {
+    T: codec,
+    // Reifies the nullable type T so it can be used as a key in the _primitives map
+    _typeOf<T?>(): codec,
+  };
+
+  static Type _typeOf<T>() => T;
+
+  static _SettingsCodec<T> forType<T>(Type runtimeType) {
+    final codec = _primitives[runtimeType];
+    if (codec == null) {
+      throw StateError('No primitive codec for $runtimeType. Provide an explicit codec when defining the SettingsKey.');
+    }
+    return codec as _SettingsCodec<T>;
+  }
+}
+
+final class _EnumCodec<T extends Enum> extends _SettingsCodec<T> {
+  final List<T> values;
+
+  const _EnumCodec(this.values);
+
+  @override
+  String encode(T value) => value.name;
+
+  @override
+  T decode(String raw) => values.firstWhere((v) => v.name == raw);
+}
+
+final class _DateTimeCodec extends _SettingsCodec<DateTime> {
+  const _DateTimeCodec();
+
+  @override
+  String encode(DateTime value) => value.toIso8601String();
+
+  @override
+  DateTime decode(String raw) => DateTime.parse(raw);
+}
+
+final class _SemVerCodec extends _SettingsCodec<SemVer> {
+  const _SemVerCodec();
+
+  @override
+  String encode(SemVer value) => value.toString();
+
+  @override
+  SemVer decode(String raw) => SemVer.fromString(raw);
+}
+
+final class _MapCodec<K extends Object, V extends Object> extends _SettingsCodec<Map<K, V>> {
+  final _SettingsCodec<K> _keyCodec;
+  final _SettingsCodec<V> _valueCodec;
+
+  const _MapCodec(this._keyCodec, this._valueCodec);
+
+  @override
+  String encode(Map<K, V> value) {
+    final entries = <String, String>{};
+    value.forEach((k, v) => entries[_keyCodec.encode(k)] = _valueCodec.encode(v));
+    return jsonEncode(entries);
+  }
+
+  @override
+  Map<K, V> decode(String raw) {
+    try {
+      final decoded = jsonDecode(raw);
+      if (decoded is! Map) {
+        return {};
+      }
+      final result = <K, V>{};
+      for (final entry in decoded.entries) {
+        final rawKey = entry.key;
+        final rawValue = entry.value;
+        if (rawKey is! String || rawValue is! String) {
+          return {};
+        }
+        final k = _keyCodec.decode(rawKey);
+        final v = _valueCodec.decode(rawValue);
+        result[k] = v;
+      }
+      return result;
+    } on FormatException {
+      return {};
+    }
+  }
+}
+
+final class _ListCodec<T extends Object> extends _SettingsCodec<List<T>> {
+  final _SettingsCodec<T> _elementCodec;
+
+  const _ListCodec(this._elementCodec);
+
+  @override
+  String encode(List<T> value) => jsonEncode(value.map(_elementCodec.encode).toList());
+
+  @override
+  List<T> decode(String raw) {
+    try {
+      final decoded = jsonDecode(raw);
+      if (decoded is! List) {
+        return [];
+      }
+      final result = <T>[];
+      for (final item in decoded) {
+        if (item is! String) {
+          return [];
+        }
+        final element = _elementCodec.decode(item);
+        result.add(element);
+      }
+      return result;
+    } on FormatException {
+      return [];
+    }
+  }
+}
+
+final class _PrimitiveCodec<T extends Object> extends _SettingsCodec<T> {
+  final T Function(String) _parse;
+
+  const _PrimitiveCodec._(this._parse);
+
+  @override
+  String encode(T value) => value.toString();
+
+  @override
+  T decode(String raw) => _parse(raw);
+
+  static const integer = _PrimitiveCodec<int>._(int.parse);
+  static const real = _PrimitiveCodec<double>._(double.parse);
+  static const boolean = _PrimitiveCodec<bool>._(bool.parse);
+  static const string = _PrimitiveCodec<String>._(_identity);
+
+  static String _identity(String s) => s;
+}

mobile/lib/domain/models/value_codec.dart

@@ -1,153 +0,0 @@
-import 'dart:convert';
-
-import 'package:immich_mobile/utils/semver.dart';
-
-sealed class ValueCodec<T> {
-  const ValueCodec();
-
-  String encode(T value);
-  T decode(String raw);
-
-  static final Map<Type, ValueCodec<Object>> _primitives = {
-    ..._register<int>(PrimitiveCodec.integer),
-    ..._register<double>(PrimitiveCodec.real),
-    ..._register<bool>(PrimitiveCodec.boolean),
-    ..._register<String>(PrimitiveCodec.string),
-    ..._register<DateTime>(const DateTimeCodec()),
-  };
-
-  static Map<Type, ValueCodec<Object>> _register<T>(ValueCodec<Object> codec) => {
-    T: codec,
-    // Reifies the nullable type T so it can be used as a key in the _primitives map
-    _typeOf<T?>(): codec,
-  };
-
-  static Type _typeOf<T>() => T;
-
-  static ValueCodec<T> forType<T>(Type runtimeType) {
-    final codec = _primitives[runtimeType];
-    if (codec == null) {
-      throw StateError('No primitive codec for $runtimeType. Provide an explicit codec when defining the key.');
-    }
-    return codec as ValueCodec<T>;
-  }
-}
-
-final class EnumCodec<T extends Enum> extends ValueCodec<T> {
-  final List<T> values;
-
-  const EnumCodec(this.values);
-
-  @override
-  String encode(T value) => value.name;
-
-  @override
-  T decode(String raw) => values.firstWhere((v) => v.name == raw);
-}
-
-final class DateTimeCodec extends ValueCodec<DateTime> {
-  const DateTimeCodec();
-
-  @override
-  String encode(DateTime value) => value.toIso8601String();
-
-  @override
-  DateTime decode(String raw) => DateTime.parse(raw);
-}
-
-final class SemVerCodec extends ValueCodec<SemVer> {
-  const SemVerCodec();
-
-  @override
-  String encode(SemVer value) => value.toString();
-
-  @override
-  SemVer decode(String raw) => SemVer.fromString(raw);
-}
-
-final class MapCodec<K extends Object, V extends Object> extends ValueCodec<Map<K, V>> {
-  final ValueCodec<K> _keyCodec;
-  final ValueCodec<V> _valueCodec;
-
-  const MapCodec(this._keyCodec, this._valueCodec);
-
-  @override
-  String encode(Map<K, V> value) {
-    final entries = <String, String>{};
-    value.forEach((k, v) => entries[_keyCodec.encode(k)] = _valueCodec.encode(v));
-    return jsonEncode(entries);
-  }
-
-  @override
-  Map<K, V> decode(String raw) {
-    try {
-      final decoded = jsonDecode(raw);
-      if (decoded is! Map) {
-        return {};
-      }
-      final result = <K, V>{};
-      for (final entry in decoded.entries) {
-        final rawKey = entry.key;
-        final rawValue = entry.value;
-        if (rawKey is! String || rawValue is! String) {
-          continue;
-        }
-        final k = _keyCodec.decode(rawKey);
-        final v = _valueCodec.decode(rawValue);
-        result[k] = v;
-      }
-      return result;
-    } on FormatException {
-      return {};
-    }
-  }
-}
-
-final class ListCodec<T extends Object> extends ValueCodec<List<T>> {
-  final ValueCodec<T> _elementCodec;
-
-  const ListCodec(this._elementCodec);
-
-  @override
-  String encode(List<T> value) => jsonEncode(value.map(_elementCodec.encode).toList());
-
-  @override
-  List<T> decode(String raw) {
-    try {
-      final decoded = jsonDecode(raw);
-      if (decoded is! List) {
-        return [];
-      }
-      final result = <T>[];
-      for (final item in decoded) {
-        if (item is! String) {
-          return [];
-        }
-        final element = _elementCodec.decode(item);
-        result.add(element);
-      }
-      return result;
-    } on FormatException {
-      return [];
-    }
-  }
-}
-
-final class PrimitiveCodec<T extends Object> extends ValueCodec<T> {
-  final T Function(String) _parse;
-
-  const PrimitiveCodec._(this._parse);
-
-  @override
-  String encode(T value) => value.toString();
-
-  @override
-  T decode(String raw) => _parse(raw);
-
-  static const integer = PrimitiveCodec<int>._(int.parse);
-  static const real = PrimitiveCodec<double>._(double.parse);
-  static const boolean = PrimitiveCodec<bool>._(bool.parse);
-  static const string = PrimitiveCodec<String>._(_identity);
-
-  static String _identity(String s) => s;
-}

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

@@ -159,8 +159,8 @@ class RemoteAlbumService {
     return updatedAlbum;
   }
 
-  Stream<(DateTime, DateTime)> watchDateRange(String albumId) {
-    return _repository.watchDateRange(albumId);
+  FutureOr<(DateTime, DateTime)> getDateRange(String albumId) {
+    return _repository.getDateRange(albumId);
   }
 
   Future<List<UserDto>> getSharedUsers(String albumId) {
@@ -175,12 +175,12 @@ class RemoteAlbumService {
     return _repository.getAssets(albumId);
   }
 
-  Future<({int added, int failed})> addAssets({required String albumId, required List<String> assetIds}) async {
+  Future<int> addAssets({required String albumId, required List<String> assetIds}) async {
     final album = await _albumApiRepository.addAssets(albumId, assetIds);
 
     await _repository.addAssets(albumId, album.added);
 
-    return (added: album.added.length, failed: album.failed.length);
+    return album.added.length;
   }
 
   /// !TODO The name here is not clear as we have addAssets method above,
@@ -196,7 +196,7 @@ class RemoteAlbumService {
   }) async {
     int addedCount = 0;
     if (candidates.remoteAssetIds.isNotEmpty) {
-      addedCount += (await addAssets(albumId: albumId, assetIds: candidates.remoteAssetIds)).added;
+      addedCount += await addAssets(albumId: albumId, assetIds: candidates.remoteAssetIds);
     }
     if (candidates.localAssetsToUpload.isNotEmpty) {
       addedCount += await _uploadAndAddLocals(

mobile/lib/infrastructure/repositories/cached_key_value_repository.dart

@@ -1,41 +0,0 @@
-import 'package:collection/collection.dart';
-import 'package:drift/drift.dart';
-// ignore: depend_on_referenced_packages
-import 'package:meta/meta.dart';
-
-abstract class CachedKeyValueRepository<K extends Enum, S> {
-  CachedKeyValueRepository(this._snapshot);
-
-  S _snapshot;
-  S get snapshot => _snapshot;
-  @protected
-  set snapshot(S value) => _snapshot = value;
-
-  List<K> get keys;
-
-  Object decodeValue(K key, String raw);
-
-  S buildSnapshot(Map<K, Object?> overrides);
-
-  Selectable<({String key, String? value})> selectable();
-
-  Future<void> refresh() async => _snapshot = _build(await selectable().get());
-
-  Stream<S> watchSnapshot() => selectable().watch().map((rows) => _snapshot = _build(rows));
-
-  S _build(List<({String key, String? value})> rows) => buildSnapshot(
-    rows.fold({}, (overrides, row) {
-      final key = keys.firstWhereOrNull((key) => key.name == row.key);
-      if (key == null) {
-        return overrides;
-      }
-
-      Object? decodedValue;
-      if (row.value != null) {
-        decodedValue = decodeValue(key, row.value!);
-      }
-
-      return {...overrides, key: decodedValue};
-    }),
-  );
-}

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

@@ -210,19 +210,17 @@ class DriftLocalAlbumRepository extends DriftDatabaseRepository {
       await _deleteAssets(deletes);
 
       await _upsertAssets(updates);
-      // Drop every existing album link for each changed asset before re-adding the
-      // ones the native side reports. A moved asset only reports its new album here,
-      // so leaving the old link around makes the per-album delete sweep wipe the
-      // asset entirely (it is still linked to a bucket it no longer lives in).
-      await _db.batch((batch) async {
-        for (final assetId in assetAlbums.keys) {
-          batch.deleteWhere(_db.localAlbumAssetEntity, (f) => f.assetId.equals(assetId));
-        }
-      });
       // The ugly casting below is required for now because the generated code
       // casts the returned values from the platform during decoding them
       // and iterating over them causes the type to be List<Object?> instead of
       // List<String>
+      await _db.batch((batch) async {
+        assetAlbums.cast<String, List<Object?>>().forEach((assetId, albumIds) {
+          for (final albumId in albumIds.cast<String?>().nonNulls) {
+            batch.deleteWhere(_db.localAlbumAssetEntity, (f) => f.albumId.equals(albumId) & f.assetId.equals(assetId));
+          }
+        });
+      });
       await _db.batch((batch) async {
         assetAlbums.cast<String, List<Object?>>().forEach((assetId, albumIds) {
           batch.insertAll(

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

@@ -217,7 +217,7 @@ class DriftRemoteAlbumRepository extends DriftDatabaseRepository {
     });
   }
 
-  Stream<(DateTime, DateTime)> watchDateRange(String albumId) {
+  FutureOr<(DateTime, DateTime)> getDateRange(String albumId) {
     final query = _db.remoteAlbumAssetEntity.selectOnly()
       ..where(_db.remoteAlbumAssetEntity.albumId.equals(albumId))
       ..addColumns([_db.remoteAssetEntity.createdAt.min(), _db.remoteAssetEntity.createdAt.max()])
@@ -229,7 +229,7 @@ class DriftRemoteAlbumRepository extends DriftDatabaseRepository {
       final minDate = row.read(_db.remoteAssetEntity.createdAt.min());
       final maxDate = row.read(_db.remoteAssetEntity.createdAt.max());
       return (minDate ?? DateTime.now(), maxDate ?? DateTime.now());
-    }).watchSingle();
+    }).getSingle();
   }
 
   Future<List<UserDto>> getSharedUsers(String albumId) async {

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

@@ -71,13 +71,7 @@ class RemoteAssetRepository extends DriftDatabaseRepository {
     }
 
     final query = _db.remoteAssetEntity.select()
-      ..where(
-        (row) =>
-            row.stackId.equals(stackId) &
-            row.id.equals(asset.id).not() &
-            row.deletedAt.isNull() &
-            row.visibility.equalsValue(AssetVisibility.timeline),
-      )
+      ..where((row) => row.stackId.equals(stackId) & row.id.equals(asset.id).not())
       ..orderBy([(row) => OrderingTerm.desc(row.createdAt)]);
 
     return query.map((row) => row.toDto()).get();

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

@@ -1,14 +1,13 @@
-import 'package:drift/drift.dart';
+import 'package:collection/collection.dart';
 import 'package:immich_mobile/domain/models/config/app_config.dart';
 import 'package:immich_mobile/domain/models/settings_key.dart';
 import 'package:immich_mobile/infrastructure/entities/settings.entity.drift.dart';
-import 'package:immich_mobile/infrastructure/repositories/cached_key_value_repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 
-class SettingsRepository extends CachedKeyValueRepository<SettingsKey, AppConfig> {
+class SettingsRepository extends DriftDatabaseRepository {
   final Drift _db;
 
-  SettingsRepository._(this._db) : super(const .new());
+  SettingsRepository._(this._db) : super(_db);
 
   static SettingsRepository? _instance;
 
@@ -20,6 +19,9 @@ class SettingsRepository extends CachedKeyValueRepository<SettingsKey, AppConfig
     return instance;
   }
 
+  AppConfig _appConfig = const .new();
+  AppConfig get appConfig => _appConfig;
+
   static Future<SettingsRepository> ensureInitialized(Drift db) async {
     if (_instance == null) {
       final instance = SettingsRepository._(db);
@@ -29,20 +31,7 @@ class SettingsRepository extends CachedKeyValueRepository<SettingsKey, AppConfig
     return _instance!;
   }
 
-  @override
-  List<SettingsKey> get keys => SettingsKey.values;
-
-  @override
-  Object decodeValue(SettingsKey key, String raw) => key.decode(raw);
-
-  @override
-  AppConfig buildSnapshot(Map<SettingsKey, Object?> overrides) => AppConfig.fromEntries(overrides);
-
-  @override
-  Selectable<({String key, String? value})> selectable() =>
-      _db.select(_db.settingsEntity).map((row) => (key: row.key, value: row.value));
-
-  AppConfig get appConfig => snapshot;
+  Future<void> refresh() async => _applyOverrides(await _db.select(_db.settingsEntity).get());
 
   Future<void> clear(Iterable<SettingsKey> keys) async {
     if (keys.isEmpty) {
@@ -52,15 +41,13 @@ class SettingsRepository extends CachedKeyValueRepository<SettingsKey, AppConfig
     final names = keys.map((key) => key.name).toList();
     await (_db.delete(_db.settingsEntity)..where((row) => row.key.isIn(names))).go();
 
-    var config = snapshot;
     for (final key in keys) {
-      config = config.write(key, defaultConfig.read(key));
+      _appConfig = _appConfig.write(key, defaultConfig.read(key));
     }
-    snapshot = config;
   }
 
   Future<void> write<T, U extends T>(SettingsKey<T> key, U value) async {
-    if (value == snapshot.read(key)) {
+    if (value == _appConfig.read(key)) {
       return;
     }
 
@@ -78,8 +65,29 @@ class SettingsRepository extends CachedKeyValueRepository<SettingsKey, AppConfig
         .insertOnConflictUpdate(
           SettingsEntityCompanion.insert(key: key.name, value: .new(resolvedValue), updatedAt: .new(DateTime.now())),
         );
-    snapshot = snapshot.write(key, value);
+    _appConfig = _appConfig.write(key, value);
   }
 
-  Stream<AppConfig> watchConfig() => watchSnapshot();
+  Stream<AppConfig> watchConfig() => _db.select(_db.settingsEntity).watch().map((rows) {
+    _applyOverrides(rows);
+    return _appConfig;
+  });
+
+  void _applyOverrides(List<SettingsEntityData> rows) {
+    _appConfig = AppConfig.fromEntries(
+      rows.fold({}, (overrides, row) {
+        final metadataKey = SettingsKey.values.firstWhereOrNull((key) => key.name == row.key);
+        if (metadataKey == null) {
+          return overrides;
+        }
+
+        Object? decodedValue;
+        if (row.value != null) {
+          decodedValue = metadataKey.decode(row.value!);
+        }
+
+        return {...overrides, metadataKey: decodedValue};
+      }),
+    );
+  }
 }

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

@@ -26,7 +26,6 @@ class _DriftCreateAlbumPageState extends ConsumerState<DriftCreateAlbumPage> {
   FocusNode albumTitleTextFieldFocusNode = FocusNode();
   FocusNode albumDescriptionTextFieldFocusNode = FocusNode();
   bool isAlbumTitleTextFieldFocus = false;
-  bool isCreatingAlbum = false;
   Set<BaseAsset> selectedAssets = {};
 
   @override
@@ -49,7 +48,7 @@ class _DriftCreateAlbumPageState extends ConsumerState<DriftCreateAlbumPage> {
     super.dispose();
   }
 
-  bool get _canCreateAlbum => albumTitleController.text.trim().isNotEmpty && !isCreatingAlbum;
+  bool get _canCreateAlbum => albumTitleController.text.trim().isNotEmpty;
 
   String _getEffectiveTitle() {
     return albumTitleController.text.isNotEmpty
@@ -168,12 +167,7 @@ class _DriftCreateAlbumPageState extends ConsumerState<DriftCreateAlbumPage> {
   }
 
   Future<void> createAlbum() async {
-    if (isCreatingAlbum) {
-      return;
-    }
-
     onBackgroundTapped();
-    setState(() => isCreatingAlbum = true);
 
     final title = _getEffectiveTitle().trim();
 
@@ -193,10 +187,6 @@ class _DriftCreateAlbumPageState extends ConsumerState<DriftCreateAlbumPage> {
       if (context.mounted) {
         ImmichToast.show(context: context, toastType: ToastType.error, msg: 'errors.failed_to_create_album'.t());
       }
-    } finally {
-      if (mounted) {
-        setState(() => isCreatingAlbum = false);
-      }
     }
   }
 

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

@@ -51,7 +51,6 @@ class _DriftSlideshowPageState extends ConsumerState<DriftSlideshowPage> with Si
   int? _crossfadeFromIndex;
   int? _crossfadeToIndex;
   int _zoomCycle = 0;
-  bool _disableAnimations = false;
 
   @override
   initState() {
@@ -71,12 +70,6 @@ class _DriftSlideshowPageState extends ConsumerState<DriftSlideshowPage> with Si
     unawaited(WakelockPlus.enable());
   }
 
-  @override
-  void didChangeDependencies() {
-    super.didChangeDependencies();
-    _disableAnimations = MediaQuery.disableAnimationsOf(context);
-  }
-
   @override
   dispose() {
     _timer.cancel();
@@ -173,11 +166,6 @@ class _DriftSlideshowPageState extends ConsumerState<DriftSlideshowPage> with Si
   }
 
   void _crossFadeToPage(int page) {
-    if (_disableAnimations) {
-      _pageController.jumpToPage(page);
-      return;
-    }
-
     final previousIndex = _index;
     _pageController.jumpToPage(page);
     setState(() {
@@ -285,12 +273,19 @@ class _DriftSlideshowPageState extends ConsumerState<DriftSlideshowPage> with Si
     }
 
     if (asset.isImage) {
-      return _SlideshowProgressBar(
+      final elapsed = _stopwatch.elapsedMilliseconds;
+      final duration = _config.duration * 1000;
+
+      return TweenAnimationBuilder(
         key: Key(_index.toString()),
-        durationMs: _config.duration * 1000,
-        elapsedMs: _stopwatch.elapsedMilliseconds,
-        paused: _paused,
-        color: context.colorScheme.primary,
+        tween: Tween<double>(begin: elapsed / duration.toDouble(), end: _paused ? elapsed / duration.toDouble() : 1.0),
+        duration: Duration(milliseconds: _paused ? 1 : max(duration - elapsed, 1)),
+        builder: (context, value, _) => LinearProgressIndicator(
+          color: context.colorScheme.primary,
+          borderRadius: const BorderRadius.all(Radius.zero),
+          minHeight: 5,
+          value: value,
+        ),
       );
     } else {
       return LinearProgressIndicator(
@@ -339,21 +334,6 @@ class _DriftSlideshowPageState extends ConsumerState<DriftSlideshowPage> with Si
     final imageProvider = getFullImageProvider(asset, size: context.sizeData);
 
     if (asset.isImage) {
-      PhotoView buildPhotoView(PhotoViewComputedScale initialScale) => PhotoView(
-        imageProvider: imageProvider,
-        index: index,
-        disableScaleGestures: true,
-        gaplessPlayback: true,
-        filterQuality: FilterQuality.high,
-        initialScale: initialScale,
-        controller: PhotoViewController(),
-        onTapUp: (_, _, _) => _onTapUp(),
-      );
-
-      if (_disableAnimations) {
-        return buildPhotoView(scale);
-      }
-
       final zoomOut = _zoomCycle.isOdd;
       final elapsed = _stopwatch.elapsedMilliseconds;
       final duration = _config.duration * 1000;
@@ -369,7 +349,16 @@ class _DriftSlideshowPageState extends ConsumerState<DriftSlideshowPage> with Si
               : 1.0,
         ),
         duration: Duration(milliseconds: _paused ? 1 : max(duration - elapsed, 1)),
-        builder: (context, value, _) => buildPhotoView(scale * (1.0 + value * _kenBurnsZoom)),
+        builder: (context, value, _) => PhotoView(
+          imageProvider: imageProvider,
+          index: index,
+          disableScaleGestures: true,
+          gaplessPlayback: true,
+          filterQuality: FilterQuality.high,
+          initialScale: scale * (1.0 + value * _kenBurnsZoom),
+          controller: PhotoViewController(),
+          onTapUp: (_, _, _) => _onTapUp(),
+        ),
       );
     } else {
       final status = ref.watch(videoPlayerProvider(asset.heroTag).select((s) => s.status));
@@ -474,75 +463,3 @@ class _DriftSlideshowPageState extends ConsumerState<DriftSlideshowPage> with Si
     );
   }
 }
-
-/// Progress bar for image slides, driven by an explicit [AnimationController].
-///
-/// [TweenAnimationBuilder] creates its controller internally with the default
-/// [AnimationBehavior.normal], which makes it run ~20x too fast while the system
-/// "reduce motion" setting is on (flutter/flutter#164287). This owns its
-/// controller so it can use [AnimationBehavior.preserve] and animate at the real
-/// slide duration regardless of that setting.
-class _SlideshowProgressBar extends StatefulWidget {
-  final int durationMs;
-  final int elapsedMs;
-  final bool paused;
-  final Color color;
-
-  const _SlideshowProgressBar({
-    super.key,
-    required this.durationMs,
-    required this.elapsedMs,
-    required this.paused,
-    required this.color,
-  });
-
-  @override
-  State<_SlideshowProgressBar> createState() => _SlideshowProgressBarState();
-}
-
-class _SlideshowProgressBarState extends State<_SlideshowProgressBar> with SingleTickerProviderStateMixin {
-  late final AnimationController _controller;
-
-  @override
-  void initState() {
-    super.initState();
-    _controller = AnimationController(
-      vsync: this,
-      duration: Duration(milliseconds: widget.durationMs),
-      animationBehavior: AnimationBehavior.preserve,
-    )..value = (widget.elapsedMs / widget.durationMs).clamp(0.0, 1.0);
-    if (!widget.paused) {
-      _controller.forward();
-    }
-  }
-
-  @override
-  void didUpdateWidget(_SlideshowProgressBar oldWidget) {
-    super.didUpdateWidget(oldWidget);
-    if (widget.durationMs != oldWidget.durationMs) {
-      _controller.duration = Duration(milliseconds: widget.durationMs);
-    }
-    if (widget.paused != oldWidget.paused) {
-      widget.paused ? _controller.stop() : _controller.forward();
-    }
-  }
-
-  @override
-  void dispose() {
-    _controller.dispose();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return AnimatedBuilder(
-      animation: _controller,
-      builder: (context, _) => LinearProgressIndicator(
-        color: widget.color,
-        borderRadius: const BorderRadius.all(Radius.zero),
-        minHeight: 5,
-        value: _controller.value,
-      ),
-    );
-  }
-}

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

@@ -2,7 +2,6 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/unarchive_action_button.widget.dart';
 import 'package:immich_mobile/providers/asset_viewer/asset_viewer.provider.dart';
@@ -155,8 +154,12 @@ class _AddActionButtonState extends ConsumerState<AddActionButton> {
       return;
     }
 
-    // Only report the failure when nothing was added; if some succeeded we show "added".
-    if (result.count > 0) {
+    if (result.count == 0) {
+      ImmichToast.show(
+        context: context,
+        msg: 'add_to_album_bottom_sheet_already_exists'.tr(namedArgs: {'album': album.name}),
+      );
+    } else {
       ImmichToast.show(
         context: context,
         msg: 'add_to_album_bottom_sheet_added'.tr(namedArgs: {'album': album.name}),
@@ -164,17 +167,6 @@ class _AddActionButtonState extends ConsumerState<AddActionButton> {
 
       // Refresh the "Appears in" list on the asset's info panel.
       ref.invalidate(albumsContainingAssetProvider(latest.remoteId!));
-    } else if (result.failedCount > 0) {
-      ImmichToast.show(
-        context: context,
-        msg: 'assets_cannot_be_added_to_album_count'.t(context: context, args: {'count': result.failedCount}),
-        toastType: ToastType.error,
-      );
-    } else {
-      ImmichToast.show(
-        context: context,
-        msg: 'add_to_album_bottom_sheet_already_exists'.tr(namedArgs: {'album': album.name}),
-      );
     }
 
     if (!context.mounted) {

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

@@ -2,13 +2,11 @@ import 'package:flutter/material.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 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/domain/models/events.model.dart';
 import 'package:immich_mobile/domain/utils/event_stream.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
-import 'package:immich_mobile/providers/asset_viewer/asset_viewer.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 import 'package:immich_mobile/widgets/common/immich_toast.dart';
@@ -61,19 +59,13 @@ class DeleteActionButton extends ConsumerWidget {
       }
     }
 
-    final currentAsset = ref.read(assetViewerProvider).currentAsset;
-    final stackIndex = ref.read(assetViewerProvider).stackIndex;
+    if (source == ActionSource.viewer) {
+      EventStream.shared.emit(const ViewerReloadAssetEvent());
+    }
 
     final result = await ref.read(actionProvider.notifier).trashRemoteAndDeleteLocal(source);
     ref.read(multiSelectProvider.notifier).reset();
 
-    if (source == ActionSource.viewer && result.success) {
-      final shouldRefreshStack = currentAsset is RemoteAsset && currentAsset.stackId != null;
-      EventStream.shared.emit(
-        shouldRefreshStack ? ViewerStackAssetDeletedEvent(stackIndex: stackIndex) : const ViewerReloadAssetEvent(),
-      );
-    }
-
     final successMessage = 'delete_action_prompt'.t(context: context, args: {'count': result.count.toString()});
 
     if (context.mounted) {

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

@@ -413,8 +413,7 @@ class _AssetPageState extends ConsumerState<AssetPage> {
     final showAssetStack = ref.watch(timelineServiceProvider.select((s) => s.origin != TimelineOrigin.trash));
     final stackChildren = showAssetStack ? ref.watch(stackChildrenNotifier(asset)).valueOrNull : null;
     if (stackChildren != null && stackChildren.isNotEmpty) {
-      final safeStackIndex = stackIndex.clamp(0, stackChildren.length - 1);
-      displayAsset = stackChildren.elementAt(safeStackIndex);
+      displayAsset = stackChildren.elementAt(stackIndex);
     }
 
     final isCurrent = currentAsset != null && currentAsset.refersToSameAsset(displayAsset);

mobile/lib/presentation/widgets/asset_viewer/asset_stack.provider.dart

@@ -11,10 +11,6 @@ class StackChildrenNotifier extends AutoDisposeFamilyAsyncNotifier<List<RemoteAs
 
     return ref.watch(assetServiceProvider).getStack(asset);
   }
-
-  void setStack(List<RemoteAsset> stack) {
-    state = AsyncData(stack);
-  }
 }
 
 final stackChildrenNotifier = AsyncNotifierProvider.autoDispose

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

@@ -1,5 +1,4 @@
 import 'dart:async';
-import 'dart:math' as math;
 
 import 'package:auto_route/auto_route.dart';
 import 'package:easy_localization/easy_localization.dart';
@@ -175,12 +174,6 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
       return;
     }
 
-    // The viewer is closing; don't flip the current asset now. Flipping it swaps
-    // the grid tile hero keys mid pop and animates the close on two tiles (#23779).
-    if (!mounted || !(ModalRoute.of(context)?.isActive ?? true)) {
-      return;
-    }
-
     AssetViewer._setAsset(ref, asset);
     _preloader.preload(index, context.sizeData);
     _handleCasting();
@@ -222,8 +215,6 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
         _onTimelineReloadEvent();
       case ViewerReloadAssetEvent():
         _onViewerReloadEvent();
-      case ViewerStackAssetDeletedEvent event:
-        _onViewerStackAssetDeletedEvent(event);
       default:
     }
   }
@@ -239,33 +230,6 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
     _onAssetChanged(target);
   }
 
-  Future<void> _onViewerStackAssetDeletedEvent(ViewerStackAssetDeletedEvent event) async {
-    final timelineAsset = ref.read(timelineServiceProvider).getAssetSafe(_currentPage);
-    if (timelineAsset == null) {
-      _onViewerReloadEvent();
-      return;
-    }
-
-    final stackProvider = stackChildrenNotifier(timelineAsset);
-
-    ref.invalidate(stackProvider);
-    final stack = await ref.read(stackProvider.future);
-
-    if (!mounted) {
-      return;
-    }
-
-    if (stack.isEmpty) {
-      _onViewerReloadEvent();
-      return;
-    }
-
-    final targetIndex = math.min(event.stackIndex, stack.length - 1);
-    ref.read(assetViewerProvider.notifier)
-      ..setAsset(stack[targetIndex])
-      ..setStackIndex(targetIndex);
-  }
-
   void _onTimelineReloadEvent() {
     final timelineService = ref.read(timelineServiceProvider);
     final totalAssets = timelineService.totalAssets;
@@ -282,11 +246,6 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
     if (index != _currentPage) {
       _pageController.jumpToPage(index);
       _onAssetChanged(index);
-    } else if (currentAsset is RemoteAsset && currentAsset.stackId != null && assetIndex == null) {
-      final timelineAsset = timelineService.getAssetSafe(index);
-      if (timelineAsset is! RemoteAsset || currentAsset.stackId != timelineAsset.stackId) {
-        _onAssetChanged(index);
-      }
     } else if (currentAsset != null && assetIndex == null) {
       _onAssetChanged(index);
     }

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

@@ -101,7 +101,7 @@ class ViewerBottomBar extends ConsumerWidget {
                       child: Column(
                         mainAxisSize: MainAxisSize.min,
                         children: [
-                          if (asset.isImage) OcrToggleButton(asset: asset),
+                          OcrToggleButton(asset: asset),
                           if (asset.isVideo) VideoControls(videoPlayerName: asset.heroTag),
                           if (!isReadonlyModeEnabled)
                             Row(mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: actions),

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

@@ -41,7 +41,7 @@ class FavoriteBottomSheet extends ConsumerWidget {
       }
 
       final remoteAssets = selectedAssets.whereType<RemoteAsset>();
-      final result = await ref
+      final addedCount = await ref
           .read(remoteAlbumProvider.notifier)
           .addAssets(album.id, remoteAssets.map((e) => e.id).toList());
 
@@ -52,22 +52,15 @@ class FavoriteBottomSheet extends ConsumerWidget {
         );
       }
 
-      // Only report the failure when nothing was added; if some succeeded we show "added".
-      if (result.added > 0) {
+      if (addedCount != remoteAssets.length) {
         ImmichToast.show(
           context: context,
-          msg: 'add_to_album_bottom_sheet_added'.t(args: {"album": album.name}),
-        );
-      } else if (result.failed > 0) {
-        ImmichToast.show(
-          context: context,
-          msg: 'assets_cannot_be_added_to_album_count'.t(context: context, args: {'count': result.failed}),
-          toastType: ToastType.error,
+          msg: 'add_to_album_bottom_sheet_already_exists'.t(args: {"album": album.name}),
         );
       } else {
         ImmichToast.show(
           context: context,
-          msg: 'add_to_album_bottom_sheet_already_exists'.t(args: {"album": album.name}),
+          msg: 'add_to_album_bottom_sheet_added'.t(args: {"album": album.name}),
         );
       }
 

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

@@ -1,76 +1,23 @@
-import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.dart';
-import 'package:immich_mobile/domain/models/album/album.model.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/download_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/share_action_button.widget.dart';
-import 'package:immich_mobile/presentation/widgets/album/album_selector.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/widgets/common/immich_toast.dart';
 
-class PartnerDetailBottomSheet extends ConsumerStatefulWidget {
+class PartnerDetailBottomSheet extends ConsumerWidget {
   const PartnerDetailBottomSheet({super.key});
 
   @override
-  ConsumerState<PartnerDetailBottomSheet> createState() => _PartnerDetailBottomSheetState();
-}
-
-class _PartnerDetailBottomSheetState extends ConsumerState<PartnerDetailBottomSheet> {
-  late final DraggableScrollableController sheetController;
-
-  @override
-  void initState() {
-    super.initState();
-    sheetController = DraggableScrollableController();
-  }
-
-  @override
-  void dispose() {
-    sheetController.dispose();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    Future<void> addToAlbum(RemoteAlbum album) async {
-      final result = await ref.read(actionProvider.notifier).addToAlbum(ActionSource.timeline, album);
-
-      if (!context.mounted) {
-        return;
-      }
-
-      if (!result.success) {
-        ImmichToast.show(context: context, msg: 'scaffold_body_error_occurred'.tr(), toastType: ToastType.error);
-        return;
-      }
-
-      ImmichToast.show(
-        context: context,
-        msg: result.count == 0
-            ? 'add_to_album_bottom_sheet_already_exists'.tr(namedArgs: {'album': album.name})
-            : 'add_to_album_bottom_sheet_added'.tr(namedArgs: {'album': album.name}),
-      );
-    }
-
-    Future<void> onKeyboardExpand() {
-      return sheetController.animateTo(0.85, duration: const Duration(milliseconds: 200), curve: Curves.easeInOut);
-    }
-
-    return BaseBottomSheet(
-      controller: sheetController,
+  Widget build(BuildContext context, WidgetRef ref) {
+    return const BaseBottomSheet(
       initialChildSize: 0.25,
-      maxChildSize: 0.85,
+      maxChildSize: 0.4,
       shouldCloseOnMinExtent: false,
-      actions: const [
+      actions: [
         ShareActionButton(source: ActionSource.timeline),
         DownloadActionButton(source: ActionSource.timeline),
       ],
-      slivers: [
-        const AddToAlbumHeader(),
-        AlbumSelector(onAlbumSelected: addToAlbum, onKeyboardExpanded: onKeyboardExpand),
-      ],
     );
   }
 }

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

@@ -16,6 +16,7 @@ import 'package:immich_mobile/presentation/widgets/bottom_sheet/map_bottom_sheet
 import 'package:immich_mobile/presentation/widgets/map/map.state.dart';
 import 'package:immich_mobile/presentation/widgets/map/map_utils.dart';
 import 'package:immich_mobile/providers/routes.provider.dart';
+import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/utils/async_mutex.dart';
 import 'package:immich_mobile/utils/debounce.dart';
 import 'package:immich_mobile/widgets/common/immich_toast.dart';
@@ -132,7 +133,8 @@ class _DriftMapState extends ConsumerState<DriftMap> {
     // When the AssetViewer is open, the DriftMap route stays alive in the background.
     // If we continue to update bounds, the map-scoped timeline service gets recreated and the previous one disposed,
     // which can invalidate the TimelineService instance that was passed into AssetViewerRoute (causing "loading forever").
-    if (ref.read(isAssetViewerOpenProvider)) {
+    final currentRoute = ref.read(currentRouteNameProvider);
+    if (currentRoute == AssetViewerRoute.name) {
       return;
     }
 
@@ -181,11 +183,6 @@ class _DriftMapState extends ConsumerState<DriftMap> {
 
   @override
   Widget build(BuildContext context) {
-    ref.listen<bool>(isAssetViewerOpenProvider, (previous, current) {
-      if (previous == true && !current) {
-        _debouncer.run(() => setBounds(forceReload: true));
-      }
-    });
     return Stack(
       children: [
         _Map(initialLocation: widget.initialLocation, onMapCreated: onMapCreated, onMapReady: onMapReady),

mobile/lib/providers/asset_viewer/download.provider.dart

@@ -1,6 +1,9 @@
+import 'dart:async';
+
 import 'package:background_downloader/background_downloader.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/models/download/download_state.model.dart';
+import 'package:immich_mobile/models/download/livephotos_medatada.model.dart';
 import 'package:immich_mobile/services/download.service.dart';
 
 class DownloadStateNotifier extends StateNotifier<DownloadState> {
@@ -14,9 +17,79 @@ class DownloadStateNotifier extends StateNotifier<DownloadState> {
           taskProgress: <String, DownloadInfo>{},
         ),
       ) {
+    _downloadService.onImageDownloadStatus = _downloadImageCallback;
+    _downloadService.onVideoDownloadStatus = _downloadVideoCallback;
+    _downloadService.onLivePhotoDownloadStatus = _downloadLivePhotoCallback;
     _downloadService.onTaskProgress = _taskProgressCallback;
   }
 
+  void _updateDownloadStatus(String taskId, TaskStatus status) {
+    if (status == TaskStatus.canceled) {
+      return;
+    }
+
+    state = state.copyWith(
+      taskProgress: <String, DownloadInfo>{}
+        ..addAll(state.taskProgress)
+        ..addAll({
+          taskId: DownloadInfo(
+            progress: state.taskProgress[taskId]?.progress ?? 0,
+            fileName: state.taskProgress[taskId]?.fileName ?? '',
+            status: status,
+          ),
+        }),
+    );
+  }
+
+  // Download live photo callback
+  void _downloadLivePhotoCallback(TaskStatusUpdate update) {
+    _updateDownloadStatus(update.task.taskId, update.status);
+
+    switch (update.status) {
+      case TaskStatus.complete:
+        if (update.task.metaData.isEmpty) {
+          return;
+        }
+        final livePhotosId = LivePhotosMetadata.fromJson(update.task.metaData).id;
+        _downloadService.saveLivePhotos(update.task, livePhotosId);
+        _onDownloadComplete(update.task.taskId);
+        break;
+
+      default:
+        break;
+    }
+  }
+
+  // Download image callback
+  void _downloadImageCallback(TaskStatusUpdate update) {
+    _updateDownloadStatus(update.task.taskId, update.status);
+
+    switch (update.status) {
+      case TaskStatus.complete:
+        _downloadService.saveImageWithPath(update.task);
+        _onDownloadComplete(update.task.taskId);
+        break;
+
+      default:
+        break;
+    }
+  }
+
+  // Download video callback
+  void _downloadVideoCallback(TaskStatusUpdate update) {
+    _updateDownloadStatus(update.task.taskId, update.status);
+
+    switch (update.status) {
+      case TaskStatus.complete:
+        _downloadService.saveVideo(update.task);
+        _onDownloadComplete(update.task.taskId);
+        break;
+
+      default:
+        break;
+    }
+  }
+
   void _taskProgressCallback(TaskProgressUpdate update) {
     // Ignore if the task is canceled or completed
     if (update.progress == -2 || update.progress == -1) {
@@ -37,6 +110,20 @@ class DownloadStateNotifier extends StateNotifier<DownloadState> {
     );
   }
 
+  void _onDownloadComplete(String id) {
+    Future.delayed(const Duration(seconds: 2), () {
+      state = state.copyWith(
+        taskProgress: <String, DownloadInfo>{}
+          ..addAll(state.taskProgress)
+          ..remove(id),
+      );
+
+      if (state.taskProgress.isEmpty) {
+        state = state.copyWith(showProgress: false);
+      }
+    });
+  }
+
   void cancelDownload(String id) async {
     final isCanceled = await _downloadService.cancelDownload(id);
 

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

@@ -1,6 +1,7 @@
 import 'dart:async';
 
 import 'package:auto_route/auto_route.dart';
+import 'package:background_downloader/background_downloader.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.dart';
@@ -9,6 +10,7 @@ import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/asset_edit.model.dart';
 import 'package:immich_mobile/domain/services/asset.service.dart';
 import 'package:immich_mobile/domain/services/remote_album.service.dart';
+import 'package:immich_mobile/models/download/livephotos_medatada.model.dart';
 import 'package:immich_mobile/providers/asset_viewer/asset_viewer.provider.dart';
 import 'package:immich_mobile/providers/backup/asset_upload_progress.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
@@ -21,6 +23,7 @@ import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/providers/websocket.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/services/action.service.dart';
+import 'package:immich_mobile/services/download.service.dart';
 import 'package:immich_mobile/services/foreground_upload.service.dart';
 import 'package:immich_mobile/utils/semver.dart';
 import 'package:immich_mobile/widgets/asset_grid/delete_dialog.dart';
@@ -34,25 +37,18 @@ class ActionResult {
   final bool success;
   final String? error;
   final List<String> remoteAssetIds;
-  final int failedCount;
 
-  const ActionResult({
-    required this.count,
-    required this.success,
-    this.error,
-    this.remoteAssetIds = const [],
-    this.failedCount = 0,
-  });
+  const ActionResult({required this.count, required this.success, this.error, this.remoteAssetIds = const []});
 
   @override
-  String toString() =>
-      'ActionResult(count: $count, success: $success, error: $error, remoteAssetIds: $remoteAssetIds, failedCount: $failedCount)';
+  String toString() => 'ActionResult(count: $count, success: $success, error: $error, remoteAssetIds: $remoteAssetIds)';
 }
 
 class ActionNotifier extends Notifier<void> {
   final Logger _logger = Logger('ActionNotifier');
   late ActionService _service;
   late ForegroundUploadService _foregroundUploadService;
+  late DownloadService _downloadService;
   late AssetService _assetService;
 
   ActionNotifier() : super();
@@ -62,6 +58,29 @@ class ActionNotifier extends Notifier<void> {
     _foregroundUploadService = ref.watch(foregroundUploadServiceProvider);
     _service = ref.watch(actionServiceProvider);
     _assetService = ref.watch(assetServiceProvider);
+    _downloadService = ref.watch(downloadServiceProvider);
+    _downloadService.onImageDownloadStatus = _downloadImageCallback;
+    _downloadService.onVideoDownloadStatus = _downloadVideoCallback;
+    _downloadService.onLivePhotoDownloadStatus = _downloadLivePhotoCallback;
+  }
+
+  void _downloadImageCallback(TaskStatusUpdate update) {
+    if (update.status == TaskStatus.complete) {
+      _downloadService.saveImageWithPath(update.task);
+    }
+  }
+
+  void _downloadVideoCallback(TaskStatusUpdate update) {
+    if (update.status == TaskStatus.complete) {
+      _downloadService.saveVideo(update.task);
+    }
+  }
+
+  void _downloadLivePhotoCallback(TaskStatusUpdate update) async {
+    if (update.status == TaskStatus.complete) {
+      final livePhotosId = LivePhotosMetadata.fromJson(update.task.metaData).id;
+      unawaited(_downloadService.saveLivePhotos(update.task, livePhotosId));
+    }
   }
 
   List<String> _getRemoteIdsForSource(ActionSource source) {
@@ -374,12 +393,9 @@ class ActionNotifier extends Notifier<void> {
     final albumNotifier = ref.read(remoteAlbumProvider.notifier);
 
     int addedRemote = 0;
-    int failedRemote = 0;
     if (remoteIds.isNotEmpty) {
       try {
-        final result = await albumNotifier.addAssets(album.id, remoteIds);
-        addedRemote = result.added;
-        failedRemote = result.failed;
+        addedRemote = await albumNotifier.addAssets(album.id, remoteIds);
       } catch (error, stack) {
         _logger.severe('Failed to add assets to album ${album.id}', error, stack);
         return ActionResult(count: 0, success: false, error: error.toString());
@@ -393,7 +409,7 @@ class ActionNotifier extends Notifier<void> {
     }
 
     if (localAssets.isEmpty) {
-      return ActionResult(count: addedRemote, success: true, failedCount: failedRemote);
+      return ActionResult(count: addedRemote, success: true);
     }
 
     final uploadResult = await upload(
@@ -408,7 +424,6 @@ class ActionNotifier extends Notifier<void> {
       count: addedRemote + uploadResult.count,
       success: uploadResult.success,
       error: uploadResult.error,
-      failedCount: failedRemote,
     );
   }
 

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

@@ -200,12 +200,12 @@ class RemoteAlbumNotifier extends Notifier<RemoteAlbumState> {
     return _remoteAlbumService.getAssets(albumId);
   }
 
-  Future<({int added, int failed})> addAssets(String albumId, List<String> assetIds) async {
-    final result = await _remoteAlbumService.addAssets(albumId: albumId, assetIds: assetIds);
-    if (result.added > 0) {
+  Future<int> addAssets(String albumId, List<String> assetIds) async {
+    final added = await _remoteAlbumService.addAssets(albumId: albumId, assetIds: assetIds);
+    if (added > 0) {
       await _refreshAlbumInState(albumId);
     }
-    return result;
+    return added;
   }
 
   /// Links a freshly-uploaded local asset to an album using its new remote ID,
@@ -313,9 +313,9 @@ class RemoteAlbumNotifier extends Notifier<RemoteAlbumState> {
   }
 }
 
-final remoteAlbumDateRangeProvider = StreamProvider.autoDispose.family<(DateTime, DateTime), String>((ref, albumId) {
+final remoteAlbumDateRangeProvider = FutureProvider.family<(DateTime, DateTime), String>((ref, albumId) async {
   final service = ref.watch(remoteAlbumServiceProvider);
-  return service.watchDateRange(albumId);
+  return service.getDateRange(albumId);
 });
 
 final remoteAlbumSharedUsersProvider = FutureProvider.autoDispose.family<List<UserDto>, String>((ref, albumId) async {

mobile/lib/providers/routes.provider.dart

@@ -2,7 +2,6 @@ import 'package:flutter/widgets.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 
 final inLockedViewProvider = StateProvider<bool>((ref) => false);
-final isAssetViewerOpenProvider = StateProvider<bool>((ref) => false);
 final currentRouteNameProvider = StateProvider<String?>((ref) => null);
 final previousRouteNameProvider = StateProvider<String?>((ref) => null);
 final previousRouteDataProvider = StateProvider<RouteSettings?>((ref) => null);

mobile/lib/providers/websocket.provider.dart

@@ -103,7 +103,6 @@ class WebsocketNotifier extends StateNotifier<WebsocketState> {
         socket.on('AssetUploadReadyV2', _handleSyncAssetUploadReadyV2);
         socket.on('AssetEditReadyV1', _handleSyncAssetEditReadyV1);
         socket.on('AssetEditReadyV2', _handleSyncAssetEditReadyV2);
-        socket.on('on_album_update', _handleAlbumUpdate);
         socket.on('on_config_update', _handleOnConfigUpdate);
         socket.on('on_new_release', _handleReleaseUpdates);
       } catch (e) {
@@ -185,10 +184,6 @@ class WebsocketNotifier extends StateNotifier<WebsocketState> {
     unawaited(_ref.read(backgroundSyncProvider).syncWebsocketEditV1(data));
   }
 
-  void _handleAlbumUpdate(dynamic _) {
-    unawaited(_ref.read(backgroundSyncProvider).syncRemote());
-  }
-
   void _handleSyncAssetEditReadyV2(dynamic data) {
     unawaited(_ref.read(backgroundSyncProvider).syncWebsocketEditV2(data));
   }

mobile/lib/repositories/download.repository.dart

@@ -27,11 +27,9 @@ class DownloadRepository {
 
   void Function(TaskStatusUpdate)? onVideoDownloadStatus;
 
-  void Function(TaskProgressUpdate)? onTaskProgress;
+  void Function(TaskStatusUpdate)? onLivePhotoDownloadStatus;
 
-  // #29900: `taskStatusCallback` is called before the DB has been updated, causing a race between the two Live Photo tasks
-  // This callback instead listens directly to DB updates
-  void Function(TaskRecord)? onLivePhotoRecordComplete;
+  void Function(TaskProgressUpdate)? onTaskProgress;
 
   DownloadRepository() {
     _downloader.registerCallbacks(
@@ -48,12 +46,9 @@ class DownloadRepository {
 
     _downloader.registerCallbacks(
       group: kDownloadGroupLivePhoto,
+      taskStatusCallback: (update) => onLivePhotoDownloadStatus?.call(update),
       taskProgressCallback: (update) => onTaskProgress?.call(update),
     );
-
-    _downloader.database.updates
-        .where((record) => record.group == kDownloadGroupLivePhoto && record.status == TaskStatus.complete)
-        .listen((record) => onLivePhotoRecordComplete?.call(record));
   }
 
   Future<List<bool>> downloadAll(List<DownloadTask> tasks) {

mobile/lib/repositories/drift_album_api_repository.dart

@@ -59,7 +59,7 @@ class DriftAlbumApiRepository extends ApiRepository {
     for (final dto in response) {
       if (dto.success) {
         added.add(dto.id);
-      } else if (dto.error.orElse(null) != BulkIdErrorReason.duplicate) {
+      } else {
         failed.add(dto.id);
       }
     }

mobile/lib/routing/app_navigation_observer.dart

@@ -24,20 +24,9 @@ class AppNavigationObserver extends AutoRouterObserver {
       ref.read(currentRouteNameProvider.notifier).state = route.settings.name;
       ref.read(previousRouteNameProvider.notifier).state = previousRoute?.settings.name;
       ref.read(previousRouteDataProvider.notifier).state = previousRoute?.settings;
-      if (route.settings.name == AssetViewerRoute.name) {
-        ref.read(isAssetViewerOpenProvider.notifier).state = true;
-      }
     });
   }
 
-  @override
-  void didPop(Route route, Route? previousRoute) {
-    _handleDriftLockedFolderState(previousRoute ?? route, null);
-    if (route.settings.name == AssetViewerRoute.name) {
-      Future(() => ref.read(isAssetViewerOpenProvider.notifier).state = false);
-    }
-  }
-
   _handleDriftLockedFolderState(Route route, Route? previousRoute) {
     final isInLockedView = ref.read(inLockedViewProvider);
     final isFromLockedViewToDetailView =

mobile/lib/services/background_upload.service.dart

@@ -290,13 +290,10 @@ 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 originalFileName = entity.isLivePhoto ? p.setExtension(fileName, p.extension(file.path)) : fileName;
+    final fileName = await _assetMediaRepository.getOriginalFilename(asset.id) ?? asset.name;
+    // Some apps (e.g. DJI/Fusion) return names without an extension; fall back to the asset name for those.
+    final extension = p.extension(file.path).isNotEmpty ? p.extension(file.path) : p.extension(asset.name);
+    final originalFileName = p.setExtension(fileName, extension);
 
     String metadata = UploadTaskMetadata(
       localAssetId: asset.id,

mobile/lib/services/download.service.dart

@@ -1,8 +1,6 @@
-import 'dart:async';
 import 'dart:io';
 
 import 'package:background_downloader/background_downloader.dart';
-import 'package:collection/collection.dart';
 import 'package:flutter/services.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/models/download/livephotos_medatada.model.dart';
@@ -20,27 +18,14 @@ class DownloadService {
   final Logger _log = Logger("DownloadService");
   void Function(TaskStatusUpdate)? onImageDownloadStatus;
   void Function(TaskStatusUpdate)? onVideoDownloadStatus;
+  void Function(TaskStatusUpdate)? onLivePhotoDownloadStatus;
   void Function(TaskProgressUpdate)? onTaskProgress;
 
-  /// Active Live Photo IDs undergoing saving
-  final Set<String> _savingLivePhotoIds = {};
-
   DownloadService(this._fileMediaRepository, this._downloadRepository) {
     _downloadRepository.onImageDownloadStatus = _onImageDownloadCallback;
     _downloadRepository.onVideoDownloadStatus = _onVideoDownloadCallback;
+    _downloadRepository.onLivePhotoDownloadStatus = _onLivePhotoDownloadCallback;
     _downloadRepository.onTaskProgress = _onTaskProgressCallback;
-    _downloadRepository.onLivePhotoRecordComplete = _onLivePhotoRecordComplete;
-
-    unawaited(_savePreviouslyCompletedLivePhotos());
-  }
-
-  Future<void> _savePreviouslyCompletedLivePhotos() async {
-    // Specifically fetch Live Photo video components only, as to not double fetch assets
-    final records = await _downloadRepository.getLiveVideoTasks();
-    final completedIds = records.map((record) => LivePhotosMetadata.fromJson(record.task.metaData).id).toSet();
-    for (final id in completedIds) {
-      await _saveLivePhotos(id);
-    }
   }
 
   void _onTaskProgressCallback(TaskProgressUpdate update) {
@@ -48,27 +33,18 @@ class DownloadService {
   }
 
   void _onImageDownloadCallback(TaskStatusUpdate update) {
-    if (update.status == TaskStatus.complete) {
-      unawaited(_saveImageWithPath(update.task));
-    }
-
     onImageDownloadStatus?.call(update);
   }
 
   void _onVideoDownloadCallback(TaskStatusUpdate update) {
-    if (update.status == TaskStatus.complete) {
-      unawaited(_saveVideo(update.task));
-    }
-
     onVideoDownloadStatus?.call(update);
   }
 
-  void _onLivePhotoRecordComplete(TaskRecord record) async {
-    final livePhotosId = LivePhotosMetadata.fromJson(record.task.metaData).id;
-    await _saveLivePhotos(livePhotosId);
+  void _onLivePhotoDownloadCallback(TaskStatusUpdate update) {
+    onLivePhotoDownloadStatus?.call(update);
   }
 
-  Future<bool> _saveImageWithPath(Task task) async {
+  Future<bool> saveImageWithPath(Task task) async {
     final filePath = await task.filePath();
     final title = task.filename;
     final relativePath = Platform.isAndroid ? 'DCIM/Immich' : null;
@@ -89,7 +65,7 @@ class DownloadService {
     }
   }
 
-  Future<bool> _saveVideo(Task task) async {
+  Future<bool> saveVideo(Task task) async {
     final filePath = await task.filePath();
     final title = task.filename;
     final relativePath = Platform.isAndroid ? 'DCIM/Immich' : null;
@@ -107,21 +83,14 @@ class DownloadService {
     }
   }
 
-  Future<bool> _saveLivePhotos(String livePhotosId) async {
+  Future<bool> saveLivePhotos(Task task, String livePhotosId) async {
     final records = await _downloadRepository.getLiveVideoTasks();
+    if (records.length < 2) {
+      return false;
+    }
+
     final imageRecord = _findTaskRecord(records, livePhotosId, LivePhotosPart.image);
     final videoRecord = _findTaskRecord(records, livePhotosId, LivePhotosPart.video);
-
-    if (imageRecord == null || videoRecord == null) {
-      return false;
-    }
-
-    // Write semaphore for this `livePhotoId`
-    if (!_savingLivePhotoIds.add(livePhotosId)) {
-      return false;
-    }
-
-    final title = imageRecord.task.filename;
     final imageFilePath = await imageRecord.task.filePath();
     final videoFilePath = await videoRecord.task.filePath();
 
@@ -129,14 +98,14 @@ class DownloadService {
       final result = await _fileMediaRepository.saveLivePhoto(
         image: File(imageFilePath),
         video: File(videoFilePath),
-        title: title,
+        title: task.filename,
       );
 
       return result != null;
     } on PlatformException catch (error, stack) {
       // Handle saving MotionPhotos on iOS
       if (error.code.startsWith('PHPhotosErrorDomain')) {
-        final result = await _fileMediaRepository.saveImageWithFile(imageFilePath, title: title);
+        final result = await _fileMediaRepository.saveImageWithFile(imageFilePath, title: task.filename);
         return result != null;
       }
       _log.severe("Error saving live photo", error, stack);
@@ -156,7 +125,6 @@ class DownloadService {
       }
 
       await _downloadRepository.deleteRecordsWithIds([imageRecord.task.taskId, videoRecord.task.taskId]);
-      _savingLivePhotoIds.remove(livePhotosId);
     }
   }
 
@@ -165,8 +133,8 @@ class DownloadService {
   }
 }
 
-TaskRecord? _findTaskRecord(List<TaskRecord> records, String livePhotosId, LivePhotosPart part) {
-  return records.firstWhereOrNull((record) {
+TaskRecord _findTaskRecord(List<TaskRecord> records, String livePhotosId, LivePhotosPart part) {
+  return records.firstWhere((record) {
     final metadata = LivePhotosMetadata.fromJson(record.task.metaData);
     return metadata.id == livePhotosId && metadata.part == part;
   });

mobile/lib/services/foreground_upload.service.dart

@@ -309,17 +309,10 @@ class ForegroundUploadService {
         return;
       }
 
-      String fileName = await _assetMediaRepository.getOriginalFilename(asset.id) ?? asset.name;
-
-      /// Handle special file name from DJI or Fusion app
-      /// If the file name has no extension, likely due to special renaming template by specific apps
-      /// we append the original extension from the asset name
-      final hasExtension = p.extension(fileName).isNotEmpty;
-      if (!hasExtension) {
-        fileName = p.setExtension(fileName, p.extension(asset.name));
-      }
-
-      final originalFileName = entity.isLivePhoto ? p.setExtension(fileName, p.extension(file.path)) : fileName;
+      final fileName = await _assetMediaRepository.getOriginalFilename(asset.id) ?? asset.name;
+      // Some apps (e.g. DJI/Fusion) return names without an extension; fall back to the asset name for those.
+      final extension = p.extension(file.path).isNotEmpty ? p.extension(file.path) : p.extension(asset.name);
+      final originalFileName = p.setExtension(fileName, extension);
       final deviceId = Store.get(StoreKey.deviceId);
 
       final fields = {

mobile/pubspec.yaml

@@ -58,7 +58,7 @@ dependencies:
   path_provider: ^2.1.5
   path_provider_foundation: ^2.6.0
   permission_handler: ^11.4.0
-  photo_manager: 3.9.0
+  photo_manager: ^3.9.0
   pinput: ^5.0.2
   punycode: ^1.0.0
   scroll_date_picker: ^3.8.0

mobile/test/infrastructure/repositories/local_album_repository_test.dart

@@ -2,7 +2,6 @@ import 'package:drift/drift.dart';
 import 'package:drift/native.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:immich_mobile/domain/models/album/local_album.model.dart';
-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/local_album.repository.dart';
 
@@ -36,75 +35,4 @@ void main() {
       expect(albums[3].id, '2'); // excluded
     });
   });
-
-  group('processDelta', () {
-    // Regression for #22844: an asset moved (not copied) into a backup album on
-    // Android was dropped. The delta reports only the asset's new album, and the
-    // stale link to its old album made the per-album delete sweep wipe the asset.
-    test('keeps an asset moved to another album that still holds other assets', () async {
-      final localAlbumRepo = mediumFactory.getRepository<DriftLocalAlbumRepository>();
-
-      final moved = _localAsset('moved');
-      final other = _localAsset('other');
-      await localAlbumRepo.upsert(
-        mediumFactory.localAlbum(id: 'src', backupSelection: BackupSelection.none),
-        toUpsert: [moved, other],
-      );
-      final anchor = _localAsset('anchor');
-      await localAlbumRepo.upsert(
-        mediumFactory.localAlbum(id: 'dst', backupSelection: BackupSelection.selected),
-        toUpsert: [anchor],
-      );
-
-      // Delta reports the moved asset now living only in the destination album.
-      await localAlbumRepo.processDelta(
-        updates: [moved],
-        deletes: [],
-        assetAlbums: {
-          'moved': ['dst'],
-        },
-      );
-
-      // Per-album delete sweep, as sync() runs on Android. src now physically
-      // holds only `other`; dst holds `anchor` and the moved asset.
-      await localAlbumRepo.syncDeletes('src', ['other']);
-      await localAlbumRepo.syncDeletes('dst', ['anchor', 'moved']);
-
-      final dstIds = (await localAlbumRepo.getAssets('dst')).map((a) => a.id).toSet();
-      final srcIds = await localAlbumRepo.getAssetIds('src');
-
-      expect(dstIds, contains('moved')); // survived and linked to the backed-up album
-      expect(srcIds, isNot(contains('moved'))); // stale source link cleared
-      expect(srcIds, contains('other')); // untouched asset stays put
-    });
-
-    test('replaces album membership with exactly what the delta reports', () async {
-      final localAlbumRepo = mediumFactory.getRepository<DriftLocalAlbumRepository>();
-
-      final moved = _localAsset('moved');
-      await localAlbumRepo.upsert(mediumFactory.localAlbum(id: 'src'), toUpsert: [moved]);
-      await localAlbumRepo.upsert(mediumFactory.localAlbum(id: 'dst'));
-
-      await localAlbumRepo.processDelta(
-        updates: [moved],
-        deletes: [],
-        assetAlbums: {
-          'moved': ['dst'],
-        },
-      );
-
-      expect(await localAlbumRepo.getAssetIds('src'), isEmpty);
-      expect(await localAlbumRepo.getAssetIds('dst'), ['moved']);
-    });
-  });
 }
-
-LocalAsset _localAsset(String id) => LocalAsset(
-  id: id,
-  name: '$id.jpg',
-  type: AssetType.image,
-  createdAt: DateTime(2024),
-  updatedAt: DateTime(2024),
-  playbackStyle: AssetPlaybackStyle.image,
-  isEdited: false,
-);

mobile/test/providers/infrastructure/action_provider_test.dart

@@ -12,6 +12,7 @@ import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/asset_viewer/asset.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/services/action.service.dart';
+import 'package:immich_mobile/services/download.service.dart';
 import 'package:immich_mobile/services/foreground_upload.service.dart';
 import 'package:mocktail/mocktail.dart';
 
@@ -19,6 +20,8 @@ class MockActionService extends Mock implements ActionService {}
 
 class MockAssetService extends Mock implements AssetService {}
 
+class MockDownloadService extends Mock implements DownloadService {}
+
 class MockForegroundUploadService extends Mock implements ForegroundUploadService {}
 
 class MockUserService extends Mock implements UserService {}
@@ -64,6 +67,7 @@ void main() {
       overrides: [
         actionServiceProvider.overrideWithValue(actionService),
         assetServiceProvider.overrideWithValue(assetService),
+        downloadServiceProvider.overrideWithValue(MockDownloadService()),
         foregroundUploadServiceProvider.overrideWithValue(MockForegroundUploadService()),
         currentUserProvider.overrideWith((ref) => CurrentUserProvider(userService)),
       ],

mobile/test/repositories/drift_album_api_repository_test.dart

@@ -1,82 +0,0 @@
-import 'package:flutter_test/flutter_test.dart';
-import 'package:immich_mobile/repositories/drift_album_api_repository.dart';
-import 'package:mocktail/mocktail.dart';
-import 'package:openapi/api.dart';
-
-class _MockAlbumsApi extends Mock implements AlbumsApi {}
-
-void main() {
-  late _MockAlbumsApi api;
-  late DriftAlbumApiRepository repo;
-
-  setUpAll(() {
-    registerFallbackValue(BulkIdsDto(ids: const []));
-  });
-
-  setUp(() {
-    api = _MockAlbumsApi();
-    repo = DriftAlbumApiRepository(api);
-  });
-
-  void stubResponse(List<BulkIdResponseDto> response) {
-    when(
-      () => api.addAssetsToAlbum(any(), any(), abortTrigger: any(named: 'abortTrigger')),
-    ).thenAnswer((_) async => response);
-  }
-
-  test('no_permission failure surfaces as failed, not added (the #22342 bug)', () async {
-    stubResponse([
-      BulkIdResponseDto(id: 'a1', success: false, error: const Optional.present(BulkIdErrorReason.noPermission)),
-    ]);
-
-    final result = await repo.addAssets('album1', ['a1']);
-
-    expect(result.added, isEmpty);
-    expect(result.failed, ['a1']);
-  });
-
-  test('duplicate is neither added nor failed (genuinely already in album)', () async {
-    stubResponse([
-      BulkIdResponseDto(id: 'a1', success: false, error: const Optional.present(BulkIdErrorReason.duplicate)),
-    ]);
-
-    final result = await repo.addAssets('album1', ['a1']);
-
-    expect(result.added, isEmpty);
-    expect(result.failed, isEmpty);
-  });
-
-  test('success is added', () async {
-    stubResponse([BulkIdResponseDto(id: 'a1', success: true)]);
-
-    final result = await repo.addAssets('album1', ['a1']);
-
-    expect(result.added, ['a1']);
-    expect(result.failed, isEmpty);
-  });
-
-  test('not_found and unknown count as failures', () async {
-    stubResponse([
-      BulkIdResponseDto(id: 'a1', success: false, error: const Optional.present(BulkIdErrorReason.notFound)),
-      BulkIdResponseDto(id: 'a2', success: false, error: const Optional.present(BulkIdErrorReason.unknown)),
-    ]);
-
-    final result = await repo.addAssets('album1', ['a1', 'a2']);
-
-    expect(result.added, isEmpty);
-    expect(result.failed, ['a1', 'a2']);
-  });
-
-  test('mixed: added kept, no_permission failed, duplicate dropped', () async {
-    stubResponse([
-      BulkIdResponseDto(id: 'ok', success: true),
-      BulkIdResponseDto(id: 'perm', success: false, error: const Optional.present(BulkIdErrorReason.noPermission)),
-      BulkIdResponseDto(id: 'dup', success: false, error: const Optional.present(BulkIdErrorReason.duplicate)),
-    ]);
-
-    final result = await repo.addAssets('album1', ['ok', 'perm', 'dup']);
-
-    expect(result.added, ['ok']);
-    expect(result.failed, ['perm']);
-  });
-}

mobile/test/services/background_upload.service_test.dart

@@ -136,6 +136,51 @@ void main() {
       expect(task, isNotNull);
       expect(task!.fields.containsKey('visibility'), isFalse);
     });
+
+    test('corrects the extension when iOS returns a rendered file for a .dng asset', () async {
+      final asset = LocalAssetStub.image1;
+      final mockEntity = MockAssetEntity();
+      final mockFile = File('/path/to/IMG_6499.jpg');
+
+      when(() => mockEntity.isLivePhoto).thenReturn(false);
+      when(() => mockStorageRepository.getAssetEntityForAsset(asset)).thenAnswer((_) async => mockEntity);
+      when(() => mockStorageRepository.getFileForAsset(asset.id)).thenAnswer((_) async => mockFile);
+      when(() => mockAssetMediaRepository.getOriginalFilename(asset.id)).thenAnswer((_) async => 'IMG_6499.dng');
+
+      final task = await sut.getUploadTask(asset);
+      expect(task, isNotNull);
+      expect(task!.fields['filename'], equals('IMG_6499.jpg'));
+    });
+
+    test('keeps the .dng extension for a genuine RAW original', () async {
+      final asset = LocalAssetStub.image1;
+      final mockEntity = MockAssetEntity();
+      final mockFile = File('/path/to/IMG_5210.dng');
+
+      when(() => mockEntity.isLivePhoto).thenReturn(false);
+      when(() => mockStorageRepository.getAssetEntityForAsset(asset)).thenAnswer((_) async => mockEntity);
+      when(() => mockStorageRepository.getFileForAsset(asset.id)).thenAnswer((_) async => mockFile);
+      when(() => mockAssetMediaRepository.getOriginalFilename(asset.id)).thenAnswer((_) async => 'IMG_5210.dng');
+
+      final task = await sut.getUploadTask(asset);
+      expect(task, isNotNull);
+      expect(task!.fields['filename'], equals('IMG_5210.dng'));
+    });
+
+    test('borrows the extension from the asset name for an extensionless name (DJI/Fusion)', () async {
+      final asset = LocalAssetStub.image1;
+      final mockEntity = MockAssetEntity();
+      final mockFile = File('/path/to/DJI_0001');
+
+      when(() => mockEntity.isLivePhoto).thenReturn(false);
+      when(() => mockStorageRepository.getAssetEntityForAsset(asset)).thenAnswer((_) async => mockEntity);
+      when(() => mockStorageRepository.getFileForAsset(asset.id)).thenAnswer((_) async => mockFile);
+      when(() => mockAssetMediaRepository.getOriginalFilename(asset.id)).thenAnswer((_) async => 'DJI_0001');
+
+      final task = await sut.getUploadTask(asset);
+      expect(task, isNotNull);
+      expect(task!.fields['filename'], equals('DJI_0001.jpg'));
+    });
   });
 
   group('getLivePhotoUploadTask', () {

mobile/test/services/foreground_upload.service_test.dart

@@ -81,6 +81,24 @@ void main() {
     return captured;
   }
 
+  List<String> captureOriginalFileNames() {
+    final captured = <String>[];
+    when(
+      () => mockUploadRepository.uploadFile(
+        file: any(named: 'file'),
+        originalFileName: any(named: 'originalFileName'),
+        fields: any(named: 'fields'),
+        cancelToken: any(named: 'cancelToken'),
+        onProgress: any(named: 'onProgress'),
+        logContext: any(named: 'logContext'),
+      ),
+    ).thenAnswer((invocation) async {
+      captured.add(invocation.namedArguments[#originalFileName] as String);
+      return UploadResult.success(remoteAssetId: 'remote-${captured.length}');
+    });
+    return captured;
+  }
+
   group('uploadSingleAsset', () {
     test('should upload the motion part hidden and keep the still image visible', () async {
       final asset = LocalAssetStub.image1;
@@ -124,5 +142,59 @@ void main() {
       expect(captured, hasLength(1));
       expect(captured[0].containsKey('visibility'), isFalse);
     });
+
+    test('corrects the extension when iOS returns a rendered file for a .dng asset', () async {
+      final asset = LocalAssetStub.image1;
+      final mockEntity = MockAssetEntity();
+      final stillFile = File('/path/to/IMG_6499.jpg');
+
+      when(() => mockEntity.isLivePhoto).thenReturn(false);
+      when(() => mockStorageRepository.getAssetEntityForAsset(asset)).thenAnswer((_) async => mockEntity);
+      when(() => mockStorageRepository.isAssetAvailableLocally(asset.id)).thenAnswer((_) async => true);
+      when(() => mockStorageRepository.getFileForAsset(asset.id)).thenAnswer((_) async => stillFile);
+      when(() => mockAssetMediaRepository.getOriginalFilename(asset.id)).thenAnswer((_) async => 'IMG_6499.dng');
+
+      final names = captureOriginalFileNames();
+
+      await sut.uploadSingleAsset(asset, null, callbacks: const UploadCallbacks());
+
+      expect(names, equals(['IMG_6499.jpg']));
+    });
+
+    test('keeps the .dng extension for a genuine RAW original', () async {
+      final asset = LocalAssetStub.image1;
+      final mockEntity = MockAssetEntity();
+      final stillFile = File('/path/to/IMG_5210.dng');
+
+      when(() => mockEntity.isLivePhoto).thenReturn(false);
+      when(() => mockStorageRepository.getAssetEntityForAsset(asset)).thenAnswer((_) async => mockEntity);
+      when(() => mockStorageRepository.isAssetAvailableLocally(asset.id)).thenAnswer((_) async => true);
+      when(() => mockStorageRepository.getFileForAsset(asset.id)).thenAnswer((_) async => stillFile);
+      when(() => mockAssetMediaRepository.getOriginalFilename(asset.id)).thenAnswer((_) async => 'IMG_5210.dng');
+
+      final names = captureOriginalFileNames();
+
+      await sut.uploadSingleAsset(asset, null, callbacks: const UploadCallbacks());
+
+      expect(names, equals(['IMG_5210.dng']));
+    });
+
+    test('borrows the extension from the asset name for an extensionless name (DJI/Fusion)', () async {
+      final asset = LocalAssetStub.image1;
+      final mockEntity = MockAssetEntity();
+      final stillFile = File('/path/to/DJI_0001');
+
+      when(() => mockEntity.isLivePhoto).thenReturn(false);
+      when(() => mockStorageRepository.getAssetEntityForAsset(asset)).thenAnswer((_) async => mockEntity);
+      when(() => mockStorageRepository.isAssetAvailableLocally(asset.id)).thenAnswer((_) async => true);
+      when(() => mockStorageRepository.getFileForAsset(asset.id)).thenAnswer((_) async => stillFile);
+      when(() => mockAssetMediaRepository.getOriginalFilename(asset.id)).thenAnswer((_) async => 'DJI_0001');
+
+      final names = captureOriginalFileNames();
+
+      await sut.uploadSingleAsset(asset, null, callbacks: const UploadCallbacks());
+
+      expect(names, equals(['DJI_0001.jpg']));
+    });
   });
 }

package.json

@@ -8,7 +8,7 @@
     "format": "prettier --cache --check i18n/",
     "format:fix": "prettier --cache --write --list-different i18n"
   },
-  "packageManager": "pnpm@11.13.1",
+  "packageManager": "pnpm@11.11.0",
   "engines": {
     "pnpm": ">=10.0.0"
   },

packages/cli/eslint.config.mjs

@@ -46,7 +46,6 @@ export default typescriptEslint.config([
       'unicorn/no-process-exit': 'off',
       'unicorn/import-style': 'off',
       'unicorn/consistent-class-member-order': 'off',
-      'unicorn/prefer-simple-condition-first': 'off',
       curly: 2,
       // prefer the typescript-eslint type-aware version
       'unicorn/require-array-sort-compare': 'off',

packages/cli/package.json

@@ -33,13 +33,12 @@
     "eslint": "^10.0.0",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-prettier": "^5.1.3",
-    "eslint-plugin-unicorn": "^72.0.0",
+    "eslint-plugin-unicorn": "^70.0.0",
     "globals": "^17.0.0",
     "mock-fs": "^5.2.0",
     "prettier": "^3.7.4",
     "prettier-plugin-organize-imports": "^4.0.0",
-    "@typescript/native": "npm:typescript@^7.0.2",
-    "typescript": "npm:@typescript/typescript6@^6.0.2",
+    "typescript": "^6.0.0",
     "typescript-eslint": "^8.58.0",
     "vite": "^8.0.0",
     "vitest": "^4.0.0",

packages/e2e-auth-server/package.json

@@ -13,5 +13,5 @@
     "oidc-provider": "^9.0.0",
     "tsx": "^4.20.6"
   },
-  "packageManager": "pnpm@11.13.1"
+  "packageManager": "pnpm@11.11.0"
 }

packages/plugin-core/package.json

@@ -16,6 +16,6 @@
     "@immich/sdk": "workspace:*",
     "@immich/plugin-sdk": "workspace:*",
     "esbuild": "^0.28.0",
-    "typescript": "^7.0.0"
+    "typescript": "^6.0.0"
   }
 }

packages/plugin-sdk/package.json

@@ -27,14 +27,14 @@
   "keywords": [],
   "author": "",
   "license": "GNU Affero General Public License version 3",
-  "packageManager": "pnpm@11.13.1",
+  "packageManager": "pnpm@11.11.0",
   "devDependencies": {
     "@extism/js-pdk": "^1.1.1",
     "@immich/sdk": "workspace:*",
     "@types/node": "^24.13.3",
     "esbuild": "^0.28.0",
     "tsc-alias": "^1.8.16",
-    "typescript": "^7.0.0"
+    "typescript": "^6.0.0"
   },
   "peerDependencies": {
     "@extism/js-pdk": "^1.1.1"

packages/scripts/package.json

@@ -32,5 +32,5 @@
     "vite": "^8.0.16",
     "vitest": "^4.1.8"
   },
-  "packageManager": "pnpm@11.13.1"
+  "packageManager": "pnpm@11.11.0"
 }

packages/sdk/package.json

@@ -25,6 +25,6 @@
   },
   "devDependencies": {
     "@types/node": "^24.13.3",
-    "typescript": "^7.0.0"
+    "typescript": "^6.0.0"
   }
 }

pnpm-workspace.yaml

@@ -29,7 +29,7 @@ allowBuilds:
   postman-code-generators: false
 overrides:
   canvas: 3.2.3
-  sharp: ^0.35.2
+  sharp: ^0.34.5
 packageExtensions:
   nestjs-kysely:
     dependencies:

server/Dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.io/immich-app/base-server-dev:202607211135@sha256:83c9ff3f7390111596a2dcd24a746c3f8618d58259dbc7aae36618d153462f18 AS builder
+FROM ghcr.io/immich-app/base-server-dev:202607132058@sha256:968709a3668167f11ef8ece5962e72ea8a4231e841f98bd5e0f35da4cc295cc7 AS builder
 ENV COREPACK_ENABLE_DOWNLOAD_PROMPT=0 \
   CI=1 \
   COREPACK_HOME=/tmp \
@@ -20,9 +20,8 @@ RUN --mount=type=cache,id=pnpm-server,target=/buildcache/pnpm-store \
   --mount=type=bind,source=.pnpmfile.cjs,target=.pnpmfile.cjs \
   --mount=type=bind,source=pnpm-lock.yaml,target=pnpm-lock.yaml \
   --mount=type=bind,source=pnpm-workspace.yaml,target=pnpm-workspace.yaml \
-  pnpm --filter @immich/sdk --filter @immich/plugin-sdk --filter immich build && \
-  pnpm --filter immich --prod deploy /output/server-pruned && \
-  SHARP_FORCE_GLOBAL_LIBVIPS=true pnpm --dir /output/server-pruned/node_modules/sharp exec npm run build
+  SHARP_IGNORE_GLOBAL_LIBVIPS=true pnpm --filter @immich/sdk --filter @immich/plugin-sdk --filter immich build && \
+  SHARP_FORCE_GLOBAL_LIBVIPS=true  pnpm --filter immich --prod --no-optional deploy /output/server-pruned
 
 FROM builder AS web
 
@@ -38,7 +37,7 @@ RUN --mount=type=cache,id=pnpm-web,target=/buildcache/pnpm-store \
   --mount=type=bind,source=.pnpmfile.cjs,target=.pnpmfile.cjs \
   --mount=type=bind,source=pnpm-lock.yaml,target=pnpm-lock.yaml \
   --mount=type=bind,source=pnpm-workspace.yaml,target=pnpm-workspace.yaml \
-  pnpm --filter @immich/sdk --filter immich-web install --frozen-lockfile --force && \
+  SHARP_IGNORE_GLOBAL_LIBVIPS=true pnpm --filter @immich/sdk --filter immich-web install --frozen-lockfile --force && \
   pnpm --filter @immich/sdk --filter immich-web build
 
 FROM builder AS cli
@@ -57,7 +56,7 @@ FROM builder AS plugins
 
 ARG TARGETPLATFORM
 
-COPY --from=ghcr.io/jdx/mise:2026.7.11@sha256:6599c81b0da6206cbf5151df97a36794d70aaec4574ceb92d13783b42080b055 /usr/local/bin/mise /usr/local/bin/mise
+COPY --from=ghcr.io/jdx/mise:2026.7.7@sha256:ead960a5f0d2834a78e4640b8e1579d0fcf08cc52a16810dba33b06abf13282e /usr/local/bin/mise /usr/local/bin/mise
 
 WORKDIR /app
 COPY ./mise.toml ./mise.toml
@@ -81,7 +80,7 @@ RUN --mount=type=cache,id=pnpm-packages,target=/buildcache/pnpm-store \
   --mount=type=cache,id=mise-tools-${TARGETPLATFORM},target=/buildcache/mise \
   mise //:plugins
 
-FROM ghcr.io/immich-app/base-server-prod:202607211135@sha256:ced131da7523544fe975cfd25abd67386e712e39496340b437cd95a08d0a18f3
+FROM ghcr.io/immich-app/base-server-prod:202607132058@sha256:85cca651310842265015f26a6710bb7420a54a8fd1ec22d519b7b620f5f93bb1
 
 WORKDIR /usr/src/app
 ENV NODE_ENV=production \

server/Dockerfile.dev

@@ -1,8 +1,8 @@
 # dev build
-FROM ghcr.io/immich-app/base-server-dev:202607211135@sha256:83c9ff3f7390111596a2dcd24a746c3f8618d58259dbc7aae36618d153462f18 AS dev
+FROM ghcr.io/immich-app/base-server-dev:202607132058@sha256:968709a3668167f11ef8ece5962e72ea8a4231e841f98bd5e0f35da4cc295cc7 AS dev
 
 
-COPY --from=ghcr.io/jdx/mise:2026.7.11@sha256:6599c81b0da6206cbf5151df97a36794d70aaec4574ceb92d13783b42080b055 /usr/local/bin/mise /usr/local/bin/mise
+COPY --from=ghcr.io/jdx/mise:2026.7.7@sha256:ead960a5f0d2834a78e4640b8e1579d0fcf08cc52a16810dba33b06abf13282e /usr/local/bin/mise /usr/local/bin/mise
 
 RUN echo "devdir=/buildcache/node-gyp" >> /usr/local/etc/npmrc && \
   echo "store-dir=/buildcache/pnpm-store" >> /usr/local/etc/npmrc && \

server/eslint.config.mjs

@@ -64,7 +64,6 @@ export default typescriptEslint.config([
       'unicorn/consistent-boolean-name': 'off',
       'unicorn/no-computed-property-existence-check': 'off',
       'unicorn/no-non-function-verb-prefix': 'off',
-      'unicorn/prefer-simple-condition-first': 'off',
       // prefer the typescript-eslint type-aware version
       'unicorn/require-array-sort-compare': 'off',
       '@typescript-eslint/require-array-sort-compare': 'error',

server/package.json

@@ -107,7 +107,7 @@
     "rxjs": "^7.8.1",
     "sanitize-filename": "^1.6.3",
     "semver": "^7.8.1",
-    "sharp": "^0.35.2",
+    "sharp": "^0.34.5",
     "sirv": "^3.0.0",
     "socket.io": "^4.8.1",
     "tailwindcss-preset-email": "^1.4.0",
@@ -151,7 +151,7 @@
     "eslint": "^10.0.0",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-prettier": "^5.1.3",
-    "eslint-plugin-unicorn": "^72.0.0",
+    "eslint-plugin-unicorn": "^70.0.0",
     "globals": "^17.0.0",
     "mock-fs": "^5.2.0",
     "pngjs": "^7.0.0",
@@ -161,14 +161,13 @@
     "supertest": "^7.1.0",
     "tailwindcss": "^3.4.0",
     "testcontainers": "^12.0.0",
-    "@typescript/native": "npm:typescript@^7.0.2",
-    "typescript": "npm:@typescript/typescript6@^6.0.2",
+    "typescript": "^6.0.0",
     "typescript-eslint": "^8.28.0",
     "unplugin-swc": "^1.4.5",
     "vite-tsconfig-paths": "^6.0.0",
     "vitest": "^3.0.0"
   },
   "overrides": {
-    "sharp": "^0.35.2"
+    "sharp": "^0.34.5"
   }
 }

server/src/controllers/asset-media.controller.ts

@@ -128,7 +128,7 @@ export class AssetMediaController {
       this.logger.deprecate(
         'Calling the thumbnail endpoint with size=original is deprecated. Use the :id/original endpoint instead',
       );
-      const [_, reqSearch] = req.url.split('?', 2);
+      const [_, reqSearch] = req.url.split('?');
       const redirSearchParams = new URLSearchParams(reqSearch);
       redirSearchParams.delete('size');
       return res.redirect('original?' + redirSearchParams.toString());
@@ -142,7 +142,7 @@ export class AssetMediaController {
       // viewThumbnailRes is a AssetMediaRedirectResponse
       // which redirects to the original asset or a specific size to make better use of caching
       const { targetSize } = viewThumbnailRes;
-      const [reqPath, reqSearch] = req.url.split('?', 2);
+      const [reqPath, reqSearch] = req.url.split('?');
       let redirPath: string;
       const redirSearchParams = new URLSearchParams(reqSearch);
       if (targetSize === 'original') {

server/src/queries/session.repository.sql

@@ -4,8 +4,7 @@
 select
   "id",
   "expiresAt",
-  "pinExpiresAt",
-  "oauthBearerToken"
+  "pinExpiresAt"
 from
   "session"
 where

server/src/repositories/event.repository.ts

@@ -38,7 +38,7 @@ type EventMap = {
   ConfigValidate: [{ newConfig: SystemConfig; oldConfig: SystemConfig }];
 
   // album events
-  AlbumUpdate: [{ id: string; userIds: string[]; recipientIds: string[] }];
+  AlbumUpdate: [{ id: string; recipientId: string }];
   AlbumInvite: [{ id: string; userId: string; senderName: string }];
 
   // asset events

server/src/repositories/media.repository.ts

@@ -313,7 +313,7 @@ export class MediaRepository {
       if (!line) {
         return;
       }
-      const [ptsStr, durationStr, flags] = line.split(',', 3);
+      const [ptsStr, durationStr, flags] = line.split(',');
       const pts = Number.parseInt(ptsStr);
       const duration = Number.parseInt(durationStr);
       if (Number.isNaN(pts) || Number.isNaN(duration) || !flags) {

server/src/repositories/oauth.repository.ts

@@ -83,7 +83,7 @@ export class OAuthRepository {
     url: string,
     expectedState: string,
     codeVerifier: string,
-  ): Promise<{ profile: OAuthProfile; sid?: string; idToken?: string }> {
+  ): Promise<{ profile: OAuthProfile; sid?: string }> {
     const client = await this.getClient(config);
     const pkceCodeVerifier = client.serverMetadata().supportsPKCE() ? codeVerifier : undefined;
 
@@ -111,7 +111,7 @@ export class OAuthRepository {
         }
       }
 
-      return { profile, sid, idToken: tokens.id_token };
+      return { profile, sid };
     } catch (error: Error | any) {
       if (error.message.includes('unexpected JWT alg received')) {
         this.logger.warn(

server/src/repositories/session.repository.ts

@@ -32,7 +32,7 @@ export class SessionRepository {
   get(id: string) {
     return this.db
       .selectFrom('session')
-      .select(['id', 'expiresAt', 'pinExpiresAt', 'oauthBearerToken'])
+      .select(['id', 'expiresAt', 'pinExpiresAt'])
       .where('id', '=', id)
       .executeTakeFirst();
   }

server/src/repositories/websocket.repository.ts

@@ -37,7 +37,6 @@ export interface ClientEventMap {
   on_asset_hidden: [string];
   on_asset_restore: [string[]];
   on_asset_stack_update: string[];
-  on_album_update: [string];
   on_person_thumbnail: [string];
   on_server_version: [ServerVersionResponseDto];
   on_config_update: [];

server/src/schema/migrations/1784647658615-AddOAuthBearerTokenToSession.ts

@@ -1,9 +0,0 @@
-import { Kysely, sql } from 'kysely';
-
-export async function up(db: Kysely<any>): Promise<void> {
-  await sql`ALTER TABLE "session" ADD "oauthBearerToken" character varying;`.execute(db);
-}
-
-export async function down(db: Kysely<any>): Promise<void> {
-  await sql`ALTER TABLE "session" DROP COLUMN "oauthBearerToken";`.execute(db);
-}

server/src/schema/tables/session.table.ts

@@ -55,7 +55,4 @@ export class SessionTable {
 
   @Column({ nullable: true, index: true })
   oauthSid!: string | null;
-
-  @Column({ nullable: true })
-  oauthBearerToken!: string | null;
 }

server/src/services/album.service.spec.ts

@@ -841,8 +841,7 @@ describe(AlbumService.name, () => {
       expect(mocks.album.addAssetIds).toHaveBeenCalledWith(album.id, [asset1.id, asset2.id, asset3.id]);
       expect(mocks.event.emit).toHaveBeenCalledWith('AlbumUpdate', {
         id: album.id,
-        userIds: album.albumUsers.map(({ user }) => user.id),
-        recipientIds: [owner.id],
+        recipientId: owner.id,
       });
     });
 
@@ -1092,13 +1091,11 @@ describe(AlbumService.name, () => {
       ]);
       expect(mocks.event.emit).toHaveBeenCalledWith('AlbumUpdate', {
         id: album1.id,
-        userIds: album1.albumUsers.map(({ user }) => user.id),
-        recipientIds: [owner1.id],
+        recipientId: owner1.id,
       });
       expect(mocks.event.emit).toHaveBeenCalledWith('AlbumUpdate', {
         id: album2.id,
-        userIds: album2.albumUsers.map(({ user }) => user.id),
-        recipientIds: [owner2.id],
+        recipientId: owner2.id,
       });
     });
 

server/src/services/album.service.ts

@@ -190,9 +190,11 @@ export class AlbumService extends BaseService {
         auth.user.id,
       );
 
-      const userIds = album.albumUsers.map(({ user }) => user.id);
-      const recipientIds = userIds.filter((userId) => userId !== auth.user.id);
-      await this.eventRepository.emit('AlbumUpdate', { id, userIds, recipientIds });
+      const allUsersExceptUs = album.albumUsers.map(({ user }) => user.id).filter((userId) => userId !== auth.user.id);
+
+      for (const recipientId of allUsersExceptUs) {
+        await this.eventRepository.emit('AlbumUpdate', { id, recipientId });
+      }
     }
 
     return results;
@@ -221,7 +223,7 @@ export class AlbumService extends BaseService {
     }
 
     const albumAssetValues: { albumId: string; assetId: string }[] = [];
-    const events: { id: string; userIds: string[]; recipientIds: string[] }[] = [];
+    const events: { id: string; recipients: string[] }[] = [];
     for (const albumId of allowedAlbumIds) {
       const existingAssetIds = await this.albumRepository.getAssetIds(albumId, [...allowedAssetIds]);
       const notPresentAssetIds = [...allowedAssetIds.difference(existingAssetIds)];
@@ -244,14 +246,15 @@ export class AlbumService extends BaseService {
         },
         auth.user.id,
       );
-      const userIds = album.albumUsers.map(({ user }) => user.id);
-      const recipientIds = userIds.filter((userId) => userId !== auth.user.id);
-      events.push({ id: albumId, userIds, recipientIds });
+      const allUsersExceptUs = album.albumUsers.map(({ user }) => user.id).filter((userId) => userId !== auth.user.id);
+      events.push({ id: albumId, recipients: allUsersExceptUs });
     }
 
     await this.albumRepository.addAssetIdsToAlbums(albumAssetValues);
     for (const event of events) {
-      await this.eventRepository.emit('AlbumUpdate', event);
+      for (const recipientId of event.recipients) {
+        await this.eventRepository.emit('AlbumUpdate', { id: event.id, recipientId });
+      }
     }
 
     return results;
@@ -268,16 +271,8 @@ export class AlbumService extends BaseService {
     );
 
     const removedIds = results.filter(({ success }) => success).map(({ id }) => id);
-    if (removedIds.length > 0) {
-      if (album.albumThumbnailAssetId && removedIds.includes(album.albumThumbnailAssetId)) {
-        await this.albumRepository.updateThumbnails();
-      }
-
-      await this.eventRepository.emit('AlbumUpdate', {
-        id,
-        userIds: album.albumUsers.map(({ user }) => user.id),
-        recipientIds: [],
-      });
+    if (removedIds.length > 0 && album.albumThumbnailAssetId && removedIds.includes(album.albumThumbnailAssetId)) {
+      await this.albumRepository.updateThumbnails();
     }
 
     return results;

server/src/services/asset-media.service.spec.ts

@@ -269,10 +269,6 @@ describe(AssetMediaService.name, () => {
         'random-uuid.jpg',
       );
     });
-
-    it('should accept filenames with just an extension', () => {
-      expect(sut.getUploadFilename(uploadFile.filename(UploadFieldName.ASSET_DATA, '.jpg'))).toEqual('random-uuid.jpg');
-    });
   });
 
   describe('getUploadFolder', () => {

server/src/services/asset-media.service.ts

@@ -1,4 +1,5 @@
 import { BadRequestException, Injectable, InternalServerErrorException, NotFoundException } from '@nestjs/common';
+import { extname } from 'node:path';
 import sanitize from 'sanitize-filename';
 import { StorageCore } from 'src/cores/storage.core';
 import { AuthSharedLink } from 'src/database';
@@ -91,7 +92,8 @@ export class AssetMediaService extends BaseService {
   getUploadFilename({ auth, fieldName, file, body }: UploadRequest): string {
     requireUploadAccess(auth);
 
-    const extension = getFilenameExtension(body.filename || file.originalName);
+    const extension = extname(body.filename || file.originalName);
+
     const lookup = {
       [UploadFieldName.ASSET_DATA]: extension,
       [UploadFieldName.SIDECAR_DATA]: '.xmp',
@@ -351,12 +353,9 @@ export class AssetMediaService extends BaseService {
     }
 
     await this.albumRepository.addAssetIds(album.id, [assetId]);
-    const userIds = album.albumUsers.map(({ user }) => user.id);
-    await this.eventRepository.emit('AlbumUpdate', {
-      id: album.id,
-      userIds,
-      recipientIds: userIds,
-    });
+    for (const { user } of album.albumUsers) {
+      await this.eventRepository.emit('AlbumUpdate', { id: album.id, recipientId: user.id });
+    }
   }
 
   private requireQuota(auth: AuthDto, size: number) {