fix: run background tasks in root isolate

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

docker/docker-compose.dev.yml

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

docker/docker-compose.prod.yml

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

docker/docker-compose.rootless.yml

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

docker/docker-compose.yml

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

docs/mise.toml

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

docs/package.json

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

e2e/docker-compose.yml

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

e2e/eslint.config.mjs

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

e2e/package.json

@@ -40,7 +40,7 @@
     "eslint": "^10.0.0",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-prettier": "^5.1.3",
-    "eslint-plugin-unicorn": "^72.0.0",
+    "eslint-plugin-unicorn": "^70.0.0",
     "exiftool-vendored": "^35.0.0",
     "globals": "^17.0.0",
     "luxon": "^3.4.4",
@@ -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/ui/specs/asset-viewer/asset-viewer.e2e-spec.ts

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

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

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

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

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

mise.lock

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

mise.toml

@@ -16,7 +16,7 @@ config_roots = [
 
 [tools]
 node = "24.15.0"
-pnpm = "11.13.1"
+pnpm = "11.11.0"
 terragrunt = "1.0.3"
 opentofu = "1.11.6"
 "npm:oazapfts" = "7.5.0"

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/MainActivity.kt

@@ -18,7 +18,6 @@ import app.alextran.immich.images.LocalImageApi
 import app.alextran.immich.images.LocalImagesImpl
 import app.alextran.immich.images.RemoteImageApi
 import app.alextran.immich.images.RemoteImagesImpl
-import app.alextran.immich.media.AssetMediaApiImpl
 import app.alextran.immich.permission.PermissionApi
 import app.alextran.immich.permission.PermissionApiImpl
 import app.alextran.immich.sync.NativeSyncApi
@@ -67,7 +66,6 @@ class MainActivity : FlutterFragmentActivity() {
       flutterEngine.plugins.add(backgroundEngineLockImpl)
       flutterEngine.plugins.add(nativeSyncApiImpl)
       flutterEngine.plugins.add(permissionApiImpl)
-      flutterEngine.plugins.add(AssetMediaApiImpl(ctx))
     }
 
     fun cancelPlugins(flutterEngine: FlutterEngine) {
@@ -77,8 +75,6 @@ class MainActivity : FlutterFragmentActivity() {
       nativeApi?.detachFromEngine()
       val permissionApi = flutterEngine.plugins.get(PermissionApiImpl::class.java) as ImmichPlugin?
       permissionApi?.detachFromEngine()
-      val assetMediaApi = flutterEngine.plugins.get(AssetMediaApiImpl::class.java) as ImmichPlugin?
-      assetMediaApi?.detachFromEngine()
     }
   }
 }

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/android/app/src/main/kotlin/app/alextran/immich/core/ImmichPlugin.kt

@@ -2,30 +2,17 @@ package app.alextran.immich.core
 
 import androidx.annotation.CallSuper
 import io.flutter.embedding.engine.plugins.FlutterPlugin
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.SupervisorJob
-import kotlinx.coroutines.isActive
 
 abstract class ImmichPlugin : FlutterPlugin {
-  private var detached: Boolean = false
-
-  private var supervisor = SupervisorJob()
-  protected var scope = CoroutineScope(supervisor + Dispatchers.Default)
-    private set
+  private var detached: Boolean = false;
 
   @CallSuper
   override fun onAttachedToEngine(binding: FlutterPlugin.FlutterPluginBinding) {
-    detached = false
-    if (!scope.isActive) {
-      supervisor = SupervisorJob()
-      scope = CoroutineScope(supervisor + Dispatchers.Default)
-    }
+    detached = false;
   }
 
   fun detachFromEngine() {
     detached = true
-    supervisor.cancel()
   }
 
   @CallSuper
@@ -35,9 +22,8 @@ abstract class ImmichPlugin : FlutterPlugin {
 
   fun <T> completeWhenActive(callback: (T) -> Unit, value: T) {
     if (detached) {
-      return
+      return;
     }
-
-    callback(value)
+    callback(value);
   }
 }

mobile/android/app/src/main/kotlin/app/alextran/immich/media/AssetMedia.g.kt

@@ -1,354 +0,0 @@
-// Autogenerated from Pigeon (v26.3.4), do not edit directly.
-// See also: https://pub.dev/packages/pigeon
-@file:Suppress("UNCHECKED_CAST", "ArrayInDataClass")
-
-package app.alextran.immich.media
-
-import android.util.Log
-import io.flutter.plugin.common.BasicMessageChannel
-import io.flutter.plugin.common.BinaryMessenger
-import io.flutter.plugin.common.EventChannel
-import io.flutter.plugin.common.MessageCodec
-import io.flutter.plugin.common.StandardMethodCodec
-import io.flutter.plugin.common.StandardMessageCodec
-import java.io.ByteArrayOutputStream
-import java.nio.ByteBuffer
-private object AssetMediaPigeonUtils {
-
-  fun wrapResult(result: Any?): List<Any?> {
-    return listOf(result)
-  }
-
-  fun wrapError(exception: Throwable): List<Any?> {
-    return if (exception is FlutterError) {
-      listOf(
-        exception.code,
-        exception.message,
-        exception.details
-      )
-    } else {
-      listOf(
-        exception.javaClass.simpleName,
-        exception.toString(),
-        "Cause: " + exception.cause + ", Stacktrace: " + Log.getStackTraceString(exception)
-      )
-    }
-  }
-  fun doubleEquals(a: Double, b: Double): Boolean {
-    // Normalize -0.0 to 0.0 and handle NaN equality.
-    return (if (a == 0.0) 0.0 else a) == (if (b == 0.0) 0.0 else b) || (a.isNaN() && b.isNaN())
-  }
-
-  fun floatEquals(a: Float, b: Float): Boolean {
-    // Normalize -0.0 to 0.0 and handle NaN equality.
-    return (if (a == 0.0f) 0.0f else a) == (if (b == 0.0f) 0.0f else b) || (a.isNaN() && b.isNaN())
-  }
-
-  fun doubleHash(d: Double): Int {
-    // Normalize -0.0 to 0.0 and handle NaN to ensure consistent hash codes.
-    val normalized = if (d == 0.0) 0.0 else d
-    val bits = java.lang.Double.doubleToLongBits(normalized)
-    return (bits xor (bits ushr 32)).toInt()
-  }
-
-  fun floatHash(f: Float): Int {
-    // Normalize -0.0 to 0.0 and handle NaN to ensure consistent hash codes.
-    val normalized = if (f == 0.0f) 0.0f else f
-    return java.lang.Float.floatToIntBits(normalized)
-  }
-
-  fun deepEquals(a: Any?, b: Any?): Boolean {
-    if (a === b) {
-      return true
-    }
-    if (a == null || b == null) {
-      return false
-    }
-    if (a is ByteArray && b is ByteArray) {
-      return a.contentEquals(b)
-    }
-    if (a is IntArray && b is IntArray) {
-      return a.contentEquals(b)
-    }
-    if (a is LongArray && b is LongArray) {
-      return a.contentEquals(b)
-    }
-    if (a is DoubleArray && b is DoubleArray) {
-      if (a.size != b.size) return false
-      for (i in a.indices) {
-        if (!doubleEquals(a[i], b[i])) return false
-      }
-      return true
-    }
-    if (a is FloatArray && b is FloatArray) {
-      if (a.size != b.size) return false
-      for (i in a.indices) {
-        if (!floatEquals(a[i], b[i])) return false
-      }
-      return true
-    }
-    if (a is Array<*> && b is Array<*>) {
-      if (a.size != b.size) return false
-      for (i in a.indices) {
-        if (!deepEquals(a[i], b[i])) return false
-      }
-      return true
-    }
-    if (a is List<*> && b is List<*>) {
-      if (a.size != b.size) return false
-      val iterA = a.iterator()
-      val iterB = b.iterator()
-      while (iterA.hasNext() && iterB.hasNext()) {
-        if (!deepEquals(iterA.next(), iterB.next())) return false
-      }
-      return true
-    }
-    if (a is Map<*, *> && b is Map<*, *>) {
-      if (a.size != b.size) return false
-      for (entry in a) {
-        val key = entry.key
-        var found = false
-        for (bEntry in b) {
-          if (deepEquals(key, bEntry.key)) {
-            if (deepEquals(entry.value, bEntry.value)) {
-              found = true
-              break
-            } else {
-              return false
-            }
-          }
-        }
-        if (!found) return false
-      }
-      return true
-    }
-    if (a is Double && b is Double) {
-      return doubleEquals(a, b)
-    }
-    if (a is Float && b is Float) {
-      return floatEquals(a, b)
-    }
-    return a == b
-  }
-
-  fun deepHash(value: Any?): Int {
-    return when (value) {
-      null -> 0
-      is ByteArray -> value.contentHashCode()
-      is IntArray -> value.contentHashCode()
-      is LongArray -> value.contentHashCode()
-      is DoubleArray -> {
-        var result = 1
-        for (item in value) {
-          result = 31 * result + doubleHash(item)
-        }
-        result
-      }
-      is FloatArray -> {
-        var result = 1
-        for (item in value) {
-          result = 31 * result + floatHash(item)
-        }
-        result
-      }
-      is Array<*> -> {
-        var result = 1
-        for (item in value) {
-          result = 31 * result + deepHash(item)
-        }
-        result
-      }
-      is List<*> -> {
-        var result = 1
-        for (item in value) {
-          result = 31 * result + deepHash(item)
-        }
-        result
-      }
-      is Map<*, *> -> {
-        var result = 0
-        for (entry in value) {
-          result += ((deepHash(entry.key) * 31) xor deepHash(entry.value))
-        }
-        result
-      }
-      is Double -> doubleHash(value)
-      is Float -> floatHash(value)
-      else -> value.hashCode()
-    }
-  }
-
-}
-
-/**
- * Error class for passing custom error details to Flutter via a thrown PlatformException.
- * @property code The error code.
- * @property message The error message.
- * @property details The error details. Must be a datatype supported by the api codec.
- */
-class FlutterError (
-  val code: String,
-  override val message: String? = null,
-  val details: Any? = null
-) : RuntimeException()
-
-enum class AssetMediaActionStatus(val raw: Int) {
-  DONE(0),
-  ALREADY_IN_STATE(1),
-  NOT_FOUND(2),
-  FAILED(3);
-
-  companion object {
-    fun ofRaw(raw: Int): AssetMediaActionStatus? {
-      return values().firstOrNull { it.raw == raw }
-    }
-  }
-}
-
-/** Generated class from Pigeon that represents data sent in messages. */
-data class AssetMediaActionResult (
-  val id: String,
-  val status: AssetMediaActionStatus
-)
- {
-  companion object {
-    fun fromList(pigeonVar_list: List<Any?>): AssetMediaActionResult {
-      val id = pigeonVar_list[0] as String
-      val status = pigeonVar_list[1] as AssetMediaActionStatus
-      return AssetMediaActionResult(id, status)
-    }
-  }
-  fun toList(): List<Any?> {
-    return listOf(
-      id,
-      status,
-    )
-  }
-  override fun equals(other: Any?): Boolean {
-    if (other == null || other.javaClass != javaClass) {
-      return false
-    }
-    if (this === other) {
-      return true
-    }
-    val other = other as AssetMediaActionResult
-    return AssetMediaPigeonUtils.deepEquals(this.id, other.id) && AssetMediaPigeonUtils.deepEquals(this.status, other.status)
-  }
-
-  override fun hashCode(): Int {
-    var result = javaClass.hashCode()
-    result = 31 * result + AssetMediaPigeonUtils.deepHash(this.id)
-    result = 31 * result + AssetMediaPigeonUtils.deepHash(this.status)
-    return result
-  }
-}
-private open class AssetMediaPigeonCodec : StandardMessageCodec() {
-  override fun readValueOfType(type: Byte, buffer: ByteBuffer): Any? {
-    return when (type) {
-      129.toByte() -> {
-        return (readValue(buffer) as Long?)?.let {
-          AssetMediaActionStatus.ofRaw(it.toInt())
-        }
-      }
-      130.toByte() -> {
-        return (readValue(buffer) as? List<Any?>)?.let {
-          AssetMediaActionResult.fromList(it)
-        }
-      }
-      else -> super.readValueOfType(type, buffer)
-    }
-  }
-  override fun writeValue(stream: ByteArrayOutputStream, value: Any?)   {
-    when (value) {
-      is AssetMediaActionStatus -> {
-        stream.write(129)
-        writeValue(stream, value.raw.toLong())
-      }
-      is AssetMediaActionResult -> {
-        stream.write(130)
-        writeValue(stream, value.toList())
-      }
-      else -> super.writeValue(stream, value)
-    }
-  }
-}
-
-
-/** Generated interface from Pigeon that represents a handler of messages from Flutter. */
-interface AssetMediaApi {
-  fun trash(ids: List<String>, callback: (Result<List<AssetMediaActionResult>>) -> Unit)
-  fun restore(ids: List<String>, callback: (Result<List<AssetMediaActionResult>>) -> Unit)
-  fun trashedAmong(ids: List<String>, callback: (Result<List<String>>) -> Unit)
-
-  companion object {
-    /** The codec used by AssetMediaApi. */
-    val codec: MessageCodec<Any?> by lazy {
-      AssetMediaPigeonCodec()
-    }
-    /** Sets up an instance of `AssetMediaApi` to handle messages through the `binaryMessenger`. */
-    @JvmOverloads
-    fun setUp(binaryMessenger: BinaryMessenger, api: AssetMediaApi?, messageChannelSuffix: String = "") {
-      val separatedMessageChannelSuffix = if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else ""
-      run {
-        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.AssetMediaApi.trash$separatedMessageChannelSuffix", codec)
-        if (api != null) {
-          channel.setMessageHandler { message, reply ->
-            val args = message as List<Any?>
-            val idsArg = args[0] as List<String>
-            api.trash(idsArg) { result: Result<List<AssetMediaActionResult>> ->
-              val error = result.exceptionOrNull()
-              if (error != null) {
-                reply.reply(AssetMediaPigeonUtils.wrapError(error))
-              } else {
-                val data = result.getOrNull()
-                reply.reply(AssetMediaPigeonUtils.wrapResult(data))
-              }
-            }
-          }
-        } else {
-          channel.setMessageHandler(null)
-        }
-      }
-      run {
-        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.AssetMediaApi.restore$separatedMessageChannelSuffix", codec)
-        if (api != null) {
-          channel.setMessageHandler { message, reply ->
-            val args = message as List<Any?>
-            val idsArg = args[0] as List<String>
-            api.restore(idsArg) { result: Result<List<AssetMediaActionResult>> ->
-              val error = result.exceptionOrNull()
-              if (error != null) {
-                reply.reply(AssetMediaPigeonUtils.wrapError(error))
-              } else {
-                val data = result.getOrNull()
-                reply.reply(AssetMediaPigeonUtils.wrapResult(data))
-              }
-            }
-          }
-        } else {
-          channel.setMessageHandler(null)
-        }
-      }
-      run {
-        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.AssetMediaApi.trashedAmong$separatedMessageChannelSuffix", codec)
-        if (api != null) {
-          channel.setMessageHandler { message, reply ->
-            val args = message as List<Any?>
-            val idsArg = args[0] as List<String>
-            api.trashedAmong(idsArg) { result: Result<List<String>> ->
-              val error = result.exceptionOrNull()
-              if (error != null) {
-                reply.reply(AssetMediaPigeonUtils.wrapError(error))
-              } else {
-                val data = result.getOrNull()
-                reply.reply(AssetMediaPigeonUtils.wrapResult(data))
-              }
-            }
-          }
-        } else {
-          channel.setMessageHandler(null)
-        }
-      }
-    }
-  }
-}

mobile/android/app/src/main/kotlin/app/alextran/immich/media/AssetMediaApiImpl.kt

@@ -1,239 +0,0 @@
-package app.alextran.immich.media
-
-import android.annotation.SuppressLint
-import android.app.Activity
-import android.content.ContentResolver
-import android.content.ContentUris
-import android.content.Context
-import android.net.Uri
-import android.os.Build
-import android.os.Bundle
-import android.provider.MediaStore
-import androidx.activity.ComponentActivity
-import androidx.activity.result.ActivityResultLauncher
-import androidx.activity.result.IntentSenderRequest
-import androidx.activity.result.contract.ActivityResultContracts
-import app.alextran.immich.core.ImmichPlugin
-import io.flutter.embedding.engine.plugins.FlutterPlugin
-import io.flutter.embedding.engine.plugins.activity.ActivityAware
-import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding
-import io.flutter.plugin.common.BinaryMessenger
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.ensureActive
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.suspendCancellableCoroutine
-import kotlinx.coroutines.withContext
-import java.util.UUID
-import kotlin.coroutines.cancellation.CancellationException
-import kotlin.coroutines.resume
-
-private enum class MediaAction { TRASH, RESTORE }
-
-private data class MediaItem(val uri: Uri, val isTrashed: Boolean)
-
-private const val MAX_QUERY_ARGS = 900
-
-private const val MAX_CONSENT_URIS = 500
-
-@SuppressLint("NewApi", "InlinedApi")
-class AssetMediaApiImpl(context: Context) : ImmichPlugin(), AssetMediaApi, ActivityAware {
-  private val ctx: Context = context.applicationContext
-  private var binaryMessenger: BinaryMessenger? = null
-  private var activityBinding: ActivityPluginBinding? = null
-
-  private val supportsMediaRequest: Boolean
-    get() = Build.VERSION.SDK_INT >= Build.VERSION_CODES.R
-
-  override fun onAttachedToEngine(binding: FlutterPlugin.FlutterPluginBinding) {
-    super.onAttachedToEngine(binding)
-    binaryMessenger = binding.binaryMessenger
-    AssetMediaApi.setUp(binding.binaryMessenger, this)
-  }
-
-  override fun onDetachedFromEngine(binding: FlutterPlugin.FlutterPluginBinding) {
-    super.onDetachedFromEngine(binding)
-    binaryMessenger?.let { AssetMediaApi.setUp(it, null) }
-    binaryMessenger = null
-    activityBinding = null
-  }
-
-  override fun onAttachedToActivity(binding: ActivityPluginBinding) {
-    activityBinding = binding
-  }
-
-  override fun onDetachedFromActivityForConfigChanges() {
-    activityBinding = null
-  }
-
-  override fun onReattachedToActivityForConfigChanges(binding: ActivityPluginBinding) {
-    activityBinding = binding
-  }
-
-  override fun onDetachedFromActivity() {
-    activityBinding = null
-  }
-
-  override fun trash(ids: List<String>, callback: (Result<List<AssetMediaActionResult>>) -> Unit) =
-    runAction(ids, MediaAction.TRASH, callback)
-
-  override fun restore(
-    ids: List<String>,
-    callback: (Result<List<AssetMediaActionResult>>) -> Unit
-  ) =
-    runAction(ids, MediaAction.RESTORE, callback)
-
-  override fun trashedAmong(ids: List<String>, callback: (Result<List<String>>) -> Unit) =
-    respond(callback, "TRASHED_AMONG_ERROR") {
-      if (!supportsMediaRequest) return@respond emptyList()
-      val items = queryMediaItems(ids)
-      ids.filter { items[it]?.isTrashed == true }
-    }
-
-  private fun runAction(
-    ids: List<String>,
-    action: MediaAction,
-    callback: (Result<List<AssetMediaActionResult>>) -> Unit,
-  ) = respond(callback, "MEDIA_ACTION_ERROR") {
-    if (ids.isEmpty()) return@respond emptyList()
-    if (!supportsMediaRequest) {
-      return@respond ids.map { AssetMediaActionResult(it, AssetMediaActionStatus.FAILED) }
-    }
-
-    val items = queryMediaItems(ids)
-
-    val targets = ids.mapNotNull { id ->
-      val item = items[id] ?: return@mapNotNull null
-      val needsAction = when (action) {
-        MediaAction.TRASH -> !item.isTrashed
-        MediaAction.RESTORE -> item.isTrashed
-      }
-
-      if (needsAction) id to item.uri else null
-    }.toMap()
-
-    val applied = buildMap {
-      for (batch in targets.entries.chunked(MAX_CONSENT_URIS)) {
-        val result = if (requestConsent(action, batch.map { it.value })) {
-          AssetMediaActionStatus.DONE
-        } else {
-          AssetMediaActionStatus.FAILED
-        }
-        batch.forEach { put(it.key, result) }
-      }
-    }
-
-    ids.map { id ->
-      val status = when (id) {
-        in applied -> applied.getValue(id)
-        !in items -> AssetMediaActionStatus.NOT_FOUND
-        else -> AssetMediaActionStatus.ALREADY_IN_STATE
-      }
-      AssetMediaActionResult(id, status)
-    }
-  }
-
-
-  private fun <T> respond(callback: (Result<T>) -> Unit, errorCode: String, work: suspend () -> T) {
-    scope.launch {
-      try {
-        completeWhenActive(callback, Result.success(work()))
-      } catch (e: CancellationException) {
-        throw e
-      } catch (e: Exception) {
-        completeWhenActive(callback, Result.failure(FlutterError(errorCode, e.message, null)))
-      }
-    }
-  }
-
-  private suspend fun requestConsent(action: MediaAction, uris: List<Uri>): Boolean =
-    withContext(Dispatchers.Main) {
-      val activity = activityBinding?.activity as? ComponentActivity ?: return@withContext false
-      val resolver = ctx.contentResolver
-      val request = when (action) {
-        MediaAction.TRASH -> MediaStore.createTrashRequest(resolver, uris, true)
-        MediaAction.RESTORE -> MediaStore.createTrashRequest(resolver, uris, false)
-      }
-
-      suspendCancellableCoroutine { continuation ->
-        val key = "immich_asset_media_api_${UUID.randomUUID()}"
-        var launcher: ActivityResultLauncher<IntentSenderRequest>? = null
-        launcher = activity.activityResultRegistry.register(
-          key,
-          ActivityResultContracts.StartIntentSenderForResult()
-        ) { result ->
-          launcher?.unregister()
-          if (continuation.isActive) {
-            continuation.resume(result.resultCode == Activity.RESULT_OK)
-          }
-        }
-        continuation.invokeOnCancellation { launcher.unregister() }
-        try {
-          launcher.launch(IntentSenderRequest.Builder(request.intentSender).build())
-        } catch (_: Exception) {
-          launcher.unregister()
-          if (continuation.isActive) {
-            continuation.resume(false)
-          }
-        }
-      }
-    }
-
-  private suspend fun queryMediaItems(ids: List<String>): Map<String, MediaItem> =
-    withContext(Dispatchers.IO) {
-      val numeric = ids.filter { it.toLongOrNull() != null }
-      if (numeric.isEmpty()) {
-        return@withContext emptyMap()
-      }
-
-      buildMap {
-        for (chunk in numeric.chunked(MAX_QUERY_ARGS)) {
-          ensureActive()
-          val placeholders = chunk.joinToString(",") { "?" }
-          val args = Bundle().apply {
-            putString(
-              ContentResolver.QUERY_ARG_SQL_SELECTION,
-              "${MediaStore.Files.FileColumns._ID} IN ($placeholders)"
-            )
-            putStringArray(ContentResolver.QUERY_ARG_SQL_SELECTION_ARGS, chunk.toTypedArray())
-            putInt(MediaStore.QUERY_ARG_MATCH_TRASHED, MediaStore.MATCH_INCLUDE)
-          }
-
-          ctx.contentResolver.query(
-            MediaStore.Files.getContentUri(MediaStore.VOLUME_EXTERNAL),
-            arrayOf(
-              MediaStore.Files.FileColumns._ID,
-              MediaStore.Files.FileColumns.MEDIA_TYPE,
-              MediaStore.Files.FileColumns.IS_TRASHED,
-            ),
-            args,
-            null,
-          )?.use { cursor ->
-            val idColumn = cursor.getColumnIndexOrThrow(MediaStore.Files.FileColumns._ID)
-            val typeColumn = cursor.getColumnIndexOrThrow(MediaStore.Files.FileColumns.MEDIA_TYPE)
-            val trashedColumn =
-              cursor.getColumnIndexOrThrow(MediaStore.Files.FileColumns.IS_TRASHED)
-            while (cursor.moveToNext()) {
-              val id = cursor.getLong(idColumn)
-              val uri = mediaContentUri(cursor.getInt(typeColumn), id) ?: continue
-              put(id.toString(), MediaItem(uri, cursor.getInt(trashedColumn) == 1))
-            }
-          }
-        }
-      }
-    }
-
-  private fun mediaContentUri(mediaType: Int, id: Long): Uri? = when (mediaType) {
-    MediaStore.Files.FileColumns.MEDIA_TYPE_IMAGE ->
-      ContentUris.withAppendedId(
-        MediaStore.Images.Media.EXTERNAL_CONTENT_URI, id
-      )
-
-    MediaStore.Files.FileColumns.MEDIA_TYPE_VIDEO ->
-      ContentUris.withAppendedId(
-        MediaStore.Video.Media.getContentUri(MediaStore.VOLUME_EXTERNAL),
-        id
-      )
-
-    else -> null
-  }
-}

mobile/android/app/src/main/kotlin/app/alextran/immich/sync/MediaTrashDelegate.kt

@@ -0,0 +1,133 @@
+package app.alextran.immich.sync
+
+import android.app.Activity
+import android.content.ContentResolver
+import android.content.ContentUris
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.os.Build
+import android.os.Bundle
+import android.provider.MediaStore
+import androidx.annotation.RequiresApi
+import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding
+import io.flutter.plugin.common.PluginRegistry
+
+class MediaTrashDelegate(
+  context: Context,
+  private val trashRequestCode: Int = 1002,
+) : PluginRegistry.ActivityResultListener {
+  private val ctx = context.applicationContext
+  private var activityBinding: ActivityPluginBinding? = null
+  private var pendingResult: ((Result<Boolean>) -> Unit)? = null
+
+  private fun hasManageMediaPermission(): Boolean {
+    return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+      MediaStore.canManageMedia(ctx)
+    } else {
+      false
+    }
+  }
+
+  fun restoreFromTrashById(mediaId: String, type: Long, callback: (Result<Boolean>) -> Unit) {
+    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R || !hasManageMediaPermission()) {
+      callback(Result.failure(FlutterError("PERMISSION_DENIED", "Media permission required", null)))
+      return
+    }
+
+    val id = mediaId.toLongOrNull()
+    if (id == null) {
+      callback(Result.failure(FlutterError("INVALID_ID", "The file id is not a valid number: $mediaId", null)))
+      return
+    }
+
+    if (!isInTrash(id)) {
+      callback(Result.failure(FlutterError("TRASH_NOT_FOUND", "Item with id=$id not found in trash", null)))
+      return
+    }
+
+    restoreUri(ContentUris.withAppendedId(contentUriForType(type.toInt()), id), callback)
+  }
+
+  @RequiresApi(Build.VERSION_CODES.R)
+  private fun restoreUri(
+    contentUri: Uri,
+    callback: (Result<Boolean>) -> Unit,
+  ) {
+    val activity = activityBinding?.activity
+    if (activity == null) {
+      callback(Result.failure(FlutterError("NO_ACTIVITY", "Activity not available", null)))
+      return
+    }
+
+    try {
+      val pendingIntent = MediaStore.createTrashRequest(ctx.contentResolver, listOf(contentUri), false)
+      pendingResult = callback
+      activity.startIntentSenderForResult(
+        pendingIntent.intentSender,
+        trashRequestCode,
+        null,
+        0,
+        0,
+        0,
+      )
+    } catch (e: Exception) {
+      pendingResult = null
+      callback(
+        Result.failure(
+          FlutterError("TRASH_ERROR", "Error creating or starting trash request", e.toString())
+        )
+      )
+    }
+  }
+
+  @RequiresApi(Build.VERSION_CODES.R)
+  private fun isInTrash(id: Long): Boolean {
+    val filesUri = MediaStore.Files.getContentUri(MediaStore.VOLUME_EXTERNAL)
+    val args = Bundle().apply {
+      putString(ContentResolver.QUERY_ARG_SQL_SELECTION, "${MediaStore.Files.FileColumns._ID}=?")
+      putStringArray(ContentResolver.QUERY_ARG_SQL_SELECTION_ARGS, arrayOf(id.toString()))
+      putInt(MediaStore.QUERY_ARG_MATCH_TRASHED, MediaStore.MATCH_ONLY)
+      putInt(ContentResolver.QUERY_ARG_LIMIT, 1)
+    }
+    return ctx.contentResolver.query(filesUri, arrayOf(MediaStore.Files.FileColumns._ID), args, null)
+      ?.use { it.moveToFirst() } == true
+  }
+
+  private fun contentUriForType(type: Int): Uri =
+    when (type) {
+      // Same order as AssetType from Dart.
+      1 -> MediaStore.Images.Media.EXTERNAL_CONTENT_URI
+      2 -> MediaStore.Video.Media.EXTERNAL_CONTENT_URI
+      3 -> MediaStore.Audio.Media.EXTERNAL_CONTENT_URI
+      else -> MediaStore.Files.getContentUri(MediaStore.VOLUME_EXTERNAL)
+    }
+
+  fun onAttachedToActivity(binding: ActivityPluginBinding) {
+    activityBinding = binding
+    binding.addActivityResultListener(this)
+  }
+
+  fun onDetachedFromActivity() {
+    failPending("ACTIVITY_DETACHED", "Activity detached before trash result")
+    activityBinding?.removeActivityResultListener(this)
+    activityBinding = null
+  }
+
+  override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?): Boolean {
+    if (requestCode == trashRequestCode) {
+      val callback = pendingResult
+      pendingResult = null
+      callback?.invoke(Result.success(resultCode == Activity.RESULT_OK))
+      return true
+    }
+
+    return false
+  }
+
+  private fun failPending(code: String, message: String) {
+    val callback = pendingResult ?: return
+    pendingResult = null
+    callback(Result.failure(FlutterError(code, message, null)))
+  }
+}

