Merge remote-tracking branch 'upstream/main' into feature/load-previews

.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
@@ -113,7 +113,7 @@ jobs:
 
       - 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

.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,7 +20,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
 
@@ -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/codeql-analysis.yml

@@ -51,7 +51,7 @@ 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 }}

.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

.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 }}
@@ -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 }}

.vscode/settings.json

@@ -29,6 +29,9 @@
     "editor.formatOnSave": true,
     "tailwindCSS.lint.suggestCanonicalClasses": "ignore"
   },
+  "svelte.plugin.svelte.compilerWarnings": {
+    "state_referenced_locally": "ignore"
+  },
   "[typescript]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode",
     "editor.formatOnSave": true
@@ -40,40 +43,37 @@
   "eslint.useFlatConfig": true,
   "eslint.validate": ["javascript", "typescript", "svelte"],
   "eslint.workingDirectories": [
-    { "changeProcessCWD": true, "directory": "cli" },
-    { "changeProcessCWD": true, "directory": "e2e" },
-    { "changeProcessCWD": true, "directory": "server" },
-    { "changeProcessCWD": true, "directory": "web" }
+    { "directory": "cli", "changeProcessCWD": true },
+    { "directory": "e2e", "changeProcessCWD": true },
+    { "directory": "server", "changeProcessCWD": true },
+    { "directory": "web", "changeProcessCWD": true }
   ],
+  "files.watcherExclude": {
+    "**/.jj/**": true,
+    "**/.git/**": true,
+    "**/node_modules/**": true,
+    "**/build/**": true,
+    "**/dist/**": true,
+    "**/.svelte-kit/**": true
+  },
   "explorer.fileNesting.enabled": true,
   "explorer.fileNesting.patterns": {
     "*.dart": "${capture}.g.dart,${capture}.gr.dart,${capture}.drift.dart",
-    "*.js": "${capture}.spec.js,${capture}.mock.js",
     "*.ts": "${capture}.spec.ts,${capture}.mock.ts",
+    "*.js": "${capture}.spec.js,${capture}.mock.js",
     "package.json": "package-lock.json, yarn.lock, pnpm-lock.yaml, bun.lockb, bun.lock, pnpm-workspace.yaml, .pnpmfile.cjs"
   },
-  "files.watcherExclude": {
-    "**/.git/**": true,
-    "**/.jj/**": true,
-    "**/.svelte-kit/**": true,
-    "**/build/**": true,
-    "**/dist/**": true,
-    "**/node_modules/**": true
-  },
-  "js/ts.preferences.importModuleSpecifier": "non-relative",
   "search.exclude": {
-    "**/.svelte-kit": true,
+    "**/node_modules": true,
     "**/build": true,
     "**/dist": true,
-    "**/node_modules": true,
+    "**/.svelte-kit": true,
     "**/open-api/typescript-sdk/src": true
   },
   "svelte.enable-ts-plugin": true,
-  "svelte.plugin.svelte.compilerWarnings": {
-    "state_referenced_locally": "ignore"
-  },
   "tailwindCSS.experimental.configFile": {
     "web/src/app.css": "web/src/**"
   },
+  "js/ts.preferences.importModuleSpecifier": "non-relative",
   "vitest.maximumConfigs": 10
 }

README.md

@@ -32,7 +32,6 @@
   <a href="readme_i18n/README_zh_TW.md">正體中文</a>
   <a href="readme_i18n/README_uk_UA.md">Українська</a>
   <a href="readme_i18n/README_ru_RU.md">Русский</a>
-  <a href="readme_i18n/README_bg_BG.md">Български</a>
   <a href="readme_i18n/README_pt_BR.md">Português Brasileiro</a>
   <a href="readme_i18n/README_sv_SE.md">Svenska</a>
   <a href="readme_i18n/README_ar_JO.md">العربية</a>

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/docs/install/synology.md

@@ -7,7 +7,7 @@ sidebar_position: 85
 :::note
 This is a community contribution and not officially supported by the Immich team, but included here for convenience.
 