mobile/android/app/src/main/kotlin/app/alextran/immich/sync/Messages.g.kt

@@ -553,6 +553,8 @@ interface NativeSyncApi {
   fun hashAssets(assetIds: List<String>, allowNetworkAccess: Boolean, callback: (Result<List<HashResult>>) -> Unit)
   fun cancelHashing()
   fun cancelSync()
+  fun getTrashedAssets(): Map<String, List<PlatformAsset>>
+  fun restoreFromTrashById(mediaId: String, type: Long, callback: (Result<Boolean>) -> Unit)
   fun getCloudIdForAssetIds(assetIds: List<String>): List<CloudIdResult>
 
   companion object {
@@ -763,6 +765,42 @@ interface NativeSyncApi {
           channel.setMessageHandler(null)
         }
       }
+      run {
+        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.NativeSyncApi.getTrashedAssets$separatedMessageChannelSuffix", codec, taskQueue)
+        if (api != null) {
+          channel.setMessageHandler { _, reply ->
+            val wrapped: List<Any?> = try {
+              listOf(api.getTrashedAssets())
+            } catch (exception: Throwable) {
+              MessagesPigeonUtils.wrapError(exception)
+            }
+            reply.reply(wrapped)
+          }
+        } else {
+          channel.setMessageHandler(null)
+        }
+      }
+      run {
+        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.NativeSyncApi.restoreFromTrashById$separatedMessageChannelSuffix", codec)
+        if (api != null) {
+          channel.setMessageHandler { message, reply ->
+            val args = message as List<Any?>
+            val mediaIdArg = args[0] as String
+            val typeArg = args[1] as Long
+            api.restoreFromTrashById(mediaIdArg, typeArg) { result: Result<Boolean> ->
+              val error = result.exceptionOrNull()
+              if (error != null) {
+                reply.reply(MessagesPigeonUtils.wrapError(error))
+              } else {
+                val data = result.getOrNull()
+                reply.reply(MessagesPigeonUtils.wrapResult(data))
+              }
+            }
+          }
+        } else {
+          channel.setMessageHandler(null)
+        }
+      }
       run {
         val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.NativeSyncApi.getCloudIdForAssetIds$separatedMessageChannelSuffix", codec, taskQueue)
         if (api != null) {

mobile/android/app/src/main/kotlin/app/alextran/immich/sync/MessagesImpl26.kt

@@ -29,4 +29,9 @@ class NativeSyncApiImpl26(context: Context) : NativeSyncApiImplBase(context), Na
   private fun getMediaChanges(): SyncDelta {
     throw IllegalStateException("Method not supported on this Android version.")
   }
+
+  override fun getTrashedAssets(): Map<String, List<PlatformAsset>> {
+    //Method not supported on this Android version.
+    return emptyMap()
+  }
 }

mobile/android/app/src/main/kotlin/app/alextran/immich/sync/MessagesImpl30.kt

@@ -99,4 +99,29 @@ class NativeSyncApiImpl30(context: Context) : NativeSyncApiImplBase(context), Na
     // Unmounted volumes are handled in dart when the album is removed
     return SyncDelta(hasChanges, changed, deleted, assetAlbums)
   }
+
+  override fun getTrashedAssets(): Map<String, List<PlatformAsset>> {
+
+    val result = LinkedHashMap<String, MutableList<PlatformAsset>>()
+    val volumes = MediaStore.getExternalVolumeNames(ctx)
+
+    for (volume in volumes) {
+
+      val queryArgs = Bundle().apply {
+        putString(ContentResolver.QUERY_ARG_SQL_SELECTION, MEDIA_SELECTION)
+        putStringArray(ContentResolver.QUERY_ARG_SQL_SELECTION_ARGS, MEDIA_SELECTION_ARGS)
+        putInt(MediaStore.QUERY_ARG_MATCH_TRASHED, MediaStore.MATCH_ONLY)
+      }
+
+      getCursor(volume, queryArgs).use { cursor ->
+        getAssets(cursor).forEach { res ->
+          if (res is AssetResult.ValidAsset) {
+            result.getOrPut(res.albumId) { mutableListOf() }.add(res.asset)
+          }
+        }
+      }
+    }
+
+    return result.mapValues { it.value.toList() }
+  }
 }

mobile/android/app/src/main/kotlin/app/alextran/immich/sync/MessagesImplBase.kt

@@ -4,6 +4,7 @@ import android.annotation.SuppressLint
 import android.content.ContentUris
 import android.content.Context
 import android.database.Cursor
+import androidx.exifinterface.media.ExifInterface
 import android.os.Build
 import android.os.Bundle
 import android.os.ext.SdkExtensions
@@ -16,6 +17,8 @@ import com.bumptech.glide.Glide
 import com.bumptech.glide.load.ImageHeaderParser
 import com.bumptech.glide.load.ImageHeaderParserUtils
 import com.bumptech.glide.load.resource.bitmap.DefaultImageHeaderParser
+import io.flutter.embedding.engine.plugins.activity.ActivityAware
+import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -38,11 +41,12 @@ sealed class AssetResult {
 private const val TAG = "NativeSyncApiImplBase"
 
 @SuppressLint("InlinedApi")
-open class NativeSyncApiImplBase(context: Context) : ImmichPlugin() {
+open class NativeSyncApiImplBase(context: Context) : ImmichPlugin(), ActivityAware {
   private val ctx: Context = context.applicationContext
 
   private var hashTask: Job? = null
   private var syncJob: Job? = null
+  private val mediaTrashDelegate = MediaTrashDelegate(ctx)
 
   companion object {
     private const val MAX_CONCURRENT_HASH_OPERATIONS = 16
@@ -373,11 +377,7 @@ open class NativeSyncApiImplBase(context: Context) : ImmichPlugin() {
     )?.use { cursor -> cursor.count.toLong() } ?: 0L
 
 
-  fun getAssetsForAlbum(
-    albumId: String,
-    updatedTimeCond: Long?,
-    callback: (Result<List<PlatformAsset>>) -> Unit
-  ) {
+  fun getAssetsForAlbum(albumId: String, updatedTimeCond: Long?, callback: (Result<List<PlatformAsset>>) -> Unit) {
     runSync(callback) { getAssetsForAlbum(albumId, updatedTimeCond) }
   }
 
@@ -477,16 +477,33 @@ open class NativeSyncApiImplBase(context: Context) : ImmichPlugin() {
       try {
         completeWhenActive(callback, Result.success(work()))
       } catch (e: CancellationException) {
-        completeWhenActive(
-          callback,
-          Result.failure(FlutterError(SYNC_CANCELLED_CODE, "Sync cancelled", null))
-        )
+        completeWhenActive(callback, Result.failure(FlutterError(SYNC_CANCELLED_CODE, "Sync cancelled", null)))
       } catch (e: Exception) {
         completeWhenActive(callback, Result.failure(e))
       }
     }
   }
 
+  fun restoreFromTrashById(mediaId: String, type: Long, callback: (Result<Boolean>) -> Unit) {
+    mediaTrashDelegate.restoreFromTrashById(mediaId, type) { completeWhenActive(callback, it) }
+  }
+
+  override fun onAttachedToActivity(binding: ActivityPluginBinding) {
+    mediaTrashDelegate.onAttachedToActivity(binding)
+  }
+
+  override fun onDetachedFromActivityForConfigChanges() {
+    mediaTrashDelegate.onDetachedFromActivity()
+  }
+
+  override fun onReattachedToActivityForConfigChanges(binding: ActivityPluginBinding) {
+    mediaTrashDelegate.onAttachedToActivity(binding)
+  }
+
+  override fun onDetachedFromActivity() {
+    mediaTrashDelegate.onDetachedFromActivity()
+  }
+
   // This method is only implemented on iOS; on Android, we do not have a concept of cloud IDs
   @Suppress("unused", "UNUSED_PARAMETER")
   fun getCloudIdForAssetIds(assetIds: List<String>): List<CloudIdResult> {

mobile/ios/Runner.xcodeproj/project.pbxproj

@@ -166,11 +166,6 @@
 			path = Sync;
 			sourceTree = "<group>";
 		};
-		B2D5F7B13005FCA00080CE3E /* AssetMedia */ = {
-			isa = PBXFileSystemSynchronizedRootGroup;
-			path = AssetMedia;
-			sourceTree = "<group>";
-		};
 		F0B57D3D2DF764BD00DC5BCC /* WidgetExtension */ = {
 			isa = PBXFileSystemSynchronizedRootGroup;
 			exceptions = (
@@ -292,7 +287,6 @@
 		97C146F01CF9000F007C117D /* Runner */ = {
 			isa = PBXGroup;
 			children = (
-				B2D5F7B13005FCA00080CE3E /* AssetMedia */,
 				FE1BB4562F8319560087DBF9 /* Utility */,
 				FEE084F22EC172080045228E /* Schemas */,
 				B231F52D2E93A44A00BC45D1 /* Core */,
@@ -394,7 +388,6 @@
 			fileSystemSynchronizedGroups = (
 				B231F52D2E93A44A00BC45D1 /* Core */,
 				B2CF7F8C2DDE4EBB00744BF6 /* Sync */,
-				B2D5F7B13005FCA00080CE3E /* AssetMedia */,
 				FEE084F22EC172080045228E /* Schemas */,
 			);
 			name = Runner;

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/AppDelegate.swift

@@ -26,7 +26,6 @@ import native_video_player
 
   public static func registerPlugins(with registry: FlutterPluginRegistry, messenger: FlutterBinaryMessenger) {
     NativeSyncApiImpl.register(with: registry.registrar(forPlugin: NativeSyncApiImpl.name)!)
-    AssetMediaApiImpl.register(with: registry.registrar(forPlugin: AssetMediaApiImpl.name)!)
     PermissionApiSetup.setUp(binaryMessenger: messenger, api: PermissionApiImpl())
     LocalImageApiSetup.setUp(binaryMessenger: messenger, api: LocalImageApiImpl())
     RemoteImageApiSetup.setUp(binaryMessenger: messenger, api: RemoteImageApiImpl())
@@ -37,6 +36,5 @@ import native_video_player
 
   public static func cancelPlugins(with engine: FlutterEngine) {
     (engine.valuePublished(byPlugin: NativeSyncApiImpl.name) as? NativeSyncApiImpl)?.detachFromEngine()
-    (engine.valuePublished(byPlugin: AssetMediaApiImpl.name) as? AssetMediaApiImpl)?.detachFromEngine()
   }
 }

mobile/ios/Runner/AssetMedia/AssetMedia.g.swift

@@ -1,313 +0,0 @@
-// Autogenerated from Pigeon (v26.3.4), do not edit directly.
-// See also: https://pub.dev/packages/pigeon
-
-import Foundation
-
-#if os(iOS)
-  import Flutter
-#elseif os(macOS)
-  import FlutterMacOS
-#else
-  #error("Unsupported platform.")
-#endif
-
-private func wrapResult(_ result: Any?) -> [Any?] {
-  return [result]
-}
-
-private func wrapError(_ error: Any) -> [Any?] {
-  if let pigeonError = error as? PigeonError {
-    return [
-      pigeonError.code,
-      pigeonError.message,
-      pigeonError.details,
-    ]
-  }
-  if let flutterError = error as? FlutterError {
-    return [
-      flutterError.code,
-      flutterError.message,
-      flutterError.details,
-    ]
-  }
-  return [
-    "\(error)",
-    "\(Swift.type(of: error))",
-    "Stacktrace: \(Thread.callStackSymbols)",
-  ]
-}
-
-private func isNullish(_ value: Any?) -> Bool {
-  return value is NSNull || value == nil
-}
-
-private func nilOrValue<T>(_ value: Any?) -> T? {
-  if value is NSNull { return nil }
-  return value as! T?
-}
-
-private func doubleEqualsAssetMedia(_ lhs: Double, _ rhs: Double) -> Bool {
-  return (lhs.isNaN && rhs.isNaN) || lhs == rhs
-}
-
-private func doubleHashAssetMedia(_ value: Double, _ hasher: inout Hasher) {
-  if value.isNaN {
-    hasher.combine(0x7FF8000000000000)
-  } else {
-    // Normalize -0.0 to 0.0
-    hasher.combine(value == 0 ? 0 : value)
-  }
-}
-
-func deepEqualsAssetMedia(_ lhs: Any?, _ rhs: Any?) -> Bool {
-  let cleanLhs = nilOrValue(lhs) as Any?
-  let cleanRhs = nilOrValue(rhs) as Any?
-  switch (cleanLhs, cleanRhs) {
-  case (nil, nil):
-    return true
-
-  case (nil, _), (_, nil):
-    return false
-
-  case (let lhs as AnyObject, let rhs as AnyObject) where lhs === rhs:
-    return true
-
-  case is (Void, Void):
-    return true
-
-  case (let lhsArray, let rhsArray) as ([Any?], [Any?]):
-    guard lhsArray.count == rhsArray.count else { return false }
-    for (index, element) in lhsArray.enumerated() {
-      if !deepEqualsAssetMedia(element, rhsArray[index]) {
-        return false
-      }
-    }
-    return true
-
-  case (let lhsArray, let rhsArray) as ([Double], [Double]):
-    guard lhsArray.count == rhsArray.count else { return false }
-    for (index, element) in lhsArray.enumerated() {
-      if !doubleEqualsAssetMedia(element, rhsArray[index]) {
-        return false
-      }
-    }
-    return true
-
-  case (let lhsDictionary, let rhsDictionary) as ([AnyHashable: Any?], [AnyHashable: Any?]):
-    guard lhsDictionary.count == rhsDictionary.count else { return false }
-    for (lhsKey, lhsValue) in lhsDictionary {
-      var found = false
-      for (rhsKey, rhsValue) in rhsDictionary {
-        if deepEqualsAssetMedia(lhsKey, rhsKey) {
-          if deepEqualsAssetMedia(lhsValue, rhsValue) {
-            found = true
-            break
-          } else {
-            return false
-          }
-        }
-      }
-      if !found { return false }
-    }
-    return true
-
-  case (let lhs as Double, let rhs as Double):
-    return doubleEqualsAssetMedia(lhs, rhs)
-
-  case (let lhsHashable, let rhsHashable) as (AnyHashable, AnyHashable):
-    return lhsHashable == rhsHashable
-
-  default:
-    return false
-  }
-}
-
-func deepHashAssetMedia(value: Any?, hasher: inout Hasher) {
-  let cleanValue = nilOrValue(value) as Any?
-  if let cleanValue = cleanValue {
-    if let doubleValue = cleanValue as? Double {
-      doubleHashAssetMedia(doubleValue, &hasher)
-    } else if let valueList = cleanValue as? [Any?] {
-      for item in valueList {
-        deepHashAssetMedia(value: item, hasher: &hasher)
-      }
-    } else if let valueList = cleanValue as? [Double] {
-      for item in valueList {
-        doubleHashAssetMedia(item, &hasher)
-      }
-    } else if let valueDict = cleanValue as? [AnyHashable: Any?] {
-      var result = 0
-      for (key, value) in valueDict {
-        var entryKeyHasher = Hasher()
-        deepHashAssetMedia(value: key, hasher: &entryKeyHasher)
-        var entryValueHasher = Hasher()
-        deepHashAssetMedia(value: value, hasher: &entryValueHasher)
-        result = result &+ ((entryKeyHasher.finalize() &* 31) ^ entryValueHasher.finalize())
-      }
-      hasher.combine(result)
-    } else if let hashableValue = cleanValue as? AnyHashable {
-      hasher.combine(hashableValue)
-    } else {
-      hasher.combine(String(describing: cleanValue))
-    }
-  } else {
-    hasher.combine(0)
-  }
-}
-
-
-enum AssetMediaActionStatus: Int {
-  case done = 0
-  case alreadyInState = 1
-  case notFound = 2
-  case failed = 3
-}
-
-/// Generated class from Pigeon that represents data sent in messages.
-struct AssetMediaActionResult: Hashable {
-  var id: String
-  var status: AssetMediaActionStatus
-
-
-  // swift-format-ignore: AlwaysUseLowerCamelCase
-  static func fromList(_ pigeonVar_list: [Any?]) -> AssetMediaActionResult? {
-    let id = pigeonVar_list[0] as! String
-    let status = pigeonVar_list[1] as! AssetMediaActionStatus
-
-    return AssetMediaActionResult(
-      id: id,
-      status: status
-    )
-  }
-  func toList() -> [Any?] {
-    return [
-      id,
-      status,
-    ]
-  }
-  static func == (lhs: AssetMediaActionResult, rhs: AssetMediaActionResult) -> Bool {
-    if Swift.type(of: lhs) != Swift.type(of: rhs) {
-      return false
-    }
-    return deepEqualsAssetMedia(lhs.id, rhs.id) && deepEqualsAssetMedia(lhs.status, rhs.status)
-  }
-
-  func hash(into hasher: inout Hasher) {
-    hasher.combine("AssetMediaActionResult")
-    deepHashAssetMedia(value: id, hasher: &hasher)
-    deepHashAssetMedia(value: status, hasher: &hasher)
-  }
-}
-
-private class AssetMediaPigeonCodecReader: FlutterStandardReader {
-  override func readValue(ofType type: UInt8) -> Any? {
-    switch type {
-    case 129:
-      let enumResultAsInt: Int? = nilOrValue(self.readValue() as! Int?)
-      if let enumResultAsInt = enumResultAsInt {
-        return AssetMediaActionStatus(rawValue: enumResultAsInt)
-      }
-      return nil
-    case 130:
-      return AssetMediaActionResult.fromList(self.readValue() as! [Any?])
-    default:
-      return super.readValue(ofType: type)
-    }
-  }
-}
-
-private class AssetMediaPigeonCodecWriter: FlutterStandardWriter {
-  override func writeValue(_ value: Any) {
-    if let value = value as? AssetMediaActionStatus {
-      super.writeByte(129)
-      super.writeValue(value.rawValue)
-    } else if let value = value as? AssetMediaActionResult {
-      super.writeByte(130)
-      super.writeValue(value.toList())
-    } else {
-      super.writeValue(value)
-    }
-  }
-}
-
-private class AssetMediaPigeonCodecReaderWriter: FlutterStandardReaderWriter {
-  override func reader(with data: Data) -> FlutterStandardReader {
-    return AssetMediaPigeonCodecReader(data: data)
-  }
-
-  override func writer(with data: NSMutableData) -> FlutterStandardWriter {
-    return AssetMediaPigeonCodecWriter(data: data)
-  }
-}
-
-class AssetMediaPigeonCodec: FlutterStandardMessageCodec, @unchecked Sendable {
-  static let shared = AssetMediaPigeonCodec(readerWriter: AssetMediaPigeonCodecReaderWriter())
-}
-
-
-/// Generated protocol from Pigeon that represents a handler of messages from Flutter.
-protocol AssetMediaApi {
-  func trash(ids: [String], completion: @escaping (Result<[AssetMediaActionResult], Error>) -> Void)
-  func restore(ids: [String], completion: @escaping (Result<[AssetMediaActionResult], Error>) -> Void)
-  func trashedAmong(ids: [String], completion: @escaping (Result<[String], Error>) -> Void)
-}
-
-/// Generated setup class from Pigeon to handle messages through the `binaryMessenger`.
-class AssetMediaApiSetup {
-  static var codec: FlutterStandardMessageCodec { AssetMediaPigeonCodec.shared }
-  /// Sets up an instance of `AssetMediaApi` to handle messages through the `binaryMessenger`.
-  static func setUp(binaryMessenger: FlutterBinaryMessenger, api: AssetMediaApi?, messageChannelSuffix: String = "") {
-    let channelSuffix = messageChannelSuffix.count > 0 ? ".\(messageChannelSuffix)" : ""
-    let trashChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.AssetMediaApi.trash\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
-    if let api = api {
-      trashChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
-        let idsArg = args[0] as! [String]
-        api.trash(ids: idsArg) { result in
-          switch result {
-          case .success(let res):
-            reply(wrapResult(res))
-          case .failure(let error):
-            reply(wrapError(error))
-          }
-        }
-      }
-    } else {
-      trashChannel.setMessageHandler(nil)
-    }
-    let restoreChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.AssetMediaApi.restore\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
-    if let api = api {
-      restoreChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
-        let idsArg = args[0] as! [String]
-        api.restore(ids: idsArg) { result in
-          switch result {
-          case .success(let res):
-            reply(wrapResult(res))
-          case .failure(let error):
-            reply(wrapError(error))
-          }
-        }
-      }
-    } else {
-      restoreChannel.setMessageHandler(nil)
-    }
-    let trashedAmongChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.AssetMediaApi.trashedAmong\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
-    if let api = api {
-      trashedAmongChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
-        let idsArg = args[0] as! [String]
-        api.trashedAmong(ids: idsArg) { result in
-          switch result {
-          case .success(let res):
-            reply(wrapResult(res))
-          case .failure(let error):
-            reply(wrapError(error))
-          }
-        }
-      }
-    } else {
-      trashedAmongChannel.setMessageHandler(nil)
-    }
-  }
-}

mobile/ios/Runner/AssetMedia/AssetMediaApiImpl.swift

@@ -1,26 +0,0 @@
-class AssetMediaApiImpl: ImmichPlugin, AssetMediaApi, FlutterPlugin {
-  static let name = "AssetMediaApi"
-
-  static func register(with registrar: FlutterPluginRegistrar) {
-    let instance = AssetMediaApiImpl()
-    AssetMediaApiSetup.setUp(binaryMessenger: registrar.messenger(), api: instance)
-    registrar.publish(instance)
-  }
-
-  func detachFromEngine(for registrar: FlutterPluginRegistrar) {
-    AssetMediaApiSetup.setUp(binaryMessenger: registrar.messenger(), api: nil)
-    super.detachFromEngine()
-  }
-
-  func trash(ids: [String], completion: @escaping (Result<[AssetMediaActionResult], Error>) -> Void) {
-    completeWhenActive(for: completion, with: .success(ids.map { AssetMediaActionResult(id: $0, status: .failed) }))
-  }
-
-  func restore(ids: [String], completion: @escaping (Result<[AssetMediaActionResult], Error>) -> Void) {
-    completeWhenActive(for: completion, with: .success(ids.map { AssetMediaActionResult(id: $0, status: .failed) }))
-  }
-
-  func trashedAmong(ids: [String], completion: @escaping (Result<[String], Error>) -> Void) {
-    completeWhenActive(for: completion, with: .success([]))
-  }
-}

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/Runner/Sync/Messages.g.swift

@@ -537,6 +537,8 @@ protocol NativeSyncApi {
   func hashAssets(assetIds: [String], allowNetworkAccess: Bool, completion: @escaping (Result<[HashResult], Error>) -> Void)
   func cancelHashing() throws
   func cancelSync() throws
+  func getTrashedAssets() throws -> [String: [PlatformAsset]]
+  func restoreFromTrashById(mediaId: String, type: Int64, completion: @escaping (Result<Bool, Error>) -> Void)
   func getCloudIdForAssetIds(assetIds: [String]) throws -> [CloudIdResult]
 }
 
@@ -721,6 +723,39 @@ class NativeSyncApiSetup {
     } else {
       cancelSyncChannel.setMessageHandler(nil)
     }
+    let getTrashedAssetsChannel = taskQueue == nil
+      ? FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.NativeSyncApi.getTrashedAssets\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
+      : FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.NativeSyncApi.getTrashedAssets\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec, taskQueue: taskQueue)
+    if let api = api {
+      getTrashedAssetsChannel.setMessageHandler { _, reply in
+        do {
+          let result = try api.getTrashedAssets()
+          reply(wrapResult(result))
+        } catch {
+          reply(wrapError(error))
+        }
+      }
+    } else {
+      getTrashedAssetsChannel.setMessageHandler(nil)
+    }
+    let restoreFromTrashByIdChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.NativeSyncApi.restoreFromTrashById\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
+    if let api = api {
+      restoreFromTrashByIdChannel.setMessageHandler { message, reply in
+        let args = message as! [Any?]
+        let mediaIdArg = args[0] as! String
+        let typeArg = args[1] as! Int64
+        api.restoreFromTrashById(mediaId: mediaIdArg, type: typeArg) { result in
+          switch result {
+          case .success(let res):
+            reply(wrapResult(res))
+          case .failure(let error):
+            reply(wrapError(error))
+          }
+        }
+      }
+    } else {
+      restoreFromTrashByIdChannel.setMessageHandler(nil)
+    }
     let getCloudIdForAssetIdsChannel = taskQueue == nil
       ? FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.NativeSyncApi.getCloudIdForAssetIds\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
       : FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.NativeSyncApi.getCloudIdForAssetIds\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec, taskQueue: taskQueue)

mobile/ios/Runner/Sync/MessagesImpl.swift

@@ -436,6 +436,14 @@ class NativeSyncApiImpl: ImmichPlugin, NativeSyncApi, FlutterPlugin {
     })
   }
   
+  func getTrashedAssets() throws -> [String: [PlatformAsset]] {
+    throw PigeonError(code: "UNSUPPORTED_OS", message: "This feature not supported on iOS.", details: nil)
+  }
+
+  func restoreFromTrashById(mediaId: String, type: Int64, completion: @escaping (Result<Bool, Error>) -> Void) {
+    completion(.success(false))
+  }
+  
   private func getAssetsFromAlbum(in album: PHAssetCollection, options: PHFetchOptions) -> PHFetchResult<PHAsset> {
     // Ensure to actually getting all assets for the Recents album
     if (album.assetCollectionSubtype == .smartAlbumUserLibrary) {

mobile/lib/constants/enums.dart

@@ -26,17 +26,3 @@ enum SlideshowLook { contain, cover, blurredBackground }
 enum SlideshowDirection { forward, backward, shuffle }
 
 enum PartnerDirection { sharedBy, sharedWith }
-
-enum TrashSyncStatus {
-  pending,
-  trashed,
-  /* The asset was restored outside of Immich. The implications of this are:
-   *  - Assets matching the same checksum won't be re-trashed
-   *  - Backups will ignore the asset from re-uploading
-   */
-  dismissed,
-  /* The asset was restored back out of the OS trash by us. This allows us
-   * to copy the checksum back into the local asset table
-   */
-  restored,
-}

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

@@ -23,7 +23,6 @@ const defaultConfig = AppConfig();
 
 class AppConfig {
   final LogLevel logLevel;
-  final bool trashSyncEnabled;
   final ThemeConfig theme;
   final CleanupConfig cleanup;
   final MapConfig map;
@@ -39,7 +38,6 @@ class AppConfig {
 
   const AppConfig({
     this.logLevel = .info,
-    this.trashSyncEnabled = false,
     this.theme = const .new(),
     this.cleanup = const .new(),
     this.map = const .new(),
@@ -56,7 +54,6 @@ class AppConfig {
 
   AppConfig copyWith({
     LogLevel? logLevel,
-    bool? trashSyncEnabled,
     ThemeConfig? theme,
     CleanupConfig? cleanup,
     MapConfig? map,
@@ -71,7 +68,6 @@ class AppConfig {
     FeatureMessageConfig? featureMessage,
   }) => .new(
     logLevel: logLevel ?? this.logLevel,
-    trashSyncEnabled: trashSyncEnabled ?? this.trashSyncEnabled,
     theme: theme ?? this.theme,
     cleanup: cleanup ?? this.cleanup,
     map: map ?? this.map,
@@ -91,7 +87,6 @@ class AppConfig {
       identical(this, other) ||
       (other is AppConfig &&
           other.logLevel == logLevel &&
-          other.trashSyncEnabled == trashSyncEnabled &&
           other.theme == theme &&
           other.cleanup == cleanup &&
           other.map == map &&
@@ -108,7 +103,6 @@ class AppConfig {
   @override
   int get hashCode => Object.hash(
     logLevel,
-    trashSyncEnabled,
     theme,
     cleanup,
     map,
@@ -125,12 +119,11 @@ class AppConfig {
 
   @override
   String toString() =>
-      'AppConfig(logLevel: $logLevel, trashSyncEnabled: $trashSyncEnabled, theme: $theme, cleanup: $cleanup, map: $map, timeline: $timeline, image: $image, viewer: $viewer, slideshow: $slideshow, album: $album, backup: $backup, network: $network, share: $share, featureMessage: $featureMessage)';
+      'AppConfig(logLevel: $logLevel, theme: $theme, cleanup: $cleanup, map: $map, timeline: $timeline, image: $image, viewer: $viewer, slideshow: $slideshow, album: $album, backup: $backup, network: $network, share: $share, featureMessage: $featureMessage)';
 
   T read<T>(SettingsKey<T> key) =>
       (switch (key) {
             .logLevel => logLevel,
-            .trashSyncEnabled => trashSyncEnabled,
             .themePrimaryColor => theme.primaryColor,
             .themeMode => theme.mode,
             .themeDynamic => theme.dynamicTheme,
@@ -183,7 +176,6 @@ class AppConfig {
   AppConfig write<T, U extends T>(SettingsKey<T> key, U value) {
     return switch (key) {
       .logLevel => copyWith(logLevel: value as LogLevel),
-      .trashSyncEnabled => copyWith(trashSyncEnabled: value as bool),
       .themePrimaryColor => copyWith(theme: theme.copyWith(primaryColor: value as ImmichColorPreset)),
       .themeMode => copyWith(theme: theme.copyWith(mode: value as ThemeMode)),
       .themeDynamic => copyWith(theme: theme.copyWith(dynamicTheme: value as bool)),

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

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

mobile/lib/domain/models/settings_key.dart

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

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

@@ -12,13 +12,13 @@ enum StoreKey<T> {
   advancedTroubleshooting<bool>._(114),
   enableHapticFeedback<bool>._(126),
 
+  manageLocalMediaAndroid<bool>._(137),
   // Read-only Mode settings
   readonlyModeEnabled<bool>._(138),
 
   syncMigrationStatus<String>._(1013),
 
   // Legacy keys that have been migrated to the new metadata store
-  legacyManageLocalMediaAndroid<bool>._(137),
   legacyBackupRequireCharging<bool>._(7),
   legacyBackupTriggerDelay<int>._(8),
   legacySyncAlbums<bool>._(131),

mobile/lib/domain/models/value_codec.dart

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

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

@@ -6,7 +6,10 @@ import 'package:background_downloader/background_downloader.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/constants.dart';
+import 'package:immich_mobile/domain/services/hash.service.dart';
+import 'package:immich_mobile/domain/services/local_sync.service.dart';
 import 'package:immich_mobile/domain/services/log.service.dart';
+import 'package:immich_mobile/domain/services/sync_stream.service.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
@@ -14,11 +17,16 @@ import 'package:immich_mobile/infrastructure/repositories/logger_db.repository.d
 import 'package:immich_mobile/infrastructure/repositories/settings.repository.dart';
 import 'package:immich_mobile/platform/background_worker_api.g.dart';
 import 'package:immich_mobile/platform/background_worker_lock_api.g.dart';
-import 'package:immich_mobile/providers/background_sync.provider.dart';
+import 'package:immich_mobile/providers/api.provider.dart';
 import 'package:immich_mobile/providers/backup/drift_backup.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/platform.provider.dart' show nativeSyncApiProvider;
+import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/sync.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
+import 'package:immich_mobile/repositories/asset_media.repository.dart';
+import 'package:immich_mobile/repositories/permission.repository.dart';
 import 'package:immich_mobile/services/auth.service.dart';
 import 'package:immich_mobile/services/foreground_upload.service.dart';
 import 'package:immich_mobile/services/localization.service.dart';
@@ -58,12 +66,43 @@ class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {
   final BackgroundWorkerBgHostApi _backgroundHostApi;
   final _cancellationToken = Completer<void>();
   final Logger _logger = Logger('BackgroundWorkerBgService');
+  late LocalSyncService _localSyncService;
+  late SyncStreamService _remoteSyncService;
+  late HashService _hashService;
 
   bool _isCleanedUp = false;
 
   BackgroundWorkerBgService({required this._drift, required this._driftLogger})
     : _backgroundHostApi = BackgroundWorkerBgHostApi() {
-    _ref = ProviderContainer(overrides: [driftProvider.overrideWith(driftOverride(_drift))]);
+    final ref = ProviderContainer(overrides: [driftProvider.overrideWith(driftOverride(_drift))]);
+    _ref = ref;
+    _localSyncService = LocalSyncService(
+      localAlbumRepository: ref.read(localAlbumRepository),
+      localAssetRepository: ref.read(localAssetRepository),
+      nativeSyncApi: ref.read(nativeSyncApiProvider),
+      trashedLocalAssetRepository: ref.read(trashedLocalAssetRepository),
+      assetMediaRepository: ref.read(assetMediaRepositoryProvider),
+      permissionRepository: ref.read(permissionRepositoryProvider),
+      cancellation: _cancellationToken,
+    );
+    _remoteSyncService = SyncStreamService(
+      syncApiRepository: ref.read(syncApiRepositoryProvider),
+      syncStreamRepository: ref.read(syncStreamRepositoryProvider),
+      localAssetRepository: ref.read(localAssetRepository),
+      trashedLocalAssetRepository: ref.read(trashedLocalAssetRepository),
+      assetMediaRepository: ref.read(assetMediaRepositoryProvider),
+      permissionRepository: ref.read(permissionRepositoryProvider),
+      syncMigrationRepository: ref.read(syncMigrationRepositoryProvider),
+      api: ref.read(apiServiceProvider),
+      cancellation: _cancellationToken,
+    );
+    _hashService = HashService(
+      localAlbumRepository: ref.read(localAlbumRepository),
+      localAssetRepository: ref.read(localAssetRepository),
+      nativeSyncApi: ref.read(nativeSyncApiProvider),
+      trashedLocalAssetRepository: ref.read(trashedLocalAssetRepository),
+      cancellation: _cancellationToken,
+    );
     BackgroundWorkerFlutterApi.setUp(this);
   }
 
@@ -119,11 +158,6 @@ class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {
     try {
       final budget = maxSeconds != null ? Duration(seconds: maxSeconds - 1) : null;
 
-      final sync = _ref?.read(backgroundSyncProvider);
-      if (sync == null) {
-        return;
-      }
-
       // Only for Background Processing tasks
       if (maxSeconds == null) {
         await _optimizeDB();
@@ -135,9 +169,23 @@ class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {
       // hash and handle_backup read drift state and tolerate stale reads
       // (server-side dedup catches the rare race). The single budget caps the
       // whole batch; no phase needs its own timeout.
-      final all = Future.wait<dynamic>([sync.syncLocal(), sync.syncRemote(), sync.hashAssets(), _handleBackup()]);
+      final all = Future.wait<dynamic>([
+        _localSyncService.sync(),
+        _remoteSyncService.sync(),
+        _hashService.hashAssets(),
+        _handleBackup(),
+      ]);
       if (budget != null) {
-        await all.timeout(budget, onTimeout: () => <dynamic>[]);
+        await all.timeout(
+          budget,
+          onTimeout: () {
+            if (!_cancellationToken.isCompleted) {
+              _logger.warning("iOS background upload timed out after ${budget.inSeconds}s, cancelling tasks");
+              _cancellationToken.complete();
+            }
+            return <dynamic>[];
+          },
+        );
       } else {
         await all;
       }
@@ -221,7 +269,6 @@ class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {
 
     try {
       _isCleanedUp = true;
-      final backgroundSyncManager = _ref?.read(backgroundSyncProvider);
       final nativeSyncApi = _ref?.read(nativeSyncApiProvider);
 
       _logger.info("Cleaning up background worker");
@@ -230,10 +277,7 @@ class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {
       }
 
       // Workers share one sqlite connection, so DB teardown must wait until every worker has stopped using it.
-      await Future.wait([
-        if (backgroundSyncManager != null) backgroundSyncManager.cancel(),
-        if (nativeSyncApi != null) nativeSyncApi.cancelHashing(),
-      ]);
+      await Future.wait([if (nativeSyncApi != null) nativeSyncApi.cancelHashing()]);
       await workerManagerPatch.dispose().catchError((_) async {});
       await Future.wait([LogService.I.dispose(), Store.dispose()]);
       await _drift.close();
@@ -279,18 +323,18 @@ class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {
   }
 
   Future<bool> _syncAssets({Duration? hashTimeout}) async {
-    await _ref?.read(backgroundSyncProvider).syncLocal();
+    await _localSyncService.sync();
     if (_isCleanedUp) {
       return false;
     }
 
-    final isSuccess = await _ref?.read(backgroundSyncProvider).syncRemote() ?? false;
+    final isSuccess = await _remoteSyncService.sync();
     if (_isCleanedUp) {
       return isSuccess;
     }
 
-    var hashFuture = _ref?.read(backgroundSyncProvider).hashAssets();
-    if (hashTimeout != null && hashFuture != null) {
+    var hashFuture = _hashService.hashAssets();
+    if (hashTimeout != null) {
       hashFuture = hashFuture.timeout(
         hashTimeout,
         onTimeout: () {

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

@@ -4,8 +4,10 @@ import 'package:flutter/services.dart';
 import 'package:immich_mobile/constants/constants.dart';
 import 'package:immich_mobile/domain/models/album/local_album.model.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:immich_mobile/infrastructure/repositories/local_album.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/local_asset.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/trashed_local_asset.repository.dart';
 import 'package:immich_mobile/platform/native_sync_api.g.dart';
 import 'package:logging/logging.dart';
 
@@ -15,6 +17,7 @@ class HashService {
   final int _batchSize;
   final DriftLocalAlbumRepository _localAlbumRepository;
   final DriftLocalAssetRepository _localAssetRepository;
+  final DriftTrashedLocalAssetRepository _trashedLocalAssetRepository;
   final NativeSyncApi _nativeSyncApi;
   final Completer<void>? _cancellation;
   final _log = Logger('HashService');
@@ -22,6 +25,7 @@ class HashService {
   HashService({
     required this._localAlbumRepository,
     required this._localAssetRepository,
+    required this._trashedLocalAssetRepository,
     required this._nativeSyncApi,
     this._cancellation,
     int? batchSize,
@@ -54,6 +58,14 @@ class HashService {
           await _hashAssets(album, assetsToHash);
         }
       }
+      if (CurrentPlatform.isAndroid && localAlbums.isNotEmpty) {
+        final backupAlbumIds = localAlbums.map((e) => e.id);
+        final trashedToHash = await _trashedLocalAssetRepository.getAssetsToHash(backupAlbumIds);
+        if (trashedToHash.isNotEmpty) {
+          final pseudoAlbum = LocalAlbum(id: '-pseudoAlbum', name: 'Trash', updatedAt: DateTime.now());
+          await _hashAssets(pseudoAlbum, trashedToHash, isTrashed: true);
+        }
+      }
     } on PlatformException catch (e) {
       if (e.code == _kHashCancelledCode) {
         _log.warning("Hashing cancelled by platform");
@@ -70,7 +82,7 @@ class HashService {
   /// Processes a list of [LocalAsset]s, storing their hash and updating the assets in the DB
   /// with hash for those that were successfully hashed. Hashes are looked up in a table
   /// [LocalAssetHashEntity] by local id. Only missing entries are newly hashed and added to the DB.
-  Future<void> _hashAssets(LocalAlbum album, List<LocalAsset> assetsToHash) async {
+  Future<void> _hashAssets(LocalAlbum album, List<LocalAsset> assetsToHash, {bool isTrashed = false}) async {
     final toHash = <String, LocalAsset>{};
 
     for (final asset in assetsToHash) {
@@ -81,16 +93,16 @@ class HashService {
 
       toHash[asset.id] = asset;
       if (toHash.length == _batchSize) {
-        await _processBatch(album, toHash);
+        await _processBatch(album, toHash, isTrashed);
         toHash.clear();
       }
     }
 
-    await _processBatch(album, toHash);
+    await _processBatch(album, toHash, isTrashed);
   }
 
   /// Processes a batch of assets.
-  Future<void> _processBatch(LocalAlbum album, Map<String, LocalAsset> toHash) async {
+  Future<void> _processBatch(LocalAlbum album, Map<String, LocalAsset> toHash, bool isTrashed) async {
     if (toHash.isEmpty) {
       return;
     }
@@ -125,6 +137,10 @@ class HashService {
     }
 
     _log.fine("Hashed ${hashed.length}/${toHash.length} assets");
-    await _localAssetRepository.updateHashes(hashed);
+    if (isTrashed) {
+      await _trashedLocalAssetRepository.updateHashes(hashed);
+    } else {
+      await _localAssetRepository.updateHashes(hashed);
+    }
   }
 }

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

@@ -5,11 +5,15 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';
 import 'package:immich_mobile/domain/models/album/local_album.model.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/domain/models/store.model.dart';
+import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:immich_mobile/infrastructure/repositories/local_album.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/local_asset.repository.dart';
-import 'package:immich_mobile/infrastructure/repositories/trash_sync.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/trashed_local_asset.repository.dart';
 import 'package:immich_mobile/platform/native_sync_api.g.dart';
+import 'package:immich_mobile/repositories/asset_media.repository.dart';
+import 'package:immich_mobile/repositories/permission.repository.dart';
 import 'package:immich_mobile/utils/datetime_helpers.dart';
 import 'package:immich_mobile/utils/diff.dart';
 import 'package:logging/logging.dart';
@@ -20,16 +24,20 @@ class LocalSyncService {
   final DriftLocalAlbumRepository _localAlbumRepository;
   // ignore: unused_field
   final DriftLocalAssetRepository _localAssetRepository;
-  final DriftTrashSyncRepository _trashSyncRepository;
   final NativeSyncApi _nativeSyncApi;
+  final DriftTrashedLocalAssetRepository _trashedLocalAssetRepository;
+  final AssetMediaRepository _assetMediaRepository;
+  final IPermissionRepository _permissionRepository;
   final Completer<void>? _cancellation;
   final Logger _log = Logger("DeviceSyncService");
 
   LocalSyncService({
     required this._localAlbumRepository,
     required this._localAssetRepository,
-    required this._trashSyncRepository,
     required this._nativeSyncApi,
+    required this._trashedLocalAssetRepository,
+    required this._assetMediaRepository,
+    required this._permissionRepository,
     this._cancellation,
   }) {
     _cancellation?.future.then((_) => _nativeSyncApi.cancelSync().onError(_log.warning));
@@ -40,6 +48,15 @@ class LocalSyncService {
   Future<void> sync({bool full = false}) async {
     final Stopwatch stopwatch = Stopwatch()..start();
     try {
+      if (CurrentPlatform.isAndroid && Store.get(StoreKey.manageLocalMediaAndroid, false)) {
+        final hasPermission = await _permissionRepository.hasManageMediaPermission();
+        if (hasPermission) {
+          await _syncTrashedAssets();
+        } else {
+          _log.warning("syncTrashedAssets cannot proceed because MANAGE_MEDIA permission is missing");
+        }
+      }
+
       if (CurrentPlatform.isIOS) {
         // final assets = await _localAssetRepository.getEmptyCloudIdAssets();
         // await _mapIosCloudIds(assets);
@@ -102,7 +119,6 @@ class LocalSyncService {
         await _mapIosCloudIds(newAssets);
       }
       await _nativeSyncApi.checkpointSync();
-      await _trashSyncRepository.restoreChecksums();
     } on PlatformException catch (e, s) {
       if (e.code == _kSyncCancelledCode) {
         _log.warning("Local sync cancelled");
@@ -134,7 +150,6 @@ class LocalSyncService {
       );
 
       await _nativeSyncApi.checkpointSync();
-      await _trashSyncRepository.restoreChecksums();
       stopwatch.stop();
       _log.info("Full device sync took - ${stopwatch.elapsedMilliseconds}ms");
     } on PlatformException catch (e, s) {
@@ -368,6 +383,48 @@ class LocalSyncService {
   bool _albumsEqual(LocalAlbum a, LocalAlbum b) {
     return a.name == b.name && a.assetCount == b.assetCount && a.updatedAt.isAtSameMomentAs(b.updatedAt);
   }
+
+  Future<void> _syncTrashedAssets() async {
+    final trashedAssetMap = await _nativeSyncApi.getTrashedAssets();
+    await processTrashedAssets(trashedAssetMap);
+  }
+
+  @visibleForTesting
+  Future<void> processTrashedAssets(Map<String, List<PlatformAsset>> trashedAssetMap) async {
+    if (trashedAssetMap.isEmpty) {
+      _log.info("syncTrashedAssets, No trashed assets found");
+    }
+    final trashedAssets = trashedAssetMap.cast<String, List<Object?>>().entries.expand(
+      (entry) => entry.value.cast<PlatformAsset>().toTrashedAssets(entry.key),
+    );
+
+    _log.fine("syncTrashedAssets, trashedAssets: ${trashedAssets.map((e) => e.asset.id)}");
+    await _trashedLocalAssetRepository.processTrashSnapshot(trashedAssets);
+
+    final assetsToRestore = await _trashedLocalAssetRepository.getToRestore();
+    if (assetsToRestore.isNotEmpty) {
+      final restoredIds = await _assetMediaRepository.restoreAssetsFromTrash(assetsToRestore);
+      await _trashedLocalAssetRepository.applyRestoredAssets(restoredIds);
+    } else {
+      _log.info("syncTrashedAssets, No remote assets found for restoration");
+    }
+
+    final localAssetsToTrash = await _trashedLocalAssetRepository.getToTrash();
+    if (localAssetsToTrash.isNotEmpty) {
+      final localIds = localAssetsToTrash.values.expand((assets) => assets).map((asset) => asset.id).toList();
+      _log.info("Moving to trash ${localIds.join(", ")} assets");
+      final movedIds = await _assetMediaRepository.deleteAll(localIds);
+      if (movedIds.isNotEmpty) {
+        final movedAssetsByAlbum = localAssetsToTrash.map(
+          (albumId, assets) => MapEntry(albumId, assets.where((asset) => movedIds.contains(asset.id)).toList()),
+        )..removeWhere((_, assets) => assets.isEmpty);
+
+        await _trashedLocalAssetRepository.trashLocalAsset(movedAssetsByAlbum);
+      }
+    } else {
+      _log.info("syncTrashedAssets, No assets found in backup-enabled albums for move to trash");
+    }
+  }
 }
 
 extension on Iterable<PlatformAlbum> {
@@ -388,6 +445,10 @@ extension on Iterable<PlatformAsset> {
   List<LocalAsset> toLocalAssets() {
     return map((e) => e.toLocalAsset()).toList();
   }
+
+  Iterable<TrashedAsset> toTrashedAssets(String albumId) {
+    return map((e) => (albumId: albumId, asset: e.toLocalAsset()));
+  }
 }
 
 extension PlatformToLocalAsset on PlatformAsset {

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

@@ -3,13 +3,18 @@
 import 'dart:async';
 import 'dart:convert';
 
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/domain/models/sync_event.model.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
+import 'package:immich_mobile/extensions/platform_extensions.dart';
+import 'package:immich_mobile/infrastructure/repositories/local_asset.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/sync_api.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/sync_migration.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/sync_stream.repository.dart';
-import 'package:immich_mobile/infrastructure/repositories/trash_sync.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/trashed_local_asset.repository.dart';
+import 'package:immich_mobile/repositories/asset_media.repository.dart';
+import 'package:immich_mobile/repositories/permission.repository.dart';
 import 'package:immich_mobile/services/api.service.dart';
 import 'package:immich_mobile/utils/semver.dart';
 import 'package:logging/logging.dart';
@@ -28,7 +33,10 @@ class SyncStreamService {
 
   final SyncApiRepository _syncApiRepository;
   final SyncStreamRepository _syncStreamRepository;
-  final DriftTrashSyncRepository _trashSyncRepository;
+  final DriftLocalAssetRepository _localAssetRepository;
+  final DriftTrashedLocalAssetRepository _trashedLocalAssetRepository;
+  final AssetMediaRepository _assetMediaRepository;
+  final IPermissionRepository _permissionRepository;
   final SyncMigrationRepository _syncMigrationRepository;
   final ApiService _api;
   final Completer<void>? _cancellation;
@@ -36,7 +44,10 @@ class SyncStreamService {
   SyncStreamService({
     required this._syncApiRepository,
     required this._syncStreamRepository,
-    required this._trashSyncRepository,
+    required this._localAssetRepository,
+    required this._trashedLocalAssetRepository,
+    required this._assetMediaRepository,
+    required this._permissionRepository,
     required this._syncMigrationRepository,
     required this._api,
     this._cancellation,
@@ -191,13 +202,24 @@ class SyncStreamService {
       case SyncEntityType.partnerDeleteV1:
         return _syncStreamRepository.deletePartnerV1(data.cast());
       case SyncEntityType.assetV1:
-        return _syncStreamRepository.updateAssetsV1(data.cast<SyncAssetV1>());
+        final remoteSyncAssets = data.cast<SyncAssetV1>();
+        await _syncStreamRepository.updateAssetsV1(remoteSyncAssets);
+        if (CurrentPlatform.isAndroid && Store.get(StoreKey.manageLocalMediaAndroid, false)) {
+          await _syncAssetTrashStatus(remoteSyncAssets.where((e) => e.deletedAt != null).map((e) => e.id).toList());
+        }
+        return;
       case SyncEntityType.assetV2:
-        return _syncStreamRepository.updateAssetsV2(data.cast<SyncAssetV2>());
+        final remoteSyncAssets = data.cast<SyncAssetV2>();
+        await _syncStreamRepository.updateAssetsV2(remoteSyncAssets);
+        if (CurrentPlatform.isAndroid && Store.get(StoreKey.manageLocalMediaAndroid, false)) {
+          await _syncAssetTrashStatus(remoteSyncAssets.where((e) => e.deletedAt != null).map((e) => e.id).toList());
+        }
+        return;
       case SyncEntityType.assetDeleteV1:
         final remoteSyncAssets = data.cast<SyncAssetDeleteV1>();
-        // Has to be before the delete call so we can record the checksums of the assets as well
-        await _trashSyncRepository.recordHardDeletedChecksums(remoteSyncAssets.map((e) => e.assetId));
+        if (CurrentPlatform.isAndroid && Store.get(StoreKey.manageLocalMediaAndroid, false)) {
+          await _syncAssetDeletion(remoteSyncAssets.map((e) => e.assetId).toList());
+        }
         return _syncStreamRepository.deleteAssetsV1(remoteSyncAssets);
       case SyncEntityType.assetExifV1:
         return _syncStreamRepository.updateAssetsExifV1(data.cast());
@@ -475,4 +497,59 @@ class SyncStreamService {
       _logger.severe("Error processing AssetEditReadyV2 websocket event", error, stackTrace);
     }
   }
+
+  Future<void> _handleRemoteDeleted(Iterable<String> remoteIds) async {
+    if (remoteIds.isEmpty) {
+      return Future.value();
+    } else {
+      final localAssetsToTrash = await _localAssetRepository.getAssetsFromBackupAlbums(remoteIds);
+      if (localAssetsToTrash.isNotEmpty) {
+        await _trashLocalAssets(localAssetsToTrash);
+      } else {
+        _logger.info("No assets found in backup-enabled albums for remote assets: $remoteIds");
+      }
+    }
+  }
+
+  Future<void> _trashLocalAssets(Map<String, List<LocalAsset>> localAssetsToTrash) async {
+    final localIds = localAssetsToTrash.values.expand((assets) => assets).map((asset) => asset.id).toList();
+    _logger.info("Moving to trash ${localIds.join(", ")} assets");
+    final movedIds = await _assetMediaRepository.deleteAll(localIds);
+    if (movedIds.isNotEmpty) {
+      final movedAssetsByAlbum = localAssetsToTrash.map(
+        (albumId, assets) => MapEntry(albumId, assets.where((asset) => movedIds.contains(asset.id)).toList()),
+      )..removeWhere((_, assets) => assets.isEmpty);
+
+      await _trashedLocalAssetRepository.trashLocalAsset(movedAssetsByAlbum);
+    }
+  }
+
+  Future<void> _applyRemoteRestoreToLocal() async {
+    final assetsToRestore = await _trashedLocalAssetRepository.getToRestore();
+    if (assetsToRestore.isNotEmpty) {
+      final restoredIds = await _assetMediaRepository.restoreAssetsFromTrash(assetsToRestore);
+      await _trashedLocalAssetRepository.applyRestoredAssets(restoredIds);
+    } else {
+      _logger.info("No remote assets found for restoration");
+    }
+  }
+
+  Future<void> _syncAssetTrashStatus(List<String> remoteIds) async {
+    if (!(await _permissionRepository.hasManageMediaPermission())) {
+      _logger.warning("Syncing asset trash status cannot proceed because MANAGE_MEDIA permission is missing");
+      return;
+    }
+
+    await _handleRemoteDeleted(remoteIds);
+    await _applyRemoteRestoreToLocal();
+  }
+
+  Future<void> _syncAssetDeletion(List<String> remoteIds) async {
+    if (!(await _permissionRepository.hasManageMediaPermission())) {
+      _logger.warning("Syncing asset deletion cannot proceed because MANAGE_MEDIA permission is missing");
+      return;
+    }
+
+    await _handleRemoteDeleted(remoteIds);
+  }
 }

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

@@ -1,124 +0,0 @@
-import 'package:immich_mobile/extensions/platform_extensions.dart';
-import 'package:immich_mobile/infrastructure/repositories/settings.repository.dart';
-import 'package:immich_mobile/infrastructure/repositories/trash_sync.repository.dart';
-import 'package:immich_mobile/platform/asset_media_api.g.dart';
-import 'package:immich_mobile/repositories/permission.repository.dart';
-import 'package:logging/logging.dart';
-
-class TrashSyncService {
-  final DriftTrashSyncRepository _repo;
-  final AssetMediaApi _assetMediaApi;
-  final PermissionRepository _permission;
-  final SettingsRepository _settings;
-  final Logger _log = Logger('TrashSyncService');
-
-  TrashSyncService({
-    required this._repo,
-    required this._assetMediaApi,
-    required this._permission,
-    required this._settings,
-  });
-
-  Future<void> reconcile() async {
-    try {
-      await _prune();
-
-      if (!_settings.appConfig.trashSyncEnabled || !await _canApplyToOsTrash()) {
-        return;
-      }
-
-      await _record();
-      await _act();
-    } catch (error, stack) {
-      _log.severe("Trash reconcile failed", error, stack);
-    }
-  }
-
-  Future<void> _prune() async {
-    await _repo.pruneStaleMarkers();
-    await _repo.pruneDismissedMarkers();
-    await _repo.prunePendingMarkers();
-  }
-
-  Future<void> _record() async {
-    await _repo.recordSoftDeleteAssets();
-    await _repo.recordHardDeletedAssets();
-  }
-
-  Future<void> _act() async {
-    await _trashAssets();
-    await _restoreAssets();
-    await _reconcileWithOSTrash();
-  }
-
-  Future<void> _trashAssets() async {
-    final pending = await _repo.getPendingAssetIds();
-    if (pending.isEmpty) {
-      return;
-    }
-
-    final results = await _assetMediaApi.trash(pending);
-    final movedIds = results.whereStatusIn(const {.done, .alreadyInState});
-    final removedIds = results.whereStatusIn(const {.notFound});
-
-    if (movedIds.isNotEmpty) {
-      await _repo.markTrashed(movedIds);
-    }
-
-    if (removedIds.isNotEmpty) {
-      await _repo.deleteMarkers(removedIds);
-    }
-
-    _log.fine("Trashed ${movedIds.length}, dropped ${removedIds.length} out of ${pending.length} pending");
-  }
-
-  Future<void> _restoreAssets() async {
-    final restorable = await _repo.getRestorableAssetIds();
-    if (restorable.isEmpty) {
-      return;
-    }
-
-    final results = await _assetMediaApi.restore(restorable);
-    final restoredIds = results.whereStatusIn(const {.done, .alreadyInState});
-    final goneIds = results.whereStatusIn(const {.notFound});
-
-    if (restoredIds.isNotEmpty) {
-      await _repo.markRestored(restoredIds);
-    }
-
-    if (goneIds.isNotEmpty) {
-      await _repo.deleteMarkers(goneIds);
-    }
-  }
-
-  Future<void> _reconcileWithOSTrash() async {
-    final trashed = await _repo.getTrashedAssetIds();
-    if (trashed.isEmpty) {
-      return;
-    }
-
-    final stillTrashed = (await _assetMediaApi.trashedAmong(trashed)).toSet();
-    final gone = trashed.where((id) => !stillTrashed.contains(id)).toList();
-    if (gone.isNotEmpty) {
-      await _repo.reconcileTrashed(gone);
-    }
-  }
-
-  Future<bool> _canApplyToOsTrash() async {
-    if (!CurrentPlatform.isAndroid) {
-      return false;
-    }
-
-    final hasPermission = await _permission.hasManageMediaPermission();
-    if (!hasPermission) {
-      _log.fine("OS trash sync skipped: MANAGE_MEDIA permission not granted");
-    }
-
-    return hasPermission;
-  }
-}
-
-extension on Iterable<AssetMediaActionResult> {
-  Set<String> whereStatusIn(Set<AssetMediaActionStatus> statuses) =>
-      where((r) => statuses.contains(r.status)).map((r) => r.id).toSet();
-}

mobile/lib/domain/utils/background_sync.dart

@@ -3,7 +3,6 @@ import 'dart:async';
 import 'package:immich_mobile/domain/utils/migrate_cloud_ids.dart' as m;
 import 'package:immich_mobile/domain/utils/sync_linked_album.dart';
 import 'package:immich_mobile/providers/infrastructure/sync.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/trash_sync.provider.dart';
 import 'package:immich_mobile/utils/isolate.dart';
 import 'package:worker_manager/worker_manager.dart';
 
@@ -34,7 +33,6 @@ class BackgroundSyncManager {
   Cancelable<void>? _deviceAlbumSyncTask;
   Cancelable<void>? _linkedAlbumSyncTask;
   Cancelable<void>? _hashTask;
-  Cancelable<void>? _trashSyncTask;
 
   BackgroundSyncManager({
     this.onRemoteSyncStart,
@@ -59,7 +57,6 @@ class BackgroundSyncManager {
       _linkedAlbumSyncTask,
       _deviceAlbumSyncTask,
       _hashTask,
-      _trashSyncTask,
     ];
     final futures = [
       for (final task in tasks)
@@ -74,7 +71,6 @@ class BackgroundSyncManager {
     _linkedAlbumSyncTask = null;
     _deviceAlbumSyncTask = null;
     _hashTask = null;
-    _trashSyncTask = null;
 
     try {
       await Future.wait(futures);
@@ -164,21 +160,6 @@ class BackgroundSyncManager {
         });
   }
 
-  Future<void> syncTrash() {
-    if (_trashSyncTask != null) {
-      return _trashSyncTask!.future;
-    }
-
-    _trashSyncTask = runInIsolateGentle(
-      computation: (ref) => ref.read(trashSyncServiceProvider).reconcile(),
-      debugLabel: 'trash-sync',
-    );
-
-    return _trashSyncTask!.whenComplete(() {
-      _trashSyncTask = null;
-    });
-  }
-
   Future<void> syncWebsocketBatchV1(List<dynamic> batchData) {
     if (_syncWebsocketTask != null) {
       return _syncWebsocketTask!.future;

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

@@ -16,11 +16,6 @@ ON remote_asset_entity (owner_id, library_id, checksum)
 WHERE (library_id IS NOT NULL);
 ''')
 @TableIndex.sql('CREATE INDEX IF NOT EXISTS idx_remote_asset_checksum ON remote_asset_entity (checksum)')
-@TableIndex.sql('''
-CREATE INDEX IF NOT EXISTS idx_remote_asset_soft_deleted_checksum
-ON remote_asset_entity (checksum)
-WHERE deleted_at IS NOT NULL
-''')
 @TableIndex.sql('CREATE INDEX IF NOT EXISTS idx_remote_asset_stack_id ON remote_asset_entity (stack_id)')
 @TableIndex.sql('''
 CREATE INDEX IF NOT EXISTS idx_remote_asset_owner_visibility_deleted_created

mobile/lib/infrastructure/entities/remote_asset.entity.drift.dart

@@ -1762,10 +1762,6 @@ i0.Index get idxRemoteAssetChecksum => i0.Index(
   'idx_remote_asset_checksum',
   'CREATE INDEX IF NOT EXISTS idx_remote_asset_checksum ON remote_asset_entity (checksum)',
 );
-i0.Index get idxRemoteAssetSoftDeletedChecksum => i0.Index(
-  'idx_remote_asset_soft_deleted_checksum',
-  'CREATE INDEX IF NOT EXISTS idx_remote_asset_soft_deleted_checksum ON remote_asset_entity (checksum) WHERE deleted_at IS NOT NULL',
-);
 i0.Index get idxRemoteAssetStackId => i0.Index(
   'idx_remote_asset_stack_id',
   'CREATE INDEX IF NOT EXISTS idx_remote_asset_stack_id ON remote_asset_entity (stack_id)',

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

@@ -1,14 +0,0 @@
-import 'package:drift/drift.dart';
-import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';
-
-class ServerDeletedChecksumEntity extends Table with DriftDefaultsMixin {
-  const ServerDeletedChecksumEntity();
-
-  TextColumn get checksum => text()();
-
-  @override
-  Set<Column> get primaryKey => {checksum};
-
-  @override
-  String get tableName => "server_deleted_checksum";
-}

mobile/lib/infrastructure/entities/server_deleted_checksum.entity.drift.dart

@@ -1,318 +0,0 @@
-// dart format width=80
-// ignore_for_file: type=lint
-import 'package:drift/drift.dart' as i0;
-import 'package:immich_mobile/infrastructure/entities/server_deleted_checksum.entity.drift.dart'
-    as i1;
-import 'package:immich_mobile/infrastructure/entities/server_deleted_checksum.entity.dart'
-    as i2;
-
-typedef $$ServerDeletedChecksumEntityTableCreateCompanionBuilder =
-    i1.ServerDeletedChecksumEntityCompanion Function({
-      required String checksum,
-    });
-typedef $$ServerDeletedChecksumEntityTableUpdateCompanionBuilder =
-    i1.ServerDeletedChecksumEntityCompanion Function({
-      i0.Value<String> checksum,
-    });
-
-class $$ServerDeletedChecksumEntityTableFilterComposer
-    extends
-        i0.Composer<
-          i0.GeneratedDatabase,
-          i1.$ServerDeletedChecksumEntityTable
-        > {
-  $$ServerDeletedChecksumEntityTableFilterComposer({
-    required super.$db,
-    required super.$table,
-    super.joinBuilder,
-    super.$addJoinBuilderToRootComposer,
-    super.$removeJoinBuilderFromRootComposer,
-  });
-  i0.ColumnFilters<String> get checksum => $composableBuilder(
-    column: $table.checksum,
-    builder: (column) => i0.ColumnFilters(column),
-  );
-}
-
-class $$ServerDeletedChecksumEntityTableOrderingComposer
-    extends
-        i0.Composer<
-          i0.GeneratedDatabase,
-          i1.$ServerDeletedChecksumEntityTable
-        > {
-  $$ServerDeletedChecksumEntityTableOrderingComposer({
-    required super.$db,
-    required super.$table,
-    super.joinBuilder,
-    super.$addJoinBuilderToRootComposer,
-    super.$removeJoinBuilderFromRootComposer,
-  });
-  i0.ColumnOrderings<String> get checksum => $composableBuilder(
-    column: $table.checksum,
-    builder: (column) => i0.ColumnOrderings(column),
-  );
-}
-
-class $$ServerDeletedChecksumEntityTableAnnotationComposer
-    extends
-        i0.Composer<
-          i0.GeneratedDatabase,
-          i1.$ServerDeletedChecksumEntityTable
-        > {
-  $$ServerDeletedChecksumEntityTableAnnotationComposer({
-    required super.$db,
-    required super.$table,
-    super.joinBuilder,
-    super.$addJoinBuilderToRootComposer,
-    super.$removeJoinBuilderFromRootComposer,
-  });
-  i0.GeneratedColumn<String> get checksum =>
-      $composableBuilder(column: $table.checksum, builder: (column) => column);
-}
-
-class $$ServerDeletedChecksumEntityTableTableManager
-    extends
-        i0.RootTableManager<
-          i0.GeneratedDatabase,
-          i1.$ServerDeletedChecksumEntityTable,
-          i1.ServerDeletedChecksumEntityData,
-          i1.$$ServerDeletedChecksumEntityTableFilterComposer,
-          i1.$$ServerDeletedChecksumEntityTableOrderingComposer,
-          i1.$$ServerDeletedChecksumEntityTableAnnotationComposer,
-          $$ServerDeletedChecksumEntityTableCreateCompanionBuilder,
-          $$ServerDeletedChecksumEntityTableUpdateCompanionBuilder,
-          (
-            i1.ServerDeletedChecksumEntityData,
-            i0.BaseReferences<
-              i0.GeneratedDatabase,
-              i1.$ServerDeletedChecksumEntityTable,
-              i1.ServerDeletedChecksumEntityData
-            >,
-          ),
-          i1.ServerDeletedChecksumEntityData,
-          i0.PrefetchHooks Function()
-        > {
-  $$ServerDeletedChecksumEntityTableTableManager(
-    i0.GeneratedDatabase db,
-    i1.$ServerDeletedChecksumEntityTable table,
-  ) : super(
-        i0.TableManagerState(
-          db: db,
-          table: table,
-          createFilteringComposer: () =>
-              i1.$$ServerDeletedChecksumEntityTableFilterComposer(
-                $db: db,
-                $table: table,
-              ),
-          createOrderingComposer: () =>
-              i1.$$ServerDeletedChecksumEntityTableOrderingComposer(
-                $db: db,
-                $table: table,
-              ),
-          createComputedFieldComposer: () =>
-              i1.$$ServerDeletedChecksumEntityTableAnnotationComposer(
-                $db: db,
-                $table: table,
-              ),
-          updateCompanionCallback:
-              ({i0.Value<String> checksum = const i0.Value.absent()}) =>
-                  i1.ServerDeletedChecksumEntityCompanion(checksum: checksum),
-          createCompanionCallback: ({required String checksum}) =>
-              i1.ServerDeletedChecksumEntityCompanion.insert(
-                checksum: checksum,
-              ),
-          withReferenceMapper: (p0) => p0
-              .map((e) => (e.readTable(table), i0.BaseReferences(db, table, e)))
-              .toList(),
-          prefetchHooksCallback: null,
-        ),
-      );
-}
-
-typedef $$ServerDeletedChecksumEntityTableProcessedTableManager =
-    i0.ProcessedTableManager<
-      i0.GeneratedDatabase,
-      i1.$ServerDeletedChecksumEntityTable,
-      i1.ServerDeletedChecksumEntityData,
-      i1.$$ServerDeletedChecksumEntityTableFilterComposer,
-      i1.$$ServerDeletedChecksumEntityTableOrderingComposer,
-      i1.$$ServerDeletedChecksumEntityTableAnnotationComposer,
-      $$ServerDeletedChecksumEntityTableCreateCompanionBuilder,
-      $$ServerDeletedChecksumEntityTableUpdateCompanionBuilder,
-      (
-        i1.ServerDeletedChecksumEntityData,
-        i0.BaseReferences<
-          i0.GeneratedDatabase,
-          i1.$ServerDeletedChecksumEntityTable,
-          i1.ServerDeletedChecksumEntityData
-        >,
-      ),
-      i1.ServerDeletedChecksumEntityData,
-      i0.PrefetchHooks Function()
-    >;
-
-class $ServerDeletedChecksumEntityTable extends i2.ServerDeletedChecksumEntity
-    with
-        i0.TableInfo<
-          $ServerDeletedChecksumEntityTable,
-          i1.ServerDeletedChecksumEntityData
-        > {
-  @override
-  final i0.GeneratedDatabase attachedDatabase;
-  final String? _alias;
-  $ServerDeletedChecksumEntityTable(this.attachedDatabase, [this._alias]);
-  static const i0.VerificationMeta _checksumMeta = const i0.VerificationMeta(
-    'checksum',
-  );
-  @override
-  late final i0.GeneratedColumn<String> checksum = i0.GeneratedColumn<String>(
-    'checksum',
-    aliasedName,
-    false,
-    type: i0.DriftSqlType.string,
-    requiredDuringInsert: true,
-  );
-  @override
-  List<i0.GeneratedColumn> get $columns => [checksum];
-  @override
-  String get aliasedName => _alias ?? actualTableName;
-  @override
-  String get actualTableName => $name;
-  static const String $name = 'server_deleted_checksum';
-  @override
-  i0.VerificationContext validateIntegrity(
-    i0.Insertable<i1.ServerDeletedChecksumEntityData> instance, {
-    bool isInserting = false,
-  }) {
-    final context = i0.VerificationContext();
-    final data = instance.toColumns(true);
-    if (data.containsKey('checksum')) {
-      context.handle(
-        _checksumMeta,
-        checksum.isAcceptableOrUnknown(data['checksum']!, _checksumMeta),
-      );
-    } else if (isInserting) {
-      context.missing(_checksumMeta);
-    }
-    return context;
-  }
-
-  @override
-  Set<i0.GeneratedColumn> get $primaryKey => {checksum};
-  @override
-  i1.ServerDeletedChecksumEntityData map(
-    Map<String, dynamic> data, {
-    String? tablePrefix,
-  }) {
-    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
-    return i1.ServerDeletedChecksumEntityData(
-      checksum: attachedDatabase.typeMapping.read(
-        i0.DriftSqlType.string,
-        data['${effectivePrefix}checksum'],
-      )!,
-    );
-  }
-
-  @override
-  $ServerDeletedChecksumEntityTable createAlias(String alias) {
-    return $ServerDeletedChecksumEntityTable(attachedDatabase, alias);
-  }
-
-  @override
-  bool get withoutRowId => true;
-  @override
-  bool get isStrict => true;
-}
-
-class ServerDeletedChecksumEntityData extends i0.DataClass
-    implements i0.Insertable<i1.ServerDeletedChecksumEntityData> {
-  final String checksum;
-  const ServerDeletedChecksumEntityData({required this.checksum});
-  @override
-  Map<String, i0.Expression> toColumns(bool nullToAbsent) {
-    final map = <String, i0.Expression>{};
-    map['checksum'] = i0.Variable<String>(checksum);
-    return map;
-  }
-
-  factory ServerDeletedChecksumEntityData.fromJson(
-    Map<String, dynamic> json, {
-    i0.ValueSerializer? serializer,
-  }) {
-    serializer ??= i0.driftRuntimeOptions.defaultSerializer;
-    return ServerDeletedChecksumEntityData(
-      checksum: serializer.fromJson<String>(json['checksum']),
-    );
-  }
-  @override
-  Map<String, dynamic> toJson({i0.ValueSerializer? serializer}) {
-    serializer ??= i0.driftRuntimeOptions.defaultSerializer;
-    return <String, dynamic>{'checksum': serializer.toJson<String>(checksum)};
-  }
-
-  i1.ServerDeletedChecksumEntityData copyWith({String? checksum}) =>
-      i1.ServerDeletedChecksumEntityData(checksum: checksum ?? this.checksum);
-  ServerDeletedChecksumEntityData copyWithCompanion(
-    i1.ServerDeletedChecksumEntityCompanion data,
-  ) {
-    return ServerDeletedChecksumEntityData(
-      checksum: data.checksum.present ? data.checksum.value : this.checksum,
-    );
-  }
-
-  @override
-  String toString() {
-    return (StringBuffer('ServerDeletedChecksumEntityData(')
-          ..write('checksum: $checksum')
-          ..write(')'))
-        .toString();
-  }
-
-  @override
-  int get hashCode => checksum.hashCode;
-  @override
-  bool operator ==(Object other) =>
-      identical(this, other) ||
-      (other is i1.ServerDeletedChecksumEntityData &&
-          other.checksum == this.checksum);
-}
-
-class ServerDeletedChecksumEntityCompanion
-    extends i0.UpdateCompanion<i1.ServerDeletedChecksumEntityData> {
-  final i0.Value<String> checksum;
-  const ServerDeletedChecksumEntityCompanion({
-    this.checksum = const i0.Value.absent(),
-  });
-  ServerDeletedChecksumEntityCompanion.insert({required String checksum})
-    : checksum = i0.Value(checksum);
-  static i0.Insertable<i1.ServerDeletedChecksumEntityData> custom({
-    i0.Expression<String>? checksum,
-  }) {
-    return i0.RawValuesInsertable({if (checksum != null) 'checksum': checksum});
-  }
-
-  i1.ServerDeletedChecksumEntityCompanion copyWith({
-    i0.Value<String>? checksum,
-  }) {
-    return i1.ServerDeletedChecksumEntityCompanion(
-      checksum: checksum ?? this.checksum,
-    );
-  }
-
-  @override
-  Map<String, i0.Expression> toColumns(bool nullToAbsent) {
-    final map = <String, i0.Expression>{};
-    if (checksum.present) {
-      map['checksum'] = i0.Variable<String>(checksum.value);
-    }
-    return map;
-  }
-
-  @override
-  String toString() {
-    return (StringBuffer('ServerDeletedChecksumEntityCompanion(')
-          ..write('checksum: $checksum')
-          ..write(')'))
-        .toString();
-  }
-}

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

@@ -1,22 +0,0 @@
-import 'package:drift/drift.dart';
-import 'package:immich_mobile/constants/enums.dart';
-import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';
-
-@TableIndex.sql('CREATE INDEX IF NOT EXISTS idx_trash_sync_checksum ON trash_sync (checksum)')
-class TrashSyncEntity extends Table with DriftDefaultsMixin {
-  const TrashSyncEntity();
-
-  TextColumn get assetId => text()();
-
-  TextColumn get checksum => text()();
-
-  IntColumn get status => intEnum<TrashSyncStatus>().withDefault(Constant(TrashSyncStatus.pending.index))();
-
-  DateTimeColumn get assetUpdatedAt => dateTime().nullable()();
-
-  @override
-  Set<Column> get primaryKey => {assetId};
-
-  @override
-  String get tableName => "trash_sync";
-}

mobile/lib/infrastructure/entities/trash_sync.entity.drift.dart

@@ -1,524 +0,0 @@
-// dart format width=80
-// ignore_for_file: type=lint
-import 'package:drift/drift.dart' as i0;
-import 'package:immich_mobile/infrastructure/entities/trash_sync.entity.drift.dart'
-    as i1;
-import 'package:immich_mobile/constants/enums.dart' as i2;
-import 'package:immich_mobile/infrastructure/entities/trash_sync.entity.dart'
-    as i3;
-import 'package:drift/src/runtime/query_builder/query_builder.dart' as i4;
-
-typedef $$TrashSyncEntityTableCreateCompanionBuilder =
-    i1.TrashSyncEntityCompanion Function({
-      required String assetId,
-      required String checksum,
-      i0.Value<i2.TrashSyncStatus> status,
-      i0.Value<DateTime?> assetUpdatedAt,
-    });
-typedef $$TrashSyncEntityTableUpdateCompanionBuilder =
-    i1.TrashSyncEntityCompanion Function({
-      i0.Value<String> assetId,
-      i0.Value<String> checksum,
-      i0.Value<i2.TrashSyncStatus> status,
-      i0.Value<DateTime?> assetUpdatedAt,
-    });
-
-class $$TrashSyncEntityTableFilterComposer
-    extends i0.Composer<i0.GeneratedDatabase, i1.$TrashSyncEntityTable> {
-  $$TrashSyncEntityTableFilterComposer({
-    required super.$db,
-    required super.$table,
-    super.joinBuilder,
-    super.$addJoinBuilderToRootComposer,
-    super.$removeJoinBuilderFromRootComposer,
-  });
-  i0.ColumnFilters<String> get assetId => $composableBuilder(
-    column: $table.assetId,
-    builder: (column) => i0.ColumnFilters(column),
-  );
-
-  i0.ColumnFilters<String> get checksum => $composableBuilder(
-    column: $table.checksum,
-    builder: (column) => i0.ColumnFilters(column),
-  );
-
-  i0.ColumnWithTypeConverterFilters<i2.TrashSyncStatus, i2.TrashSyncStatus, int>
-  get status => $composableBuilder(
-    column: $table.status,
-    builder: (column) => i0.ColumnWithTypeConverterFilters(column),
-  );
-
-  i0.ColumnFilters<DateTime> get assetUpdatedAt => $composableBuilder(
-    column: $table.assetUpdatedAt,
-    builder: (column) => i0.ColumnFilters(column),
-  );
-}
-
-class $$TrashSyncEntityTableOrderingComposer
-    extends i0.Composer<i0.GeneratedDatabase, i1.$TrashSyncEntityTable> {
-  $$TrashSyncEntityTableOrderingComposer({
-    required super.$db,
-    required super.$table,
-    super.joinBuilder,
-    super.$addJoinBuilderToRootComposer,
-    super.$removeJoinBuilderFromRootComposer,
-  });
-  i0.ColumnOrderings<String> get assetId => $composableBuilder(
-    column: $table.assetId,
-    builder: (column) => i0.ColumnOrderings(column),
-  );
-
-  i0.ColumnOrderings<String> get checksum => $composableBuilder(
-    column: $table.checksum,
-    builder: (column) => i0.ColumnOrderings(column),
-  );
-
-  i0.ColumnOrderings<int> get status => $composableBuilder(
-    column: $table.status,
-    builder: (column) => i0.ColumnOrderings(column),
-  );
-
-  i0.ColumnOrderings<DateTime> get assetUpdatedAt => $composableBuilder(
-    column: $table.assetUpdatedAt,
-    builder: (column) => i0.ColumnOrderings(column),
-  );
-}
-
-class $$TrashSyncEntityTableAnnotationComposer
-    extends i0.Composer<i0.GeneratedDatabase, i1.$TrashSyncEntityTable> {
-  $$TrashSyncEntityTableAnnotationComposer({
-    required super.$db,
-    required super.$table,
-    super.joinBuilder,
-    super.$addJoinBuilderToRootComposer,
-    super.$removeJoinBuilderFromRootComposer,
-  });
-  i0.GeneratedColumn<String> get assetId =>
-      $composableBuilder(column: $table.assetId, builder: (column) => column);
-
-  i0.GeneratedColumn<String> get checksum =>
-      $composableBuilder(column: $table.checksum, builder: (column) => column);
-
-  i0.GeneratedColumnWithTypeConverter<i2.TrashSyncStatus, int> get status =>
-      $composableBuilder(column: $table.status, builder: (column) => column);
-
-  i0.GeneratedColumn<DateTime> get assetUpdatedAt => $composableBuilder(
-    column: $table.assetUpdatedAt,
-    builder: (column) => column,
-  );
-}
-
-class $$TrashSyncEntityTableTableManager
-    extends
-        i0.RootTableManager<
-          i0.GeneratedDatabase,
-          i1.$TrashSyncEntityTable,
-          i1.TrashSyncEntityData,
-          i1.$$TrashSyncEntityTableFilterComposer,
-          i1.$$TrashSyncEntityTableOrderingComposer,
-          i1.$$TrashSyncEntityTableAnnotationComposer,
-          $$TrashSyncEntityTableCreateCompanionBuilder,
-          $$TrashSyncEntityTableUpdateCompanionBuilder,
-          (
-            i1.TrashSyncEntityData,
-            i0.BaseReferences<
-              i0.GeneratedDatabase,
-              i1.$TrashSyncEntityTable,
-              i1.TrashSyncEntityData
-            >,
-          ),
-          i1.TrashSyncEntityData,
-          i0.PrefetchHooks Function()
-        > {
-  $$TrashSyncEntityTableTableManager(
-    i0.GeneratedDatabase db,
-    i1.$TrashSyncEntityTable table,
-  ) : super(
-        i0.TableManagerState(
-          db: db,
-          table: table,
-          createFilteringComposer: () =>
-              i1.$$TrashSyncEntityTableFilterComposer($db: db, $table: table),
-          createOrderingComposer: () =>
-              i1.$$TrashSyncEntityTableOrderingComposer($db: db, $table: table),
-          createComputedFieldComposer: () => i1
-              .$$TrashSyncEntityTableAnnotationComposer($db: db, $table: table),
-          updateCompanionCallback:
-              ({
-                i0.Value<String> assetId = const i0.Value.absent(),
-                i0.Value<String> checksum = const i0.Value.absent(),
-                i0.Value<i2.TrashSyncStatus> status = const i0.Value.absent(),
-                i0.Value<DateTime?> assetUpdatedAt = const i0.Value.absent(),
-              }) => i1.TrashSyncEntityCompanion(
-                assetId: assetId,
-                checksum: checksum,
-                status: status,
-                assetUpdatedAt: assetUpdatedAt,
-              ),
-          createCompanionCallback:
-              ({
-                required String assetId,
-                required String checksum,
-                i0.Value<i2.TrashSyncStatus> status = const i0.Value.absent(),
-                i0.Value<DateTime?> assetUpdatedAt = const i0.Value.absent(),
-              }) => i1.TrashSyncEntityCompanion.insert(
-                assetId: assetId,
-                checksum: checksum,
-                status: status,
-                assetUpdatedAt: assetUpdatedAt,
-              ),
-          withReferenceMapper: (p0) => p0
-              .map((e) => (e.readTable(table), i0.BaseReferences(db, table, e)))
-              .toList(),
-          prefetchHooksCallback: null,
-        ),
-      );
-}
-
-typedef $$TrashSyncEntityTableProcessedTableManager =
-    i0.ProcessedTableManager<
-      i0.GeneratedDatabase,
-      i1.$TrashSyncEntityTable,
-      i1.TrashSyncEntityData,
-      i1.$$TrashSyncEntityTableFilterComposer,
-      i1.$$TrashSyncEntityTableOrderingComposer,
-      i1.$$TrashSyncEntityTableAnnotationComposer,
-      $$TrashSyncEntityTableCreateCompanionBuilder,
-      $$TrashSyncEntityTableUpdateCompanionBuilder,
-      (
-        i1.TrashSyncEntityData,
-        i0.BaseReferences<
-          i0.GeneratedDatabase,
-          i1.$TrashSyncEntityTable,
-          i1.TrashSyncEntityData
-        >,
-      ),
-      i1.TrashSyncEntityData,
-      i0.PrefetchHooks Function()
-    >;
-i0.Index get idxTrashSyncChecksum => i0.Index(
-  'idx_trash_sync_checksum',
-  'CREATE INDEX IF NOT EXISTS idx_trash_sync_checksum ON trash_sync (checksum)',
-);
-
-class $TrashSyncEntityTable extends i3.TrashSyncEntity
-    with i0.TableInfo<$TrashSyncEntityTable, i1.TrashSyncEntityData> {
-  @override
-  final i0.GeneratedDatabase attachedDatabase;
-  final String? _alias;
-  $TrashSyncEntityTable(this.attachedDatabase, [this._alias]);
-  static const i0.VerificationMeta _assetIdMeta = const i0.VerificationMeta(
-    'assetId',
-  );
-  @override
-  late final i0.GeneratedColumn<String> assetId = i0.GeneratedColumn<String>(
-    'asset_id',
-    aliasedName,
-    false,
-    type: i0.DriftSqlType.string,
-    requiredDuringInsert: true,
-  );
-  static const i0.VerificationMeta _checksumMeta = const i0.VerificationMeta(
-    'checksum',
-  );
-  @override
-  late final i0.GeneratedColumn<String> checksum = i0.GeneratedColumn<String>(
-    'checksum',
-    aliasedName,
-    false,
-    type: i0.DriftSqlType.string,
-    requiredDuringInsert: true,
-  );
-  @override
-  late final i0.GeneratedColumnWithTypeConverter<i2.TrashSyncStatus, int>
-  status =
-      i0.GeneratedColumn<int>(
-        'status',
-        aliasedName,
-        false,
-        type: i0.DriftSqlType.int,
-        requiredDuringInsert: false,
-        defaultValue: i4.Constant(i2.TrashSyncStatus.pending.index),
-      ).withConverter<i2.TrashSyncStatus>(
-        i1.$TrashSyncEntityTable.$converterstatus,
-      );
-  static const i0.VerificationMeta _assetUpdatedAtMeta =
-      const i0.VerificationMeta('assetUpdatedAt');
-  @override
-  late final i0.GeneratedColumn<DateTime> assetUpdatedAt =
-      i0.GeneratedColumn<DateTime>(
-        'asset_updated_at',
-        aliasedName,
-        true,
-        type: i0.DriftSqlType.dateTime,
-        requiredDuringInsert: false,
-      );
-  @override
-  List<i0.GeneratedColumn> get $columns => [
-    assetId,
-    checksum,
-    status,
-    assetUpdatedAt,
-  ];
-  @override
-  String get aliasedName => _alias ?? actualTableName;
-  @override
-  String get actualTableName => $name;
-  static const String $name = 'trash_sync';
-  @override
-  i0.VerificationContext validateIntegrity(
-    i0.Insertable<i1.TrashSyncEntityData> instance, {
-    bool isInserting = false,
-  }) {
-    final context = i0.VerificationContext();
-    final data = instance.toColumns(true);
-    if (data.containsKey('asset_id')) {
-      context.handle(
-        _assetIdMeta,
-        assetId.isAcceptableOrUnknown(data['asset_id']!, _assetIdMeta),
-      );
-    } else if (isInserting) {
-      context.missing(_assetIdMeta);
-    }
-    if (data.containsKey('checksum')) {
-      context.handle(
-        _checksumMeta,
-        checksum.isAcceptableOrUnknown(data['checksum']!, _checksumMeta),
-      );
-    } else if (isInserting) {
-      context.missing(_checksumMeta);
-    }
-    if (data.containsKey('asset_updated_at')) {
-      context.handle(
-        _assetUpdatedAtMeta,
-        assetUpdatedAt.isAcceptableOrUnknown(
-          data['asset_updated_at']!,
-          _assetUpdatedAtMeta,
-        ),
-      );
-    }
-    return context;
-  }
-
-  @override
-  Set<i0.GeneratedColumn> get $primaryKey => {assetId};
-  @override
-  i1.TrashSyncEntityData map(Map<String, dynamic> data, {String? tablePrefix}) {
-    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
-    return i1.TrashSyncEntityData(
-      assetId: attachedDatabase.typeMapping.read(
-        i0.DriftSqlType.string,
-        data['${effectivePrefix}asset_id'],
-      )!,
-      checksum: attachedDatabase.typeMapping.read(
-        i0.DriftSqlType.string,
-        data['${effectivePrefix}checksum'],
-      )!,
-      status: i1.$TrashSyncEntityTable.$converterstatus.fromSql(
-        attachedDatabase.typeMapping.read(
-          i0.DriftSqlType.int,
-          data['${effectivePrefix}status'],
-        )!,
-      ),
-      assetUpdatedAt: attachedDatabase.typeMapping.read(
-        i0.DriftSqlType.dateTime,
-        data['${effectivePrefix}asset_updated_at'],
-      ),
-    );
-  }
-
-  @override
-  $TrashSyncEntityTable createAlias(String alias) {
-    return $TrashSyncEntityTable(attachedDatabase, alias);
-  }
-
-  static i0.JsonTypeConverter2<i2.TrashSyncStatus, int, int> $converterstatus =
-      const i0.EnumIndexConverter<i2.TrashSyncStatus>(
-        i2.TrashSyncStatus.values,
-      );
-  @override
-  bool get withoutRowId => true;
-  @override
-  bool get isStrict => true;
-}
-
-class TrashSyncEntityData extends i0.DataClass
-    implements i0.Insertable<i1.TrashSyncEntityData> {
-  final String assetId;
-  final String checksum;
-  final i2.TrashSyncStatus status;
-  final DateTime? assetUpdatedAt;
-  const TrashSyncEntityData({
-    required this.assetId,
-    required this.checksum,
-    required this.status,
-    this.assetUpdatedAt,
-  });
-  @override
-  Map<String, i0.Expression> toColumns(bool nullToAbsent) {
-    final map = <String, i0.Expression>{};
-    map['asset_id'] = i0.Variable<String>(assetId);
-    map['checksum'] = i0.Variable<String>(checksum);
-    {
-      map['status'] = i0.Variable<int>(
-        i1.$TrashSyncEntityTable.$converterstatus.toSql(status),
-      );
-    }
-    if (!nullToAbsent || assetUpdatedAt != null) {
-      map['asset_updated_at'] = i0.Variable<DateTime>(assetUpdatedAt);
-    }
-    return map;
-  }
-
-  factory TrashSyncEntityData.fromJson(
-    Map<String, dynamic> json, {
-    i0.ValueSerializer? serializer,
-  }) {
-    serializer ??= i0.driftRuntimeOptions.defaultSerializer;
-    return TrashSyncEntityData(
-      assetId: serializer.fromJson<String>(json['assetId']),
-      checksum: serializer.fromJson<String>(json['checksum']),
-      status: i1.$TrashSyncEntityTable.$converterstatus.fromJson(
-        serializer.fromJson<int>(json['status']),
-      ),
-      assetUpdatedAt: serializer.fromJson<DateTime?>(json['assetUpdatedAt']),
-    );
-  }
-  @override
-  Map<String, dynamic> toJson({i0.ValueSerializer? serializer}) {
-    serializer ??= i0.driftRuntimeOptions.defaultSerializer;
-    return <String, dynamic>{
-      'assetId': serializer.toJson<String>(assetId),
-      'checksum': serializer.toJson<String>(checksum),
-      'status': serializer.toJson<int>(
-        i1.$TrashSyncEntityTable.$converterstatus.toJson(status),
-      ),
-      'assetUpdatedAt': serializer.toJson<DateTime?>(assetUpdatedAt),
-    };
-  }
-
-  i1.TrashSyncEntityData copyWith({
-    String? assetId,
-    String? checksum,
-    i2.TrashSyncStatus? status,
-    i0.Value<DateTime?> assetUpdatedAt = const i0.Value.absent(),
-  }) => i1.TrashSyncEntityData(
-    assetId: assetId ?? this.assetId,
-    checksum: checksum ?? this.checksum,
-    status: status ?? this.status,
-    assetUpdatedAt: assetUpdatedAt.present
-        ? assetUpdatedAt.value
-        : this.assetUpdatedAt,
-  );
-  TrashSyncEntityData copyWithCompanion(i1.TrashSyncEntityCompanion data) {
-    return TrashSyncEntityData(
-      assetId: data.assetId.present ? data.assetId.value : this.assetId,
-      checksum: data.checksum.present ? data.checksum.value : this.checksum,
-      status: data.status.present ? data.status.value : this.status,
-      assetUpdatedAt: data.assetUpdatedAt.present
-          ? data.assetUpdatedAt.value
-          : this.assetUpdatedAt,
-    );
-  }
-
-  @override
-  String toString() {
-    return (StringBuffer('TrashSyncEntityData(')
-          ..write('assetId: $assetId, ')
-          ..write('checksum: $checksum, ')
-          ..write('status: $status, ')
-          ..write('assetUpdatedAt: $assetUpdatedAt')
-          ..write(')'))
-        .toString();
-  }
-
-  @override
-  int get hashCode => Object.hash(assetId, checksum, status, assetUpdatedAt);
-  @override
-  bool operator ==(Object other) =>
-      identical(this, other) ||
-      (other is i1.TrashSyncEntityData &&
-          other.assetId == this.assetId &&
-          other.checksum == this.checksum &&
-          other.status == this.status &&
-          other.assetUpdatedAt == this.assetUpdatedAt);
-}
-
-class TrashSyncEntityCompanion
-    extends i0.UpdateCompanion<i1.TrashSyncEntityData> {
-  final i0.Value<String> assetId;
-  final i0.Value<String> checksum;
-  final i0.Value<i2.TrashSyncStatus> status;
-  final i0.Value<DateTime?> assetUpdatedAt;
-  const TrashSyncEntityCompanion({
-    this.assetId = const i0.Value.absent(),
-    this.checksum = const i0.Value.absent(),
-    this.status = const i0.Value.absent(),
-    this.assetUpdatedAt = const i0.Value.absent(),
-  });
-  TrashSyncEntityCompanion.insert({
-    required String assetId,
-    required String checksum,
-    this.status = const i0.Value.absent(),
-    this.assetUpdatedAt = const i0.Value.absent(),
-  }) : assetId = i0.Value(assetId),
-       checksum = i0.Value(checksum);
-  static i0.Insertable<i1.TrashSyncEntityData> custom({
-    i0.Expression<String>? assetId,
-    i0.Expression<String>? checksum,
-    i0.Expression<int>? status,
-    i0.Expression<DateTime>? assetUpdatedAt,
-  }) {
-    return i0.RawValuesInsertable({
-      if (assetId != null) 'asset_id': assetId,
-      if (checksum != null) 'checksum': checksum,
-      if (status != null) 'status': status,
-      if (assetUpdatedAt != null) 'asset_updated_at': assetUpdatedAt,
-    });
-  }
-
-  i1.TrashSyncEntityCompanion copyWith({
-    i0.Value<String>? assetId,
-    i0.Value<String>? checksum,
-    i0.Value<i2.TrashSyncStatus>? status,
-    i0.Value<DateTime?>? assetUpdatedAt,
-  }) {
-    return i1.TrashSyncEntityCompanion(
-      assetId: assetId ?? this.assetId,
-      checksum: checksum ?? this.checksum,
-      status: status ?? this.status,
-      assetUpdatedAt: assetUpdatedAt ?? this.assetUpdatedAt,
-    );
-  }
-
-  @override
-  Map<String, i0.Expression> toColumns(bool nullToAbsent) {
-    final map = <String, i0.Expression>{};
-    if (assetId.present) {
-      map['asset_id'] = i0.Variable<String>(assetId.value);
-    }
-    if (checksum.present) {
-      map['checksum'] = i0.Variable<String>(checksum.value);
-    }
-    if (status.present) {
-      map['status'] = i0.Variable<int>(
-        i1.$TrashSyncEntityTable.$converterstatus.toSql(status.value),
-      );
-    }
-    if (assetUpdatedAt.present) {
-      map['asset_updated_at'] = i0.Variable<DateTime>(assetUpdatedAt.value);
-    }
-    return map;
-  }
-
-  @override
-  String toString() {
-    return (StringBuffer('TrashSyncEntityCompanion(')
-          ..write('assetId: $assetId, ')
-          ..write('checksum: $checksum, ')
-          ..write('status: $status, ')
-          ..write('assetUpdatedAt: $assetUpdatedAt')
-          ..write(')'))
-        .toString();
-  }
-}

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

@@ -0,0 +1,53 @@
+import 'package:drift/drift.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/infrastructure/entities/trashed_local_asset.entity.drift.dart';
+import 'package:immich_mobile/infrastructure/utils/asset.mixin.dart';
+import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';
+
+enum TrashOrigin {
+  // do not change this order!
+  localSync,
+  remoteSync,
+  localUser,
+}
+
+@TableIndex.sql('CREATE INDEX IF NOT EXISTS idx_trashed_local_asset_checksum ON trashed_local_asset_entity (checksum)')
+@TableIndex.sql('CREATE INDEX IF NOT EXISTS idx_trashed_local_asset_album ON trashed_local_asset_entity (album_id)')
+class TrashedLocalAssetEntity extends Table with DriftDefaultsMixin, AssetEntityMixin {
+  const TrashedLocalAssetEntity();
+
+  TextColumn get id => text()();
+
+  TextColumn get albumId => text()();
+
+  TextColumn get checksum => text().nullable()();
+
+  BoolColumn get isFavorite => boolean().withDefault(const Constant(false))();
+
+  IntColumn get orientation => integer().withDefault(const Constant(0))();
+
+  IntColumn get source => intEnum<TrashOrigin>()();
+
+  IntColumn get playbackStyle => intEnum<AssetPlaybackStyle>().withDefault(const Constant(0))();
+
+  @override
+  Set<Column> get primaryKey => {id, albumId};
+}
+
+extension TrashedLocalAssetEntityDataDomainExtension on TrashedLocalAssetEntityData {
+  LocalAsset toLocalAsset() => LocalAsset(
+    id: id,
+    name: name,
+    checksum: checksum,
+    type: type,
+    createdAt: createdAt,
+    updatedAt: updatedAt,
+    durationMs: durationMs,
+    isFavorite: isFavorite,
+    height: height,
+    width: width,
+    orientation: orientation,
+    playbackStyle: playbackStyle,
+    isEdited: false,
+  );
+}

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

@@ -58,12 +58,6 @@ class DriftBackupRepository extends DriftDatabaseRepository {
             INNER JOIN main.local_album_entity la on laa.album_id = la.id
             WHERE laa.asset_id = lae.id
                 AND la.backup_selection = ?3
-        )
-        AND NOT EXISTS (
-            SELECT 1 FROM trash_sync ts WHERE ts.asset_id = lae.id
-        )
-        AND NOT EXISTS (
-            SELECT 1 FROM server_deleted_checksum sd WHERE sd.checksum = lae.checksum
         );
       ''';
 
@@ -75,14 +69,7 @@ class DriftBackupRepository extends DriftDatabaseRepository {
             Variable.withInt(BackupSelection.selected.index),
             Variable.withInt(BackupSelection.excluded.index),
           ],
-          readsFrom: {
-            _db.localAlbumAssetEntity,
-            _db.localAlbumEntity,
-            _db.localAssetEntity,
-            _db.remoteAssetEntity,
-            _db.trashSyncEntity,
-            _db.serverDeletedChecksumEntity,
-          },
+          readsFrom: {_db.localAlbumAssetEntity, _db.localAlbumEntity, _db.localAssetEntity, _db.remoteAssetEntity},
         )
         .getSingle();
 
@@ -117,16 +104,6 @@ class DriftBackupRepository extends DriftDatabaseRepository {
                   _db.remoteAssetEntity.checksum.equalsExp(lae.checksum) & _db.remoteAssetEntity.ownerId.equals(userId),
                 ),
             ) &
-            notExistsQuery(
-              _db.trashSyncEntity.selectOnly()
-                ..addColumns([_db.trashSyncEntity.assetId])
-                ..where(_db.trashSyncEntity.assetId.equalsExp(lae.id)),
-            ) &
-            notExistsQuery(
-              _db.serverDeletedChecksumEntity.selectOnly()
-                ..addColumns([_db.serverDeletedChecksumEntity.checksum])
-                ..where(_db.serverDeletedChecksumEntity.checksum.equalsExp(lae.checksum)),
-            ) &
             lae.id.isNotInQuery(_getExcludedSubquery()),
       )
       ..orderBy([(localAsset) => OrderingTerm.desc(localAsset.createdAt)]);

mobile/lib/infrastructure/repositories/cached_key_value_repository.dart

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

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

@@ -25,11 +25,11 @@ import 'package:immich_mobile/infrastructure/entities/remote_album_user.entity.d
 import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_asset_cloud_id.entity.dart';
-import 'package:immich_mobile/infrastructure/entities/server_deleted_checksum.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/settings.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/stack.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/store.entity.dart';
-import 'package:immich_mobile/infrastructure/entities/trash_sync.entity.dart';
+import 'package:immich_mobile/infrastructure/entities/trashed_local_asset.entity.dart';
+import 'package:immich_mobile/infrastructure/entities/trashed_local_asset.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/user.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/user_metadata.entity.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.drift.dart';
@@ -63,8 +63,7 @@ import 'package:sqlite_async/sqlite_async.dart';
     PersonEntity,
     AssetFaceEntity,
     StoreEntity,
-    TrashSyncEntity,
-    ServerDeletedChecksumEntity,
+    TrashedLocalAssetEntity,
     AssetEditEntity,
     SettingsEntity,
     AssetOcrEntity,
@@ -121,7 +120,7 @@ class Drift extends $Drift {
   }
 
   @override
-  int get schemaVersion => 32;
+  int get schemaVersion => 31;
 
   @override
   MigrationStrategy get migration => MigrationStrategy(
@@ -222,7 +221,7 @@ class Drift extends $Drift {
                 await m.alterTable(
                   TableMigration(
                     v15.trashedLocalAssetEntity,
-                    columnTransformer: {v15.trashedLocalAssetEntity.source: const Constant(0)}, // TrashOrigin.localSync
+                    columnTransformer: {v15.trashedLocalAssetEntity.source: Constant(TrashOrigin.localSync.index)},
                     newColumns: [v15.trashedLocalAssetEntity.source],
                   ),
                 );
@@ -281,7 +280,11 @@ class Drift extends $Drift {
                     durationMs: v23.remoteAssetEntity.durationMs * const Constant(1000),
                   ),
                 );
-                await customStatement('UPDATE trashed_local_asset_entity SET duration_ms = duration_ms * 1000');
+                await trashedLocalAssetEntity.update().write(
+                  TrashedLocalAssetEntityCompanion.custom(
+                    durationMs: v23.trashedLocalAssetEntity.durationMs * const Constant(1000),
+                  ),
+                );
               },
               from23To24: (m, v24) async {
                 await customStatement('DROP INDEX IF EXISTS idx_remote_album_owner_id');
@@ -315,13 +318,6 @@ class Drift extends $Drift {
               from30To31: (m, v31) async {
                 await m.createIndex(v31.idxRemoteAssetUploaded);
               },
-              from31To32: (m, v32) async {
-                await m.createTable(v32.trashSync);
-                await m.create(v32.idxTrashSyncChecksum);
-                await m.createTable(v32.serverDeletedChecksum);
-                await m.create(v32.idxRemoteAssetSoftDeletedChecksum);
-                await m.deleteTable('trashed_local_asset_entity');
-              },
             ),
           ),
         );
@@ -353,8 +349,6 @@ class DriftDatabaseRepository {
   const DriftDatabaseRepository(this._db);
 
   Future<T> transaction<T>(Future<T> Function() callback) => _db.transaction(callback);
-
-  BaseSelectStatement currentUserIdQuery() => _db.selectOnly(_db.authUserEntity)..addColumns([_db.authUserEntity.id]);
 }
 
 // ignore: invalid_use_of_internal_member

mobile/lib/infrastructure/repositories/db.repository.drift.dart

@@ -39,19 +39,17 @@ import 'package:immich_mobile/infrastructure/entities/asset_face.entity.drift.da
     as i18;
 import 'package:immich_mobile/infrastructure/entities/store.entity.drift.dart'
     as i19;
-import 'package:immich_mobile/infrastructure/entities/trash_sync.entity.drift.dart'
+import 'package:immich_mobile/infrastructure/entities/trashed_local_asset.entity.drift.dart'
     as i20;
-import 'package:immich_mobile/infrastructure/entities/server_deleted_checksum.entity.drift.dart'
-    as i21;
 import 'package:immich_mobile/infrastructure/entities/asset_edit.entity.drift.dart'
-    as i22;
+    as i21;
 import 'package:immich_mobile/infrastructure/entities/settings.entity.drift.dart'
-    as i23;
+    as i22;
 import 'package:immich_mobile/infrastructure/entities/asset_ocr.entity.drift.dart'
-    as i24;
+    as i23;
 import 'package:immich_mobile/infrastructure/entities/merged_asset.drift.dart'
-    as i25;
-import 'package:drift/internal/modular.dart' as i26;
+    as i24;
+import 'package:drift/internal/modular.dart' as i25;
 
 abstract class $Drift extends i0.GeneratedDatabase {
   $Drift(i0.QueryExecutor e) : super(e);
@@ -91,21 +89,19 @@ abstract class $Drift extends i0.GeneratedDatabase {
   late final i18.$AssetFaceEntityTable assetFaceEntity = i18
       .$AssetFaceEntityTable(this);
   late final i19.$StoreEntityTable storeEntity = i19.$StoreEntityTable(this);
-  late final i20.$TrashSyncEntityTable trashSyncEntity = i20
-      .$TrashSyncEntityTable(this);
-  late final i21.$ServerDeletedChecksumEntityTable serverDeletedChecksumEntity =
-      i21.$ServerDeletedChecksumEntityTable(this);
-  late final i22.$AssetEditEntityTable assetEditEntity = i22
+  late final i20.$TrashedLocalAssetEntityTable trashedLocalAssetEntity = i20
+      .$TrashedLocalAssetEntityTable(this);
+  late final i21.$AssetEditEntityTable assetEditEntity = i21
       .$AssetEditEntityTable(this);
-  late final i23.$SettingsEntityTable settingsEntity = i23.$SettingsEntityTable(
+  late final i22.$SettingsEntityTable settingsEntity = i22.$SettingsEntityTable(
     this,
   );
-  late final i24.$AssetOcrEntityTable assetOcrEntity = i24.$AssetOcrEntityTable(
+  late final i23.$AssetOcrEntityTable assetOcrEntity = i23.$AssetOcrEntityTable(
     this,
   );
-  i25.MergedAssetDrift get mergedAssetDrift => i26.ReadDatabaseContainer(
+  i24.MergedAssetDrift get mergedAssetDrift => i25.ReadDatabaseContainer(
     this,
-  ).accessor<i25.MergedAssetDrift>(i25.MergedAssetDrift.new);
+  ).accessor<i24.MergedAssetDrift>(i24.MergedAssetDrift.new);
   @override
   Iterable<i0.TableInfo<i0.Table, Object?>> get allTables =>
       allSchemaEntities.whereType<i0.TableInfo<i0.Table, Object?>>();
@@ -126,7 +122,6 @@ abstract class $Drift extends i0.GeneratedDatabase {
     i2.uQRemoteAssetsOwnerChecksum,
     i2.uQRemoteAssetsOwnerLibraryChecksum,
     i2.idxRemoteAssetChecksum,
-    i2.idxRemoteAssetSoftDeletedChecksum,
     i2.idxRemoteAssetStackId,
     i2.idxRemoteAssetOwnerVisibilityDeletedCreated,
     i2.idxRemoteAssetUploaded,
@@ -142,8 +137,7 @@ abstract class $Drift extends i0.GeneratedDatabase {
     personEntity,
     assetFaceEntity,
     storeEntity,
-    trashSyncEntity,
-    serverDeletedChecksumEntity,
+    trashedLocalAssetEntity,
     assetEditEntity,
     settingsEntity,
     assetOcrEntity,
@@ -156,9 +150,10 @@ abstract class $Drift extends i0.GeneratedDatabase {
     i18.idxAssetFacePersonId,
     i18.idxAssetFaceAssetId,
     i18.idxAssetFaceVisiblePerson,
-    i20.idxTrashSyncChecksum,
-    i22.idxAssetEditAssetId,
-    i24.idxAssetOcrAssetId,
+    i20.idxTrashedLocalAssetChecksum,
+    i20.idxTrashedLocalAssetAlbum,
+    i21.idxAssetEditAssetId,
+    i23.idxAssetOcrAssetId,
   ];
   @override
   i0.StreamQueryUpdateRules
@@ -409,18 +404,15 @@ class $DriftManager {
       i18.$$AssetFaceEntityTableTableManager(_db, _db.assetFaceEntity);
   i19.$$StoreEntityTableTableManager get storeEntity =>
       i19.$$StoreEntityTableTableManager(_db, _db.storeEntity);
-  i20.$$TrashSyncEntityTableTableManager get trashSyncEntity =>
-      i20.$$TrashSyncEntityTableTableManager(_db, _db.trashSyncEntity);
-  i21.$$ServerDeletedChecksumEntityTableTableManager
-  get serverDeletedChecksumEntity =>
-      i21.$$ServerDeletedChecksumEntityTableTableManager(
+  i20.$$TrashedLocalAssetEntityTableTableManager get trashedLocalAssetEntity =>
+      i20.$$TrashedLocalAssetEntityTableTableManager(
         _db,
-        _db.serverDeletedChecksumEntity,
+        _db.trashedLocalAssetEntity,
       );
-  i22.$$AssetEditEntityTableTableManager get assetEditEntity =>
-      i22.$$AssetEditEntityTableTableManager(_db, _db.assetEditEntity);
-  i23.$$SettingsEntityTableTableManager get settingsEntity =>
-      i23.$$SettingsEntityTableTableManager(_db, _db.settingsEntity);
-  i24.$$AssetOcrEntityTableTableManager get assetOcrEntity =>
-      i24.$$AssetOcrEntityTableTableManager(_db, _db.assetOcrEntity);
+  i21.$$AssetEditEntityTableTableManager get assetEditEntity =>
+      i21.$$AssetEditEntityTableTableManager(_db, _db.assetEditEntity);
+  i22.$$SettingsEntityTableTableManager get settingsEntity =>
+      i22.$$SettingsEntityTableTableManager(_db, _db.settingsEntity);
+  i23.$$AssetOcrEntityTableTableManager get assetOcrEntity =>
+      i23.$$AssetOcrEntityTableTableManager(_db, _db.assetOcrEntity);
 }

mobile/lib/infrastructure/repositories/db.repository.steps.dart

@@ -16506,632 +16506,6 @@ final class Schema31 extends i0.VersionedSchema {
   );
 }
 
-final class Schema32 extends i0.VersionedSchema {
-  Schema32({required super.database}) : super(version: 32);
-  @override
-  late final List<i1.DatabaseSchemaEntity> entities = [
-    userEntity,
-    remoteAssetEntity,
-    stackEntity,
-    localAssetEntity,
-    remoteAlbumEntity,
-    localAlbumEntity,
-    localAlbumAssetEntity,
-    idxLocalAlbumAssetAlbumAsset,
-    idxLocalAssetChecksum,
-    idxLocalAssetCloudId,
-    idxLocalAssetCreatedAt,
-    idxStackPrimaryAssetId,
-    uQRemoteAssetsOwnerChecksum,
-    uQRemoteAssetsOwnerLibraryChecksum,
-    idxRemoteAssetChecksum,
-    idxRemoteAssetSoftDeletedChecksum,
-    idxRemoteAssetStackId,
-    idxRemoteAssetOwnerVisibilityDeletedCreated,
-    idxRemoteAssetUploaded,
-    authUserEntity,
-    userMetadataEntity,
-    partnerEntity,
-    remoteExifEntity,
-    remoteAlbumAssetEntity,
-    remoteAlbumUserEntity,
-    remoteAssetCloudIdEntity,
-    memoryEntity,
-    memoryAssetEntity,
-    personEntity,
-    assetFaceEntity,
-    storeEntity,
-    trashSync,
-    serverDeletedChecksum,
-    assetEditEntity,
-    settings,
-    assetOcrEntity,
-    idxPartnerSharedWithId,
-    idxLatLng,
-    idxRemoteExifCity,
-    idxRemoteAlbumAssetAlbumAsset,
-    idxRemoteAssetCloudId,
-    idxPersonOwnerId,
-    idxAssetFacePersonId,
-    idxAssetFaceAssetId,
-    idxAssetFaceVisiblePerson,
-    idxTrashSyncChecksum,
-    idxAssetEditAssetId,
-    idxAssetOcrAssetId,
-  ];
-  late final Shape33 userEntity = Shape33(
-    source: i0.VersionedTable(
-      entityName: 'user_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_107,
-        _column_108,
-        _column_109,
-        _column_110,
-        _column_111,
-        _column_112,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape50 remoteAssetEntity = Shape50(
-    source: i0.VersionedTable(
-      entityName: 'remote_asset_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_108,
-        _column_113,
-        _column_114,
-        _column_115,
-        _column_116,
-        _column_117,
-        _column_118,
-        _column_107,
-        _column_119,
-        _column_120,
-        _column_121,
-        _column_122,
-        _column_123,
-        _column_124,
-        _column_212,
-        _column_125,
-        _column_126,
-        _column_127,
-        _column_128,
-        _column_129,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape35 stackEntity = Shape35(
-    source: i0.VersionedTable(
-      entityName: 'stack_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_107,
-        _column_114,
-        _column_115,
-        _column_121,
-        _column_130,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape36 localAssetEntity = Shape36(
-    source: i0.VersionedTable(
-      entityName: 'local_asset_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_108,
-        _column_113,
-        _column_114,
-        _column_115,
-        _column_116,
-        _column_117,
-        _column_118,
-        _column_107,
-        _column_131,
-        _column_120,
-        _column_132,
-        _column_133,
-        _column_134,
-        _column_135,
-        _column_136,
-        _column_137,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape48 remoteAlbumEntity = Shape48(
-    source: i0.VersionedTable(
-      entityName: 'remote_album_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_107,
-        _column_108,
-        _column_138,
-        _column_114,
-        _column_115,
-        _column_139,
-        _column_140,
-        _column_141,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape38 localAlbumEntity = Shape38(
-    source: i0.VersionedTable(
-      entityName: 'local_album_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_107,
-        _column_108,
-        _column_115,
-        _column_142,
-        _column_143,
-        _column_144,
-        _column_145,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape39 localAlbumAssetEntity = Shape39(
-    source: i0.VersionedTable(
-      entityName: 'local_album_asset_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(asset_id, album_id)'],
-      columns: [_column_146, _column_147, _column_145],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  final i1.Index idxLocalAlbumAssetAlbumAsset = i1.Index(
-    'idx_local_album_asset_album_asset',
-    'CREATE INDEX IF NOT EXISTS idx_local_album_asset_album_asset ON local_album_asset_entity (album_id, asset_id)',
-  );
-  final i1.Index idxLocalAssetChecksum = i1.Index(
-    'idx_local_asset_checksum',
-    'CREATE INDEX IF NOT EXISTS idx_local_asset_checksum ON local_asset_entity (checksum)',
-  );
-  final i1.Index idxLocalAssetCloudId = i1.Index(
-    'idx_local_asset_cloud_id',
-    'CREATE INDEX IF NOT EXISTS idx_local_asset_cloud_id ON local_asset_entity (i_cloud_id)',
-  );
-  final i1.Index idxLocalAssetCreatedAt = i1.Index(
-    'idx_local_asset_created_at',
-    'CREATE INDEX IF NOT EXISTS idx_local_asset_created_at ON local_asset_entity (created_at)',
-  );
-  final i1.Index idxStackPrimaryAssetId = i1.Index(
-    'idx_stack_primary_asset_id',
-    'CREATE INDEX IF NOT EXISTS idx_stack_primary_asset_id ON stack_entity (primary_asset_id)',
-  );
-  final i1.Index uQRemoteAssetsOwnerChecksum = i1.Index(
-    'UQ_remote_assets_owner_checksum',
-    'CREATE UNIQUE INDEX IF NOT EXISTS UQ_remote_assets_owner_checksum ON remote_asset_entity (owner_id, checksum) WHERE(library_id IS NULL)',
-  );
-  final i1.Index uQRemoteAssetsOwnerLibraryChecksum = i1.Index(
-    'UQ_remote_assets_owner_library_checksum',
-    'CREATE UNIQUE INDEX IF NOT EXISTS UQ_remote_assets_owner_library_checksum ON remote_asset_entity (owner_id, library_id, checksum) WHERE(library_id IS NOT NULL)',
-  );
-  final i1.Index idxRemoteAssetChecksum = i1.Index(
-    'idx_remote_asset_checksum',
-    'CREATE INDEX IF NOT EXISTS idx_remote_asset_checksum ON remote_asset_entity (checksum)',
-  );
-  final i1.Index idxRemoteAssetSoftDeletedChecksum = i1.Index(
-    'idx_remote_asset_soft_deleted_checksum',
-    'CREATE INDEX IF NOT EXISTS idx_remote_asset_soft_deleted_checksum ON remote_asset_entity (checksum) WHERE deleted_at IS NOT NULL',
-  );
-  final i1.Index idxRemoteAssetStackId = i1.Index(
-    'idx_remote_asset_stack_id',
-    'CREATE INDEX IF NOT EXISTS idx_remote_asset_stack_id ON remote_asset_entity (stack_id)',
-  );
-  final i1.Index idxRemoteAssetOwnerVisibilityDeletedCreated = i1.Index(
-    'idx_remote_asset_owner_visibility_deleted_created',
-    'CREATE INDEX IF NOT EXISTS idx_remote_asset_owner_visibility_deleted_created ON remote_asset_entity (owner_id, visibility, deleted_at, created_at DESC)',
-  );
-  final i1.Index idxRemoteAssetUploaded = i1.Index(
-    'idx_remote_asset_uploaded',
-    'CREATE INDEX IF NOT EXISTS idx_remote_asset_uploaded ON remote_asset_entity (uploaded_at)',
-  );
-  late final Shape40 authUserEntity = Shape40(
-    source: i0.VersionedTable(
-      entityName: 'auth_user_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_107,
-        _column_108,
-        _column_109,
-        _column_148,
-        _column_110,
-        _column_111,
-        _column_149,
-        _column_150,
-        _column_151,
-        _column_152,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape4 userMetadataEntity = Shape4(
-    source: i0.VersionedTable(
-      entityName: 'user_metadata_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(user_id, "key")'],
-      columns: [_column_153, _column_154, _column_155],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape41 partnerEntity = Shape41(
-    source: i0.VersionedTable(
-      entityName: 'partner_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(shared_by_id, shared_with_id)'],
-      columns: [_column_156, _column_157, _column_158],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape42 remoteExifEntity = Shape42(
-    source: i0.VersionedTable(
-      entityName: 'remote_exif_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(asset_id)'],
-      columns: [
-        _column_159,
-        _column_160,
-        _column_161,
-        _column_162,
-        _column_163,
-        _column_164,
-        _column_117,
-        _column_116,
-        _column_165,
-        _column_166,
-        _column_167,
-        _column_168,
-        _column_135,
-        _column_136,
-        _column_169,
-        _column_170,
-        _column_171,
-        _column_172,
-        _column_173,
-        _column_174,
-        _column_175,
-        _column_176,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape7 remoteAlbumAssetEntity = Shape7(
-    source: i0.VersionedTable(
-      entityName: 'remote_album_asset_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(asset_id, album_id)'],
-      columns: [_column_159, _column_177],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape10 remoteAlbumUserEntity = Shape10(
-    source: i0.VersionedTable(
-      entityName: 'remote_album_user_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(album_id, user_id)'],
-      columns: [_column_177, _column_153, _column_178],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape43 remoteAssetCloudIdEntity = Shape43(
-    source: i0.VersionedTable(
-      entityName: 'remote_asset_cloud_id_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(asset_id)'],
-      columns: [
-        _column_159,
-        _column_179,
-        _column_180,
-        _column_134,
-        _column_135,
-        _column_136,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape44 memoryEntity = Shape44(
-    source: i0.VersionedTable(
-      entityName: 'memory_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_107,
-        _column_114,
-        _column_115,
-        _column_124,
-        _column_121,
-        _column_113,
-        _column_181,
-        _column_182,
-        _column_183,
-        _column_184,
-        _column_185,
-        _column_186,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape12 memoryAssetEntity = Shape12(
-    source: i0.VersionedTable(
-      entityName: 'memory_asset_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(asset_id, memory_id)'],
-      columns: [_column_159, _column_187],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape45 personEntity = Shape45(
-    source: i0.VersionedTable(
-      entityName: 'person_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_107,
-        _column_114,
-        _column_115,
-        _column_121,
-        _column_108,
-        _column_188,
-        _column_189,
-        _column_190,
-        _column_191,
-        _column_192,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape46 assetFaceEntity = Shape46(
-    source: i0.VersionedTable(
-      entityName: 'asset_face_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_107,
-        _column_159,
-        _column_193,
-        _column_194,
-        _column_195,
-        _column_196,
-        _column_197,
-        _column_198,
-        _column_199,
-        _column_200,
-        _column_201,
-        _column_124,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape18 storeEntity = Shape18(
-    source: i0.VersionedTable(
-      entityName: 'store_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [_column_202, _column_203, _column_204],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape52 trashSync = Shape52(
-    source: i0.VersionedTable(
-      entityName: 'trash_sync',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(asset_id)'],
-      columns: [_column_225, _column_119, _column_226, _column_227],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape53 serverDeletedChecksum = Shape53(
-    source: i0.VersionedTable(
-      entityName: 'server_deleted_checksum',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(checksum)'],
-      columns: [_column_119],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape32 assetEditEntity = Shape32(
-    source: i0.VersionedTable(
-      entityName: 'asset_edit_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_107,
-        _column_159,
-        _column_207,
-        _column_208,
-        _column_209,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape49 settings = Shape49(
-    source: i0.VersionedTable(
-      entityName: 'settings',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY("key")'],
-      columns: [_column_210, _column_224, _column_115],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape51 assetOcrEntity = Shape51(
-    source: i0.VersionedTable(
-      entityName: 'asset_ocr_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_107,
-        _column_159,
-        _column_213,
-        _column_214,
-        _column_215,
-        _column_216,
-        _column_217,
-        _column_218,
-        _column_219,
-        _column_220,
-        _column_221,
-        _column_222,
-        _column_223,
-        _column_201,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  final i1.Index idxPartnerSharedWithId = i1.Index(
-    'idx_partner_shared_with_id',
-    'CREATE INDEX IF NOT EXISTS idx_partner_shared_with_id ON partner_entity (shared_with_id)',
-  );
-  final i1.Index idxLatLng = i1.Index(
-    'idx_lat_lng',
-    'CREATE INDEX IF NOT EXISTS idx_lat_lng ON remote_exif_entity (latitude, longitude)',
-  );
-  final i1.Index idxRemoteExifCity = i1.Index(
-    'idx_remote_exif_city',
-    'CREATE INDEX IF NOT EXISTS idx_remote_exif_city ON remote_exif_entity (city) WHERE city IS NOT NULL',
-  );
-  final i1.Index idxRemoteAlbumAssetAlbumAsset = i1.Index(
-    'idx_remote_album_asset_album_asset',
-    'CREATE INDEX IF NOT EXISTS idx_remote_album_asset_album_asset ON remote_album_asset_entity (album_id, asset_id)',
-  );
-  final i1.Index idxRemoteAssetCloudId = i1.Index(
-    'idx_remote_asset_cloud_id',
-    'CREATE INDEX IF NOT EXISTS idx_remote_asset_cloud_id ON remote_asset_cloud_id_entity (cloud_id)',
-  );
-  final i1.Index idxPersonOwnerId = i1.Index(
-    'idx_person_owner_id',
-    'CREATE INDEX IF NOT EXISTS idx_person_owner_id ON person_entity (owner_id)',
-  );
-  final i1.Index idxAssetFacePersonId = i1.Index(
-    'idx_asset_face_person_id',
-    'CREATE INDEX IF NOT EXISTS idx_asset_face_person_id ON asset_face_entity (person_id)',
-  );
-  final i1.Index idxAssetFaceAssetId = i1.Index(
-    'idx_asset_face_asset_id',
-    'CREATE INDEX IF NOT EXISTS idx_asset_face_asset_id ON asset_face_entity (asset_id)',
-  );
-  final i1.Index idxAssetFaceVisiblePerson = i1.Index(
-    'idx_asset_face_visible_person',
-    'CREATE INDEX IF NOT EXISTS idx_asset_face_visible_person ON asset_face_entity (person_id, asset_id) WHERE is_visible = 1 AND deleted_at IS NULL',
-  );
-  final i1.Index idxTrashSyncChecksum = i1.Index(
-    'idx_trash_sync_checksum',
-    'CREATE INDEX IF NOT EXISTS idx_trash_sync_checksum ON trash_sync (checksum)',
-  );
-  final i1.Index idxAssetEditAssetId = i1.Index(
-    'idx_asset_edit_asset_id',
-    'CREATE INDEX IF NOT EXISTS idx_asset_edit_asset_id ON asset_edit_entity (asset_id)',
-  );
-  final i1.Index idxAssetOcrAssetId = i1.Index(
-    'idx_asset_ocr_asset_id',
-    'CREATE INDEX IF NOT EXISTS idx_asset_ocr_asset_id ON asset_ocr_entity (asset_id)',
-  );
-}
-
-class Shape52 extends i0.VersionedTable {
-  Shape52({required super.source, required super.alias}) : super.aliased();
-  i1.GeneratedColumn<String> get assetId =>
-      columnsByName['asset_id']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<String> get checksum =>
-      columnsByName['checksum']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<int> get status =>
-      columnsByName['status']! as i1.GeneratedColumn<int>;
-  i1.GeneratedColumn<String> get assetUpdatedAt =>
-      columnsByName['asset_updated_at']! as i1.GeneratedColumn<String>;
-}
-
-i1.GeneratedColumn<String> _column_225(String aliasedName) =>
-    i1.GeneratedColumn<String>(
-      'asset_id',
-      aliasedName,
-      false,
-      type: i1.DriftSqlType.string,
-      $customConstraints: 'NOT NULL',
-    );
-i1.GeneratedColumn<int> _column_226(String aliasedName) =>
-    i1.GeneratedColumn<int>(
-      'status',
-      aliasedName,
-      false,
-      type: i1.DriftSqlType.int,
-      $customConstraints: 'NOT NULL DEFAULT 0',
-      defaultValue: const i1.CustomExpression('0'),
-    );
-i1.GeneratedColumn<String> _column_227(String aliasedName) =>
-    i1.GeneratedColumn<String>(
-      'asset_updated_at',
-      aliasedName,
-      true,
-      type: i1.DriftSqlType.string,
-      $customConstraints: 'NULL',
-    );
-
-class Shape53 extends i0.VersionedTable {
-  Shape53({required super.source, required super.alias}) : super.aliased();
-  i1.GeneratedColumn<String> get checksum =>
-      columnsByName['checksum']! as i1.GeneratedColumn<String>;
-}
-
 i0.MigrationStepWithVersion migrationSteps({
   required Future<void> Function(i1.Migrator m, Schema2 schema) from1To2,
   required Future<void> Function(i1.Migrator m, Schema3 schema) from2To3,
@@ -17163,7 +16537,6 @@ i0.MigrationStepWithVersion migrationSteps({
   required Future<void> Function(i1.Migrator m, Schema29 schema) from28To29,
   required Future<void> Function(i1.Migrator m, Schema30 schema) from29To30,
   required Future<void> Function(i1.Migrator m, Schema31 schema) from30To31,
-  required Future<void> Function(i1.Migrator m, Schema32 schema) from31To32,
 }) {
   return (currentVersion, database) async {
     switch (currentVersion) {
@@ -17317,11 +16690,6 @@ i0.MigrationStepWithVersion migrationSteps({
         final migrator = i1.Migrator(database, schema);
         await from30To31(migrator, schema);
         return 31;
-      case 31:
-        final schema = Schema32(database: database);
-        final migrator = i1.Migrator(database, schema);
-        await from31To32(migrator, schema);
-        return 32;
       default:
         throw ArgumentError.value('Unknown migration from $currentVersion');
     }
@@ -17359,7 +16727,6 @@ i1.OnUpgrade stepByStep({
   required Future<void> Function(i1.Migrator m, Schema29 schema) from28To29,
   required Future<void> Function(i1.Migrator m, Schema30 schema) from29To30,
   required Future<void> Function(i1.Migrator m, Schema31 schema) from30To31,
-  required Future<void> Function(i1.Migrator m, Schema32 schema) from31To32,
 }) => i0.VersionedSchema.stepByStepHelper(
   step: migrationSteps(
     from1To2: from1To2,
@@ -17392,6 +16759,5 @@ i1.OnUpgrade stepByStep({
     from28To29: from28To29,
     from29To30: from29To30,
     from30To31: from30To31,
-    from31To32: from31To32,
   ),
 );

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

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

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

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

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

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

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

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

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

@@ -71,8 +71,6 @@ class SyncStreamRepository extends DriftDatabaseRepository {
             await _db.remoteAssetCloudIdEntity.deleteAll();
             await _db.assetEditEntity.deleteAll();
             await _db.assetOcrEntity.deleteAll();
-            await _db.trashSyncEntity.deleteAll();
-            await _db.serverDeletedChecksumEntity.deleteAll();
           });
         } finally {
           // re-enable FK even if the transaction throws, otherwise the connection

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

@@ -1,280 +0,0 @@
-import 'package:collection/collection.dart';
-import 'package:drift/drift.dart';
-import 'package:immich_mobile/constants/constants.dart';
-import 'package:immich_mobile/infrastructure/entities/local_asset.entity.drift.dart';
-import 'package:immich_mobile/infrastructure/entities/server_deleted_checksum.entity.drift.dart';
-import 'package:immich_mobile/infrastructure/entities/trash_sync.entity.drift.dart';
-import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
-
-class DriftTrashSyncRepository extends DriftDatabaseRepository {
-  final Drift _db;
-
-  const DriftTrashSyncRepository(this._db) : super(_db);
-
-  // Prunes asset markers for assets that are now live on the server
-  Future<void> pruneStaleMarkers() async {
-    final liveChecksums = _db.selectOnly(_db.remoteAssetEntity)
-      ..addColumns([_db.remoteAssetEntity.checksum])
-      ..where(_db.remoteAssetEntity.deletedAt.isNull() & _db.remoteAssetEntity.ownerId.isInQuery(currentUserIdQuery()));
-
-    await _db.transaction(() async {
-      await (_db.delete(_db.serverDeletedChecksumEntity)..where((t) => t.checksum.isInQuery(liveChecksums))).go();
-      await (_db.delete(
-        _db.trashSyncEntity,
-      )..where((t) => t.checksum.isInQuery(liveChecksums) & t.status.equalsValue(.pending))).go();
-    });
-  }
-
-  // Prunes dismissed assets marker for assets that are not on the server anymore
-  Future<void> pruneDismissedMarkers() async {
-    final softDeletedChecksums = _db.selectOnly(_db.remoteAssetEntity)
-      ..addColumns([_db.remoteAssetEntity.checksum])
-      ..where(
-        _db.remoteAssetEntity.deletedAt.isNotNull() & _db.remoteAssetEntity.ownerId.isInQuery(currentUserIdQuery()),
-      );
-
-    final serverDeletedChecksums = _db.selectOnly(_db.serverDeletedChecksumEntity)
-      ..addColumns([_db.serverDeletedChecksumEntity.checksum]);
-
-    await (_db.delete(_db.trashSyncEntity)..where(
-          (t) =>
-              t.status.equalsValue(.dismissed) &
-              t.checksum.isNotInQuery(softDeletedChecksums) &
-              t.checksum.isNotInQuery(serverDeletedChecksums),
-        ))
-        .go();
-  }
-
-  // Prunes pending markers for assets that has been modified locally
-  Future<void> prunePendingMarkers() async {
-    final staleIds = _db.selectOnly(_db.trashSyncEntity)
-      ..addColumns([_db.trashSyncEntity.assetId])
-      ..join([
-        innerJoin(
-          _db.localAssetEntity,
-          _db.localAssetEntity.id.equalsExp(_db.trashSyncEntity.assetId),
-          useColumns: false,
-        ),
-      ])
-      ..where(
-        _db.trashSyncEntity.status.equalsValue(.pending) &
-            _db.localAssetEntity.checksum.isNotNull() &
-            _db.localAssetEntity.checksum.equalsExp(_db.trashSyncEntity.checksum).not(),
-      );
-    await (_db.delete(_db.trashSyncEntity)..where((t) => t.assetId.isInQuery(staleIds))).go();
-  }
-
-  Future<void> recordHardDeletedChecksums(Iterable<String> remoteIds) async {
-    for (final slice in remoteIds.toSet().slices(kDriftMaxChunk)) {
-      final checksums =
-          await (_db.selectOnly(_db.remoteAssetEntity, distinct: true)
-                ..addColumns([_db.remoteAssetEntity.checksum])
-                ..where(
-                  _db.remoteAssetEntity.id.isIn(slice) & _db.remoteAssetEntity.ownerId.isInQuery(currentUserIdQuery()),
-                ))
-              .map((r) => r.read(_db.remoteAssetEntity.checksum)!)
-              .get();
-      if (checksums.isEmpty) {
-        continue;
-      }
-
-      await _db.batch((batch) {
-        for (final checksum in checksums) {
-          batch.insert(
-            _db.serverDeletedChecksumEntity,
-            ServerDeletedChecksumEntityCompanion.insert(checksum: checksum),
-            onConflict: DoNothing(),
-          );
-        }
-      });
-    }
-  }
-
-  Future<void> recordSoftDeleteAssets() => _recordAssets(
-    innerJoin(
-      _db.remoteAssetEntity,
-      _db.remoteAssetEntity.checksum.equalsExp(_db.localAssetEntity.checksum) &
-          _db.remoteAssetEntity.deletedAt.isNotNull() &
-          _db.remoteAssetEntity.ownerId.isInQuery(currentUserIdQuery()),
-      useColumns: false,
-    ),
-  );
-
-  Future<void> recordHardDeletedAssets() => _recordAssets(
-    innerJoin(
-      _db.serverDeletedChecksumEntity,
-      _db.serverDeletedChecksumEntity.checksum.equalsExp(_db.localAssetEntity.checksum),
-      useColumns: false,
-    ),
-  );
-
-  Future<void> _recordAssets(Join contentJoin) async {
-    final excludedAssetIds = _db.selectOnly(_db.localAlbumAssetEntity)
-      ..addColumns([_db.localAlbumAssetEntity.assetId])
-      ..join([
-        innerJoin(
-          _db.localAlbumEntity,
-          _db.localAlbumEntity.id.equalsExp(_db.localAlbumAssetEntity.albumId),
-          useColumns: false,
-        ),
-      ])
-      ..where(_db.localAlbumEntity.backupSelection.equalsValue(.excluded));
-
-    final selectedAssetsQuery = _db.selectOnly(_db.localAlbumAssetEntity)
-      ..addColumns([_db.localAlbumAssetEntity.assetId])
-      ..where(
-        _db.localAlbumAssetEntity.assetId.equalsExp(_db.localAssetEntity.id) &
-            _db.localAlbumAssetEntity.albumId.isInQuery(
-              _db.selectOnly(_db.localAlbumEntity)
-                ..addColumns([_db.localAlbumEntity.id])
-                ..where(_db.localAlbumEntity.backupSelection.equalsValue(.selected)),
-            ),
-      );
-
-    final dismissedAssetsQuery = _db.selectOnly(_db.trashSyncEntity)
-      ..addColumns([_db.trashSyncEntity.assetId])
-      ..where(
-        _db.trashSyncEntity.checksum.equalsExp(_db.localAssetEntity.checksum) &
-            _db.trashSyncEntity.status.equalsValue(.dismissed),
-      );
-
-    final source = _db.selectOnly(_db.localAssetEntity)
-      ..addColumns([_db.localAssetEntity.id, _db.localAssetEntity.checksum, _db.localAssetEntity.updatedAt])
-      ..join([contentJoin])
-      ..where(
-        _db.localAssetEntity.checksum.isNotNull() &
-            existsQuery(selectedAssetsQuery) &
-            _db.localAssetEntity.id.isNotInQuery(excludedAssetIds) &
-            notExistsQuery(dismissedAssetsQuery),
-      );
-
-    await _db
-        .into(_db.trashSyncEntity)
-        .insertFromSelect(
-          source,
-          columns: {
-            _db.trashSyncEntity.assetId: _db.localAssetEntity.id,
-            _db.trashSyncEntity.checksum: _db.localAssetEntity.checksum,
-            _db.trashSyncEntity.assetUpdatedAt: _db.localAssetEntity.updatedAt,
-          },
-          mode: .insertOrIgnore,
-        );
-  }
-
-  Future<void> markTrashed(Iterable<String> assetIds) async {
-    final set = assetIds.toSet();
-    if (set.isEmpty) {
-      return;
-    }
-    await _db.transaction(() async {
-      for (final slice in set.slices(kDriftMaxChunk)) {
-        await (_db.update(
-          _db.trashSyncEntity,
-        )..where((t) => t.assetId.isIn(slice))).write(const TrashSyncEntityCompanion(status: .new(.trashed)));
-        await (_db.delete(_db.localAssetEntity)..where((t) => t.id.isIn(slice))).go();
-      }
-    });
-  }
-
-  Future<void> markRestored(Iterable<String> assetIds) async {
-    final set = assetIds.toSet();
-    if (set.isEmpty) {
-      return;
-    }
-    for (final slice in set.slices(kDriftMaxChunk)) {
-      await (_db.update(
-        _db.trashSyncEntity,
-      )..where((t) => t.assetId.isIn(slice))).write(const TrashSyncEntityCompanion(status: .new(.restored)));
-    }
-  }
-
-  Future<void> restoreChecksums() async {
-    final restored = await (_db.select(_db.trashSyncEntity)..where((t) => t.status.equalsValue(.restored))).get();
-    if (restored.isEmpty) {
-      return;
-    }
-
-    await _db.batch((batch) {
-      for (final row in restored) {
-        final assetUpdatedAt = row.assetUpdatedAt;
-        if (assetUpdatedAt == null) {
-          continue;
-        }
-
-        batch.update(
-          _db.localAssetEntity,
-          LocalAssetEntityCompanion(checksum: .new(row.checksum)),
-          where: (t) => t.id.equals(row.assetId) & t.checksum.isNull() & t.updatedAt.equals(assetUpdatedAt),
-        );
-      }
-
-      batch.deleteWhere(_db.trashSyncEntity, (t) => t.status.equalsValue(.restored));
-    });
-  }
-
-  // Mark assets that were previously marked as trashed but are now live on the device as dismissed
-  Future<void> reconcileTrashed(Iterable<String> assetIds) async {
-    final set = assetIds.toSet();
-    if (set.isEmpty) {
-      return;
-    }
-
-    JoinedSelectStatement localAssetQuery($TrashSyncEntityTable trash) => _db.selectOnly(_db.localAssetEntity)
-      ..addColumns([_db.localAssetEntity.id])
-      ..where(_db.localAssetEntity.id.equalsExp(trash.assetId));
-
-    await _db.transaction(() async {
-      for (final slice in set.slices(kDriftMaxChunk)) {
-        await (_db.update(_db.trashSyncEntity)..where((t) => t.assetId.isIn(slice) & existsQuery(localAssetQuery(t))))
-            .write(const TrashSyncEntityCompanion(status: .new(.dismissed)));
-
-        await (_db.delete(
-          _db.trashSyncEntity,
-        )..where((t) => t.assetId.isIn(slice) & notExistsQuery(localAssetQuery(t)))).go();
-      }
-    });
-  }
-
-  Future<void> deleteMarkers(Iterable<String> assetIds) async {
-    final set = assetIds.toSet();
-    if (set.isEmpty) {
-      return;
-    }
-    for (final slice in set.slices(kDriftMaxChunk)) {
-      await (_db.delete(_db.trashSyncEntity)..where((t) => t.assetId.isIn(slice))).go();
-    }
-  }
-
-  Future<List<String>> getPendingAssetIds() =>
-      _trashSyncAssetIdsWhere(_db.trashSyncEntity.status.equalsValue(.pending));
-
-  Future<List<String>> getTrashedAssetIds() =>
-      _trashSyncAssetIdsWhere(_db.trashSyncEntity.status.equalsValue(.trashed));
-
-  Future<List<String>> _trashSyncAssetIdsWhere(Expression<bool> filter) {
-    return (_db.selectOnly(_db.trashSyncEntity)
-          ..addColumns([_db.trashSyncEntity.assetId])
-          ..where(filter))
-        .map((row) => row.read(_db.trashSyncEntity.assetId)!)
-        .get();
-  }
-
-  Future<List<String>> getRestorableAssetIds() {
-    return (_db.selectOnly(_db.trashSyncEntity, distinct: true)
-          ..addColumns([_db.trashSyncEntity.assetId])
-          ..join([
-            innerJoin(
-              _db.remoteAssetEntity,
-              _db.remoteAssetEntity.checksum.equalsExp(_db.trashSyncEntity.checksum),
-              useColumns: false,
-            ),
-          ])
-          ..where(
-            _db.trashSyncEntity.status.equalsValue(.trashed) &
-                _db.remoteAssetEntity.deletedAt.isNull() &
-                _db.remoteAssetEntity.ownerId.isInQuery(currentUserIdQuery()),
-          ))
-        .map((row) => row.read(_db.trashSyncEntity.assetId)!)
-        .get();
-  }
-}

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

@@ -0,0 +1,311 @@
+import 'package:collection/collection.dart';
+import 'package:drift/drift.dart';
+import 'package:immich_mobile/constants/constants.dart';
+import 'package:immich_mobile/domain/models/album/local_album.model.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/infrastructure/entities/local_asset.entity.dart';
+import 'package:immich_mobile/infrastructure/entities/local_asset.entity.drift.dart';
+import 'package:immich_mobile/infrastructure/entities/trashed_local_asset.entity.dart';
+import 'package:immich_mobile/infrastructure/entities/trashed_local_asset.entity.drift.dart';
+import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
+
+typedef TrashedAsset = ({String albumId, LocalAsset asset});
+
+class DriftTrashedLocalAssetRepository extends DriftDatabaseRepository {
+  final Drift _db;
+
+  const DriftTrashedLocalAssetRepository(this._db) : super(_db);
+
+  Future<void> updateHashes(Map<String, String> hashes) {
+    if (hashes.isEmpty) {
+      return Future.value();
+    }
+    return _db.batch((batch) async {
+      for (final entry in hashes.entries) {
+        batch.update(
+          _db.trashedLocalAssetEntity,
+          TrashedLocalAssetEntityCompanion(checksum: Value(entry.value)),
+          where: (e) => e.id.equals(entry.key),
+        );
+      }
+    });
+  }
+
+  Future<List<LocalAsset>> getAssetsToHash(Iterable<String> albumIds) {
+    final query = _db.trashedLocalAssetEntity.select()..where((r) => r.albumId.isIn(albumIds) & r.checksum.isNull());
+    return query.map((row) => row.toLocalAsset()).get();
+  }
+
+  Future<Iterable<LocalAsset>> getToRestore() async {
+    final selectedAlbumIds = (_db.selectOnly(_db.localAlbumEntity)
+      ..addColumns([_db.localAlbumEntity.id])
+      ..where(_db.localAlbumEntity.backupSelection.equalsValue(BackupSelection.selected)));
+
+    final rows =
+        await (_db.select(_db.trashedLocalAssetEntity).join([
+              innerJoin(
+                _db.remoteAssetEntity,
+                _db.remoteAssetEntity.checksum.equalsExp(_db.trashedLocalAssetEntity.checksum),
+              ),
+            ])..where(
+              _db.trashedLocalAssetEntity.source.equalsValue(TrashOrigin.remoteSync) &
+                  _db.trashedLocalAssetEntity.albumId.isInQuery(selectedAlbumIds) &
+                  _db.remoteAssetEntity.deletedAt.isNull(),
+            ))
+            .get();
+
+    return rows.map((result) => result.readTable(_db.trashedLocalAssetEntity).toLocalAsset());
+  }
+
+  /// Applies resulted snapshot of trashed assets:
+  /// - upserts incoming rows
+  /// - deletes rows that are not present in the snapshot
+  Future<void> processTrashSnapshot(Iterable<TrashedAsset> trashedAssets) async {
+    if (trashedAssets.isEmpty) {
+      await _db.delete(_db.trashedLocalAssetEntity).go();
+      return;
+    }
+    final assetIds = trashedAssets.map((e) => e.asset.id).toSet();
+    Map<String, String> localChecksumById = await _getCachedChecksums(assetIds);
+
+    return _db.transaction(() async {
+      await _db.batch((batch) {
+        for (final item in trashedAssets) {
+          final effectiveChecksum = localChecksumById[item.asset.id] ?? item.asset.checksum;
+          final companion = TrashedLocalAssetEntityCompanion.insert(
+            id: item.asset.id,
+            albumId: item.albumId,
+            checksum: Value(effectiveChecksum),
+            name: item.asset.name,
+            type: item.asset.type,
+            createdAt: Value(item.asset.createdAt),
+            updatedAt: Value(item.asset.updatedAt),
+            width: Value(item.asset.width),
+            height: Value(item.asset.height),
+            durationMs: Value(item.asset.durationMs),
+            isFavorite: Value(item.asset.isFavorite),
+            orientation: Value(item.asset.orientation),
+            playbackStyle: Value(item.asset.playbackStyle),
+            source: TrashOrigin.localSync,
+          );
+
+          batch.insert<$TrashedLocalAssetEntityTable, TrashedLocalAssetEntityData>(
+            _db.trashedLocalAssetEntity,
+            companion,
+            onConflict: DoUpdate((_) => companion, where: (old) => old.updatedAt.isNotValue(item.asset.updatedAt)),
+          );
+        }
+      });
+
+      if (assetIds.length <= kDriftMaxChunk) {
+        await (_db.delete(_db.trashedLocalAssetEntity)..where((row) => row.id.isNotIn(assetIds))).go();
+      } else {
+        final existingIds = await (_db.selectOnly(
+          _db.trashedLocalAssetEntity,
+        )..addColumns([_db.trashedLocalAssetEntity.id])).map((r) => r.read(_db.trashedLocalAssetEntity.id)!).get();
+        final idToDelete = existingIds.where((id) => !assetIds.contains(id));
+        for (final slice in idToDelete.slices(kDriftMaxChunk)) {
+          await (_db.delete(_db.trashedLocalAssetEntity)..where((t) => t.id.isIn(slice))).go();
+        }
+      }
+    });
+  }
+
+  Stream<int> watchCount() {
+    return (_db.selectOnly(_db.trashedLocalAssetEntity)..addColumns([_db.trashedLocalAssetEntity.id.count()]))
+        .watchSingle()
+        .map((row) => row.read<int>(_db.trashedLocalAssetEntity.id.count()) ?? 0);
+  }
+
+  Stream<int> watchHashedCount() {
+    return (_db.selectOnly(_db.trashedLocalAssetEntity)
+          ..addColumns([_db.trashedLocalAssetEntity.id.count()])
+          ..where(_db.trashedLocalAssetEntity.checksum.isNotNull()))
+        .watchSingle()
+        .map((row) => row.read<int>(_db.trashedLocalAssetEntity.id.count()) ?? 0);
+  }
+
+  Future<void> trashLocalAsset(Map<String, List<LocalAsset>> assetsByAlbums) async {
+    if (assetsByAlbums.isEmpty) {
+      return Future.value();
+    }
+
+    final companions = <TrashedLocalAssetEntityCompanion>[];
+    final idToDelete = <String>{};
+
+    for (final entry in assetsByAlbums.entries) {
+      for (final asset in entry.value) {
+        idToDelete.add(asset.id);
+        companions.add(
+          TrashedLocalAssetEntityCompanion(
+            id: Value(asset.id),
+            name: Value(asset.name),
+            albumId: Value(entry.key),
+            checksum: Value(asset.checksum),
+            type: Value(asset.type),
+            width: Value(asset.width),
+            height: Value(asset.height),
+            durationMs: Value(asset.durationMs),
+            isFavorite: Value(asset.isFavorite),
+            orientation: Value(asset.orientation),
+            playbackStyle: Value(asset.playbackStyle),
+            createdAt: Value(asset.createdAt),
+            updatedAt: Value(asset.updatedAt),
+            source: const Value(TrashOrigin.remoteSync),
+          ),
+        );
+      }
+    }
+
+    await _db.transaction(() async {
+      for (final companion in companions) {
+        await _db.into(_db.trashedLocalAssetEntity).insertOnConflictUpdate(companion);
+      }
+
+      for (final slice in idToDelete.slices(kDriftMaxChunk)) {
+        await (_db.delete(_db.localAssetEntity)..where((t) => t.id.isIn(slice))).go();
+      }
+    });
+  }
+
+  Future<void> applyRestoredAssets(List<String> idList) async {
+    if (idList.isEmpty) {
+      return Future.value();
+    }
+
+    final trashedAssets = <TrashedLocalAssetEntityData>[];
+
+    for (final slice in idList.slices(kDriftMaxChunk)) {
+      final q = _db.select(_db.trashedLocalAssetEntity)..where((t) => t.id.isIn(slice));
+      trashedAssets.addAll(await q.get());
+    }
+
+    if (trashedAssets.isEmpty) {
+      return;
+    }
+
+    final companions = trashedAssets.map((e) {
+      return LocalAssetEntityCompanion.insert(
+        id: e.id,
+        name: e.name,
+        type: e.type,
+        createdAt: Value(e.createdAt),
+        updatedAt: Value(e.updatedAt),
+        width: Value(e.width),
+        height: Value(e.height),
+        durationMs: Value(e.durationMs),
+        checksum: Value(e.checksum),
+        isFavorite: Value(e.isFavorite),
+        orientation: Value(e.orientation),
+        playbackStyle: Value(e.playbackStyle),
+      );
+    });
+
+    await _db.transaction(() async {
+      for (final companion in companions) {
+        await _db.into(_db.localAssetEntity).insertOnConflictUpdate(companion);
+      }
+      for (final slice in idList.slices(kDriftMaxChunk)) {
+        await (_db.delete(_db.trashedLocalAssetEntity)..where((t) => t.id.isIn(slice))).go();
+      }
+    });
+  }
+
+  Future<void> applyTrashedAssets(List<String> idList) async {
+    if (idList.isEmpty) {
+      return Future.value();
+    }
+
+    final trashedAssets = <({LocalAssetEntityData asset, String albumId})>[];
+
+    for (final slice in idList.slices(kDriftMaxChunk)) {
+      final rows = await (_db.select(_db.localAlbumAssetEntity).join([
+        innerJoin(_db.localAssetEntity, _db.localAlbumAssetEntity.assetId.equalsExp(_db.localAssetEntity.id)),
+      ])..where(_db.localAlbumAssetEntity.assetId.isIn(slice))).get();
+
+      final assetsWithAlbum = rows.map(
+        (row) =>
+            (albumId: row.readTable(_db.localAlbumAssetEntity).albumId, asset: row.readTable(_db.localAssetEntity)),
+      );
+
+      trashedAssets.addAll(assetsWithAlbum);
+    }
+
+    if (trashedAssets.isEmpty) {
+      return;
+    }
+
+    final companions = trashedAssets.map((e) {
+      return TrashedLocalAssetEntityCompanion.insert(
+        id: e.asset.id,
+        name: e.asset.name,
+        type: e.asset.type,
+        createdAt: Value(e.asset.createdAt),
+        updatedAt: Value(e.asset.updatedAt),
+        width: Value(e.asset.width),
+        height: Value(e.asset.height),
+        durationMs: Value(e.asset.durationMs),
+        checksum: Value(e.asset.checksum),
+        isFavorite: Value(e.asset.isFavorite),
+        orientation: Value(e.asset.orientation),
+        playbackStyle: Value(e.asset.playbackStyle),
+        source: TrashOrigin.localUser,
+        albumId: e.albumId,
+      );
+    });
+
+    await _db.transaction(() async {
+      for (final companion in companions) {
+        await _db.into(_db.trashedLocalAssetEntity).insertOnConflictUpdate(companion);
+      }
+      for (final slice in idList.slices(kDriftMaxChunk)) {
+        await (_db.delete(_db.localAssetEntity)..where((t) => t.id.isIn(slice))).go();
+      }
+    });
+  }
+
+  Future<Map<String, List<LocalAsset>>> getToTrash() async {
+    final result = <String, List<LocalAsset>>{};
+
+    final rows =
+        await (_db.select(_db.localAlbumAssetEntity).join([
+              innerJoin(_db.localAlbumEntity, _db.localAlbumAssetEntity.albumId.equalsExp(_db.localAlbumEntity.id)),
+              innerJoin(_db.localAssetEntity, _db.localAlbumAssetEntity.assetId.equalsExp(_db.localAssetEntity.id)),
+              leftOuterJoin(
+                _db.remoteAssetEntity,
+                _db.remoteAssetEntity.checksum.equalsExp(_db.localAssetEntity.checksum),
+              ),
+            ])..where(
+              _db.localAlbumEntity.backupSelection.equalsValue(BackupSelection.selected) &
+                  _db.remoteAssetEntity.deletedAt.isNotNull(),
+            ))
+            .get();
+
+    for (final row in rows) {
+      final albumId = row.readTable(_db.localAlbumAssetEntity).albumId;
+      final asset = row.readTable(_db.localAssetEntity).toDto();
+      (result[albumId] ??= <LocalAsset>[]).add(asset);
+    }
+
+    return result;
+  }
+
+  //attempt to reuse existing checksums
+  Future<Map<String, String>> _getCachedChecksums(Set<String> assetIds) async {
+    final localChecksumById = <String, String>{};
+
+    for (final slice in assetIds.slices(kDriftMaxChunk)) {
+      final rows =
+          await (_db.selectOnly(_db.localAssetEntity)
+                ..where(_db.localAssetEntity.id.isIn(slice) & _db.localAssetEntity.checksum.isNotNull())
+                ..addColumns([_db.localAssetEntity.id, _db.localAssetEntity.checksum]))
+              .get();
+
+      for (final r in rows) {
+        localChecksumById[r.read(_db.localAssetEntity.id)!] = r.read(_db.localAssetEntity.checksum)!;
+      }
+    }
+
+    return localChecksumById;
+  }
+}

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

@@ -333,7 +333,6 @@ class SplashScreenPageState extends ConsumerState<SplashScreenPage> {
                   // TODO: Bring back when the soft freeze issue is addressed
                   // backgroundManager.syncCloudIds(),
                 ]);
-                await backgroundManager.syncTrash();
               } else {
                 await backgroundManager.hashAssets();
               }

mobile/lib/platform/asset_media_api.g.dart

@@ -1,228 +0,0 @@
-// Autogenerated from Pigeon (v26.3.4), do not edit directly.
-// See also: https://pub.dev/packages/pigeon
-// ignore_for_file: unused_import, unused_shown_name
-// ignore_for_file: type=lint
-
-import 'dart:async';
-import 'dart:typed_data' show Float64List, Int32List, Int64List;
-
-import 'package:flutter/services.dart';
-import 'package:meta/meta.dart' show immutable, protected, visibleForTesting;
-
-Object? _extractReplyValueOrThrow(List<Object?>? replyList, String channelName, {required bool isNullValid}) {
-  if (replyList == null) {
-    throw PlatformException(
-      code: 'channel-error',
-      message: 'Unable to establish connection on channel: "$channelName".',
-    );
-  } else if (replyList.length > 1) {
-    throw PlatformException(code: replyList[0]! as String, message: replyList[1] as String?, details: replyList[2]);
-  } else if (!isNullValid && (replyList.isNotEmpty && replyList[0] == null)) {
-    throw PlatformException(
-      code: 'null-error',
-      message: 'Host platform returned null value for non-null return value.',
-    );
-  }
-  return replyList.firstOrNull;
-}
-
-bool _deepEquals(Object? a, Object? b) {
-  if (identical(a, b)) {
-    return true;
-  }
-  if (a is double && b is double) {
-    if (a.isNaN && b.isNaN) {
-      return true;
-    }
-    return a == b;
-  }
-  if (a is List && b is List) {
-    return a.length == b.length && a.indexed.every(((int, dynamic) item) => _deepEquals(item.$2, b[item.$1]));
-  }
-  if (a is Map && b is Map) {
-    if (a.length != b.length) {
-      return false;
-    }
-    for (final MapEntry<Object?, Object?> entryA in a.entries) {
-      bool found = false;
-      for (final MapEntry<Object?, Object?> entryB in b.entries) {
-        if (_deepEquals(entryA.key, entryB.key)) {
-          if (_deepEquals(entryA.value, entryB.value)) {
-            found = true;
-            break;
-          } else {
-            return false;
-          }
-        }
-      }
-      if (!found) {
-        return false;
-      }
-    }
-    return true;
-  }
-  return a == b;
-}
-
-int _deepHash(Object? value) {
-  if (value is List) {
-    return Object.hashAll(value.map(_deepHash));
-  }
-  if (value is Map) {
-    int result = 0;
-    for (final MapEntry<Object?, Object?> entry in value.entries) {
-      result += (_deepHash(entry.key) * 31) ^ _deepHash(entry.value);
-    }
-    return result;
-  }
-  if (value is double && value.isNaN) {
-    // Normalize NaN to a consistent hash.
-    return 0x7FF8000000000000.hashCode;
-  }
-  if (value is double && value == 0.0) {
-    // Normalize -0.0 to 0.0 so they have the same hash code.
-    return 0.0.hashCode;
-  }
-  return value.hashCode;
-}
-
-enum AssetMediaActionStatus { done, alreadyInState, notFound, failed }
-
-class AssetMediaActionResult {
-  AssetMediaActionResult({required this.id, required this.status});
-
-  String id;
-
-  AssetMediaActionStatus status;
-
-  List<Object?> _toList() {
-    return <Object?>[id, status];
-  }
-
-  Object encode() {
-    return _toList();
-  }
-
-  static AssetMediaActionResult decode(Object result) {
-    result as List<Object?>;
-    return AssetMediaActionResult(id: result[0]! as String, status: result[1]! as AssetMediaActionStatus);
-  }
-
-  @override
-  // ignore: avoid_equals_and_hash_code_on_mutable_classes
-  bool operator ==(Object other) {
-    if (other is! AssetMediaActionResult || other.runtimeType != runtimeType) {
-      return false;
-    }
-    if (identical(this, other)) {
-      return true;
-    }
-    return _deepEquals(id, other.id) && _deepEquals(status, other.status);
-  }
-
-  @override
-  // ignore: avoid_equals_and_hash_code_on_mutable_classes
-  int get hashCode => _deepHash(<Object?>[runtimeType, ..._toList()]);
-}
-
-class _PigeonCodec extends StandardMessageCodec {
-  const _PigeonCodec();
-  @override
-  void writeValue(WriteBuffer buffer, Object? value) {
-    if (value is int) {
-      buffer.putUint8(4);
-      buffer.putInt64(value);
-    } else if (value is AssetMediaActionStatus) {
-      buffer.putUint8(129);
-      writeValue(buffer, value.index);
-    } else if (value is AssetMediaActionResult) {
-      buffer.putUint8(130);
-      writeValue(buffer, value.encode());
-    } else {
-      super.writeValue(buffer, value);
-    }
-  }
-
-  @override
-  Object? readValueOfType(int type, ReadBuffer buffer) {
-    switch (type) {
-      case 129:
-        final value = readValue(buffer) as int?;
-        return value == null ? null : AssetMediaActionStatus.values[value];
-      case 130:
-        return AssetMediaActionResult.decode(readValue(buffer)!);
-      default:
-        return super.readValueOfType(type, buffer);
-    }
-  }
-}
-
-class AssetMediaApi {
-  /// Constructor for [AssetMediaApi].  The [binaryMessenger] named argument is
-  /// available for dependency injection.  If it is left null, the default
-  /// BinaryMessenger will be used which routes to the host platform.
-  AssetMediaApi({BinaryMessenger? binaryMessenger, String messageChannelSuffix = ''})
-    : pigeonVar_binaryMessenger = binaryMessenger,
-      pigeonVar_messageChannelSuffix = messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : '';
-  final BinaryMessenger? pigeonVar_binaryMessenger;
-
-  static const MessageCodec<Object?> pigeonChannelCodec = _PigeonCodec();
-
-  final String pigeonVar_messageChannelSuffix;
-
-  Future<List<AssetMediaActionResult>> trash(List<String> ids) async {
-    final pigeonVar_channelName = 'dev.flutter.pigeon.immich_mobile.AssetMediaApi.trash$pigeonVar_messageChannelSuffix';
-    final pigeonVar_channel = BasicMessageChannel<Object?>(
-      pigeonVar_channelName,
-      pigeonChannelCodec,
-      binaryMessenger: pigeonVar_binaryMessenger,
-    );
-    final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(<Object?>[ids]);
-    final pigeonVar_replyList = await pigeonVar_sendFuture as List<Object?>?;
-
-    final Object? pigeonVar_replyValue = _extractReplyValueOrThrow(
-      pigeonVar_replyList,
-      pigeonVar_channelName,
-      isNullValid: false,
-    );
-    return (pigeonVar_replyValue! as List<Object?>).cast<AssetMediaActionResult>();
-  }
-
-  Future<List<AssetMediaActionResult>> restore(List<String> ids) async {
-    final pigeonVar_channelName =
-        'dev.flutter.pigeon.immich_mobile.AssetMediaApi.restore$pigeonVar_messageChannelSuffix';
-    final pigeonVar_channel = BasicMessageChannel<Object?>(
-      pigeonVar_channelName,
-      pigeonChannelCodec,
-      binaryMessenger: pigeonVar_binaryMessenger,
-    );
-    final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(<Object?>[ids]);
-    final pigeonVar_replyList = await pigeonVar_sendFuture as List<Object?>?;
-
-    final Object? pigeonVar_replyValue = _extractReplyValueOrThrow(
-      pigeonVar_replyList,
-      pigeonVar_channelName,
-      isNullValid: false,
-    );
-    return (pigeonVar_replyValue! as List<Object?>).cast<AssetMediaActionResult>();
-  }
-
-  Future<List<String>> trashedAmong(List<String> ids) async {
-    final pigeonVar_channelName =
-        'dev.flutter.pigeon.immich_mobile.AssetMediaApi.trashedAmong$pigeonVar_messageChannelSuffix';
-    final pigeonVar_channel = BasicMessageChannel<Object?>(
-      pigeonVar_channelName,
-      pigeonChannelCodec,
-      binaryMessenger: pigeonVar_binaryMessenger,
-    );
-    final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(<Object?>[ids]);
-    final pigeonVar_replyList = await pigeonVar_sendFuture as List<Object?>?;
-
-    final Object? pigeonVar_replyValue = _extractReplyValueOrThrow(
-      pigeonVar_replyList,
-      pigeonVar_channelName,
-      isNullValid: false,
-    );
-    return (pigeonVar_replyValue! as List<Object?>).cast<String>();
-  }
-}

mobile/lib/platform/native_sync_api.g.dart

@@ -649,6 +649,44 @@ class NativeSyncApi {
     _extractReplyValueOrThrow(pigeonVar_replyList, pigeonVar_channelName, isNullValid: true);
   }
 
+  Future<Map<String, List<PlatformAsset>>> getTrashedAssets() async {
+    final pigeonVar_channelName =
+        'dev.flutter.pigeon.immich_mobile.NativeSyncApi.getTrashedAssets$pigeonVar_messageChannelSuffix';
+    final pigeonVar_channel = BasicMessageChannel<Object?>(
+      pigeonVar_channelName,
+      pigeonChannelCodec,
+      binaryMessenger: pigeonVar_binaryMessenger,
+    );
+    final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(null);
+    final pigeonVar_replyList = await pigeonVar_sendFuture as List<Object?>?;
+
+    final Object? pigeonVar_replyValue = _extractReplyValueOrThrow(
+      pigeonVar_replyList,
+      pigeonVar_channelName,
+      isNullValid: false,
+    );
+    return (pigeonVar_replyValue! as Map<Object?, Object?>).cast<String, List<PlatformAsset>>();
+  }
+
+  Future<bool> restoreFromTrashById(String mediaId, int type) async {
+    final pigeonVar_channelName =
+        'dev.flutter.pigeon.immich_mobile.NativeSyncApi.restoreFromTrashById$pigeonVar_messageChannelSuffix';
+    final pigeonVar_channel = BasicMessageChannel<Object?>(
+      pigeonVar_channelName,
+      pigeonChannelCodec,
+      binaryMessenger: pigeonVar_binaryMessenger,
+    );
+    final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(<Object?>[mediaId, type]);
+    final pigeonVar_replyList = await pigeonVar_sendFuture as List<Object?>?;
+
+    final Object? pigeonVar_replyValue = _extractReplyValueOrThrow(
+      pigeonVar_replyList,
+      pigeonVar_channelName,
+      isNullValid: false,
+    );
+    return pigeonVar_replyValue! as bool;
+  }
+
   Future<List<CloudIdResult>> getCloudIdForAssetIds(List<String> assetIds) async {
     final pigeonVar_channelName =
         'dev.flutter.pigeon.immich_mobile.NativeSyncApi.getCloudIdForAssetIds$pigeonVar_messageChannelSuffix';

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

mobile/lib/providers/app_life_cycle.provider.dart

@@ -126,7 +126,6 @@ class AppLifeCycleNotifier extends StateNotifier<AppLifeCycleEnum> {
           // TODO: Bring back when the soft freeze issue is addressed
           // _safeRun(backgroundManager.syncCloudIds(), "syncCloudIds"),
         ]);
-        await _safeRun(backgroundManager.syncTrash(), "syncTrash");
       } else {
         await _safeRun(backgroundManager.hashAssets(), "hashAssets");
       }

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,
     );
   }