-Community support should be directed to Synology-specific support platforms.
+Community support can be found in the dedicated channel on the [Discord Server](https://discord.immich.app/).
 :::
 
 Immich can easily be installed on a Synology NAS using Container Manager within DSM. If you have not installed Container Manager already, you can install it in the Packages Center. Refer to the [Container Manager docs](https://kb.synology.com/en-us/DSM/help/ContainerManager/docker_desc?version=7) for more information on using Container Manager.

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

@@ -41,18 +41,9 @@ export default typescriptEslint.config([
       '@typescript-eslint/no-floating-promises': 'error',
       'unicorn/prefer-module': 'off',
       'unicorn/import-style': 'off',
-      'unicorn/consistent-boolean-name': 'off',
-      'unicorn/no-non-function-verb-prefix': 'off',
-      'unicorn/no-unreadable-for-of-expression': 'off',
-      'unicorn/max-nested-calls': 'off',
-      'unicorn/prefer-uint8array-base64': 'off',
-      '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',
+      'unicorn/prevent-abbreviations': 'off',
       'unicorn/filename-case': 'off',
       'unicorn/no-null': 'off',
       'unicorn/prefer-top-level-await': '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": "^64.0.0",
     "exiftool-vendored": "^35.0.0",
     "globals": "^17.0.0",
     "luxon": "^3.4.4",
@@ -51,8 +51,7 @@
     "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/specs/maintenance/server/database-backups.e2e-spec.ts

@@ -118,7 +118,7 @@ describe('/admin/database-backups', () => {
 
       expect(status).toBe(201);
 
-      cookie = headers['set-cookie'][0].split(';', 1)[0];
+      cookie = headers['set-cookie'][0].split(';')[0];
 
       await expect
         .poll(
@@ -224,7 +224,7 @@ describe('/admin/database-backups', () => {
         });
 
       expect(status).toBe(201);
-      cookie = headers['set-cookie'][0].split(';', 1)[0];
+      cookie = headers['set-cookie'][0].split(';')[0];
 
       await expect
         .poll(
@@ -295,7 +295,7 @@ describe('/admin/database-backups', () => {
         });
 
       expect(status).toBe(201);
-      cookie = headers['set-cookie'][0].split(';', 1)[0];
+      cookie = headers['set-cookie'][0].split(';')[0];
 
       await expect
         .poll(

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

@@ -85,7 +85,7 @@ describe('/admin/maintenance', () => {
 
       expect(status).toBe(201);
 
-      cookie = headers['set-cookie'][0].split(';', 1)[0];
+      cookie = headers['set-cookie'][0].split(';')[0];
       expect(cookie).toEqual(
         expect.stringMatching(/^immich_maintenance_token=[A-Za-z0-9-_]*\.[A-Za-z0-9-_]*\.[A-Za-z0-9-_]*$/),
       );
@@ -149,7 +149,7 @@ describe('/admin/maintenance', () => {
         const { status, body } = await request(app)
           .post('/admin/maintenance/login')
           .send({
-            token: cookie!.split('=', 2)[1].trim(),
+            token: cookie!.split('=')[1].trim(),
           });
         expect(status).toBe(201);
         expect(body).toEqual(

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

@@ -27,7 +27,7 @@ test.describe('Maintenance', () => {
   test('maintenance shows no options to users until they authenticate', async ({ page }) => {
     const setCookie = await utils.enterMaintenance(admin.accessToken);
     const cookie = setCookie
-      ?.map((cookie) => cookie.split(';', 1)[0].split('='))
+      ?.map((cookie) => cookie.split(';')[0].split('='))
       ?.find(([name]) => name === 'immich_maintenance_token');
 
     expect(cookie).toBeTruthy();

e2e/src/specs/server/api/album.e2e-spec.ts

@@ -120,7 +120,6 @@ describe('/albums', () => {
       }),
     ]);
 
-    // eslint-disable-next-line unicorn/no-unreadable-array-destructuring
     [user2Albums[0]] = await Promise.all([
       getAlbumInfo({ id: user2Albums[0].id }, { headers: asBearerAuth(user2.accessToken) }),
       deleteUserAdmin({ id: user3.userId, userAdminDeleteDto: {} }, { headers: asBearerAuth(admin.accessToken) }),

e2e/src/specs/server/api/asset.e2e-spec.ts

@@ -781,7 +781,7 @@ describe('/asset', () => {
             exifImageWidth: 4032,
             exifImageHeight: 3024,
             latitude: 41.2203,
-            longitude: -96.071625,
+            longitude: -96.071_625,
             make: 'Apple',
             model: 'iPhone 7',
             lensModel: 'iPhone 7 back camera 3.99mm f/1.8',
@@ -973,9 +973,9 @@ describe('/asset', () => {
             fileSizeInByte: 31_175_472,
             focalLength: 18.3,
             iso: 100,
-            latitude: 36.61324,
+            latitude: 36.613_24,
             lensModel: '18.3mm F2.8',
-            longitude: -121.89785,
+            longitude: -121.897_85,
             make: 'RICOH IMAGING COMPANY, LTD.',
             model: 'RICOH GR III',
             orientation: '1',

e2e/src/specs/server/api/map.e2e-spec.ts

@@ -75,7 +75,7 @@ describe('/map', () => {
           country: 'United States of America',
           id: expect.any(String),
           lat: expect.closeTo(39.115),
-          lon: expect.closeTo(-108.400968),
+          lon: expect.closeTo(-108.400_968),
           state: 'Colorado',
         },
         {
@@ -83,7 +83,7 @@ describe('/map', () => {
           country: 'United States of America',
           id: expect.any(String),
           lat: expect.closeTo(41.2203),
-          lon: expect.closeTo(-96.071625),
+          lon: expect.closeTo(-96.071_625),
           state: 'Nebraska',
         },
       ]);
@@ -123,7 +123,7 @@ describe('/map', () => {
           country: 'United States of America',
           id: expect.any(String),
           lat: expect.closeTo(39.115),
-          lon: expect.closeTo(-108.400968),
+          lon: expect.closeTo(-108.400_968),
           state: 'Colorado',
         },
         {
@@ -131,7 +131,7 @@ describe('/map', () => {
           country: 'United States of America',
           id: expect.any(String),
           lat: expect.closeTo(41.2203),
-          lon: expect.closeTo(-96.071625),
+          lon: expect.closeTo(-96.071_625),
           state: 'Nebraska',
         },
       ]);
@@ -188,20 +188,20 @@ describe('/map', () => {
     const reverseGeocodeTestCases = [
       {
         name: 'Vaucluse',
-        lat: -33.85897705866313,
-        lon: 151.27849073027048,
+        lat: -33.858_977_058_663_13,
+        lon: 151.278_490_730_270_48,
         results: [{ city: 'Vaucluse', state: 'New South Wales', country: 'Australia' }],
       },
       {
         name: 'Ravenhall',
-        lat: -37.76573239917475,
-        lon: 144.7524531648833,
+        lat: -37.765_732_399_174_75,
+        lon: 144.752_453_164_883_3,
         results: [{ city: 'Ravenhall', state: 'Victoria', country: 'Australia' }],
       },
       {
         name: 'Scarborough',
-        lat: -31.894346156789997,
-        lon: 115.75761710390464,
+        lat: -31.894_346_156_789_997,
+        lon: 115.757_617_103_904_64,
         results: [{ city: 'Scarborough', state: 'Western Australia', country: 'Australia' }],
       },
     ];

e2e/src/specs/server/api/oauth.e2e-spec.ts

@@ -44,7 +44,7 @@ const loginWithOAuth = async (sub: OAuthUser | string, redirectUri?: string) =>
   });
 
   // login
-  const response1 = await redirect(url.replace(authServer.internal, () => authServer.external));
+  const response1 = await redirect(url.replace(authServer.internal, authServer.external));
   const response2 = await request(authServer.external + response1.location)
     .post('')
     .set('Cookie', response1.cookies)

e2e/src/specs/server/api/search.e2e-spec.ts

@@ -87,23 +87,23 @@ describe('/search', () => {
 
     // note: the coordinates here are not the actual coordinates of the images and are random for most of them
     const coordinates = [
-      { latitude: 48.85341, longitude: 2.3488 }, // paris
-      { latitude: 35.6895, longitude: 139.69171 }, // tokyo
-      { latitude: 52.52437, longitude: 13.41053 }, // berlin
-      { latitude: 1.3146631, longitude: 103.8454093 }, // singapore
-      { latitude: 41.01384, longitude: 28.94966 }, // istanbul
-      { latitude: 5.55602, longitude: -0.1969 }, // accra
-      { latitude: 37.5442706, longitude: -4.7277528 }, // andalusia
-      { latitude: 23.13302, longitude: -82.38304 }, // havana
-      { latitude: 41.69411, longitude: 44.83368 }, // tbilisi
-      { latitude: 31.22222, longitude: 121.45806 }, // shanghai
+      { latitude: 48.853_41, longitude: 2.3488 }, // paris
+      { latitude: 35.6895, longitude: 139.691_71 }, // tokyo
+      { latitude: 52.524_37, longitude: 13.410_53 }, // berlin
+      { latitude: 1.314_663_1, longitude: 103.845_409_3 }, // singapore
+      { latitude: 41.013_84, longitude: 28.949_66 }, // istanbul
+      { latitude: 5.556_02, longitude: -0.1969 }, // accra
+      { latitude: 37.544_270_6, longitude: -4.727_752_8 }, // andalusia
+      { latitude: 23.133_02, longitude: -82.383_04 }, // havana
+      { latitude: 41.694_11, longitude: 44.833_68 }, // tbilisi
+      { latitude: 31.222_22, longitude: 121.458_06 }, // shanghai
       { latitude: 38.9711, longitude: -109.7137 }, // thompson springs
-      { latitude: 40.71427, longitude: -74.00597 }, // new york
-      { latitude: 47.04057, longitude: 9.06804 }, // glarus
-      { latitude: 32.77152, longitude: -89.11673 }, // philadelphia
-      { latitude: 31.63416, longitude: -7.99994 }, // marrakesh
-      { latitude: 38.5237354, longitude: -78.4886194 }, // tanners ridge
-      { latitude: 59.93863, longitude: 30.31413 }, // st. petersburg
+      { latitude: 40.714_27, longitude: -74.005_97 }, // new york
+      { latitude: 47.040_57, longitude: 9.068_04 }, // glarus
+      { latitude: 32.771_52, longitude: -89.116_73 }, // philadelphia
+      { latitude: 31.634_16, longitude: -7.999_94 }, // marrakesh
+      { latitude: 38.523_735_4, longitude: -78.488_619_4 }, // tanners ridge
+      { latitude: 59.938_63, longitude: 30.314_13 }, // st. petersburg
       { latitude: 0, longitude: 0 }, // null island
     ];
 
@@ -112,7 +112,7 @@ describe('/search', () => {
     );
 
     await Promise.all(updates);
-    for (const i of coordinates.keys()) {
+    for (const [i] of coordinates.entries()) {
       await utils.waitForWebsocketEvent({ event: 'assetUpdate', id: assets[i].id });
     }
 

e2e/src/specs/server/cli/login.e2e-spec.ts

@@ -31,7 +31,7 @@ describe(`immich login`, () => {
   it('should login and save auth.yml with 600', async () => {
     const admin = await utils.adminSetup();
     const key = await utils.createApiKey(admin.accessToken, [Permission.All]);
-    const { stdout, stderr, exitCode } = await immichCli(['login', app, key.secret]);
+    const { stdout, stderr, exitCode } = await immichCli(['login', app, `${key.secret}`]);
     expect(stdout.split('\n')).toEqual([
       'Logging in to http://127.0.0.1:2285/api',
       'Logged in as admin@immich.cloud',
@@ -48,7 +48,7 @@ describe(`immich login`, () => {
   it('should login without /api in the url', async () => {
     const admin = await utils.adminSetup();
     const key = await utils.createApiKey(admin.accessToken, [Permission.All]);
-    const { stdout, stderr, exitCode } = await immichCli(['login', app.replaceAll('/api', ''), key.secret]);
+    const { stdout, stderr, exitCode } = await immichCli(['login', app.replaceAll('/api', ''), `${key.secret}`]);
     expect(stdout.split('\n')).toEqual([
       'Logging in to http://127.0.0.1:2285',
       'Discovered API at http://127.0.0.1:2285/api',

e2e/src/specs/server/cli/upload.e2e-spec.ts

@@ -119,9 +119,7 @@ describe(`immich upload`, () => {
           const baseDir = `/tmp/upload/`;
 
           const testPaths = Object.keys(files).map((filePath) => `${baseDir}/${filePath}`);
-          for (const filePath of testPaths) {
-            utils.createImageFile(filePath);
-          }
+          testPaths.map((filePath) => utils.createImageFile(filePath));
 
           const commandLine = paths.map((argument) => `${baseDir}/${argument}`);
 
@@ -137,9 +135,7 @@ describe(`immich upload`, () => {
           const assets = await getAssetStatistics({}, { headers: asKeyAuth(key) });
           expect(assets.total).toBe(expectedCount);
 
-          for (const filePath of testPaths) {
-            utils.removeImageFile(filePath);
-          }
+          testPaths.map((filePath) => utils.removeImageFile(filePath));
         });
       }
     });

e2e/src/ui/generators/timeline/images.ts

@@ -21,7 +21,7 @@ export const randomImageFromString = async (
   let seedNumber = 0;
   for (let i = 0; i < seed.length; i++) {
     seedNumber = (seedNumber << 5) - seedNumber + (seed.codePointAt(i) ?? 0);
-    seedNumber &= seedNumber; // Convert to 32bit integer
+    seedNumber = seedNumber & seedNumber; // Convert to 32bit integer
   }
   return randomImage(new SeededRandom(Math.abs(seedNumber)), { width, height });
 };

e2e/src/ui/generators/timeline/model-objects.ts

@@ -64,7 +64,7 @@ export function generateAsset(
   const asset: MockTimelineAsset = {
     id: assetId,
     ownerId,
-    ratio: Number(ratio.split(':', 1)[0]) / Number(ratio.split(':', 2)[1]),
+    ratio: Number.parseFloat(ratio.split(':')[0]) / Number.parseFloat(ratio.split(':')[1]),
     thumbhash: generateThumbhash(rng),
     localDateTime: date.toISOString(),
     fileCreatedAt: date.toISOString(),
@@ -214,7 +214,7 @@ export function generateTimelineData(config: TimelineConfig): MockTimelineData {
   }
 
   // Create a mock album from random assets
-  const allAssets = buckets.values().toArray().flat();
+  const allAssets = [...buckets.values()].flat();
 
   // Select 10-30 random assets for the album (or all assets if less than 10)
   const albumSize = Math.min(allAssets.length, globalRng.nextInt(10, 31));

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

@@ -172,7 +172,11 @@ function shouldIncludeAsset(
   if (isArchived !== undefined && actuallyArchived !== isArchived) {
     return false;
   }
-  return isFavorite === undefined || actuallyFavorited === isFavorite;
+  if (isFavorite !== undefined && actuallyFavorited !== isFavorite) {
+    return false;
+  }
+
+  return true;
 }
 /**
  * Get summary for all buckets (mimics getTimeBuckets API)
@@ -357,7 +361,7 @@ export function getAsset(
   owner?: UserResponseDto,
 ): AssetResponseDto | undefined {
   // Search through all buckets for the asset
-  const buckets = timelineData.buckets.values().toArray();
+  const buckets = [...timelineData.buckets.values()];
   for (const assets of buckets) {
     const asset = assets.find((a) => a.id === assetId);
     if (asset) {
@@ -391,7 +395,7 @@ export function getAlbum(
 
   // Get the actual asset objects from the timeline data
   const albumAssets: AssetResponseDto[] = [];
-  const allAssets = timelineData.buckets.values().toArray().flat();
+  const allAssets = [...timelineData.buckets.values()].flat();
 
   for (const assetId of album.assetIds) {
     const assetConfig = allAssets.find((a) => a.id === assetId);

e2e/src/ui/generators/timeline/timeline-config.ts

@@ -143,7 +143,7 @@ export function validateTimelineConfig(config: TimelineConfig): void {
   }
 
   // Validate seed if provided
-  if (config.seed !== undefined && (config.seed < 0 || !Number.isSafeInteger(config.seed))) {
+  if (config.seed !== undefined && (config.seed < 0 || !Number.isInteger(config.seed))) {
     throw new Error('Seed must be a non-negative integer');
   }
 

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

@@ -153,8 +153,11 @@ export function getMockAsset(
   const isInDifferentPeriod = (date1: DateTime, date2: DateTime): boolean => {
     if (unit === 'day') {
       return !date1.startOf('day').equals(date2.startOf('day'));
+    } else if (unit === 'month') {
+      return date1.year !== date2.year || date1.month !== date2.month;
+    } else {
+      return date1.year !== date2.year;
     }
-    return unit === 'month' ? date1.year !== date2.year || date1.month !== date2.month : date1.year !== date2.year;
   };
 
   if (direction === 'next') {

e2e/src/ui/mock-network/timeline-network.ts

@@ -40,8 +40,7 @@ export const setupTimelineMockApiRoutes = async (
         contentType: 'application/json',
         json: getTimeBuckets(timelineRestData, isTrashed, isArchived, isFavorite, albumId, changes),
       });
-    }
-    if (pathname === '/api/timeline/bucket') {
+    } else if (pathname === '/api/timeline/bucket') {
       const timeBucket = url.searchParams.get('timeBucket');
       if (!timeBucket) {
         return route.continue();

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/memory/utils.ts

@@ -1,4 +1,3 @@
-/* eslint-disable unicorn/no-this-outside-of-class */
 import type { AssetResponseDto } from '@immich/sdk';
 import { expect, Page } from '@playwright/test';
 

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')}`;
 };
 
@@ -72,7 +72,6 @@ export const thumbnailUtils = {
   },
   async queryThumbnailInViewport(page: Page, collector: (assetId: string) => boolean) {
     const assetIds: string[] = [];
-    // eslint-disable-next-line unicorn/no-this-outside-of-class
     for (const thumb of await this.locator(page).all()) {
       const box = await thumb.boundingBox();
       if (box) {
@@ -152,7 +151,6 @@ export const timelineUtils = {
       page.evaluate(() => {
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore
-
         return document.querySelector('#asset-grid').scrollTop;
       });
     await expect.poll(queryTop).toBeGreaterThan(0);
@@ -179,7 +177,6 @@ export const assetViewerUtils = {
       page.evaluate(() => {
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore
-        // eslint-disable-next-line unicorn/no-optional-chaining-on-undeclared-variable
         return document.activeElement?.dataset?.asset;
       });
     await expect(poll(page, activeElement, (result) => result === assetId)).resolves.toBe(assetId);

e2e/src/utils.ts

@@ -1,4 +1,3 @@
-/* eslint-disable unicorn/no-top-level-assignment-in-function */
 import {
   AssetMediaCreateDto,
   AssetMediaResponseDto,
@@ -178,7 +177,7 @@ export const utils = {
   resetDatabase: async (tables?: string[]) => {
     client = await utils.connectDatabase();
 
-    tables ||= [
+    tables = tables || [
       // TODO e2e test for deleting a stack, since it is quite complex
       'stack',
       'library',
@@ -305,7 +304,7 @@ export const utils = {
   },
 
   adminSetup: async (options?: AdminSetupOptions) => {
-    options ||= { onboarding: true };
+    options = options || { onboarding: true };
 
     await signUpAdmin({ signUpDto: signupDto.admin });
     const response = await login({ loginCredentialDto: loginDto.admin });
@@ -546,7 +545,6 @@ export const utils = {
       {
         headers: asBearerAuth(accessToken),
         fetch: (...args: Parameters<typeof fetch>) =>
-          // eslint-disable-next-line unicorn/no-invalid-argument-count, unicorn/prefer-await
           fetch(...args).then((response) => {
             setCookie = response.headers.getSetCookie();
             return response;
@@ -676,7 +674,7 @@ export const utils = {
 
   cliLogin: async (accessToken: string) => {
     const key = await utils.createApiKey(accessToken, [Permission.All]);
-    await immichCli(['login', app, key.secret]);
+    await immichCli(['login', app, `${key.secret}`]);
     return key.secret;
   },
 
@@ -708,7 +706,6 @@ export const utils = {
   },
 };
 
-// eslint-disable-next-line unicorn/no-top-level-side-effects
 utils.initSdk();
 
 if (!existsSync(`${testAssetDir}/albums`)) {

e2e/tsconfig.json

@@ -10,7 +10,6 @@
     "allowSyntheticDefaultImports": true,
     "resolveJsonModule": true,
     "target": "es2023",
-    "lib": ["dom", "ESNext"],
     "sourceMap": true,
     "outDir": "./dist",
     "incremental": true,

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"

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/integration_test/background_sync_teardown_test.dart

@@ -46,7 +46,7 @@ void main() {
 
   void sendUser(SyncStream stream, String id, String name) {
     stream.send(
-      type: SyncEntityType.userV1.toString(),
+      type: SyncEntityType.userV1.value,
       data: SyncUserV1(
         id: id,
         name: name,

mobile/ios/Runner.xcodeproj/project.pbxproj

@@ -586,7 +586,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "/bin/bash \"$SRCROOT/scripts/xcode_flutter_build.sh\"\n";
+			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build\n";
 		};
 		BAEA01ACA3F5C9CD3D732370 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;

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/scripts/xcode_flutter_build.sh

@@ -1,45 +0,0 @@
-#!/usr/bin/env bash
-# Makes Flutter's builds through the Xcode GUI properly display errors and warnings
-# in the Issue navigator
-#
-# Flutter's `xcode_backend.dart` runs `flutter assemble` with `allowFail: true`,
-# which intentionally does not prefix output with `error:`. Unsure why they do this,
-# but this script rebuilds the expected output so Xcode can parse and display the errors
-
-set -o pipefail
-
-# The Immich mobile root (containing the Dart `lib` directory). This is used to make
-# absolute paths for Xcode linking
-app_root="${FLUTTER_APPLICATION_PATH:-$SRCROOT/..}"
-
-/bin/sh "$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh" build 2>&1 \
-  | awk -v app_root="$app_root" '
-    # Match Dart CFE diagnostics: <path>.dart:<line>:<col>: <Kind>: <message>
-    # Written for macOS/POSIX/BSD awk
-    {
-      # Always pass the original line through to preserve the original build log
-      print
-
-      if ($0 ~ /^.*\.dart:[0-9]+:[0-9]+: (Error|Warning|Context|Info):/) {
-        # Locate the ": Kind:" separator to split location from message.
-        rest = $0
-        if      (match(rest, /: Error:/))   { kind = "Error";   keyword = "error"   }
-        else if (match(rest, /: Warning:/)) { kind = "Warning"; keyword = "warning" }
-        else if (match(rest, /: Context:/)) { kind = "Context"; keyword = "note"    }
-        else if (match(rest, /: Info:/))    { kind = "Info";    keyword = "note"    }
-
-        # location = everything before ": Kind:" (e.g. "lib/foo.dart:12:5")
-        location = substr(rest, 1, RSTART - 1)
-        # message = everything after ": Kind:" (leading space preserved)
-        message = substr(rest, RSTART + length(": " kind ":"))
-
-        # Make the path absolute so Xcode links to it
-        if (location !~ /^\//)
-          location = app_root "/" location
-
-        printf "%s: %s:%s\n", location, keyword, message
-      }
-    }
-  '
-
-exit "${PIPESTATUS[0]}"

mobile/lib/domain/models/config/app_config.dart

@@ -129,6 +129,7 @@ class AppConfig {
             .themeDynamic => theme.dynamicTheme,
             .themeColorfulInterface => theme.colorfulInterface,
             .imagePreferRemote => image.preferRemote,
+            .imageLoadPreview => image.loadPreview,
             .imageLoadOriginal => image.loadOriginal,
             .viewerLoopVideo => viewer.loopVideo,
             .viewerLoadOriginalVideo => viewer.loadOriginalVideo,
@@ -181,6 +182,7 @@ class AppConfig {
       .themeDynamic => copyWith(theme: theme.copyWith(dynamicTheme: value as bool)),
       .themeColorfulInterface => copyWith(theme: theme.copyWith(colorfulInterface: value as bool)),
       .imagePreferRemote => copyWith(image: image.copyWith(preferRemote: value as bool)),
+      .imageLoadPreview => copyWith(image: image.copyWith(loadPreview: value as bool)),
       .imageLoadOriginal => copyWith(image: image.copyWith(loadOriginal: value as bool)),
       .viewerLoopVideo => copyWith(viewer: viewer.copyWith(loopVideo: value as bool)),
       .viewerLoadOriginalVideo => copyWith(viewer: viewer.copyWith(loadOriginalVideo: value as bool)),

mobile/lib/domain/models/config/image_config.dart

@@ -1,20 +1,28 @@
 class ImageConfig {
   final bool preferRemote;
+  final bool loadPreview;
   final bool loadOriginal;
 
-  const ImageConfig({this.preferRemote = false, this.loadOriginal = false});
+  const ImageConfig({this.preferRemote = false, this.loadPreview = true, this.loadOriginal = false});
 
-  ImageConfig copyWith({bool? preferRemote, bool? loadOriginal}) =>
-      ImageConfig(preferRemote: preferRemote ?? this.preferRemote, loadOriginal: loadOriginal ?? this.loadOriginal);
+  ImageConfig copyWith({bool? preferRemote, bool? loadPreview, bool? loadOriginal}) => ImageConfig(
+    preferRemote: preferRemote ?? this.preferRemote,
+    loadPreview: loadPreview ?? this.loadPreview,
+    loadOriginal: loadOriginal ?? this.loadOriginal,
+  );
 
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
-      (other is ImageConfig && other.preferRemote == preferRemote && other.loadOriginal == loadOriginal);
+      (other is ImageConfig &&
+          other.preferRemote == preferRemote &&
+          other.loadPreview == loadPreview &&
+          other.loadOriginal == loadOriginal);
 
   @override
-  int get hashCode => Object.hash(preferRemote, loadOriginal);
+  int get hashCode => Object.hash(preferRemote, loadPreview, loadOriginal);
 
   @override
-  String toString() => 'ImageConfig(preferRemoteImage: $preferRemote, loadOriginal: $loadOriginal)';
+  String toString() =>
+      'ImageConfig(preferRemoteImage: $preferRemote, loadPreview: $loadPreview, loadOriginal: $loadOriginal)';
 }

mobile/lib/domain/models/settings_key.dart

@@ -17,6 +17,7 @@ enum SettingsKey<T> {
 
   // Image
   imagePreferRemote<bool>(),
+  imageLoadPreview<bool>(),
   imageLoadOriginal<bool>(),
 
   // Viewer

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/domain/services/sync_stream.service.dart

@@ -328,6 +328,8 @@ class SyncStreamService {
         return _syncStreamRepository.updateAssetOcrV1(data.cast());
       case SyncEntityType.assetOcrDeleteV1:
         return _syncStreamRepository.deleteAssetOcrV1(data.cast());
+      default:
+        _logger.warning("Unknown sync data type: $type");
     }
   }
 

mobile/lib/extensions/asset_extensions.dart

@@ -58,6 +58,7 @@ extension on api.AssetVisibility {
     api.AssetVisibility.hidden => AssetVisibility.hidden,
     api.AssetVisibility.archive => AssetVisibility.archive,
     api.AssetVisibility.locked => AssetVisibility.locked,
+    _ => AssetVisibility.timeline,
   };
 }
 
@@ -67,5 +68,6 @@ extension on api.AssetTypeEnum {
     api.AssetTypeEnum.VIDEO => AssetType.video,
     api.AssetTypeEnum.AUDIO => AssetType.audio,
     api.AssetTypeEnum.OTHER => AssetType.other,
+    _ => throw Exception('Unknown AssetType value: $this'),
   };
 }

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/sync_stream.repository.dart

@@ -937,6 +937,7 @@ extension on AssetTypeEnum {
     AssetTypeEnum.VIDEO => AssetType.video,
     AssetTypeEnum.AUDIO => AssetType.audio,
     AssetTypeEnum.OTHER => AssetType.other,
+    _ => throw Exception('Unknown AssetType value: $this'),
   };
 }
 
@@ -944,12 +945,14 @@ extension on AssetOrder {
   AlbumAssetOrder toAlbumAssetOrder() => switch (this) {
     AssetOrder.asc => AlbumAssetOrder.asc,
     AssetOrder.desc => AlbumAssetOrder.desc,
+    _ => throw Exception('Unknown AssetOrder value: $this'),
   };
 }
 
 extension on MemoryType {
   MemoryTypeEnum toMemoryType() => switch (this) {
     MemoryType.onThisDay => MemoryTypeEnum.onThisDay,
+    _ => throw Exception('Unknown MemoryType value: $this'),
   };
 }
 
@@ -958,6 +961,7 @@ extension on api.AlbumUserRole {
     api.AlbumUserRole.editor => AlbumUserRole.editor,
     api.AlbumUserRole.viewer => AlbumUserRole.viewer,
     api.AlbumUserRole.owner => AlbumUserRole.owner,
+    _ => throw Exception('Unknown AlbumUserRole value: $this'),
   };
 }
 
@@ -967,6 +971,7 @@ extension on api.AssetVisibility {
     api.AssetVisibility.hidden => AssetVisibility.hidden,
     api.AssetVisibility.archive => AssetVisibility.archive,
     api.AssetVisibility.locked => AssetVisibility.locked,
+    _ => throw Exception('Unknown AssetVisibility value: $this'),
   };
 }
 
@@ -975,11 +980,12 @@ extension on api.UserMetadataKey {
     api.UserMetadataKey.onboarding => UserMetadataKey.onboarding,
     api.UserMetadataKey.preferences => UserMetadataKey.preferences,
     api.UserMetadataKey.license => UserMetadataKey.license,
+    _ => throw Exception('Unknown UserMetadataKey value: $this'),
   };
 }
 
 extension on UserAvatarColor {
-  AvatarColor? toAvatarColor() => AvatarColor.values.firstWhereOrNull((c) => c.name == toString());
+  AvatarColor? toAvatarColor() => AvatarColor.values.firstWhereOrNull((c) => c.name == value);
 }
 
 extension on api.AssetEditAction {
@@ -987,5 +993,6 @@ extension on api.AssetEditAction {
     api.AssetEditAction.crop => AssetEditAction.crop,
     api.AssetEditAction.rotate => AssetEditAction.rotate,
     api.AssetEditAction.mirror => AssetEditAction.mirror,
+    _ => AssetEditAction.other,
   };
 }

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/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/share_action_button.widget.dart

@@ -7,6 +7,7 @@ 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/settings_key.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/generated/translations.g.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
@@ -128,6 +129,12 @@ class ShareActionButton extends ConsumerWidget {
       return;
     }
 
+    await ref.read(settingsProvider).write(SettingsKey.shareFileType, fileType);
+
+    if (!context.mounted) {
+      return;
+    }
+
     await _share(context, ref, fileType);
   }
 

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

@@ -745,15 +745,10 @@ class AddToAlbumHeader extends ConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     Future<void> onCreateAlbum() async {
-      final albumName = await showDialog<String?>(context: context, builder: (context) => const NewAlbumNameModal());
-      if (albumName == null) {
-        return;
-      }
-
       final selectedAssets = ref.read(multiSelectProvider).selectedAssets;
       final newAlbum = await ref
           .read(remoteAlbumProvider.notifier)
-          .createAlbumWithAssets(title: albumName, assets: selectedAssets);
+          .createAlbumWithAssets(title: "Untitled Album", assets: selectedAssets);
 
       if (newAlbum == null) {
         ImmichToast.show(context: context, toastType: ToastType.error, msg: 'errors.failed_to_create_album'.tr());

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

@@ -174,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();

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

@@ -91,7 +91,7 @@ class _NativeVideoViewerState extends ConsumerState<NativeVideoViewer> with Widg
         }
       case AppLifecycleState.paused:
         _shouldPlayOnForeground = await _controller?.isPlaying() ?? true;
-        if (_shouldPlayOnForeground && mounted) {
+        if (_shouldPlayOnForeground) {
           await _notifier.pause();
         }
       default:
@@ -268,13 +268,10 @@ class _NativeVideoViewerState extends ConsumerState<NativeVideoViewer> with Widg
       return;
     }
 
-    // Grab refs to prevent reading after dispose
+    await _notifier.load(source);
     final loopVideo = ref.read(appConfigProvider).viewer.loopVideo;
-    final localNotifier = _notifier;
-
-    await localNotifier.load(source);
-    await localNotifier.setLoop(!widget.asset.isMotionPhoto && loopVideo);
-    await localNotifier.setVolume(1);
+    await _notifier.setLoop(!widget.asset.isMotionPhoto && loopVideo);
+    await _notifier.setVolume(1);
   }
 
   void _initController(NativeVideoPlayerController nc) {

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/images/image_provider.dart

@@ -45,7 +45,6 @@ mixin CancellableImageProviderMixin<T extends Object> on CancellableImageProvide
 
     completer.operation.valueOrCancellation().whenComplete(() {
       cachedStream.removeListener(listener);
-      cachedOperation = null;
     });
     cachedOperation = completer.operation;
     return null;
@@ -95,6 +94,9 @@ mixin CancellableImageProviderMixin<T extends Object> on CancellableImageProvide
       isFinished = isFinal;
       return codec;
     } catch (e) {
+      if (isCancelled) {
+        return null;
+      }
       if (isFinal) {
         isFinished = true;
         PaintingBinding.instance.imageCache.evict(this);
@@ -106,18 +108,33 @@ mixin CancellableImageProviderMixin<T extends Object> on CancellableImageProvide
     }
   }
 
-  Stream<ImageInfo> initialImageStream() async* {
+  Stream<ImageInfo> initialImageStream({required bool isFinal}) async* {
     final cachedOperation = this.cachedOperation;
+    if (isCancelled) {
+      return;
+    }
     if (cachedOperation == null) {
+      // image resolved synchronously
+      isFinished = isFinal;
       return;
     }
 
     try {
       final cachedImage = await cachedOperation.valueOrCancellation();
-      if (cachedImage != null && !isCancelled) {
-        yield cachedImage;
+      if (isCancelled || cachedImage == null) {
+        return;
       }
+      isFinished = isFinal;
+      yield cachedImage;
     } catch (e, stack) {
+      if (isCancelled) {
+        return;
+      }
+      if (isFinal) {
+        isFinished = true;
+        PaintingBinding.instance.imageCache.evict(this);
+        rethrow;
+      }
       _log.severe('Error loading initial image', e, stack);
     } finally {
       this.cachedOperation = null;

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

@@ -98,51 +98,55 @@ class LocalFullImageProvider extends CancellableImageProvider<LocalFullImageProv
   }
 
   Stream<ImageInfo> _codec(LocalFullImageProvider key, ImageDecoderCallback decode) async* {
-    yield* initialImageStream();
+    final loadOriginal = SettingsRepository.instance.appConfig.image.loadOriginal;
+    final loadPreview = SettingsRepository.instance.appConfig.image.loadPreview;
+    yield* initialImageStream(isFinal: !loadOriginal && !loadPreview);
 
     if (isCancelled) {
       return;
     }
 
-    final loadOriginal = SettingsRepository.instance.appConfig.image.loadOriginal;
-    final devicePixelRatio = PlatformDispatcher.instance.views.first.devicePixelRatio;
-    var request = this.request = LocalImageRequest(
-      localId: key.id,
-      size: Size(size.width * devicePixelRatio, size.height * devicePixelRatio),
-      assetType: key.assetType,
-    );
-    yield* loadRequest(request, decode, isFinal: !loadOriginal);
+    if (loadPreview) {
+      final devicePixelRatio = PlatformDispatcher.instance.views.first.devicePixelRatio;
+      final previewRequest = request = LocalImageRequest(
+        localId: key.id,
+        size: Size(size.width * devicePixelRatio, size.height * devicePixelRatio),
+        assetType: key.assetType,
+      );
+      yield* loadRequest(previewRequest, decode, isFinal: !loadOriginal);
+
+      if (isCancelled) {
+        return;
+      }
+    }
 
     if (!loadOriginal) {
       return;
     }
 
-    if (isCancelled) {
-      return;
-    }
-
-    request = this.request = LocalImageRequest(localId: key.id, assetType: key.assetType, size: Size.zero);
-
-    yield* loadRequest(request, decode, isFinal: true);
+    final originalRequest = request = LocalImageRequest(localId: key.id, assetType: key.assetType, size: Size.zero);
+    yield* loadRequest(originalRequest, decode, isFinal: true);
   }
 
   Stream<Object> _animatedCodec(LocalFullImageProvider key, ImageDecoderCallback decode) async* {
-    yield* initialImageStream();
+    yield* initialImageStream(isFinal: false);
 
     if (isCancelled) {
       return;
     }
 
-    final devicePixelRatio = PlatformDispatcher.instance.views.first.devicePixelRatio;
-    final previewRequest = request = LocalImageRequest(
-      localId: key.id,
-      size: Size(size.width * devicePixelRatio, size.height * devicePixelRatio),
-      assetType: key.assetType,
-    );
-    yield* loadRequest(previewRequest, decode, isFinal: false);
+    if (SettingsRepository.instance.appConfig.image.loadPreview) {
+      final devicePixelRatio = PlatformDispatcher.instance.views.first.devicePixelRatio;
+      final previewRequest = request = LocalImageRequest(
+        localId: key.id,
+        size: Size(size.width * devicePixelRatio, size.height * devicePixelRatio),
+        assetType: key.assetType,
+      );
+      yield* loadRequest(previewRequest, decode, isFinal: false);
 
-    if (isCancelled) {
-      return;
+      if (isCancelled) {
+        return;
+      }
     }
 
     // always try original for animated, since previews don't support animation

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

@@ -108,31 +108,35 @@ class RemoteFullImageProvider extends CancellableImageProvider<RemoteFullImagePr
   }
 
   Stream<ImageInfo> _codec(RemoteFullImageProvider key, ImageDecoderCallback decode) async* {
-    yield* initialImageStream();
+    final isImage = assetType == AssetType.image;
+    final loadOriginal = isImage && SettingsRepository.instance.appConfig.image.loadOriginal;
+    final loadPreview = isImage && SettingsRepository.instance.appConfig.image.loadPreview;
+    yield* initialImageStream(isFinal: !loadOriginal && !loadPreview);
 
     if (isCancelled) {
       return;
     }
 
-    final previewRequest = request = RemoteImageRequest(
-      uri: getThumbnailUrlForRemoteId(
-        key.assetId,
-        type: AssetMediaSize.preview,
-        thumbhash: key.thumbhash,
-        edited: key.edited,
-      ),
-    );
-    final loadOriginal = assetType == AssetType.image && SettingsRepository.instance.appConfig.image.loadOriginal;
-    yield* loadRequest(previewRequest, decode, isFinal: !loadOriginal);
+    if (loadPreview) {
+      final previewRequest = request = RemoteImageRequest(
+        uri: getThumbnailUrlForRemoteId(
+          key.assetId,
+          type: AssetMediaSize.preview,
+          thumbhash: key.thumbhash,
+          edited: key.edited,
+        ),
+      );
+      yield* loadRequest(previewRequest, decode, isFinal: !loadOriginal);
+
+      if (isCancelled) {
+        return;
+      }
+    }
 
     if (!loadOriginal) {
       return;
     }
 
-    if (isCancelled) {
-      return;
-    }
-
     final originalRequest = request = RemoteImageRequest(
       uri: getOriginalUrlForRemoteId(key.assetId, edited: key.edited),
     );
@@ -140,24 +144,26 @@ class RemoteFullImageProvider extends CancellableImageProvider<RemoteFullImagePr
   }
 
   Stream<Object> _animatedCodec(RemoteFullImageProvider key, ImageDecoderCallback decode) async* {
-    yield* initialImageStream();
+    yield* initialImageStream(isFinal: false);
 
     if (isCancelled) {
       return;
     }
 
-    final previewRequest = request = RemoteImageRequest(
-      uri: getThumbnailUrlForRemoteId(
-        key.assetId,
-        type: AssetMediaSize.preview,
-        thumbhash: key.thumbhash,
-        edited: key.edited,
-      ),
-    );
-    yield* loadRequest(previewRequest, decode, isFinal: false);
+    if (SettingsRepository.instance.appConfig.image.loadPreview) {
+      final previewRequest = request = RemoteImageRequest(
+        uri: getThumbnailUrlForRemoteId(
+          key.assetId,
+          type: AssetMediaSize.preview,
+          thumbhash: key.thumbhash,
+          edited: key.edited,
+        ),
+      );
+      yield* loadRequest(previewRequest, decode, isFinal: false);
 
-    if (isCancelled) {
-      return;
+      if (isCancelled) {
+        return;
+      }
     }
 
     // always try original for animated, since previews don't support animation

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/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/services/background_upload.service.dart

@@ -318,7 +318,7 @@ class BackgroundUploadService {
       isFavorite: asset.isFavorite,
       requiresWiFi: requiresWiFi,
       // Visibility hidden on upload to prevent the server from running regular jobs on the live photo asset
-      fields: entity.isLivePhoto ? {'visibility': api.AssetVisibility.hidden.toString()} : null,
+      fields: entity.isLivePhoto ? {'visibility': api.AssetVisibility.hidden.value} : null,
       cloudId: entity.isLivePhoto ? null : asset.cloudId,
       adjustmentTime: entity.isLivePhoto ? null : asset.adjustmentTime?.toIso8601String(),
       latitude: entity.isLivePhoto ? null : asset.latitude?.toString(),

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

@@ -342,7 +342,7 @@ class ForegroundUploadService {
           file: livePhotoFile,
           originalFileName: livePhotoTitle,
           // Visibility hidden on upload to prevent the server from running regular jobs on the live photo asset
-          fields: {...fields, 'visibility': AssetVisibility.hidden.toString()},
+          fields: {...fields, 'visibility': AssetVisibility.hidden.value},
           cancelToken: cancelToken,
           onProgress: onProgress != null
               ? (bytes, totalBytes) => onProgress(asset.localId!, livePhotoTitle, bytes, totalBytes)

mobile/lib/utils/image_url_builder.dart

@@ -12,7 +12,7 @@ String getThumbnailUrlForRemoteId(
   bool edited = true,
   String? thumbhash,
 }) {
-  final url = '${Store.get(StoreKey.serverEndpoint)}/assets/$id/thumbnail?size=${type.toString()}&edited=$edited';
+  final url = '${Store.get(StoreKey.serverEndpoint)}/assets/$id/thumbnail?size=${type.value}&edited=$edited';
   return thumbhash != null ? '$url&c=${Uri.encodeComponent(thumbhash)}' : url;
 }
 

mobile/lib/utils/migration.dart

@@ -11,20 +11,17 @@ import 'package:immich_mobile/domain/models/log.model.dart';
 import 'package:immich_mobile/domain/models/settings_key.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/domain/models/timeline.model.dart';
-import 'package:immich_mobile/domain/services/feature_message.service.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/settings.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/network.repository.dart';
-import 'package:immich_mobile/infrastructure/repositories/settings.repository.dart';
 import 'package:immich_mobile/models/auth/auxilary_endpoint.model.dart';
 import 'package:immich_mobile/providers/album/album_sort_by_options.provider.dart';
 
 const int targetVersion = 26;
 
 Future<void> migrateDatabaseIfNeeded(Drift drift) async {
-  final int? storedVersion = Store.tryGet(StoreKey.version);
-  final version = storedVersion ?? targetVersion;
+  final int version = Store.get(StoreKey.version, targetVersion);
 
   if (version < 25) {
     await _migrateTo25();
@@ -34,10 +31,6 @@ Future<void> migrateDatabaseIfNeeded(Drift drift) async {
     await _migrateTo26(drift);
   }
 
-  if (storedVersion == null) {
-    await FeatureMessageService(SettingsRepository.instance).markSeen();
-  }
-
   await Store.put(StoreKey.version, targetVersion);
   return;
 }

mobile/lib/widgets/settings/asset_viewer_settings/image_viewer_quality_setting.dart

@@ -12,7 +12,11 @@ class ImageViewerQualitySetting extends HookConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
+    final isPreview = useState(ref.read(appConfigProvider).image.loadPreview);
     final isOriginal = useState(ref.read(appConfigProvider).image.loadOriginal);
+    useValueChanged<bool, void>(isPreview.value, (_, __) {
+      ref.read(settingsProvider).write(.imageLoadPreview, isPreview.value);
+    });
     useValueChanged<bool, void>(isOriginal.value, (_, __) {
       ref.read(settingsProvider).write(.imageLoadOriginal, isOriginal.value);
     });
@@ -25,6 +29,12 @@ class ImageViewerQualitySetting extends HookConsumerWidget {
           icon: Icons.image_outlined,
           subtitle: "setting_image_viewer_help".t(context: context),
         ),
+        SettingsSwitchListTile(
+          valueNotifier: isPreview,
+          title: "setting_image_viewer_preview_title".t(context: context),
+          subtitle: "setting_image_viewer_preview_subtitle".t(context: context),
+          onChanged: (_) => ref.invalidate(appSettingsServiceProvider),
+        ),
         SettingsSwitchListTile(
           valueNotifier: isOriginal,
           title: "setting_image_viewer_original_title".t(context: context),

mobile/lib/widgets/settings/backup_settings/drift_backup_settings.dart

@@ -1,5 +1,6 @@
 import 'dart:async';
 
+import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/album/local_album.model.dart';
@@ -9,7 +10,6 @@ import 'package:immich_mobile/domain/services/sync_linked_album.service.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
-import 'package:immich_mobile/generated/translations.g.dart';
 import 'package:immich_mobile/providers/background_sync.provider.dart';
 import 'package:immich_mobile/providers/backup/backup_album.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
@@ -255,11 +255,11 @@ class _BackupDelaySlider extends ConsumerWidget {
     _ => 600,
   };
 
-  static String formatBackupDelaySliderValue(BuildContext context, int v) => switch (v) {
-    0 => context.t.setting_notifications_notify_seconds(count: 5),
-    1 => context.t.setting_notifications_notify_seconds(count: 30),
-    2 => context.t.setting_notifications_notify_minutes(count: 2),
-    _ => context.t.setting_notifications_notify_minutes(count: 10),
+  static String formatBackupDelaySliderValue(int v) => switch (v) {
+    0 => 'setting_notifications_notify_seconds'.tr(namedArgs: {'count': '5'}),
+    1 => 'setting_notifications_notify_seconds'.tr(namedArgs: {'count': '30'}),
+    2 => 'setting_notifications_notify_minutes'.tr(namedArgs: {'count': '2'}),
+    _ => 'setting_notifications_notify_minutes'.tr(namedArgs: {'count': '10'}),
   };
 
   @override
@@ -272,8 +272,8 @@ class _BackupDelaySlider extends ConsumerWidget {
         Padding(
           padding: const EdgeInsets.only(left: 24.0, top: 8.0),
           child: Text(
-            context.t.backup_controller_page_background_delay(
-              duration: formatBackupDelaySliderValue(context, currentValue),
+            'backup_controller_page_background_delay'.tr(
+              namedArgs: {'duration': formatBackupDelaySliderValue(currentValue)},
             ),
             style: context.textTheme.bodyLarge?.copyWith(fontWeight: FontWeight.w500),
           ),
@@ -291,7 +291,7 @@ class _BackupDelaySlider extends ConsumerWidget {
           max: 3.0,
           min: 0.0,
           divisions: 3,
-          label: formatBackupDelaySliderValue(context, currentValue),
+          label: formatBackupDelaySliderValue(currentValue),
         ),
       ],
     );

mobile/openapi/.openapi-generator/VERSION

@@ -1 +1 @@
-7.24.0
+7.22.0

mobile/openapi/README.md

@@ -4,12 +4,12 @@ Immich API
 This Dart package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
 
 - API version: 3.0.3
-- Generator version: 7.24.0
+- Generator version: 7.22.0
 - Build package: org.openapitools.codegen.languages.DartClientCodegen
 
 ## Requirements
 
-Dart 2.17 or later
+Dart 2.12 or later
 
 ## Installation & Usage
 

mobile/openapi/lib/api_client.dart

@@ -97,9 +97,9 @@ class ApiClient {
       if (nullableHeaderParams != null) {
         request.headers.addAll(nullableHeaderParams);
       }
-      if (msgBody is String && msgBody.isNotEmpty) {
+      if (msgBody is String) {
         request.body = msgBody;
-      } else if (msgBody is List<int> && msgBody.isNotEmpty) {
+      } else if (msgBody is List<int>) {
         request.bodyBytes = msgBody;
       } else if (msgBody is Map<String, String>) {
         request.bodyFields = msgBody;

mobile/openapi/lib/model/album_user_role.dart

@@ -11,30 +11,31 @@
 part of openapi.api;
 
 /// Album user role
-enum AlbumUserRole {
-  editor._(r'editor'),
-  owner._(r'owner'),
-  viewer._(r'viewer'),
-  ;
-
-  /// Instantiate a new enum with the provided value.
-  const AlbumUserRole._(this._value);
+class AlbumUserRole {
+  /// Instantiate a new enum with the provided [value].
+  const AlbumUserRole._(this.value);
 
   /// The underlying value of this enum member.
-  final String _value;
+  final String value;
 
   @override
-  String toString() => _value;
+  String toString() => value;
 
-  /// Encodes this enum as a value suitable for JSON.
-  String toJson() => _value;
+  String toJson() => value;
+
+  static const editor = AlbumUserRole._(r'editor');
+  static const owner = AlbumUserRole._(r'owner');
+  static const viewer = AlbumUserRole._(r'viewer');
+
+  /// List of all possible values in this [enum][AlbumUserRole].
+  static const values = <AlbumUserRole>[
+    editor,
+    owner,
+    viewer,
+  ];
 
-  /// Returns the instance of [AlbumUserRole] that was successfully decoded
-  /// from the passed [value] on success, null otherwise.
   static AlbumUserRole? fromJson(dynamic value) => AlbumUserRoleTypeTransformer().decode(value);
 
-  /// Returns a [List] containing instances of [AlbumUserRole]
-  /// that were successfully decoded from the passed [JSON][json].
   static List<AlbumUserRole> listFromJson(dynamic json, {bool growable = false,}) {
     final result = <AlbumUserRole>[];
     if (json is List && json.isNotEmpty) {
@@ -56,11 +57,9 @@ class AlbumUserRoleTypeTransformer {
 
   const AlbumUserRoleTypeTransformer._();
 
-  /// Encodes this enum as a value suitable for JSON.
-  String encode(AlbumUserRole data) => data._value;
+  String encode(AlbumUserRole data) => data.value;
 
-  /// Returns the instance of [AlbumUserRole] that was successfully decoded
-  /// from the passed [data] value on success, null otherwise.
+  /// Decodes a [dynamic value][data] to a AlbumUserRole.
   ///
   /// If [allowNull] is true and the [dynamic value][data] cannot be decoded successfully,
   /// then null is returned. However, if [allowNull] is false and the [dynamic value][data]
@@ -69,9 +68,6 @@ class AlbumUserRoleTypeTransformer {
   /// The [allowNull] is very handy when an API changes and a new enum value is added or removed,
   /// and users are still using an old app with the old code.
   AlbumUserRole? decode(dynamic data, {bool allowNull = true}) {
-    if (data is AlbumUserRole) {
-      return data;
-    }
     if (data != null) {
       switch (data) {
         case r'editor': return AlbumUserRole.editor;
@@ -86,7 +82,7 @@ class AlbumUserRoleTypeTransformer {
     return null;
   }
 
-  /// The singleton instance of this transformer.
+  /// Singleton [AlbumUserRoleTypeTransformer] instance.
   static AlbumUserRoleTypeTransformer? _instance;
 }
 

mobile/openapi/lib/model/asset_edit_action.dart

@@ -11,30 +11,31 @@
 part of openapi.api;
 
 /// Type of edit action to perform
-enum AssetEditAction {
-  crop._(r'crop'),
-  rotate._(r'rotate'),
-  mirror._(r'mirror'),
-  ;
-
-  /// Instantiate a new enum with the provided value.
-  const AssetEditAction._(this._value);
+class AssetEditAction {
+  /// Instantiate a new enum with the provided [value].
+  const AssetEditAction._(this.value);
 
   /// The underlying value of this enum member.
-  final String _value;
+  final String value;
 
   @override
-  String toString() => _value;
+  String toString() => value;
 
-  /// Encodes this enum as a value suitable for JSON.
-  String toJson() => _value;
+  String toJson() => value;
+
+  static const crop = AssetEditAction._(r'crop');
+  static const rotate = AssetEditAction._(r'rotate');
+  static const mirror = AssetEditAction._(r'mirror');
+
+  /// List of all possible values in this [enum][AssetEditAction].
+  static const values = <AssetEditAction>[
+    crop,
+    rotate,
+    mirror,
+  ];
 
-  /// Returns the instance of [AssetEditAction] that was successfully decoded
-  /// from the passed [value] on success, null otherwise.
   static AssetEditAction? fromJson(dynamic value) => AssetEditActionTypeTransformer().decode(value);
 
-  /// Returns a [List] containing instances of [AssetEditAction]
-  /// that were successfully decoded from the passed [JSON][json].
   static List<AssetEditAction> listFromJson(dynamic json, {bool growable = false,}) {
     final result = <AssetEditAction>[];
     if (json is List && json.isNotEmpty) {
@@ -56,11 +57,9 @@ class AssetEditActionTypeTransformer {
 
   const AssetEditActionTypeTransformer._();
 
-  /// Encodes this enum as a value suitable for JSON.
-  String encode(AssetEditAction data) => data._value;
+  String encode(AssetEditAction data) => data.value;
 
-  /// Returns the instance of [AssetEditAction] that was successfully decoded
-  /// from the passed [data] value on success, null otherwise.
+  /// Decodes a [dynamic value][data] to a AssetEditAction.
   ///
   /// If [allowNull] is true and the [dynamic value][data] cannot be decoded successfully,
   /// then null is returned. However, if [allowNull] is false and the [dynamic value][data]
@@ -69,9 +68,6 @@ class AssetEditActionTypeTransformer {
   /// The [allowNull] is very handy when an API changes and a new enum value is added or removed,
   /// and users are still using an old app with the old code.
   AssetEditAction? decode(dynamic data, {bool allowNull = true}) {
-    if (data is AssetEditAction) {
-      return data;
-    }
     if (data != null) {
       switch (data) {
         case r'crop': return AssetEditAction.crop;
@@ -86,7 +82,7 @@ class AssetEditActionTypeTransformer {
     return null;
   }
 
-  /// The singleton instance of this transformer.
+  /// Singleton [AssetEditActionTypeTransformer] instance.
   static AssetEditActionTypeTransformer? _instance;
 }
 

mobile/openapi/lib/model/asset_id_error_reason.dart

@@ -11,30 +11,31 @@
 part of openapi.api;
 
 /// Error reason if failed
-enum AssetIdErrorReason {
-  duplicate._(r'duplicate'),
-  noPermission._(r'no_permission'),
-  notFound._(r'not_found'),
-  ;
-
-  /// Instantiate a new enum with the provided value.
-  const AssetIdErrorReason._(this._value);
+class AssetIdErrorReason {
+  /// Instantiate a new enum with the provided [value].
+  const AssetIdErrorReason._(this.value);
 
   /// The underlying value of this enum member.
-  final String _value;
+  final String value;
 
   @override
-  String toString() => _value;
+  String toString() => value;
 
-  /// Encodes this enum as a value suitable for JSON.
-  String toJson() => _value;
+  String toJson() => value;
+
+  static const duplicate = AssetIdErrorReason._(r'duplicate');
+  static const noPermission = AssetIdErrorReason._(r'no_permission');
+  static const notFound = AssetIdErrorReason._(r'not_found');
+
+  /// List of all possible values in this [enum][AssetIdErrorReason].
+  static const values = <AssetIdErrorReason>[
+    duplicate,
+    noPermission,
+    notFound,
+  ];
 
-  /// Returns the instance of [AssetIdErrorReason] that was successfully decoded
-  /// from the passed [value] on success, null otherwise.
   static AssetIdErrorReason? fromJson(dynamic value) => AssetIdErrorReasonTypeTransformer().decode(value);
 
-  /// Returns a [List] containing instances of [AssetIdErrorReason]
-  /// that were successfully decoded from the passed [JSON][json].
   static List<AssetIdErrorReason> listFromJson(dynamic json, {bool growable = false,}) {
     final result = <AssetIdErrorReason>[];
     if (json is List && json.isNotEmpty) {
@@ -56,11 +57,9 @@ class AssetIdErrorReasonTypeTransformer {
 
   const AssetIdErrorReasonTypeTransformer._();
 
-  /// Encodes this enum as a value suitable for JSON.
-  String encode(AssetIdErrorReason data) => data._value;
+  String encode(AssetIdErrorReason data) => data.value;
 
-  /// Returns the instance of [AssetIdErrorReason] that was successfully decoded
-  /// from the passed [data] value on success, null otherwise.
+  /// Decodes a [dynamic value][data] to a AssetIdErrorReason.
   ///
   /// If [allowNull] is true and the [dynamic value][data] cannot be decoded successfully,
   /// then null is returned. However, if [allowNull] is false and the [dynamic value][data]
@@ -69,9 +68,6 @@ class AssetIdErrorReasonTypeTransformer {
   /// The [allowNull] is very handy when an API changes and a new enum value is added or removed,
   /// and users are still using an old app with the old code.
   AssetIdErrorReason? decode(dynamic data, {bool allowNull = true}) {
-    if (data is AssetIdErrorReason) {
-      return data;
-    }
     if (data != null) {
       switch (data) {
         case r'duplicate': return AssetIdErrorReason.duplicate;
@@ -86,7 +82,7 @@ class AssetIdErrorReasonTypeTransformer {
     return null;
   }
 
-  /// The singleton instance of this transformer.
+  /// Singleton [AssetIdErrorReasonTypeTransformer] instance.
   static AssetIdErrorReasonTypeTransformer? _instance;
 }
 

mobile/openapi/lib/model/asset_job_name.dart

@@ -11,31 +11,33 @@
 part of openapi.api;
 
 /// Job name
-enum AssetJobName {
-  refreshFaces._(r'refresh-faces'),
-  refreshMetadata._(r'refresh-metadata'),
-  regenerateThumbnail._(r'regenerate-thumbnail'),
-  transcodeVideo._(r'transcode-video'),
-  ;
-
-  /// Instantiate a new enum with the provided value.
-  const AssetJobName._(this._value);
+class AssetJobName {
+  /// Instantiate a new enum with the provided [value].
+  const AssetJobName._(this.value);
 
   /// The underlying value of this enum member.
-  final String _value;
+  final String value;
 
   @override
-  String toString() => _value;
+  String toString() => value;
 
-  /// Encodes this enum as a value suitable for JSON.
-  String toJson() => _value;
+  String toJson() => value;
+
+  static const refreshFaces = AssetJobName._(r'refresh-faces');
+  static const refreshMetadata = AssetJobName._(r'refresh-metadata');
+  static const regenerateThumbnail = AssetJobName._(r'regenerate-thumbnail');
+  static const transcodeVideo = AssetJobName._(r'transcode-video');
+
+  /// List of all possible values in this [enum][AssetJobName].
+  static const values = <AssetJobName>[
+    refreshFaces,
+    refreshMetadata,
+    regenerateThumbnail,
+    transcodeVideo,
+  ];
 
-  /// Returns the instance of [AssetJobName] that was successfully decoded
-  /// from the passed [value] on success, null otherwise.
   static AssetJobName? fromJson(dynamic value) => AssetJobNameTypeTransformer().decode(value);
 
-  /// Returns a [List] containing instances of [AssetJobName]
-  /// that were successfully decoded from the passed [JSON][json].
   static List<AssetJobName> listFromJson(dynamic json, {bool growable = false,}) {
     final result = <AssetJobName>[];
     if (json is List && json.isNotEmpty) {
@@ -57,11 +59,9 @@ class AssetJobNameTypeTransformer {
 
   const AssetJobNameTypeTransformer._();
 
-  /// Encodes this enum as a value suitable for JSON.
-  String encode(AssetJobName data) => data._value;
+  String encode(AssetJobName data) => data.value;
 
-  /// Returns the instance of [AssetJobName] that was successfully decoded
-  /// from the passed [data] value on success, null otherwise.
+  /// Decodes a [dynamic value][data] to a AssetJobName.
   ///
   /// If [allowNull] is true and the [dynamic value][data] cannot be decoded successfully,
   /// then null is returned. However, if [allowNull] is false and the [dynamic value][data]
@@ -70,9 +70,6 @@ class AssetJobNameTypeTransformer {
   /// The [allowNull] is very handy when an API changes and a new enum value is added or removed,
   /// and users are still using an old app with the old code.
   AssetJobName? decode(dynamic data, {bool allowNull = true}) {
-    if (data is AssetJobName) {
-      return data;
-    }
     if (data != null) {
       switch (data) {
         case r'refresh-faces': return AssetJobName.refreshFaces;
@@ -88,7 +85,7 @@ class AssetJobNameTypeTransformer {
     return null;
   }
 
-  /// The singleton instance of this transformer.
+  /// Singleton [AssetJobNameTypeTransformer] instance.
   static AssetJobNameTypeTransformer? _instance;
 }
 

mobile/openapi/lib/model/asset_media_size.dart

@@ -11,31 +11,33 @@
 part of openapi.api;
 
 /// Asset media size
-enum AssetMediaSize {
-  original._(r'original'),
-  fullsize._(r'fullsize'),
-  preview._(r'preview'),
-  thumbnail._(r'thumbnail'),
-  ;
-
-  /// Instantiate a new enum with the provided value.
-  const AssetMediaSize._(this._value);
+class AssetMediaSize {
+  /// Instantiate a new enum with the provided [value].
+  const AssetMediaSize._(this.value);
 
   /// The underlying value of this enum member.
-  final String _value;
+  final String value;
 
   @override
-  String toString() => _value;
+  String toString() => value;
 
-  /// Encodes this enum as a value suitable for JSON.
-  String toJson() => _value;
+  String toJson() => value;
+
+  static const original = AssetMediaSize._(r'original');
+  static const fullsize = AssetMediaSize._(r'fullsize');
+  static const preview = AssetMediaSize._(r'preview');
+  static const thumbnail = AssetMediaSize._(r'thumbnail');
+
+  /// List of all possible values in this [enum][AssetMediaSize].
+  static const values = <AssetMediaSize>[
+    original,
+    fullsize,
+    preview,
+    thumbnail,
+  ];
 
-  /// Returns the instance of [AssetMediaSize] that was successfully decoded
-  /// from the passed [value] on success, null otherwise.
   static AssetMediaSize? fromJson(dynamic value) => AssetMediaSizeTypeTransformer().decode(value);
 
-  /// Returns a [List] containing instances of [AssetMediaSize]
-  /// that were successfully decoded from the passed [JSON][json].
   static List<AssetMediaSize> listFromJson(dynamic json, {bool growable = false,}) {
     final result = <AssetMediaSize>[];
     if (json is List && json.isNotEmpty) {
@@ -57,11 +59,9 @@ class AssetMediaSizeTypeTransformer {
 
   const AssetMediaSizeTypeTransformer._();
 
-  /// Encodes this enum as a value suitable for JSON.
-  String encode(AssetMediaSize data) => data._value;
+  String encode(AssetMediaSize data) => data.value;
 
-  /// Returns the instance of [AssetMediaSize] that was successfully decoded
-  /// from the passed [data] value on success, null otherwise.
+  /// Decodes a [dynamic value][data] to a AssetMediaSize.
   ///
   /// If [allowNull] is true and the [dynamic value][data] cannot be decoded successfully,
   /// then null is returned. However, if [allowNull] is false and the [dynamic value][data]
@@ -70,9 +70,6 @@ class AssetMediaSizeTypeTransformer {
   /// The [allowNull] is very handy when an API changes and a new enum value is added or removed,
   /// and users are still using an old app with the old code.
   AssetMediaSize? decode(dynamic data, {bool allowNull = true}) {
-    if (data is AssetMediaSize) {
-      return data;
-    }
     if (data != null) {
       switch (data) {
         case r'original': return AssetMediaSize.original;
@@ -88,7 +85,7 @@ class AssetMediaSizeTypeTransformer {
     return null;
   }
 
-  /// The singleton instance of this transformer.
+  /// Singleton [AssetMediaSizeTypeTransformer] instance.
   static AssetMediaSizeTypeTransformer? _instance;
 }