refactor(mobile): actions

Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>

.github/workflows/build-mobile.yml

@@ -106,7 +106,7 @@ jobs:
         working-directory: ./mobile
         run: printf "%s" $KEY_JKS | base64 -d > android/key.jks
 
-      - uses: actions/setup-java@0f481fcb613427c0f801b606911222b5b6f3083a # v5.5.0
+      - uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5.6.0
         with:
           distribution: 'zulu'
           java-version: '17'
@@ -241,7 +241,7 @@ jobs:
         run: flutter build ios --config-only --no-codesign
 
       - name: Setup Ruby
-        uses: ruby/setup-ruby@d45b1a4e94b71acab930e56e79c6aa188764e7f9 # v1.316.0
+        uses: ruby/setup-ruby@003a5c4d8d6321bd302e38f6f0ec593f77f06600 # v1.319.0
         with:
           ruby-version: '3.3'
           bundler-cache: true

.github/workflows/check-openapi.yml

@@ -25,7 +25,7 @@ jobs:
           persist-credentials: false
 
       - name: Check for breaking API changes
-        uses: oasdiff/oasdiff-action/breaking@291b6594ce617f22f49af5898ee038ed0b46e8fe # v0.1.5
+        uses: oasdiff/oasdiff-action/breaking@024f6c399f9a21ada1addb0f9a36ce1bfac995f1 # v0.1.6
         with:
           base: https://raw.githubusercontent.com/${{ github.repository }}/main/open-api/immich-openapi-specs.json
           revision: open-api/immich-openapi-specs.json

.github/workflows/close-duplicates.yml

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

.github/workflows/codeql-analysis.yml

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

.github/workflows/prepare-release.yml

@@ -152,7 +152,7 @@ jobs:
           github-token: ${{ steps.generate-token.outputs.token }}
 
       - name: Create draft release
-        uses: softprops/action-gh-release@718ea10b132b3b2eba29c1007bb80653f286566b # v3.0.1
+        uses: softprops/action-gh-release@3d0d9888cb7fd7b750713d6e236d1fcb99157228 # v3.0.2
         with:
           draft: true
           prerelease: ${{ needs.bump_version.outputs.rc }}

deployment/mise.toml

@@ -1,6 +1,6 @@
 [tools]
-terragrunt = "1.0.3"
-opentofu = "1.11.6"
+terragrunt = "1.1.1"
+opentofu = "1.12.4"
 
 [tasks."tg:fmt"]
 run = "terragrunt hclfmt"

deployment/modules/cloudflare/docs-release/.terraform.lock.hcl

@@ -2,37 +2,35 @@
 # Manual edits may be lost in future updates.
 
 provider "registry.opentofu.org/cloudflare/cloudflare" {
-  version     = "4.52.7"
-  constraints = "4.52.7"
+  version     = "4.52.8"
+  constraints = "4.52.8"
   hashes = [
-    "h1:+O72J3QYiZtYmYYZM/Eh0f4NNfl1BvjX1eju43qTQsQ=",
-    "h1:0oqjYIPXcXh7XiDiKI085cHDYQQ5mh8kDl9dmBtvtog=",
-    "h1:4b4ESb87MGv5bnadgYe7sK5rEkKMZhbkQcwPubQTsR4=",
-    "h1:6mTr3eA1Ddb348lLmJuyvn98z4KF+ejqaUEJ76D1rzQ=",
-    "h1:9/3YH+9k9HqsvFtbmBf7SO2+xqZeZrXNKzLkjNuhUEA=",
-    "h1:Jcq4tBWgyH4/2JsojNBSRaN0mcItVMchO+lynonrlqc=",
-    "h1:Y4Vv/2RdP0Q+uxqhOxzOdKxuuEMjXPDcU0vPc5bCQzI=",
-    "h1:a0gW8FBKsbP9Fi0HEDoy49WIbEWVHk9+BR4/iwuBdDQ=",
-    "h1:gElv6iqJtg8OKN77gbw+MjrkrQmJHPkkMEi1J+0xkpU=",
-    "h1:oslXUugD/NQ+duJgT4BhKQyfGbuFOANknMvR73fiOeM=",
-    "h1:pPItIWii5oymR+geZB219ROSPuSODPLTlM4S/u8xLvM=",
-    "h1:u67GWw8GwD9NDlDzp9Y5VRnSQGcCrE8rSpkGPaBpDl0=",
-    "h1:uUUa9dY0XQOycI8pxg16PFFtL0WCTi9uEJz8trTQ7pU=",
-    "h1:y3rV8KF2q6GEMANNlf5EkKJurlfbKlIKpjGcdxoy7pQ=",
-    "zh:0c904ce31a4c6c4a5b3bf7ff1560e77c0cc7e2450c8553ded8e8c90398e1418b",
-    "zh:36183d310c36373fe4cb936b83c595c6fd3b0a94bc7827f28e5789ccbf59752e",
-    "zh:556a568a6f0235e8f41647de9e4d3a1e7b1d6502df8b19b54ec441f1c653ea10",
-    "zh:633ebbd5b0245e75e500ef9be4d9e62288f97e8da3baaa51323892a786d90285",
-    "zh:6acfe60cf52a65ba8f044f748548d2119e7f4fd7f8ebcb14698960d87c68f529",
+    "h1:2uxVaMaGPDJljXqYzuD6xtyfOKdNudtGIgawRTkFJIs=",
+    "h1:34HL1GDpqYdn2iEC+85pCi+NddZf30qH3fJ8y3P6CAM=",
+    "h1:4Z+uD+YY/7HrqdypM7DyUK+RtWepoLBc9fqtRQYZx4I=",
+    "h1:8Ss6wlJL2BHvkIZU1iaHvyUntqNhPFZ0fl6mjsxhctc=",
+    "h1:AYeWWMTWaNg01N3hivxr/6YlG41j1RietMnft9vLjUI=",
+    "h1:BGRNOzo8NUgbx5RwpWkWmr38f/s3txb7mzQhqfM5blI=",
+    "h1:EEXRMdC8bPlpLuOU8u+dE8mFJe3BpquFdH6vXcKseY4=",
+    "h1:ENp29e6O6OnaHJlbtmRlyjlAmm3Wt4mGctWUpBY3d0g=",
+    "h1:IAtBAbGVe1npj/n1NvCIZkSYGl7qaPYT+FnVdZ2CZ00=",
+    "h1:QRGGKngrxLORr4CImKXLDDJL5s67zUNBDAgk6FIIFNk=",
+    "h1:bNql6cC+MfDbaJK3q7a8C1m3A21o7e5mrjBIGtk0RdI=",
+    "h1:gmNv+PEOkYDdu+c15bfpcoAE3EI7pgmov9RMf3GZLsI=",
+    "h1:yieZ7NWRYQcLYHUevzDDrrmDkoQICM+3ZeX4i/mw9ME=",
+    "zh:08b305329a680a9213b2d8e642fbce7e4d97a524b1d2cef59e190ba9d678c477",
+    "zh:47975bd711ee18a46e589822171fa87474a552b332bfc8dea8fd1a64504eed8d",
+    "zh:5640d0d226bbafff3395542456c29feb942ca9c55ac01b4245a34c0590a33363",
+    "zh:5b0ad839fafba938c60a95d6b4a865843643591e97573ed2b9c4af3754064f74",
     "zh:890df766e9b839623b1f0437355032a3c006226a6c200cd911e15ee1a9014e9f",
-    "zh:904acc31ebb9d6ef68c792074b30532ee61bf515f19e0a3c75b46f126cca1f13",
-    "zh:a1d0a81246afc8750286d3f6fe7a8fbe6460dd2662407b28dbfbabb612e5fa9d",
-    "zh:a41a36fe253fc365fe2b7ffc749624688b2693b4634862fda161179ab100029f",
-    "zh:a7ef269e77ffa8715c8945a2c14322c7ff159ea44c15f62505f3cbb2cae3b32d",
-    "zh:b01aa3bed30610633b762df64332b26f8844a68c3960cebcb30f04918efc67fe",
-    "zh:b069cc2cd18cae10757df3ae030508eac8d55de7e49eda7a5e3e11f2f7fe6455",
-    "zh:b2d2c6313729ebb7465dceece374049e2d08bda34473901be9ff46a8836d42b2",
-    "zh:db0e114edaf4bc2f3d4769958807c83022bfbc619a00bdf4c4bd17faa4ab2d8b",
-    "zh:ecc0aa8b9044f664fd2aaf8fa992d976578f78478980555b4b8f6148e8d1a5fe",
+    "zh:93a9bc1139f5c02a44fdbf51fb2ce0891e2a42033b66febb928ccf72e870408f",
+    "zh:977f75cdf365686aa16ae02dcc0fc1769bae6f86be6e165393756c940bfb4af0",
+    "zh:9afcda2660b3dc6ee6329acea532a719225bd1f6cf46f695feb2d77160847c1b",
+    "zh:9e3da67b1b05b03d1f0c18b8677edf3797815b5dd49629f10eb2f457dccbed30",
+    "zh:b8d7da230f5266367c1b6b1cf31aa39087e231a87d55b71bb9d5c854ca1fcfe6",
+    "zh:cc96e7cd7350456b7a11a53d1c76c73a542de8359f9750f637ff865e8e77be91",
+    "zh:da1f58d067def243047bb7178cb197e2b9c3a791a9eb380ad92b73290615ae29",
+    "zh:ed5f3e1f59a338bcdce0a2537a8a2f299cfe18c168626799b2a9c97af3d8d3cb",
+    "zh:f16cc31f73a58a26ffe2d93223eddb7c340623a4e2ef38c6091766fd611e3e11",
   ]
 }

deployment/modules/cloudflare/docs-release/config.tf

@@ -5,7 +5,7 @@ terraform {
   required_providers {
     cloudflare = {
       source = "cloudflare/cloudflare"
-      version = "4.52.7"
+      version = "4.52.8"
     }
   }
 }

deployment/modules/cloudflare/docs/.terraform.lock.hcl

@@ -2,37 +2,35 @@
 # Manual edits may be lost in future updates.
 
 provider "registry.opentofu.org/cloudflare/cloudflare" {
-  version     = "4.52.7"
-  constraints = "4.52.7"
+  version     = "4.52.8"
+  constraints = "4.52.8"
   hashes = [
-    "h1:+O72J3QYiZtYmYYZM/Eh0f4NNfl1BvjX1eju43qTQsQ=",
-    "h1:0oqjYIPXcXh7XiDiKI085cHDYQQ5mh8kDl9dmBtvtog=",
-    "h1:4b4ESb87MGv5bnadgYe7sK5rEkKMZhbkQcwPubQTsR4=",
-    "h1:6mTr3eA1Ddb348lLmJuyvn98z4KF+ejqaUEJ76D1rzQ=",
-    "h1:9/3YH+9k9HqsvFtbmBf7SO2+xqZeZrXNKzLkjNuhUEA=",
-    "h1:Jcq4tBWgyH4/2JsojNBSRaN0mcItVMchO+lynonrlqc=",
-    "h1:Y4Vv/2RdP0Q+uxqhOxzOdKxuuEMjXPDcU0vPc5bCQzI=",
-    "h1:a0gW8FBKsbP9Fi0HEDoy49WIbEWVHk9+BR4/iwuBdDQ=",
-    "h1:gElv6iqJtg8OKN77gbw+MjrkrQmJHPkkMEi1J+0xkpU=",
-    "h1:oslXUugD/NQ+duJgT4BhKQyfGbuFOANknMvR73fiOeM=",
-    "h1:pPItIWii5oymR+geZB219ROSPuSODPLTlM4S/u8xLvM=",
-    "h1:u67GWw8GwD9NDlDzp9Y5VRnSQGcCrE8rSpkGPaBpDl0=",
-    "h1:uUUa9dY0XQOycI8pxg16PFFtL0WCTi9uEJz8trTQ7pU=",
-    "h1:y3rV8KF2q6GEMANNlf5EkKJurlfbKlIKpjGcdxoy7pQ=",
-    "zh:0c904ce31a4c6c4a5b3bf7ff1560e77c0cc7e2450c8553ded8e8c90398e1418b",
-    "zh:36183d310c36373fe4cb936b83c595c6fd3b0a94bc7827f28e5789ccbf59752e",
-    "zh:556a568a6f0235e8f41647de9e4d3a1e7b1d6502df8b19b54ec441f1c653ea10",
-    "zh:633ebbd5b0245e75e500ef9be4d9e62288f97e8da3baaa51323892a786d90285",
-    "zh:6acfe60cf52a65ba8f044f748548d2119e7f4fd7f8ebcb14698960d87c68f529",
+    "h1:2uxVaMaGPDJljXqYzuD6xtyfOKdNudtGIgawRTkFJIs=",
+    "h1:34HL1GDpqYdn2iEC+85pCi+NddZf30qH3fJ8y3P6CAM=",
+    "h1:4Z+uD+YY/7HrqdypM7DyUK+RtWepoLBc9fqtRQYZx4I=",
+    "h1:8Ss6wlJL2BHvkIZU1iaHvyUntqNhPFZ0fl6mjsxhctc=",
+    "h1:AYeWWMTWaNg01N3hivxr/6YlG41j1RietMnft9vLjUI=",
+    "h1:BGRNOzo8NUgbx5RwpWkWmr38f/s3txb7mzQhqfM5blI=",
+    "h1:EEXRMdC8bPlpLuOU8u+dE8mFJe3BpquFdH6vXcKseY4=",
+    "h1:ENp29e6O6OnaHJlbtmRlyjlAmm3Wt4mGctWUpBY3d0g=",
+    "h1:IAtBAbGVe1npj/n1NvCIZkSYGl7qaPYT+FnVdZ2CZ00=",
+    "h1:QRGGKngrxLORr4CImKXLDDJL5s67zUNBDAgk6FIIFNk=",
+    "h1:bNql6cC+MfDbaJK3q7a8C1m3A21o7e5mrjBIGtk0RdI=",
+    "h1:gmNv+PEOkYDdu+c15bfpcoAE3EI7pgmov9RMf3GZLsI=",
+    "h1:yieZ7NWRYQcLYHUevzDDrrmDkoQICM+3ZeX4i/mw9ME=",
+    "zh:08b305329a680a9213b2d8e642fbce7e4d97a524b1d2cef59e190ba9d678c477",
+    "zh:47975bd711ee18a46e589822171fa87474a552b332bfc8dea8fd1a64504eed8d",
+    "zh:5640d0d226bbafff3395542456c29feb942ca9c55ac01b4245a34c0590a33363",
+    "zh:5b0ad839fafba938c60a95d6b4a865843643591e97573ed2b9c4af3754064f74",
     "zh:890df766e9b839623b1f0437355032a3c006226a6c200cd911e15ee1a9014e9f",
-    "zh:904acc31ebb9d6ef68c792074b30532ee61bf515f19e0a3c75b46f126cca1f13",
-    "zh:a1d0a81246afc8750286d3f6fe7a8fbe6460dd2662407b28dbfbabb612e5fa9d",
-    "zh:a41a36fe253fc365fe2b7ffc749624688b2693b4634862fda161179ab100029f",
-    "zh:a7ef269e77ffa8715c8945a2c14322c7ff159ea44c15f62505f3cbb2cae3b32d",
-    "zh:b01aa3bed30610633b762df64332b26f8844a68c3960cebcb30f04918efc67fe",
-    "zh:b069cc2cd18cae10757df3ae030508eac8d55de7e49eda7a5e3e11f2f7fe6455",
-    "zh:b2d2c6313729ebb7465dceece374049e2d08bda34473901be9ff46a8836d42b2",
-    "zh:db0e114edaf4bc2f3d4769958807c83022bfbc619a00bdf4c4bd17faa4ab2d8b",
-    "zh:ecc0aa8b9044f664fd2aaf8fa992d976578f78478980555b4b8f6148e8d1a5fe",
+    "zh:93a9bc1139f5c02a44fdbf51fb2ce0891e2a42033b66febb928ccf72e870408f",
+    "zh:977f75cdf365686aa16ae02dcc0fc1769bae6f86be6e165393756c940bfb4af0",
+    "zh:9afcda2660b3dc6ee6329acea532a719225bd1f6cf46f695feb2d77160847c1b",
+    "zh:9e3da67b1b05b03d1f0c18b8677edf3797815b5dd49629f10eb2f457dccbed30",
+    "zh:b8d7da230f5266367c1b6b1cf31aa39087e231a87d55b71bb9d5c854ca1fcfe6",
+    "zh:cc96e7cd7350456b7a11a53d1c76c73a542de8359f9750f637ff865e8e77be91",
+    "zh:da1f58d067def243047bb7178cb197e2b9c3a791a9eb380ad92b73290615ae29",
+    "zh:ed5f3e1f59a338bcdce0a2537a8a2f299cfe18c168626799b2a9c97af3d8d3cb",
+    "zh:f16cc31f73a58a26ffe2d93223eddb7c340623a4e2ef38c6091766fd611e3e11",
   ]
 }

deployment/modules/cloudflare/docs/config.tf

@@ -5,7 +5,7 @@ terraform {
   required_providers {
     cloudflare = {
       source = "cloudflare/cloudflare"
-      version = "4.52.7"
+      version = "4.52.8"
     }
   }
 }

docker/docker-compose.prod.yml

@@ -97,7 +97,7 @@ services:
     command: ['./run.sh', '-disable-reporting']
     ports:
       - 3000:3000
-    image: grafana/grafana:12.4.4-ubuntu@sha256:df2e7ef5f32f771794cf76bad5f2bceac227036460a2cc269a9045e5662abc58
+    image: grafana/grafana:12.4.5-ubuntu@sha256:00396460e499415c828b7c298f19287c8a0f95e72412ee37ac11723655c2d6b9
     volumes:
       - grafana-data:/var/lib/grafana
 

docs/docs/administration/server-commands.md

@@ -35,6 +35,7 @@ Found Admin:
 - Email=admin@example.com
 - Name=Immich Admin
 ? Please choose a new password (optional) immich-is-cool
+? Invalidate existing sessions? Yes
 The admin password has been updated.
 ```
 

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

@@ -650,7 +650,7 @@ describe(`immich upload`, () => {
       ]);
 
       expect(stdout).toBe('');
-      expect(stderr).toEqual(`error: option '-n, --dry-run' cannot be used with option '-h, --skip-hash'`);
+      expect(stderr).toEqual(`error: option '-n, --dry-run' cannot be used with option '--skip-hash'`);
       expect(exitCode).not.toBe(0);
 
       const assets = await getAssetStatistics({}, { headers: asKeyAuth(key) });

e2e/src/specs/server/immich-admin/immich-admin.e2e-spec.ts

@@ -65,6 +65,10 @@ describe(`immich-admin`, () => {
       child.stdout.on('data', (chunk) => {
         data += chunk;
         if (data.includes('Please choose a new password (optional)')) {
+          child.stdin.write('\n');
+        }
+
+        if (data.includes('Invalidate existing sessions?')) {
           child.stdin.end('\n');
         }
       });

mise.lock

@@ -94,6 +94,23 @@ url_api = "https://api.github.com/repos/jellyfin/jellyfin-ffmpeg/releases/assets
 version = "7.1.3-6"
 backend = "github:jellyfin/jellyfin-ffmpeg"
 
+[tools."github:jellyfin/jellyfin-ffmpeg".options]
+asset_pattern = "jellyfin-ffmpeg_*_portable_linuxarm64-gpl.tar.xz"
+
+[tools."github:jellyfin/jellyfin-ffmpeg"."platforms.linux-arm64"]
+checksum = "sha256:bea03c670e8cc5bfe9edc0c5d624d4735421610cef5e808db93e7d8596952886"
+url = "https://github.com/jellyfin/jellyfin-ffmpeg/releases/download/v7.1.3-6/jellyfin-ffmpeg_7.1.3-6_portable_linuxarm64-gpl.tar.xz"
+url_api = "https://api.github.com/repos/jellyfin/jellyfin-ffmpeg/releases/assets/409048876"
+
+[tools."github:jellyfin/jellyfin-ffmpeg"."platforms.linux-arm64-musl"]
+checksum = "sha256:bea03c670e8cc5bfe9edc0c5d624d4735421610cef5e808db93e7d8596952886"
+url = "https://github.com/jellyfin/jellyfin-ffmpeg/releases/download/v7.1.3-6/jellyfin-ffmpeg_7.1.3-6_portable_linuxarm64-gpl.tar.xz"
+url_api = "https://api.github.com/repos/jellyfin/jellyfin-ffmpeg/releases/assets/409048876"
+
+[[tools."github:jellyfin/jellyfin-ffmpeg"]]
+version = "7.1.3-6"
+backend = "github:jellyfin/jellyfin-ffmpeg"
+
 [tools."github:jellyfin/jellyfin-ffmpeg".options]
 asset_pattern = "jellyfin-ffmpeg_*_portable_linux64-gpl.tar.xz"
 
@@ -112,17 +129,12 @@ version = "7.1.3-6"
 backend = "github:jellyfin/jellyfin-ffmpeg"
 
 [tools."github:jellyfin/jellyfin-ffmpeg".options]
-asset_pattern = "jellyfin-ffmpeg_*_portable_linuxarm64-gpl.tar.xz"
+asset_pattern = "jellyfin-ffmpeg_*_portable_mac64-gpl.tar.xz"
 
-[tools."github:jellyfin/jellyfin-ffmpeg"."platforms.linux-arm64"]
-checksum = "sha256:bea03c670e8cc5bfe9edc0c5d624d4735421610cef5e808db93e7d8596952886"
-url = "https://github.com/jellyfin/jellyfin-ffmpeg/releases/download/v7.1.3-6/jellyfin-ffmpeg_7.1.3-6_portable_linuxarm64-gpl.tar.xz"
-url_api = "https://api.github.com/repos/jellyfin/jellyfin-ffmpeg/releases/assets/409048876"
-
-[tools."github:jellyfin/jellyfin-ffmpeg"."platforms.linux-arm64-musl"]
-checksum = "sha256:bea03c670e8cc5bfe9edc0c5d624d4735421610cef5e808db93e7d8596952886"
-url = "https://github.com/jellyfin/jellyfin-ffmpeg/releases/download/v7.1.3-6/jellyfin-ffmpeg_7.1.3-6_portable_linuxarm64-gpl.tar.xz"
-url_api = "https://api.github.com/repos/jellyfin/jellyfin-ffmpeg/releases/assets/409048876"
+[tools."github:jellyfin/jellyfin-ffmpeg"."platforms.macos-x64"]
+checksum = "sha256:066ede9774aaae97a18098aaeea8b7e0d286653eb8618f640476e99c59a536c2"
+url = "https://github.com/jellyfin/jellyfin-ffmpeg/releases/download/v7.1.3-6/jellyfin-ffmpeg_7.1.3-6_portable_mac64-gpl.tar.xz"
+url_api = "https://api.github.com/repos/jellyfin/jellyfin-ffmpeg/releases/assets/408995889"
 
 [[tools."github:jellyfin/jellyfin-ffmpeg"]]
 version = "7.1.3-6"
@@ -133,18 +145,6 @@ checksum = "sha256:7b7168149689610296f3a187c717056ce0786cc125a31caf28056737e9ba1
 url = "https://github.com/jellyfin/jellyfin-ffmpeg/releases/download/v7.1.3-6/jellyfin-ffmpeg_7.1.3-6_portable_win64-clang-gpl.zip"
 url_api = "https://api.github.com/repos/jellyfin/jellyfin-ffmpeg/releases/assets/409036094"
 
-[[tools."github:jellyfin/jellyfin-ffmpeg"]]
-version = "7.1.3-6"
-backend = "github:jellyfin/jellyfin-ffmpeg"
-
-[tools."github:jellyfin/jellyfin-ffmpeg".options]
-asset_pattern = "jellyfin-ffmpeg_*_portable_mac64-gpl.tar.xz"
-
-[tools."github:jellyfin/jellyfin-ffmpeg"."platforms.macos-x64"]
-checksum = "sha256:066ede9774aaae97a18098aaeea8b7e0d286653eb8618f640476e99c59a536c2"
-url = "https://github.com/jellyfin/jellyfin-ffmpeg/releases/download/v7.1.3-6/jellyfin-ffmpeg_7.1.3-6_portable_mac64-gpl.tar.xz"
-url_api = "https://api.github.com/repos/jellyfin/jellyfin-ffmpeg/releases/assets/408995889"
-
 [[tools."github:webassembly/binaryen"]]
 version = "version_124"
 backend = "github:webassembly/binaryen"
@@ -248,43 +248,43 @@ version = "7.5.0"
 backend = "npm:oazapfts"
 
 [[tools.opentofu]]
-version = "1.11.6"
+version = "1.12.4"
 backend = "aqua:opentofu/opentofu"
 
 [tools.opentofu."platforms.linux-arm64"]
-checksum = "sha256:d4f2ab15776925864b049bb329d69682851de6f5204f256e9fa86d07a0308850"
-url = "https://github.com/opentofu/opentofu/releases/download/v1.11.6/tofu_1.11.6_linux_arm64.tar.gz"
-url_api = "https://api.github.com/repos/opentofu/opentofu/releases/assets/391536382"
+checksum = "sha256:dc7bfcd93ce9795a86c58fbf71efd013c39dcd1febb13c9cd3555c43b9c2403a"
+url = "https://github.com/opentofu/opentofu/releases/download/v1.12.4/tofu_1.12.4_linux_arm64.tar.gz"
+url_api = "https://api.github.com/repos/opentofu/opentofu/releases/assets/475646678"
 
 [tools.opentofu."platforms.linux-arm64-musl"]
-checksum = "sha256:d4f2ab15776925864b049bb329d69682851de6f5204f256e9fa86d07a0308850"
-url = "https://github.com/opentofu/opentofu/releases/download/v1.11.6/tofu_1.11.6_linux_arm64.tar.gz"
-url_api = "https://api.github.com/repos/opentofu/opentofu/releases/assets/391536382"
+checksum = "sha256:dc7bfcd93ce9795a86c58fbf71efd013c39dcd1febb13c9cd3555c43b9c2403a"
+url = "https://github.com/opentofu/opentofu/releases/download/v1.12.4/tofu_1.12.4_linux_arm64.tar.gz"
+url_api = "https://api.github.com/repos/opentofu/opentofu/releases/assets/475646678"
 
 [tools.opentofu."platforms.linux-x64"]
-checksum = "sha256:02800fafa2753a9f50c38483e2fdf5bc353fd62895eb9e25eec9a5145df3a69e"
-url = "https://github.com/opentofu/opentofu/releases/download/v1.11.6/tofu_1.11.6_linux_amd64.tar.gz"
-url_api = "https://api.github.com/repos/opentofu/opentofu/releases/assets/391536401"
+checksum = "sha256:81836d0f12b4fe9013b85586349f993def9429b6383bb77cdd6c2f3a9d9aac24"
+url = "https://github.com/opentofu/opentofu/releases/download/v1.12.4/tofu_1.12.4_linux_amd64.tar.gz"
+url_api = "https://api.github.com/repos/opentofu/opentofu/releases/assets/475646677"
 
 [tools.opentofu."platforms.linux-x64-musl"]
-checksum = "sha256:02800fafa2753a9f50c38483e2fdf5bc353fd62895eb9e25eec9a5145df3a69e"
-url = "https://github.com/opentofu/opentofu/releases/download/v1.11.6/tofu_1.11.6_linux_amd64.tar.gz"
-url_api = "https://api.github.com/repos/opentofu/opentofu/releases/assets/391536401"
+checksum = "sha256:81836d0f12b4fe9013b85586349f993def9429b6383bb77cdd6c2f3a9d9aac24"
+url = "https://github.com/opentofu/opentofu/releases/download/v1.12.4/tofu_1.12.4_linux_amd64.tar.gz"
+url_api = "https://api.github.com/repos/opentofu/opentofu/releases/assets/475646677"
 
 [tools.opentofu."platforms.macos-arm64"]
-checksum = "sha256:62d7fa8539e13b444827aa0a3b90c5972da5c47e8f8882d9dcf2e430e78840c1"
-url = "https://github.com/opentofu/opentofu/releases/download/v1.11.6/tofu_1.11.6_darwin_arm64.tar.gz"
-url_api = "https://api.github.com/repos/opentofu/opentofu/releases/assets/391536399"
+checksum = "sha256:7c06e4390d9ccd467773e37ff1c3d833c7ca0c24742cd9e9ad47284bea472247"
+url = "https://github.com/opentofu/opentofu/releases/download/v1.12.4/tofu_1.12.4_darwin_arm64.tar.gz"
+url_api = "https://api.github.com/repos/opentofu/opentofu/releases/assets/475646544"
 
 [tools.opentofu."platforms.macos-x64"]
-checksum = "sha256:1408cdef1c380f914565e6b4bb70794c6b163f195fcb233357f3d6c5745906b6"
-url = "https://github.com/opentofu/opentofu/releases/download/v1.11.6/tofu_1.11.6_darwin_amd64.tar.gz"
-url_api = "https://api.github.com/repos/opentofu/opentofu/releases/assets/391536384"
+checksum = "sha256:ead1d2ce643addb4ffeb93240b9377ae1c2fd793a6bd22d65922ac37adfdf546"
+url = "https://github.com/opentofu/opentofu/releases/download/v1.12.4/tofu_1.12.4_darwin_amd64.tar.gz"
+url_api = "https://api.github.com/repos/opentofu/opentofu/releases/assets/475646688"
 
 [tools.opentofu."platforms.windows-x64"]
-checksum = "sha256:27323f70c875b8251bfd7e61a4cffc3ebff4e56ed1e611b955016f0c7077367e"
-url = "https://github.com/opentofu/opentofu/releases/download/v1.11.6/tofu_1.11.6_windows_amd64.tar.gz"
-url_api = "https://api.github.com/repos/opentofu/opentofu/releases/assets/391536406"
+checksum = "sha256:a4d86a07755c8d151f20f945e6cfb5b40deeed942af36a9bd385c5c2e965d5dd"
+url = "https://github.com/opentofu/opentofu/releases/download/v1.12.4/tofu_1.12.4_windows_amd64.tar.gz"
+url_api = "https://api.github.com/repos/opentofu/opentofu/releases/assets/475646543"
 
 [[tools.pnpm]]
 version = "11.13.1"
@@ -327,40 +327,40 @@ url_api = "https://api.github.com/repos/pnpm/pnpm/releases/assets/478563981"
 provenance = "github-attestations"
 
 [[tools.terragrunt]]
-version = "1.0.3"
+version = "1.1.1"
 backend = "aqua:gruntwork-io/terragrunt"
 
 [tools.terragrunt."platforms.linux-arm64"]
-checksum = "sha256:e5b60ab05b5214db694e6bc215d8124fb626e277cdb56b86f6147ae110d510fe"
-url = "https://github.com/gruntwork-io/terragrunt/releases/download/v1.0.3/terragrunt_linux_arm64.tar.gz"
-url_api = "https://api.github.com/repos/gruntwork-io/terragrunt/releases/assets/406654253"
+checksum = "sha256:a374a7993ff3d99665a7e014007d3647ec7f0465c9d55c85e9f94c932e73cea2"
+url = "https://github.com/gruntwork-io/terragrunt/releases/download/v1.1.1/terragrunt_linux_arm64.tar.gz"
+url_api = "https://api.github.com/repos/gruntwork-io/terragrunt/releases/assets/476786148"
 
 [tools.terragrunt."platforms.linux-arm64-musl"]
-checksum = "sha256:e5b60ab05b5214db694e6bc215d8124fb626e277cdb56b86f6147ae110d510fe"
-url = "https://github.com/gruntwork-io/terragrunt/releases/download/v1.0.3/terragrunt_linux_arm64.tar.gz"
-url_api = "https://api.github.com/repos/gruntwork-io/terragrunt/releases/assets/406654253"
+checksum = "sha256:a374a7993ff3d99665a7e014007d3647ec7f0465c9d55c85e9f94c932e73cea2"
+url = "https://github.com/gruntwork-io/terragrunt/releases/download/v1.1.1/terragrunt_linux_arm64.tar.gz"
+url_api = "https://api.github.com/repos/gruntwork-io/terragrunt/releases/assets/476786148"
 
 [tools.terragrunt."platforms.linux-x64"]
-checksum = "sha256:6d48049baf82e0bf9c804368dc85cbfeadc10955e33777e9e8de3e020b94b073"
-url = "https://github.com/gruntwork-io/terragrunt/releases/download/v1.0.3/terragrunt_linux_amd64.tar.gz"
-url_api = "https://api.github.com/repos/gruntwork-io/terragrunt/releases/assets/406654196"
+checksum = "sha256:ce90077ac31ef17a2ba10d11d45f36c6501997a8f4f79d703bb7daba37032f53"
+url = "https://github.com/gruntwork-io/terragrunt/releases/download/v1.1.1/terragrunt_linux_amd64.tar.gz"
+url_api = "https://api.github.com/repos/gruntwork-io/terragrunt/releases/assets/476785968"
 
 [tools.terragrunt."platforms.linux-x64-musl"]
-checksum = "sha256:6d48049baf82e0bf9c804368dc85cbfeadc10955e33777e9e8de3e020b94b073"
-url = "https://github.com/gruntwork-io/terragrunt/releases/download/v1.0.3/terragrunt_linux_amd64.tar.gz"
-url_api = "https://api.github.com/repos/gruntwork-io/terragrunt/releases/assets/406654196"
+checksum = "sha256:ce90077ac31ef17a2ba10d11d45f36c6501997a8f4f79d703bb7daba37032f53"
+url = "https://github.com/gruntwork-io/terragrunt/releases/download/v1.1.1/terragrunt_linux_amd64.tar.gz"
+url_api = "https://api.github.com/repos/gruntwork-io/terragrunt/releases/assets/476785968"
 
 [tools.terragrunt."platforms.macos-arm64"]
-checksum = "sha256:aacb5be2ca5475300cbce246dfbd8a45eb47510fbaa70fab8561c49ef5db03aa"
-url = "https://github.com/gruntwork-io/terragrunt/releases/download/v1.0.3/terragrunt_darwin_arm64.tar.gz"
-url_api = "https://api.github.com/repos/gruntwork-io/terragrunt/releases/assets/406654084"
+checksum = "sha256:9ec8f678b9ae6c81d5d9d77b94cbf6349ce639d5938694b4adc9dea73e416794"
+url = "https://github.com/gruntwork-io/terragrunt/releases/download/v1.1.1/terragrunt_darwin_arm64.tar.gz"
+url_api = "https://api.github.com/repos/gruntwork-io/terragrunt/releases/assets/476785628"
 
 [tools.terragrunt."platforms.macos-x64"]
-checksum = "sha256:3133c2251e191aede8e3dd2a5b3aee2e91c5f08f88f117aee40eed9a24c8ef6b"
-url = "https://github.com/gruntwork-io/terragrunt/releases/download/v1.0.3/terragrunt_darwin_amd64.tar.gz"
-url_api = "https://api.github.com/repos/gruntwork-io/terragrunt/releases/assets/406653970"
+checksum = "sha256:73e768a69fa44a60f9d9174f54aaf179327e08706f633c9c79d5f5c9622c91c2"
+url = "https://github.com/gruntwork-io/terragrunt/releases/download/v1.1.1/terragrunt_darwin_amd64.tar.gz"
+url_api = "https://api.github.com/repos/gruntwork-io/terragrunt/releases/assets/476785520"
 
 [tools.terragrunt."platforms.windows-x64"]
-checksum = "sha256:183b2745b4e04980a6bfa4450ff81956a12596ca22d70f7aaa793980f5b036db"
-url = "https://github.com/gruntwork-io/terragrunt/releases/download/v1.0.3/terragrunt_windows_amd64.exe.tar.gz"
-url_api = "https://api.github.com/repos/gruntwork-io/terragrunt/releases/assets/406654412"
+checksum = "sha256:dd50a324691e072a3ac879e9ec43d6310e2936c929fda658eb2811fefcc75115"
+url = "https://github.com/gruntwork-io/terragrunt/releases/download/v1.1.1/terragrunt_windows_amd64.exe.tar.gz"
+url_api = "https://api.github.com/repos/gruntwork-io/terragrunt/releases/assets/476786421"

mise.toml

@@ -1,4 +1,4 @@
-experimental_monorepo_root = true
+monorepo_root = true
 
 [monorepo]
 config_roots = [
@@ -17,8 +17,8 @@ config_roots = [
 [tools]
 node = "24.15.0"
 pnpm = "11.13.1"
-terragrunt = "1.0.3"
-opentofu = "1.11.6"
+terragrunt = "1.1.1"
+opentofu = "1.12.4"
 "npm:oazapfts" = "7.5.0"
 "github:extism/cli" = "1.6.3"
 "github:webassembly/binaryen" = "version_124"
@@ -35,7 +35,6 @@ macos-x64 = { asset_pattern = "jellyfin-ffmpeg_*_portable_mac64-gpl.tar.xz" }
 macos-arm64 = { asset_pattern = "jellyfin-ffmpeg_*_portable_macarm64-gpl.tar.xz" }
 
 [settings]
-experimental = true
 pin = true
 lockfile = true
 

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/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/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/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/ios/WidgetExtension/ImmichAPI.swift

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

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/settings_key.dart

@@ -36,9 +36,6 @@ enum SettingsKey<T> {
   albumIsReverse<bool>(),
   albumIsGrid<bool>(),
 
-  // Sync
-  trashSyncEnabled<bool>(),
-
   // Backup
   backupEnabled<bool>(),
   backupUseCellularForVideos<bool>(),

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

@@ -1,5 +1,4 @@
 import 'package:drift/drift.dart';
-import 'package:flutter/foundation.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';
@@ -30,12 +29,6 @@ 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;
 

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/pages/library/partner/partner.page.dart

@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/user.model.dart';
 import 'package:immich_mobile/generated/translations.g.dart';
-import 'package:immich_mobile/presentation/actions/action.widget.dart';
+import 'package:immich_mobile/presentation/actions/action.dart';
 import 'package:immich_mobile/presentation/actions/partner.action.dart';
 import 'package:immich_mobile/presentation/widgets/people/partner_user_avatar.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/user.provider.dart';
@@ -33,7 +33,7 @@ class PartnerPage extends ConsumerWidget {
         title: Text(context.t.partners),
         elevation: 0,
         centerTitle: false,
-        actions: const [ActionIconButtonWidget(action: PartnerAddAction())],
+        actions: const [PartnerAddAction(display: ActionDisplay.iconButton)],
       ),
       body: sharedByAsync.when(
         data: (partners) => PartnerSharedByList(partners: partners.toList(growable: false)),
@@ -60,7 +60,7 @@ class _EmptyPartners extends StatelessWidget {
           ),
           const Align(
             alignment: .center,
-            child: ActionButtonWidget(action: PartnerAddAction()),
+            child: PartnerAddAction(),
           ),
         ],
       ),
@@ -88,8 +88,10 @@ class PartnerSharedByList extends StatelessWidget {
           leading: PartnerUserAvatar(userId: partner.id, name: partner.name),
           title: Text(partner.name),
           subtitle: Text(partner.email),
-          trailing: ActionIconButtonWidget(
-            action: PartnerRemoveAction(sharedWithId: partner.id, partnerName: partner.name),
+          trailing: PartnerRemoveAction(
+            sharedWithId: partner.id,
+            partnerName: partner.name,
+            display: ActionDisplay.iconButton,
           ),
         );
       },

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/actions/action.dart

@@ -1,32 +1,17 @@
-import 'package:flutter/material.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/domain/models/user.model.dart';
+import 'package:flutter/widgets.dart' hide Action;
 
-class ActionScope {
-  final BuildContext context;
-  final WidgetRef ref;
-  final UserDto authUser;
+enum ActionDisplay { button, iconButton, menuItem, columnButton }
 
-  const ActionScope({required this.context, required this.ref, required this.authUser});
-}
-
-abstract class BaseAction {
-  const BaseAction();
-
-  IconData get icon;
-
-  String label(ActionScope scope);
-
-  bool isVisible(ActionScope scope) => true;
-
-  Future<void> onAction(ActionScope scope);
-}
-
-abstract class AssetAction<T extends BaseAsset> extends BaseAction {
-  final Iterable<BaseAsset> assets;
-
-  const AssetAction({required this.assets});
-
-  Iterable<T> filter(ActionScope scope) => assets.whereType<T>();
+class Action {
+  final IconData icon;
+  final bool isVisible;
+  final String label;
+  final Future<void> Function() onAction;
+
+  const Action({
+    required this.icon,
+    this.isVisible = true,
+    required this.label,
+    required this.onAction,
+  });
 }

mobile/lib/presentation/actions/action.widget.dart

@@ -1,95 +1,30 @@
-import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
+import 'package:flutter/material.dart' hide Action;
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/presentation/actions/action.dart';
-import 'package:immich_mobile/providers/user.provider.dart';
-import 'package:immich_mobile/utils/error_handler.dart';
 import 'package:immich_ui/immich_ui.dart';
 
-class _ActionWidgetScope {
-  final String label;
-  final VoidCallback onAction;
+abstract class ActionWidget extends ConsumerWidget {
+  final ActionDisplay display;
 
-  const _ActionWidgetScope({required this.label, required this.onAction});
-}
+  const ActionWidget({super.key, this.display = ActionDisplay.button});
 
-class _ActionWidget extends ConsumerWidget {
-  final BaseAction action;
-  final Widget Function(_ActionWidgetScope context) builder;
-
-  const _ActionWidget({required this.action, required this.builder});
-
-  Future<void> _onAction(ActionScope scope) async {
-    try {
-      await action.onAction(scope);
-    } catch (error, stackTrace) {
-      handleError(scope.context, error, stack: stackTrace, description: 'Action failed: ${action.runtimeType}');
-    }
-  }
+  Action resolve(BuildContext context, WidgetRef ref);
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final authUser = ref.watch(currentUserProvider);
-    if (authUser == null) {
+    final action = resolve(context, ref);
+    if (!action.isVisible) {
       return const SizedBox.shrink();
     }
 
-    final scope = ActionScope(context: context, ref: ref, authUser: authUser);
-    if (!action.isVisible(scope)) {
-      return const SizedBox.shrink();
-    }
-
-    return builder(.new(label: action.label(scope), onAction: () => _onAction(scope)));
+    return switch (display) {
+      ActionDisplay.button =>
+        ImmichTextButton(labelText: action.label, icon: action.icon, onPressed: action.onAction),
+      ActionDisplay.iconButton => ImmichIconButton(icon: action.icon, onPressed: action.onAction),
+      ActionDisplay.menuItem =>
+        ImmichMenuItem(icon: action.icon, label: action.label, onPressed: action.onAction),
+      ActionDisplay.columnButton =>
+        ImmichColumnButton(icon: action.icon, label: action.label, onPressed: action.onAction),
+    };
   }
 }
-
-class ActionIconButtonWidget extends StatelessWidget {
-  final BaseAction action;
-  final ImmichVariant variant;
-
-  const ActionIconButtonWidget({super.key, required this.action, this.variant = .ghost});
-
-  @override
-  Widget build(BuildContext context) => _ActionWidget(
-    action: action,
-    builder: (ctx) => ImmichIconButton(icon: action.icon, onPressed: ctx.onAction, variant: variant),
-  );
-}
-
-class ActionButtonWidget extends StatelessWidget {
-  final BaseAction action;
-  final ImmichVariant variant;
-
-  const ActionButtonWidget({super.key, required this.action, this.variant = .ghost});
-
-  @override
-  Widget build(BuildContext context) => _ActionWidget(
-    action: action,
-    builder: (ctx) =>
-        ImmichTextButton(labelText: ctx.label, icon: action.icon, onPressed: ctx.onAction, variant: variant),
-  );
-}
-
-class ActionColumnButtonWidget extends StatelessWidget {
-  final BaseAction action;
-
-  const ActionColumnButtonWidget({super.key, required this.action});
-
-  @override
-  Widget build(BuildContext context) => _ActionWidget(
-    action: action,
-    builder: (ctx) => ImmichColumnButton(icon: action.icon, label: ctx.label, onPressed: ctx.onAction),
-  );
-}
-
-class ActionMenuItemWidget extends StatelessWidget {
-  final BaseAction action;
-
-  const ActionMenuItemWidget({super.key, required this.action});
-
-  @override
-  Widget build(BuildContext context) => _ActionWidget(
-    action: action,
-    builder: (ctx) => ImmichMenuItem(icon: action.icon, label: ctx.label, onPressed: ctx.onAction),
-  );
-}

mobile/lib/presentation/actions/asset_action.dart

@@ -0,0 +1,33 @@
+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/presentation/actions/action.widget.dart';
+import 'package:immich_mobile/providers/asset_viewer/asset_viewer.provider.dart';
+import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
+
+typedef AssetActionSelection = ({Set<BaseAsset> assets, void Function() clearSelect});
+
+final assetsActionProvider = Provider.family<AssetActionSelection, ActionSource>((ref, source) {
+  final assets = switch (source) {
+    ActionSource.timeline => ref.watch(multiSelectProvider.select((s) => s.selectedAssets)),
+    ActionSource.viewer => switch (ref.watch(assetViewerProvider.select((s) => s.currentAsset))) {
+      BaseAsset asset => {asset},
+      null => const <BaseAsset>{},
+    },
+  };
+
+  return (
+    assets: assets,
+    clearSelect: () {
+      if (source == ActionSource.timeline) {
+        ref.read(multiSelectProvider.notifier).reset();
+      }
+    },
+  );
+});
+
+abstract class AssetAction extends ActionWidget {
+  final ActionSource source;
+
+  const AssetAction({super.key, super.display, this.source = ActionSource.timeline});
+}

mobile/lib/presentation/actions/asset_debug.action.dart

@@ -1,27 +1,30 @@
 import 'dart:async';
 
 import 'package:auto_route/auto_route.dart';
-import 'package:flutter/material.dart';
-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:flutter/material.dart' hide Action;
+import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/generated/translations.g.dart';
 import 'package:immich_mobile/presentation/actions/action.dart';
+import 'package:immich_mobile/presentation/actions/asset_action.dart';
 import 'package:immich_mobile/providers/infrastructure/setting.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
 
-class AssetDebugAction extends AssetAction<BaseAsset> {
-  const AssetDebugAction({required super.assets});
+class AssetDebugAction extends AssetAction {
+  const AssetDebugAction({super.key, super.display, super.source});
 
   @override
-  IconData get icon => Icons.help_outline_rounded;
+  Action resolve(BuildContext context, WidgetRef ref) {
+    final (:assets, :clearSelect) = ref.watch(assetsActionProvider(source));
+    final advancedTroubleshooting = ref.watch(settingsProvider.notifier).get(.advancedTroubleshooting);
 
-  @override
-  String label(ActionScope scope) => scope.context.t.troubleshoot;
-
-  @override
-  bool isVisible(ActionScope scope) =>
-      assets.length == 1 && scope.ref.watch(settingsProvider.notifier).get(.advancedTroubleshooting);
-
-  @override
-  Future<void> onAction(ActionScope scope) async =>
-      unawaited(scope.context.pushRoute(AssetTroubleshootRoute(asset: assets.first)));
+    return Action(
+      icon: Icons.help_outline_rounded,
+      isVisible: assets.length == 1 && advancedTroubleshooting,
+      label: context.t.troubleshoot,
+      onAction: () async {
+        unawaited(context.pushRoute(AssetTroubleshootRoute(asset: assets.first)));
+        clearSelect();
+      },
+    );
+  }
 }

mobile/lib/presentation/actions/favorite.action.dart

@@ -1,38 +1,60 @@
-import 'package:flutter/material.dart';
+import 'package:flutter/material.dart' hide Action;
+import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/generated/translations.g.dart';
 import 'package:immich_mobile/presentation/actions/action.dart';
+import 'package:immich_mobile/presentation/actions/asset_action.dart';
 import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
+import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/utils/asset_filter.dart';
 import 'package:immich_ui/immich_ui.dart';
 
-class FavoriteAction extends AssetAction<RemoteAsset> {
-  final bool favorite;
-
-  FavoriteAction({required super.assets}) : favorite = assets.any((asset) => !asset.isFavorite);
+class FavoriteAction extends AssetAction {
+  const FavoriteAction({super.key, super.display, super.source});
 
   @override
-  IconData get icon => favorite ? Icons.favorite_border_rounded : Icons.favorite_rounded;
+  Action resolve(BuildContext context, WidgetRef ref) {
+    final (:assets, :clearSelect) = ref.watch(assetsActionProvider(source));
+    final userId = ref.read(currentUserProvider)?.id;
+    final targets = userId == null
+        ? const <RemoteAsset>[]
+        : AssetFilter(assets).owned(userId).favorite(isFavorite: false).toList(growable: false);
 
-  @override
-  String label(ActionScope scope) => favorite ? scope.context.t.favorite : scope.context.t.unfavorite;
-
-  @override
-  Iterable<RemoteAsset> filter(ActionScope scope) =>
-      AssetFilter(assets).owned(scope.authUser.id).favorite(isFavorite: !favorite);
-
-  @override
-  bool isVisible(ActionScope scope) => filter(scope).isNotEmpty;
-
-  @override
-  Future<void> onAction(ActionScope scope) async {
-    final ActionScope(:ref) = scope;
-    final assets = filter(scope).map((asset) => asset.id).toList(growable: false);
-
-    await ref.read(assetServiceProvider).updateFavorite(assets, favorite);
-    final message = favorite
-        ? StaticTranslations.instance.favorite_action_prompt(count: assets.length)
-        : StaticTranslations.instance.unfavorite_action_prompt(count: assets.length);
-    snackbar.success(message);
+    return Action(
+      icon: Icons.favorite_border_rounded,
+      isVisible: targets.isNotEmpty,
+      label: context.t.favorite,
+      onAction: () async {
+        final ids = targets.map((asset) => asset.id).toList(growable: false);
+        await ref.read(assetServiceProvider).updateFavorite(ids, true);
+        snackbar.success(StaticTranslations.instance.favorite_action_prompt(count: ids.length));
+        clearSelect();
+      },
+    );
+  }
+}
+
+class UnfavoriteAction extends AssetAction {
+  const UnfavoriteAction({super.key, super.display, super.source});
+
+  @override
+  Action resolve(BuildContext context, WidgetRef ref) {
+    final (:assets, :clearSelect) = ref.watch(assetsActionProvider(source));
+    final userId = ref.read(currentUserProvider)?.id;
+    final targets = userId == null
+        ? const <RemoteAsset>[]
+        : AssetFilter(assets).owned(userId).favorite(isFavorite: true).toList(growable: false);
+
+    return Action(
+      icon: Icons.favorite_rounded,
+      isVisible: targets.isNotEmpty,
+      label: context.t.unfavorite,
+      onAction: () async {
+        final ids = targets.map((asset) => asset.id).toList(growable: false);
+        await ref.read(assetServiceProvider).updateFavorite(ids, false);
+        snackbar.success(StaticTranslations.instance.unfavorite_action_prompt(count: ids.length));
+        clearSelect();
+      },
+    );
   }
 }

mobile/lib/presentation/actions/partner.action.dart

@@ -1,69 +1,76 @@
-import 'package:flutter/material.dart';
+import 'package:flutter/material.dart' hide Action;
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/user.model.dart';
 import 'package:immich_mobile/generated/translations.g.dart';
 import 'package:immich_mobile/presentation/actions/action.dart';
+import 'package:immich_mobile/presentation/actions/action.widget.dart';
 import 'package:immich_mobile/presentation/widgets/people/partner_user_avatar.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/user.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/widgets/common/confirm_dialog.dart';
 
-class PartnerAddAction extends BaseAction {
-  const PartnerAddAction();
+class PartnerAddAction extends ActionWidget {
+  const PartnerAddAction({super.key, super.display});
 
   @override
-  IconData get icon => Icons.person_add_rounded;
+  Action resolve(BuildContext context, WidgetRef ref) {
+    return Action(
+      icon: Icons.person_add_rounded,
+      label: context.t.add_partner,
+      onAction: () async {
+        final authUser = ref.read(currentUserProvider);
+        if (authUser == null) {
+          return;
+        }
 
-  @override
-  String label(ActionScope scope) => scope.context.t.add_partner;
+        final selected = await showDialog<User>(context: context, builder: (_) => const PartnerSelectionDialog());
+        if (selected == null) {
+          return;
+        }
 
-  @override
-  Future<void> onAction(ActionScope scope) async {
-    final ActionScope(:context, :ref, :authUser) = scope;
-    final selected = await showDialog<User>(context: context, builder: (_) => const PartnerSelectionDialog());
-    if (selected == null) {
-      return;
-    }
-
-    await ref.read(partnerServiceProvider).create(sharedById: authUser.id, sharedWithId: selected.id);
+        await ref.read(partnerServiceProvider).create(sharedById: authUser.id, sharedWithId: selected.id);
+      },
+    );
   }
 }
 
-class PartnerRemoveAction extends BaseAction {
-  const PartnerRemoveAction({required this.sharedWithId, required this.partnerName});
-
+class PartnerRemoveAction extends ActionWidget {
   final String sharedWithId;
   final String partnerName;
 
-  @override
-  IconData get icon => Icons.person_remove_rounded;
+  const PartnerRemoveAction({super.key, super.display, required this.sharedWithId, required this.partnerName});
 
   @override
-  String label(ActionScope scope) => scope.context.t.remove;
+  Action resolve(BuildContext context, WidgetRef ref) {
+    return Action(
+      icon: Icons.person_remove_rounded,
+      label: context.t.remove,
+      onAction: () async {
+        final authUser = ref.read(currentUserProvider);
+        if (authUser == null) {
+          return;
+        }
 
-  @override
-  Future<void> onAction(ActionScope scope) async {
-    final ActionScope(:context, :ref, :authUser) = scope;
+        final confirmed = await showDialog<bool>(
+          context: context,
+          builder: (_) => ConfirmDialog(
+            title: context.t.stop_photo_sharing,
+            content: context.t.partner_page_stop_sharing_content(partner: partnerName),
+          ),
+        );
+        if (confirmed != true) {
+          return;
+        }
 
-    final confirmed = await showDialog<bool>(
-      context: context,
-      builder: (_) => ConfirmDialog(
-        title: context.t.stop_photo_sharing,
-        content: context.t.partner_page_stop_sharing_content(partner: partnerName),
-      ),
+        await ref.read(partnerServiceProvider).delete(sharedById: authUser.id, sharedWithId: sharedWithId);
+      },
     );
-    if (confirmed != true) {
-      return;
-    }
-
-    await ref.read(partnerServiceProvider).delete(sharedById: authUser.id, sharedWithId: sharedWithId);
   }
 }
 
 @visibleForTesting
 final candidatesStateProvider = StreamProvider.autoDispose<Iterable<User>>((ref) {
   final currentUser = ref.watch(currentUserProvider);
-  // TODO: Refactor with a route guard to avoid this check in every provider
   if (currentUser == null) {
     return const Stream.empty();
   }

mobile/lib/presentation/actions/timeline.action.dart

@@ -1,24 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:immich_mobile/presentation/actions/action.dart';
-import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
-
-class TimelineAction extends BaseAction {
-  final BaseAction action;
-
-  const TimelineAction({required this.action});
-
-  @override
-  IconData get icon => action.icon;
-
-  @override
-  String label(ActionScope scope) => action.label(scope);
-
-  @override
-  bool isVisible(ActionScope scope) => action.isVisible(scope);
-
-  @override
-  Future<void> onAction(ActionScope scope) async {
-    await action.onAction(scope);
-    scope.ref.read(multiSelectProvider.notifier).reset();
-  }
-}

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

@@ -2,9 +2,10 @@ import 'package:auto_route/auto_route.dart';
 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/asset/base_asset.model.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/presentation/actions/action.widget.dart';
+import 'package:immich_mobile/presentation/actions/action.dart';
 import 'package:immich_mobile/presentation/actions/favorite.action.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/motion_photo_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/viewer_kebab_menu.widget.dart';
@@ -43,7 +44,6 @@ class ViewerTopAppBar extends ConsumerWidget implements PreferredSizeWidget {
     double opacity = ref.watch(assetViewerProvider.select((s) => s.backgroundOpacity)) * (showingControls ? 1 : 0);
 
     final originalTheme = context.themeData;
-    final assetForAction = [asset];
 
     final actions = <Widget>[
       if (asset.isMotionPhoto) const MotionPhotoActionButton(iconOnly: true),
@@ -61,7 +61,8 @@ class ViewerTopAppBar extends ConsumerWidget implements PreferredSizeWidget {
           },
         ),
 
-      ActionIconButtonWidget(action: FavoriteAction(assets: assetForAction)),
+      const FavoriteAction(source: ActionSource.viewer, display: ActionDisplay.iconButton),
+      const UnfavoriteAction(source: ActionSource.viewer, display: ActionDisplay.iconButton),
 
       ImmichColorOverride(color: null, child: ViewerKebabMenu(originalTheme: originalTheme)),
     ];

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

@@ -3,9 +3,8 @@ 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/actions/action.widget.dart';
+import 'package:immich_mobile/presentation/actions/action.dart';
 import 'package:immich_mobile/presentation/actions/favorite.action.dart';
-import 'package:immich_mobile/presentation/actions/timeline.action.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_local_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_permanent_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/download_action_button.widget.dart';
@@ -76,9 +75,6 @@ class _ArchiveBottomSheetState extends ConsumerState<ArchiveBottomSheet> {
       return sheetController.animateTo(0.85, duration: const Duration(milliseconds: 200), curve: Curves.easeInOut);
     }
 
-    final assets = multiselect.selectedAssets.toList(growable: false);
-    final actions = [FavoriteAction(assets: assets)];
-
     return BaseBottomSheet(
       controller: sheetController,
       initialChildSize: 0.25,
@@ -89,7 +85,7 @@ class _ArchiveBottomSheetState extends ConsumerState<ArchiveBottomSheet> {
         if (multiselect.hasRemote) ...[
           const ShareLinkActionButton(source: ActionSource.timeline),
           const UnArchiveActionButton(source: ActionSource.timeline),
-          ...actions.map((action) => ActionColumnButtonWidget(action: TimelineAction(action: action))),
+          const FavoriteAction(source: ActionSource.timeline, display: ActionDisplay.columnButton),
           if (multiselect.onlyRemote) const DownloadActionButton(source: ActionSource.timeline),
           isTrashEnable
               ? const TrashActionButton(source: ActionSource.timeline)

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

@@ -4,9 +4,8 @@ import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/album/album.model.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
-import 'package:immich_mobile/presentation/actions/action.widget.dart';
+import 'package:immich_mobile/presentation/actions/action.dart';
 import 'package:immich_mobile/presentation/actions/favorite.action.dart';
-import 'package:immich_mobile/presentation/actions/timeline.action.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/archive_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_local_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_permanent_action_button.widget.dart';
@@ -74,9 +73,6 @@ class FavoriteBottomSheet extends ConsumerWidget {
       ref.read(multiSelectProvider.notifier).reset();
     }
 
-    final assets = multiselect.selectedAssets.toList(growable: false);
-    final actions = [FavoriteAction(assets: assets)];
-
     return BaseBottomSheet(
       initialChildSize: 0.4,
       maxChildSize: 0.7,
@@ -85,7 +81,7 @@ class FavoriteBottomSheet extends ConsumerWidget {
         const ShareActionButton(source: ActionSource.timeline),
         if (multiselect.hasRemote) ...[
           const ShareLinkActionButton(source: ActionSource.timeline),
-          ...actions.map((action) => ActionColumnButtonWidget(action: TimelineAction(action: action))),
+          const FavoriteAction(source: ActionSource.timeline, display: ActionDisplay.columnButton),
           const ArchiveActionButton(source: ActionSource.timeline),
           if (multiselect.onlyRemote) const DownloadActionButton(source: ActionSource.timeline),
           isTrashEnable

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

@@ -3,9 +3,8 @@ 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/actions/action.widget.dart';
+import 'package:immich_mobile/presentation/actions/action.dart';
 import 'package:immich_mobile/presentation/actions/asset_debug.action.dart';
-import 'package:immich_mobile/presentation/actions/timeline.action.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/archive_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/bulk_tag_assets_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_action_button.widget.dart';
@@ -83,9 +82,6 @@ class _GeneralBottomSheetState extends ConsumerState<GeneralBottomSheet> {
       return sheetController.animateTo(0.85, duration: const Duration(milliseconds: 200), curve: Curves.easeInOut);
     }
 
-    final assets = multiselect.selectedAssets.toList(growable: false);
-    final actions = [AssetDebugAction(assets: assets)];
-
     return BaseBottomSheet(
       controller: sheetController,
       initialChildSize: widget.minChildSize ?? 0.15,
@@ -93,7 +89,7 @@ class _GeneralBottomSheetState extends ConsumerState<GeneralBottomSheet> {
       maxChildSize: 0.85,
       shouldCloseOnMinExtent: false,
       actions: [
-        ...actions.map((action) => ActionColumnButtonWidget(action: TimelineAction(action: action))),
+        const AssetDebugAction(source: ActionSource.timeline, display: ActionDisplay.columnButton),
         const ShareActionButton(source: ActionSource.timeline),
         if (multiselect.hasRemote) ...[
           const ShareLinkActionButton(source: ActionSource.timeline),

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

@@ -3,9 +3,8 @@ 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/extensions/translate_extensions.dart';
-import 'package:immich_mobile/presentation/actions/action.widget.dart';
+import 'package:immich_mobile/presentation/actions/action.dart';
 import 'package:immich_mobile/presentation/actions/favorite.action.dart';
-import 'package:immich_mobile/presentation/actions/timeline.action.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/archive_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_local_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_permanent_action_button.widget.dart';
@@ -85,9 +84,6 @@ class _RemoteAlbumBottomSheetState extends ConsumerState<RemoteAlbumBottomSheet>
       return sheetController.animateTo(0.85, duration: const Duration(milliseconds: 200), curve: Curves.easeInOut);
     }
 
-    final assets = multiselect.selectedAssets.toList(growable: false);
-    final actions = [FavoriteAction(assets: assets)];
-
     return BaseBottomSheet(
       controller: sheetController,
       initialChildSize: 0.22,
@@ -101,7 +97,7 @@ class _RemoteAlbumBottomSheetState extends ConsumerState<RemoteAlbumBottomSheet>
 
           if (ownsAlbum) ...[
             const ArchiveActionButton(source: ActionSource.timeline),
-            ...actions.map((action) => ActionColumnButtonWidget(action: TimelineAction(action: action))),
+            const FavoriteAction(source: ActionSource.timeline, display: ActionDisplay.columnButton),
           ],
           const DownloadActionButton(source: ActionSource.timeline),
           if (ownsAlbum) ...[

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/infrastructure/asset.provider.dart

@@ -2,6 +2,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/services/asset.service.dart';
 import 'package:immich_mobile/infrastructure/repositories/local_asset.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/remote_asset.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/trashed_local_asset.repository.dart';
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/repositories/asset_api.repository.dart';
@@ -14,6 +15,10 @@ final remoteAssetRepositoryProvider = Provider<RemoteAssetRepository>(
   (ref) => RemoteAssetRepository(ref.watch(driftProvider)),
 );
 
+final trashedLocalAssetRepository = Provider<DriftTrashedLocalAssetRepository>(
+  (ref) => DriftTrashedLocalAssetRepository(ref.watch(driftProvider)),
+);
+
 final assetServiceProvider = Provider(
   (ref) => AssetService(
     remoteRepository: ref.watch(remoteAssetRepositoryProvider),

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

@@ -1,6 +1,5 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/services/background_worker.service.dart';
-import 'package:immich_mobile/platform/asset_media_api.g.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/platform/connectivity_api.g.dart';
@@ -18,8 +17,6 @@ final backgroundWorkerLockServiceProvider = Provider<BackgroundWorkerLockService
 
 final nativeSyncApiProvider = Provider<NativeSyncApi>((_) => NativeSyncApi());
 
-final assetMediaApiProvider = Provider<AssetMediaApi>((_) => AssetMediaApi());
-
 final permissionApiProvider = Provider<PermissionApi>((_) => PermissionApi());
 
 final connectivityApiProvider = Provider<ConnectivityApi>((_) => ConnectivityApi());

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

@@ -11,7 +11,8 @@ import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/cancel.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/trash_sync.provider.dart';
+import 'package:immich_mobile/repositories/asset_media.repository.dart';
+import 'package:immich_mobile/repositories/permission.repository.dart';
 
 final syncMigrationRepositoryProvider = Provider((ref) => SyncMigrationRepository(ref.watch(driftProvider)));
 
@@ -19,7 +20,10 @@ final syncStreamServiceProvider = Provider(
   (ref) => SyncStreamService(
     syncApiRepository: ref.watch(syncApiRepositoryProvider),
     syncStreamRepository: ref.watch(syncStreamRepositoryProvider),
-    trashSyncRepository: ref.watch(trashSyncRepositoryProvider),
+    localAssetRepository: ref.watch(localAssetRepository),
+    trashedLocalAssetRepository: ref.watch(trashedLocalAssetRepository),
+    assetMediaRepository: ref.watch(assetMediaRepositoryProvider),
+    permissionRepository: ref.watch(permissionRepositoryProvider),
     syncMigrationRepository: ref.watch(syncMigrationRepositoryProvider),
     api: ref.watch(apiServiceProvider),
     cancellation: ref.watch(cancellationProvider),
@@ -34,7 +38,9 @@ final localSyncServiceProvider = Provider(
   (ref) => LocalSyncService(
     localAlbumRepository: ref.watch(localAlbumRepository),
     localAssetRepository: ref.watch(localAssetRepository),
-    trashSyncRepository: ref.watch(trashSyncRepositoryProvider),
+    trashedLocalAssetRepository: ref.watch(trashedLocalAssetRepository),
+    assetMediaRepository: ref.watch(assetMediaRepositoryProvider),
+    permissionRepository: ref.watch(permissionRepositoryProvider),
     nativeSyncApi: ref.watch(nativeSyncApiProvider),
     cancellation: ref.watch(cancellationProvider),
   ),
@@ -45,6 +51,7 @@ final hashServiceProvider = Provider(
     localAlbumRepository: ref.watch(localAlbumRepository),
     localAssetRepository: ref.watch(localAssetRepository),
     nativeSyncApi: ref.watch(nativeSyncApiProvider),
+    trashedLocalAssetRepository: ref.watch(trashedLocalAssetRepository),
     cancellation: ref.watch(cancellationProvider),
   ),
 );

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

@@ -1,20 +1,12 @@
+import 'package:async/async.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/domain/services/trash_sync.service.dart';
-import 'package:immich_mobile/infrastructure/repositories/trash_sync.repository.dart';
-import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
-import 'package:immich_mobile/repositories/permission.repository.dart';
+import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
 
-final trashSyncRepositoryProvider = Provider<DriftTrashSyncRepository>(
-  (ref) => DriftTrashSyncRepository(ref.watch(driftProvider)),
-);
+typedef TrashedAssetsCount = ({int total, int hashed});
 
-final trashSyncServiceProvider = Provider<TrashSyncService>(
-  (ref) => TrashSyncService(
-    repo: ref.watch(trashSyncRepositoryProvider),
-    assetMediaApi: ref.watch(assetMediaApiProvider),
-    permission: ref.watch(permissionRepositoryProvider),
-    settings: ref.watch(settingsProvider),
-  ),
-);
+final trashedAssetsCountProvider = StreamProvider<TrashedAssetsCount>((ref) {
+  final repo = ref.watch(trashedLocalAssetRepository);
+  final total$ = repo.watchCount();
+  final hashed$ = repo.watchHashedCount();
+  return StreamZip<int>([total$, hashed$]).map((values) => (total: values[0], hashed: values[1]));
+});

mobile/lib/providers/routes.provider.dart

@@ -1,8 +1,19 @@
 import 'package:flutter/widgets.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/routing/router.dart';
+
+@visibleForTesting
+bool isRouteInStack(Ref ref, String routeName) {
+  final router = ref.watch(appRouterProvider);
+  void onChange() => ref.invalidateSelf();
+  router.addListener(onChange);
+  ref.onDispose(() => router.removeListener(onChange));
+  return router.stackData.any((route) => route.name == routeName);
+}
+
+final inLockedViewProvider = Provider<bool>((ref) => isRouteInStack(ref, DriftLockedFolderRoute.name));
+final isAssetViewerOpenProvider = Provider<bool>((ref) => isRouteInStack(ref, AssetViewerRoute.name));
 
-final inLockedViewProvider = StateProvider<bool>((ref) => false);
-final isAssetViewerOpenProvider = StateProvider<bool>((ref) => false);
 final currentRouteNameProvider = StateProvider<String?>((ref) => null);
 final previousRouteNameProvider = StateProvider<String?>((ref) => null);
 final previousRouteDataProvider = StateProvider<RouteSettings?>((ref) => null);

mobile/lib/repositories/asset_media.repository.dart

@@ -11,6 +11,8 @@ import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:immich_mobile/infrastructure/repositories/storage.repository.dart';
+import 'package:immich_mobile/platform/native_sync_api.g.dart';
+import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/storage.provider.dart';
 import 'package:immich_mobile/services/api.service.dart';
 import 'package:immich_mobile/utils/image_url_builder.dart';
@@ -22,13 +24,16 @@ import 'package:share_plus/share_plus.dart';
 
 typedef _ShareFile = ({File file, bool cleanup, String displayName});
 
-final assetMediaRepositoryProvider = Provider((ref) => AssetMediaRepository(ref.watch(storageRepositoryProvider)));
+final assetMediaRepositoryProvider = Provider(
+  (ref) => AssetMediaRepository(ref.watch(nativeSyncApiProvider), ref.watch(storageRepositoryProvider)),
+);
 
 class AssetMediaRepository {
+  final NativeSyncApi _nativeSyncApi;
   final StorageRepository _storageRepository;
   static final Logger _log = Logger("AssetMediaRepository");
 
-  const AssetMediaRepository(this._storageRepository);
+  const AssetMediaRepository(this._nativeSyncApi, this._storageRepository);
 
   Future<bool> _androidSupportsTrash() async {
     if (Platform.isAndroid) {
@@ -53,6 +58,27 @@ class AssetMediaRepository {
     return PhotoManager.editor.deleteWithIds(ids);
   }
 
+  Future<bool> _restoreFromTrashById(String mediaId, int type) async {
+    try {
+      return await _nativeSyncApi.restoreFromTrashById(mediaId, type);
+    } catch (e, s) {
+      _log.warning('Error restore file from trash by Id', e, s);
+      return false;
+    }
+  }
+
+  Future<List<String>> restoreAssetsFromTrash(Iterable<LocalAsset> assets) async {
+    final restoredIds = <String>[];
+    for (final asset in assets) {
+      _log.info("Restoring from trash, localId: ${asset.id}, checksum: ${asset.checksum}");
+      final result = await _restoreFromTrashById(asset.id, asset.type.index);
+      if (result) {
+        restoredIds.add(asset.id);
+      }
+    }
+    return restoredIds;
+  }
+
   Future<AssetEntity?> get(String id) async {
     final entity = await AssetEntity.fromId(id);
     return entity;

mobile/lib/routing/app_navigation_observer.dart

@@ -4,7 +4,6 @@ import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/providers/routes.provider.dart';
-import 'package:immich_mobile/routing/router.dart';
 
 class AppNavigationObserver extends AutoRouterObserver {
   /// Riverpod Instance
@@ -12,46 +11,12 @@ class AppNavigationObserver extends AutoRouterObserver {
 
   AppNavigationObserver({required this.ref});
 
-  @override
-  Future<void> didChangeTabRoute(TabPageRoute route, TabPageRoute previousRoute) async {
-    unawaited(Future(() => ref.read(inLockedViewProvider.notifier).state = false));
-  }
-
   @override
   void didPush(Route route, Route? previousRoute) {
-    _handleDriftLockedFolderState(route, previousRoute);
     Future(() {
       ref.read(currentRouteNameProvider.notifier).state = route.settings.name;
       ref.read(previousRouteNameProvider.notifier).state = previousRoute?.settings.name;
       ref.read(previousRouteDataProvider.notifier).state = previousRoute?.settings;
-      if (route.settings.name == AssetViewerRoute.name) {
-        ref.read(isAssetViewerOpenProvider.notifier).state = true;
-      }
     });
   }
-
-  @override
-  void didPop(Route route, Route? previousRoute) {
-    _handleDriftLockedFolderState(previousRoute ?? route, null);
-    if (route.settings.name == AssetViewerRoute.name) {
-      Future(() => ref.read(isAssetViewerOpenProvider.notifier).state = false);
-    }
-  }
-
-  _handleDriftLockedFolderState(Route route, Route? previousRoute) {
-    final isInLockedView = ref.read(inLockedViewProvider);
-    final isFromLockedViewToDetailView =
-        route.settings.name == AssetViewerRoute.name && previousRoute?.settings.name == DriftLockedFolderRoute.name;
-
-    final isFromDetailViewToInfoPanelView =
-        route.settings.name == null && previousRoute?.settings.name == AssetViewerRoute.name && isInLockedView;
-
-    if (route.settings.name == DriftLockedFolderRoute.name ||
-        isFromLockedViewToDetailView ||
-        isFromDetailViewToInfoPanelView) {
-      Future(() => ref.read(inLockedViewProvider.notifier).state = true);
-    } else {
-      Future(() => ref.read(inLockedViewProvider.notifier).state = false);
-    }
-  }
 }

mobile/lib/services/action.service.dart

@@ -6,10 +6,14 @@ 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/asset_edit.model.dart';
+import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/domain/services/tag.service.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/remote_album.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/remote_asset.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/trashed_local_asset.repository.dart';
 import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
 import 'package:immich_mobile/repositories/asset_api.repository.dart';
@@ -30,6 +34,7 @@ final actionServiceProvider = Provider<ActionService>(
     ref.watch(localAssetRepository),
     ref.watch(driftAlbumApiRepositoryProvider),
     ref.watch(remoteAlbumRepository),
+    ref.watch(trashedLocalAssetRepository),
     ref.watch(assetMediaRepositoryProvider),
     ref.watch(downloadRepositoryProvider),
     ref.watch(tagServiceProvider),
@@ -42,6 +47,7 @@ class ActionService {
   final DriftLocalAssetRepository _localAssetRepository;
   final DriftAlbumApiRepository _albumApiRepository;
   final DriftRemoteAlbumRepository _remoteAlbumRepository;
+  final DriftTrashedLocalAssetRepository _trashedLocalAssetRepository;
   final AssetMediaRepository _assetMediaRepository;
   final DownloadRepository _downloadRepository;
   final TagService _tagService;
@@ -52,6 +58,7 @@ class ActionService {
     this._localAssetRepository,
     this._albumApiRepository,
     this._remoteAlbumRepository,
+    this._trashedLocalAssetRepository,
     this._assetMediaRepository,
     this._downloadRepository,
     this._tagService,
@@ -311,7 +318,11 @@ class ActionService {
     if (deletedIds.isEmpty) {
       return 0;
     }
-    await _localAssetRepository.delete(deletedIds);
+    if (CurrentPlatform.isAndroid && Store.get(StoreKey.manageLocalMediaAndroid, false)) {
+      await _trashedLocalAssetRepository.applyTrashedAssets(deletedIds);
+    } else {
+      await _localAssetRepository.delete(deletedIds);
+    }
     return deletedIds.length;
   }
 }

mobile/lib/services/app_settings.service.dart

@@ -3,6 +3,7 @@ import 'package:immich_mobile/entities/store.entity.dart';
 
 enum AppSettingsEnum<T> {
   advancedTroubleshooting<bool>(StoreKey.advancedTroubleshooting, null, false),
+  manageLocalMediaAndroid<bool>(StoreKey.manageLocalMediaAndroid, null, false),
   enableHapticFeedback<bool>(StoreKey.enableHapticFeedback, null, true),
   readonlyModeEnabled<bool>(StoreKey.readonlyModeEnabled, "readonlyModeEnabled", false);
 

mobile/lib/services/background_upload.service.dart

@@ -290,13 +290,10 @@ class BackgroundUploadService {
       return null;
     }
 
-    String fileName = await _assetMediaRepository.getOriginalFilename(asset.id) ?? asset.name;
-    final hasExtension = p.extension(fileName).isNotEmpty;
-    if (!hasExtension) {
-      fileName = p.setExtension(fileName, p.extension(asset.name));
-    }
-
-    final originalFileName = entity.isLivePhoto ? p.setExtension(fileName, p.extension(file.path)) : fileName;
+    final fileName = await _assetMediaRepository.getOriginalFilename(asset.id) ?? asset.name;
+    // Some apps (e.g. DJI/Fusion) return names without an extension; fall back to the asset name for those.
+    final extension = p.extension(file.path).isNotEmpty ? p.extension(file.path) : p.extension(asset.name);
+    final originalFileName = p.setExtension(fileName, extension);
 
     String metadata = UploadTaskMetadata(
       localAssetId: asset.id,

mobile/lib/services/foreground_upload.service.dart

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

mobile/lib/utils/action_button.utils.dart

@@ -7,7 +7,7 @@ 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/services/timeline.service.dart';
 import 'package:immich_mobile/domain/utils/event_stream.dart';
-import 'package:immich_mobile/presentation/actions/action.widget.dart';
+import 'package:immich_mobile/presentation/actions/action.dart';
 import 'package:immich_mobile/presentation/actions/asset_debug.action.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/archive_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
@@ -192,7 +192,7 @@ enum ActionButtonType {
     bool menuItem = false,
   ]) {
     return switch (this) {
-      ActionButtonType.advancedInfo => ActionMenuItemWidget(action: AssetDebugAction(assets: [context.asset])),
+      ActionButtonType.advancedInfo => AssetDebugAction(source: context.source, display: ActionDisplay.menuItem),
       ActionButtonType.share => ShareActionButton(source: context.source, iconOnly: iconOnly, menuItem: menuItem),
       ActionButtonType.shareLink => ShareLinkActionButton(
         source: context.source,

mobile/lib/utils/migration.dart

@@ -20,7 +20,7 @@ import 'package:immich_mobile/infrastructure/repositories/settings.repository.da
 import 'package:immich_mobile/models/auth/auxilary_endpoint.model.dart';
 import 'package:immich_mobile/providers/album/album_sort_by_options.provider.dart';
 
-const int targetVersion = 27;
+const int targetVersion = 26;
 
 Future<void> migrateDatabaseIfNeeded(Drift drift) async {
   final int? storedVersion = Store.tryGet(StoreKey.version);
@@ -34,10 +34,6 @@ Future<void> migrateDatabaseIfNeeded(Drift drift) async {
     await _migrateTo26(drift);
   }
 
-  if (version < 27) {
-    await _migrateTo27(drift);
-  }
-
   if (storedVersion == null) {
     await FeatureMessageService(SettingsRepository.instance).markSeen();
   }
@@ -149,12 +145,6 @@ Future<void> _migrateTo26(Drift drift) async {
   await migrator.complete();
 }
 
-Future<void> _migrateTo27(Drift drift) async {
-  final migrator = _StoreMigrator(drift);
-  await migrator.migrateBool(.legacyManageLocalMediaAndroid, .trashSyncEnabled);
-  await migrator.complete();
-}
-
 Future<void> _migrateAlbumSortMode(_StoreMigrator migrator) async {
   final raw = await migrator.readLegacyStoreInt(StoreKey.legacySelectedAlbumSortOrder.id);
   final mode = AlbumSortMode.values.firstWhereOrNull((e) => raw != null && e.storeIndex == raw);

mobile/lib/widgets/forms/login/login_form.dart

@@ -11,16 +11,15 @@ import 'package:flutter/services.dart';
 import 'package:flutter_hooks/flutter_hooks.dart' hide Store;
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/store.model.dart';
+import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
-import 'package:immich_mobile/generated/translations.g.dart';
 import 'package:immich_mobile/infrastructure/repositories/settings.repository.dart';
 import 'package:immich_mobile/providers/auth.provider.dart';
 import 'package:immich_mobile/providers/background_sync.provider.dart';
 import 'package:immich_mobile/providers/feature_message.provider.dart';
 import 'package:immich_mobile/providers/gallery_permission.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
 import 'package:immich_mobile/providers/oauth.provider.dart';
 import 'package:immich_mobile/providers/server_info.provider.dart';
 import 'package:immich_mobile/providers/view_intent/view_intent_handler.provider.dart';
@@ -180,71 +179,64 @@ class LoginForm extends HookConsumerWidget {
       final viewIntentHandler = ref.read(viewIntentHandlerProvider);
 
       await backgroundManager.syncLocal(full: true);
-      final syncSuccess = await backgroundManager.syncRemote();
+      await backgroundManager.syncRemote();
       await viewIntentHandler.flushDeferredViewIntent();
       await backgroundManager.hashAssets();
-      if (syncSuccess) {
-        await backgroundManager.syncTrash();
-      }
 
       if (SettingsRepository.instance.appConfig.backup.syncAlbums) {
         await backgroundManager.syncLinkedAlbum();
       }
     }
 
-    Future<void> promptManageMediaIfNeeded() async {
-      if (!CurrentPlatform.isAndroid || !ref.read(appConfigProvider).trashSyncEnabled) {
-        return;
-      }
-
-      final permission = ref.read(permissionRepositoryProvider);
-      if (await permission.hasManageMediaPermission() || !context.mounted) {
-        return;
-      }
-
-      await showDialog(
-        context: context,
-        builder: (BuildContext context) {
-          return AlertDialog(
-            shape: const RoundedRectangleBorder(borderRadius: .all(.circular(10))),
-            elevation: 5,
-            title: Text(
-              context.t.manage_media_access_title,
-              style: .new(fontSize: 16, fontWeight: .bold, color: context.primaryColor),
-            ),
-            content: SingleChildScrollView(
-              child: ListBody(
-                children: [
-                  Text(context.t.manage_media_access_subtitle, style: const .new(fontSize: 14)),
-                  const SizedBox(height: 4),
-                  Text(context.t.manage_media_access_rationale, style: const .new(fontSize: 12)),
-                ],
-              ),
-            ),
-            actions: [
-              TextButton(
-                onPressed: () => Navigator.of(context).pop(),
-                child: Text(
-                  context.t.cancel,
-                  style: .new(fontWeight: .w600, color: context.primaryColor),
+    getManageMediaPermission() async {
+      final hasPermission = await ref.read(permissionRepositoryProvider).hasManageMediaPermission();
+      if (!hasPermission) {
+        await showDialog(
+          context: context,
+          builder: (BuildContext context) {
+            return AlertDialog(
+              shape: const RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(10))),
+              elevation: 5,
+              title: Text(
+                'manage_media_access_title',
+                style: TextStyle(fontSize: 16, fontWeight: FontWeight.bold, color: context.primaryColor),
+              ).tr(),
+              content: SingleChildScrollView(
+                child: ListBody(
+                  children: [
+                    const Text('manage_media_access_subtitle', style: TextStyle(fontSize: 14)).tr(),
+                    const SizedBox(height: 4),
+                    const Text('manage_media_access_rationale', style: TextStyle(fontSize: 12)).tr(),
+                  ],
                 ),
               ),
-              TextButton(
-                onPressed: () {
-                  unawaited(permission.requestManageMediaPermission());
-                  Navigator.of(context).pop();
-                },
-                child: Text(
-                  context.t.manage_media_access_settings,
-                  style: .new(fontWeight: .w600, color: context.primaryColor),
+              actions: [
+                TextButton(
+                  onPressed: () => Navigator.of(context).pop(),
+                  child: Text(
+                    'cancel'.tr(),
+                    style: TextStyle(fontWeight: FontWeight.w600, color: context.primaryColor),
+                  ),
                 ),
-              ),
-            ],
-          );
-        },
-      );
+                TextButton(
+                  onPressed: () {
+                    unawaited(ref.read(permissionRepositoryProvider).requestManageMediaPermission());
+                    Navigator.of(context).pop();
+                  },
+                  child: Text(
+                    'manage_media_access_settings'.tr(),
+                    style: TextStyle(fontWeight: FontWeight.w600, color: context.primaryColor),
+                  ),
+                ),
+              ],
+            );
+          },
+        );
+      }
     }
 
+    bool isSyncRemoteDeletionsMode() => Platform.isAndroid && Store.get(StoreKey.manageLocalMediaAndroid, false);
+
     login() async {
       TextInput.finishAutofillContext();
 
@@ -258,7 +250,9 @@ class LoginForm extends HookConsumerWidget {
           unawaited(context.pushRoute(const ChangePasswordRoute()));
         } else {
           await ref.read(galleryPermissionNotifier.notifier).requestGalleryPermission();
-          await promptManageMediaIfNeeded();
+          if (isSyncRemoteDeletionsMode()) {
+            await getManageMediaPermission();
+          }
           unawaited(handleSyncFlow());
           ref.read(websocketProvider.notifier).connect();
           unawaited(ref.read(featureMessageServiceProvider).markSeen());
@@ -345,7 +339,9 @@ class LoginForm extends HookConsumerWidget {
 
           if (isSuccess) {
             await ref.read(galleryPermissionNotifier.notifier).requestGalleryPermission();
-            await promptManageMediaIfNeeded();
+            if (isSyncRemoteDeletionsMode()) {
+              await getManageMediaPermission();
+            }
             unawaited(handleSyncFlow());
             unawaited(ref.read(featureMessageServiceProvider).markSeen());
             unawaited(context.router.replaceAll([const TabShellRoute()]));

mobile/lib/widgets/settings/advanced_settings.dart

@@ -7,9 +7,9 @@ import 'package:flutter_hooks/flutter_hooks.dart' hide Store;
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/services/log.service.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/readonly_mode.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
 import 'package:immich_mobile/repositories/permission.repository.dart';
 import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:immich_mobile/utils/bytes_units.dart';
@@ -28,7 +28,7 @@ class AdvancedSettings extends HookConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final advancedTroubleshooting = useAppSettingsState(AppSettingsEnum.advancedTroubleshooting);
-    final trashSyncEnabled = useState(ref.read(appConfigProvider).trashSyncEnabled);
+    final manageLocalMediaAndroid = useAppSettingsState(AppSettingsEnum.manageLocalMediaAndroid);
     final isManageMediaSupported = useState(false);
     final manageMediaAndroidPermission = useState(false);
     final levelId = useState<int>(ref.read(appConfigProvider).logLevel.index);
@@ -75,16 +75,14 @@ class AdvancedSettings extends HookConsumerWidget {
           children: [
             SettingsSwitchListTile(
               enabled: true,
-              valueNotifier: trashSyncEnabled,
+              valueNotifier: manageLocalMediaAndroid,
               title: "advanced_settings_sync_remote_deletions_title".tr(),
               subtitle: "advanced_settings_sync_remote_deletions_subtitle".tr(),
               onChanged: (value) async {
-                trashSyncEnabled.value = value;
-                await ref.read(settingsProvider).write(.trashSyncEnabled, value);
                 if (value) {
-                  manageMediaAndroidPermission.value = await ref
-                      .read(permissionRepositoryProvider)
-                      .requestManageMediaPermission();
+                  final result = await ref.read(permissionRepositoryProvider).requestManageMediaPermission();
+                  manageLocalMediaAndroid.value = result;
+                  manageMediaAndroidPermission.value = result;
                 }
               },
             ),
@@ -92,14 +90,12 @@ class AdvancedSettings extends HookConsumerWidget {
               title: "manage_media_access_title".tr(),
               statusText: manageMediaAndroidPermission.value ? "allowed".tr() : "not_allowed".tr(),
               subtitle: "manage_media_access_rationale".tr(),
-              statusColor: trashSyncEnabled.value && !manageMediaAndroidPermission.value
+              statusColor: manageLocalMediaAndroid.value && !manageMediaAndroidPermission.value
                   ? const Color.fromARGB(255, 243, 188, 106)
                   : null,
               onActionTap: () async {
-                await ref.read(permissionRepositoryProvider).manageMediaPermission();
-                manageMediaAndroidPermission.value = await ref
-                    .read(permissionRepositoryProvider)
-                    .hasManageMediaPermission();
+                final result = await ref.read(permissionRepositoryProvider).manageMediaPermission();
+                manageMediaAndroidPermission.value = result;
               },
             ),
           ],

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

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

mobile/lib/widgets/settings/beta_sync_settings/sync_status_and_actions.dart

@@ -7,14 +7,17 @@ import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/generated/translations.g.dart';
+import 'package:immich_mobile/providers/app_settings.provider.dart';
 import 'package:immich_mobile/providers/background_sync.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/memory.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/storage.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/trash_sync.provider.dart';
 import 'package:immich_mobile/providers/server_info.provider.dart';
 import 'package:immich_mobile/providers/sync_status.provider.dart';
+import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:immich_mobile/widgets/settings/beta_sync_settings/entity_count_tile.dart';
 import 'package:immich_mobile/widgets/settings/setting_group_title.dart';
 import 'package:immich_mobile/widgets/settings/setting_list_tile.dart';
@@ -216,6 +219,7 @@ class _SyncStatsCounts extends ConsumerWidget {
     final localAlbumService = ref.watch(localAlbumServiceProvider);
     final remoteAlbumService = ref.watch(remoteAlbumServiceProvider);
     final memoryService = ref.watch(driftMemoryServiceProvider);
+    final appSettingsService = ref.watch(appSettingsServiceProvider);
 
     Future<List<dynamic>> loadCounts() async {
       final assetCounts = assetService.getAssetCounts();
@@ -349,6 +353,47 @@ class _SyncStatsCounts extends ConsumerWidget {
                 ),
               ),
             ),
+            // To be removed once the experimental feature is stable
+            if (CurrentPlatform.isAndroid &&
+                appSettingsService.getSetting<bool>(AppSettingsEnum.manageLocalMediaAndroid)) ...[
+              SettingGroupTitle(title: "trash".t(context: context)),
+              Consumer(
+                builder: (context, ref, _) {
+                  final counts = ref.watch(trashedAssetsCountProvider);
+                  return counts.when(
+                    data: (c) => Padding(
+                      padding: const EdgeInsets.fromLTRB(16, 8, 16, 16),
+                      child: IntrinsicHeight(
+                        child: Flex(
+                          direction: Axis.horizontal,
+                          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                          crossAxisAlignment: CrossAxisAlignment.stretch, // Added
+                          spacing: 8.0,
+                          children: [
+                            Expanded(
+                              child: EntityCountTile(
+                                label: "local".t(context: context),
+                                count: c.total,
+                                icon: Icons.delete_outline,
+                              ),
+                            ),
+                            Expanded(
+                              child: EntityCountTile(
+                                label: "hashed_assets".t(context: context),
+                                count: c.hashed,
+                                icon: Icons.tag,
+                              ),
+                            ),
+                          ],
+                        ),
+                      ),
+                    ),
+                    loading: () => const CircularProgressIndicator(),
+                    error: (e, st) => Text('Error: $e'),
+                  );
+                },
+              ),
+            ],
           ],
         );
       },

mobile/pigeon/asset_media_api.dart

@@ -1,33 +0,0 @@
-import 'package:pigeon/pigeon.dart';
-
-@ConfigurePigeon(
-  PigeonOptions(
-    dartOut: 'lib/platform/asset_media_api.g.dart',
-    swiftOut: 'ios/Runner/AssetMedia/AssetMedia.g.swift',
-    swiftOptions: SwiftOptions(includeErrorClass: false),
-    kotlinOut: 'android/app/src/main/kotlin/app/alextran/immich/media/AssetMedia.g.kt',
-    kotlinOptions: KotlinOptions(package: 'app.alextran.immich.media'),
-    dartOptions: DartOptions(),
-    dartPackageName: 'immich_mobile',
-  ),
-)
-enum AssetMediaActionStatus { done, alreadyInState, notFound, failed }
-
-class AssetMediaActionResult {
-  final String id;
-  final AssetMediaActionStatus status;
-
-  const AssetMediaActionResult({required this.id, required this.status});
-}
-
-@HostApi()
-abstract class AssetMediaApi {
-  @async
-  List<AssetMediaActionResult> trash(List<String> ids);
-
-  @async
-  List<AssetMediaActionResult> restore(List<String> ids);
-
-  @async
-  List<String> trashedAmong(List<String> ids);
-}

mobile/pigeon/native_sync_api.dart

@@ -135,6 +135,12 @@ abstract class NativeSyncApi {
 
   void cancelSync();
 
+  @TaskQueue(type: TaskQueueType.serialBackgroundThread)
+  Map<String, List<PlatformAsset>> getTrashedAssets();
+
+  @async
+  bool restoreFromTrashById(String mediaId, int type);
+
   @TaskQueue(type: TaskQueueType.serialBackgroundThread)
   List<CloudIdResult> getCloudIdForAssetIds(List<String> assetIds);
 }

mobile/test/domain/service.mock.dart

@@ -1,10 +1,8 @@
 import 'package:immich_mobile/domain/services/asset.service.dart';
 import 'package:immich_mobile/domain/services/partner.service.dart';
 import 'package:immich_mobile/domain/services/store.service.dart';
-import 'package:immich_mobile/domain/services/trash_sync.service.dart';
 import 'package:immich_mobile/domain/services/user.service.dart';
 import 'package:immich_mobile/domain/utils/background_sync.dart';
-import 'package:immich_mobile/platform/asset_media_api.g.dart';
 import 'package:immich_mobile/platform/native_sync_api.g.dart';
 import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:mocktail/mocktail.dart';
@@ -15,10 +13,6 @@ class MockBackgroundSyncManager extends Mock implements BackgroundSyncManager {}
 
 class MockNativeSyncApi extends Mock implements NativeSyncApi {}
 
-class MockAssetMediaApi extends Mock implements AssetMediaApi {}
-
-class MockTrashSyncService extends Mock implements TrashSyncService {}
-
 class MockAppSettingsService extends Mock implements AppSettingsService {}
 
 class MockPartnerService extends Mock implements PartnerService {}

mobile/test/domain/services/local_sync_service_test.dart

@@ -3,6 +3,7 @@ import 'package:drift/native.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter_test/flutter_test.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/domain/services/local_sync.service.dart';
 import 'package:immich_mobile/domain/services/store.service.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
@@ -10,17 +11,23 @@ import 'package:immich_mobile/infrastructure/repositories/db.repository.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/store.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:mocktail/mocktail.dart';
 
 import '../../domain/service.mock.dart';
+import '../../fixtures/asset.stub.dart';
 import '../../infrastructure/repository.mock.dart';
+import '../../repository.mocks.dart';
 
 void main() {
   late LocalSyncService sut;
   late DriftLocalAlbumRepository mockLocalAlbumRepository;
   late DriftLocalAssetRepository mockLocalAssetRepository;
-  late MockTrashSyncRepository mockTrashSyncRepository;
+  late DriftTrashedLocalAssetRepository mockTrashedLocalAssetRepository;
+  late AssetMediaRepository mockAssetMediaRepository;
+  late MockPermissionRepository mockPermissionRepository;
   late MockNativeSyncApi mockNativeSyncApi;
   late Drift db;
 
@@ -41,29 +48,175 @@ void main() {
   setUp(() async {
     mockLocalAlbumRepository = MockLocalAlbumRepository();
     mockLocalAssetRepository = MockLocalAssetRepository();
-    mockTrashSyncRepository = MockTrashSyncRepository();
+    mockTrashedLocalAssetRepository = MockTrashedLocalAssetRepository();
+    mockAssetMediaRepository = MockAssetMediaRepository();
+    mockPermissionRepository = MockPermissionRepository();
     mockNativeSyncApi = MockNativeSyncApi();
 
     when(() => mockNativeSyncApi.shouldFullSync()).thenAnswer((_) async => false);
     when(() => mockNativeSyncApi.getMediaChanges()).thenAnswer(
       (_) async => SyncDelta(hasChanges: false, updates: const [], deletes: const [], assetAlbums: const {}),
     );
-    when(() => mockTrashSyncRepository.restoreChecksums()).thenAnswer((_) async {});
+    when(() => mockNativeSyncApi.getTrashedAssets()).thenAnswer((_) async => {});
+    when(() => mockTrashedLocalAssetRepository.processTrashSnapshot(any())).thenAnswer((_) async {});
+    when(() => mockTrashedLocalAssetRepository.getToRestore()).thenAnswer((_) async => []);
+    when(() => mockTrashedLocalAssetRepository.getToTrash()).thenAnswer((_) async => {});
+    when(() => mockTrashedLocalAssetRepository.applyRestoredAssets(any())).thenAnswer((_) async {});
+    when(() => mockTrashedLocalAssetRepository.trashLocalAsset(any())).thenAnswer((_) async {});
+    when(() => mockAssetMediaRepository.deleteAll(any())).thenAnswer((invocation) async {
+      final ids = invocation.positionalArguments.first as List<String>;
+      return ids;
+    });
 
     sut = LocalSyncService(
       localAlbumRepository: mockLocalAlbumRepository,
       localAssetRepository: mockLocalAssetRepository,
-      trashSyncRepository: mockTrashSyncRepository,
+      trashedLocalAssetRepository: mockTrashedLocalAssetRepository,
+      assetMediaRepository: mockAssetMediaRepository,
+      permissionRepository: mockPermissionRepository,
       nativeSyncApi: mockNativeSyncApi,
     );
+
+    await Store.put(StoreKey.manageLocalMediaAndroid, false);
+    when(() => mockPermissionRepository.hasManageMediaPermission()).thenAnswer((_) async => false);
   });
 
-  group('LocalSyncService - no changes', () {
-    test('does nothing when there are no media changes', () async {
+  group('LocalSyncService - syncTrashedAssets gating', () {
+    test('invokes syncTrashedAssets when Android flag enabled and permission granted', () async {
+      await Store.put(StoreKey.manageLocalMediaAndroid, true);
+      when(() => mockPermissionRepository.hasManageMediaPermission()).thenAnswer((_) async => true);
+
       await sut.sync();
 
-      verify(() => mockNativeSyncApi.getMediaChanges()).called(1);
-      verifyNever(() => mockLocalAlbumRepository.updateAll(any()));
+      verify(() => mockNativeSyncApi.getTrashedAssets()).called(1);
+      verify(() => mockTrashedLocalAssetRepository.processTrashSnapshot(any())).called(1);
+    });
+
+    test('skips syncTrashedAssets when store flag disabled', () async {
+      await Store.put(StoreKey.manageLocalMediaAndroid, false);
+      when(() => mockPermissionRepository.hasManageMediaPermission()).thenAnswer((_) async => true);
+
+      await sut.sync();
+
+      verifyNever(() => mockNativeSyncApi.getTrashedAssets());
+    });
+
+    test('skips syncTrashedAssets when MANAGE_MEDIA permission absent', () async {
+      await Store.put(StoreKey.manageLocalMediaAndroid, true);
+      when(() => mockPermissionRepository.hasManageMediaPermission()).thenAnswer((_) async => false);
+
+      await sut.sync();
+
+      verifyNever(() => mockNativeSyncApi.getTrashedAssets());
+    });
+
+    test('skips syncTrashedAssets on non-Android platforms', () async {
+      debugDefaultTargetPlatformOverride = TargetPlatform.iOS;
+      addTearDown(() => debugDefaultTargetPlatformOverride = TargetPlatform.android);
+
+      await Store.put(StoreKey.manageLocalMediaAndroid, true);
+      when(() => mockPermissionRepository.hasManageMediaPermission()).thenAnswer((_) async => true);
+
+      await sut.sync();
+
+      verifyNever(() => mockNativeSyncApi.getTrashedAssets());
+    });
+  });
+
+  group('LocalSyncService - syncTrashedAssets behavior', () {
+    test('processes trashed snapshot, restores assets, and trashes local files', () async {
+      final platformAsset = PlatformAsset(
+        id: 'remote-id',
+        name: 'remote.jpg',
+        type: AssetType.image.index,
+        durationMs: 0,
+        orientation: 0,
+        isFavorite: false,
+        playbackStyle: PlatformAssetPlaybackStyle.image,
+      );
+
+      final assetsToRestore = [LocalAssetStub.image1];
+      when(() => mockTrashedLocalAssetRepository.getToRestore()).thenAnswer((_) async => assetsToRestore);
+      final restoredIds = ['image1'];
+      when(() => mockAssetMediaRepository.restoreAssetsFromTrash(any())).thenAnswer((invocation) async {
+        final Iterable<LocalAsset> requested = invocation.positionalArguments.first as Iterable<LocalAsset>;
+        expect(requested, orderedEquals(assetsToRestore));
+        return restoredIds;
+      });
+
+      final localAssetToTrash = LocalAssetStub.image2.copyWith(id: 'local-trash', checksum: 'checksum-trash');
+      when(() => mockTrashedLocalAssetRepository.getToTrash()).thenAnswer(
+        (_) async => {
+          'album-a': [localAssetToTrash],
+        },
+      );
+
+      await sut.processTrashedAssets({
+        'album-a': [platformAsset],
+      });
+
+      final trashedSnapshot =
+          verify(() => mockTrashedLocalAssetRepository.processTrashSnapshot(captureAny())).captured.single
+              as Iterable<TrashedAsset>;
+      expect(trashedSnapshot.length, 1);
+      final trashedEntry = trashedSnapshot.single;
+      expect(trashedEntry.albumId, 'album-a');
+      expect(trashedEntry.asset.id, platformAsset.id);
+      expect(trashedEntry.asset.name, platformAsset.name);
+      verify(() => mockTrashedLocalAssetRepository.getToTrash()).called(1);
+
+      verify(() => mockAssetMediaRepository.restoreAssetsFromTrash(any())).called(1);
+      verify(() => mockTrashedLocalAssetRepository.applyRestoredAssets(restoredIds)).called(1);
+
+      final moveArgs = verify(() => mockAssetMediaRepository.deleteAll(captureAny())).captured.single as List<String>;
+      expect(moveArgs, ['local-trash']);
+      final trashArgs =
+          verify(() => mockTrashedLocalAssetRepository.trashLocalAsset(captureAny())).captured.single
+              as Map<String, List<LocalAsset>>;
+      expect(trashArgs.keys, ['album-a']);
+      expect(trashArgs['album-a'], [localAssetToTrash]);
+    });
+
+    test('records only local assets that were moved to device trash', () async {
+      final movedAsset = LocalAssetStub.image1.copyWith(id: 'moved-local', checksum: 'checksum-moved');
+      final skippedAsset = LocalAssetStub.image2.copyWith(id: 'skipped-local', checksum: 'checksum-skipped');
+      when(() => mockTrashedLocalAssetRepository.getToTrash()).thenAnswer(
+        (_) async => {
+          'album-a': [movedAsset],
+          'album-b': [skippedAsset],
+        },
+      );
+      when(() => mockAssetMediaRepository.deleteAll(any())).thenAnswer((_) async => ['moved-local']);
+
+      await sut.processTrashedAssets({});
+
+      final trashArgs =
+          verify(() => mockTrashedLocalAssetRepository.trashLocalAsset(captureAny())).captured.single
+              as Map<String, List<LocalAsset>>;
+      expect(trashArgs.keys, ['album-a']);
+      expect(trashArgs['album-a'], [movedAsset]);
+    });
+
+    test('does not attempt restore when repository has no assets to restore', () async {
+      when(() => mockTrashedLocalAssetRepository.getToRestore()).thenAnswer((_) async => []);
+
+      await sut.processTrashedAssets({});
+
+      final trashedSnapshot =
+          verify(() => mockTrashedLocalAssetRepository.processTrashSnapshot(captureAny())).captured.single
+              as Iterable<TrashedAsset>;
+      expect(trashedSnapshot, isEmpty);
+      verifyNever(() => mockAssetMediaRepository.restoreAssetsFromTrash(any()));
+      verifyNever(() => mockTrashedLocalAssetRepository.applyRestoredAssets(any()));
+    });
+
+    test('does not move local assets when repository finds nothing to trash', () async {
+      when(() => mockTrashedLocalAssetRepository.getToTrash()).thenAnswer((_) async => {});
+
+      await sut.processTrashedAssets({});
+
+      verifyNever(() => mockAssetMediaRepository.deleteAll(any()));
+      verifyNever(() => mockTrashedLocalAssetRepository.trashLocalAsset(any()));
     });
   });
 

mobile/test/domain/services/sync_stream_service_test.dart

@@ -4,15 +4,19 @@ import 'package:drift/drift.dart' as drift;
 import 'package:drift/native.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter_test/flutter_test.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/domain/models/sync_event.model.dart';
 import 'package:immich_mobile/domain/services/store.service.dart';
 import 'package:immich_mobile/domain/services/sync_stream.service.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/local_asset.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/store.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/sync_api.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/sync_stream.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/utils/semver.dart';
 import 'package:mocktail/mocktail.dart';
 import 'package:openapi/api.dart';
@@ -21,6 +25,7 @@ import '../../api.mocks.dart';
 import '../../fixtures/asset.stub.dart';
 import '../../fixtures/sync_stream.stub.dart';
 import '../../infrastructure/repository.mock.dart';
+import '../../repository.mocks.dart';
 import '../../service.mocks.dart';
 
 class _AbortCallbackWrapper {
@@ -31,11 +36,15 @@ class _AbortCallbackWrapper {
 
 class _MockAbortCallbackWrapper extends Mock implements _AbortCallbackWrapper {}
 
+
 void main() {
   late SyncStreamService sut;
   late SyncStreamRepository mockSyncStreamRepo;
   late SyncApiRepository mockSyncApiRepo;
-  late MockTrashSyncRepository mockTrashSyncRepo;
+  late DriftLocalAssetRepository mockLocalAssetRepo;
+  late DriftTrashedLocalAssetRepository mockTrashedLocalAssetRepo;
+  late AssetMediaRepository mockAssetMediaRepo;
+  late MockPermissionRepository mockPermissionRepo;
   late MockApiService mockApi;
   late MockServerApi mockServerApi;
   late MockSyncMigrationRepository mockSyncMigrationRepo;
@@ -43,6 +52,7 @@ void main() {
   late _MockAbortCallbackWrapper mockAbortCallbackWrapper;
   late _MockAbortCallbackWrapper mockResetCallbackWrapper;
   late Drift db;
+  late bool hasManageMediaPermission;
 
   setUpAll(() async {
     TestWidgetsFlutterBinding.ensureInitialized();
@@ -65,7 +75,10 @@ void main() {
   setUp(() async {
     mockSyncStreamRepo = MockSyncStreamRepository();
     mockSyncApiRepo = MockSyncApiRepository();
-    mockTrashSyncRepo = MockTrashSyncRepository();
+    mockLocalAssetRepo = MockLocalAssetRepository();
+    mockTrashedLocalAssetRepo = MockTrashedLocalAssetRepository();
+    mockAssetMediaRepo = MockAssetMediaRepository();
+    mockPermissionRepo = MockPermissionRepository();
     mockAbortCallbackWrapper = _MockAbortCallbackWrapper();
     mockResetCallbackWrapper = _MockAbortCallbackWrapper();
     mockApi = MockApiService();
@@ -140,12 +153,26 @@ void main() {
     sut = SyncStreamService(
       syncApiRepository: mockSyncApiRepo,
       syncStreamRepository: mockSyncStreamRepo,
-      trashSyncRepository: mockTrashSyncRepo,
+      localAssetRepository: mockLocalAssetRepo,
+      trashedLocalAssetRepository: mockTrashedLocalAssetRepo,
+      assetMediaRepository: mockAssetMediaRepo,
+      permissionRepository: mockPermissionRepo,
       api: mockApi,
       syncMigrationRepository: mockSyncMigrationRepo,
     );
 
-    when(() => mockTrashSyncRepo.recordHardDeletedChecksums(any())).thenAnswer((_) => Future.value());
+    when(() => mockLocalAssetRepo.getAssetsFromBackupAlbums(any())).thenAnswer((_) async => {});
+    when(() => mockTrashedLocalAssetRepo.trashLocalAsset(any())).thenAnswer((_) async {});
+    when(() => mockTrashedLocalAssetRepo.getToRestore()).thenAnswer((_) async => []);
+    when(() => mockTrashedLocalAssetRepo.applyRestoredAssets(any())).thenAnswer((_) async {});
+    hasManageMediaPermission = false;
+    when(() => mockPermissionRepo.hasManageMediaPermission()).thenAnswer((_) async => hasManageMediaPermission);
+    when(() => mockAssetMediaRepo.deleteAll(any())).thenAnswer((invocation) async {
+      final ids = invocation.positionalArguments.first as List<String>;
+      return ids;
+    });
+    when(() => mockAssetMediaRepo.restoreAssetsFromTrash(any())).thenAnswer((_) async => []);
+    await Store.put(StoreKey.manageLocalMediaAndroid, false);
   });
 
   Future<void> simulateEvents(List<SyncEvent> events) async {
@@ -178,13 +205,6 @@ void main() {
       verifyNever(() => mockAbortCallbackWrapper());
     });
 
-    test("assetDeleteV1 records the server deleted checksums", () async {
-      await simulateEvents([SyncStreamStub.assetDeleteV1]);
-
-      verify(() => mockTrashSyncRepo.recordHardDeletedChecksums(any())).called(1);
-      verify(() => mockSyncStreamRepo.deleteAssetsV1(any())).called(1);
-    });
-
     test("processes final batch correctly", () async {
       final events = [SyncStreamStub.userDeleteV1, SyncStreamStub.userV1Admin];
 
@@ -216,7 +236,10 @@ void main() {
       sut = SyncStreamService(
         syncApiRepository: mockSyncApiRepo,
         syncStreamRepository: mockSyncStreamRepo,
-        trashSyncRepository: mockTrashSyncRepo,
+        localAssetRepository: mockLocalAssetRepo,
+        trashedLocalAssetRepository: mockTrashedLocalAssetRepo,
+        assetMediaRepository: mockAssetMediaRepo,
+        permissionRepository: mockPermissionRepo,
         cancellation: cancellation,
         api: mockApi,
         syncMigrationRepository: mockSyncMigrationRepo,
@@ -253,7 +276,10 @@ void main() {
       sut = SyncStreamService(
         syncApiRepository: mockSyncApiRepo,
         syncStreamRepository: mockSyncStreamRepo,
-        trashSyncRepository: mockTrashSyncRepo,
+        localAssetRepository: mockLocalAssetRepo,
+        trashedLocalAssetRepository: mockTrashedLocalAssetRepo,
+        assetMediaRepository: mockAssetMediaRepo,
+        permissionRepository: mockPermissionRepo,
         cancellation: cancellation,
         api: mockApi,
         syncMigrationRepository: mockSyncMigrationRepo,
@@ -366,6 +392,164 @@ void main() {
     });
   });
 
+  group("SyncStreamService - remote trash & restore", () {
+    setUp(() async {
+      await Store.put(StoreKey.manageLocalMediaAndroid, true);
+      hasManageMediaPermission = true;
+    });
+
+    tearDown(() async {
+      await Store.put(StoreKey.manageLocalMediaAndroid, false);
+      hasManageMediaPermission = false;
+    });
+
+    test("moves backed up local and merged assets to device trash when remote trash events are received", () async {
+      final localAsset = LocalAssetStub.image1.copyWith(id: 'local-only', checksum: 'checksum-local', remoteId: null);
+      final mergedAsset = LocalAssetStub.image2.copyWith(
+        id: 'merged-local',
+        checksum: 'checksum-merged',
+        remoteId: 'remote-merged',
+      );
+      final assetsByAlbum = {
+        'album-a': [localAsset],
+        'album-b': [mergedAsset],
+      };
+      when(() => mockLocalAssetRepo.getAssetsFromBackupAlbums(any())).thenAnswer((invocation) async {
+        final Iterable<String> requestedRemoteIds = invocation.positionalArguments.first as Iterable<String>;
+        expect(requestedRemoteIds.toSet(), equals({'remote-1', 'remote-2', 'remote-3'}));
+        return assetsByAlbum;
+      });
+
+      when(() => mockAssetMediaRepo.deleteAll(any())).thenAnswer((invocation) async {
+        final ids = invocation.positionalArguments.first as List<String>;
+        expect(ids, unorderedEquals(['local-only', 'merged-local']));
+        return ids;
+      });
+
+      final events = [
+        SyncStreamStub.assetTrashed(
+          id: 'remote-1',
+          checksum: localAsset.checksum!,
+          ack: 'asset-remote-local-1',
+          trashedAt: DateTime(2025, 5, 1),
+        ),
+        SyncStreamStub.assetTrashed(
+          id: 'remote-2',
+          checksum: mergedAsset.checksum!,
+          ack: 'asset-remote-merged-2',
+          trashedAt: DateTime(2025, 5, 2),
+        ),
+        SyncStreamStub.assetTrashed(
+          id: 'remote-3',
+          checksum: 'checksum-remote-only',
+          ack: 'asset-remote-only-3',
+          trashedAt: DateTime(2025, 5, 3),
+        ),
+      ];
+
+      await simulateEvents(events);
+
+      final trashArgs =
+          verify(() => mockTrashedLocalAssetRepo.trashLocalAsset(captureAny())).captured.single
+              as Map<String, List<LocalAsset>>;
+      expect(trashArgs.keys, unorderedEquals(['album-a', 'album-b']));
+      expect(trashArgs['album-a'], [localAsset]);
+      expect(trashArgs['album-b'], [mergedAsset]);
+      verify(() => mockAssetMediaRepo.deleteAll(any())).called(1);
+      verify(() => mockSyncApiRepo.ack(['asset-remote-only-3'])).called(1);
+    });
+
+    test("records only assets that were moved to device trash", () async {
+      final movedAsset = LocalAssetStub.image1.copyWith(id: 'moved-local', checksum: 'checksum-moved');
+      final skippedAsset = LocalAssetStub.image2.copyWith(id: 'skipped-local', checksum: 'checksum-skipped');
+      when(() => mockLocalAssetRepo.getAssetsFromBackupAlbums(any())).thenAnswer(
+        (_) async => {
+          'album-a': [movedAsset],
+          'album-b': [skippedAsset],
+        },
+      );
+      when(() => mockAssetMediaRepo.deleteAll(any())).thenAnswer((_) async => ['moved-local']);
+
+      final events = [
+        SyncStreamStub.assetTrashed(
+          id: 'remote-moved',
+          checksum: movedAsset.checksum!,
+          ack: 'asset-remote-moved',
+          trashedAt: DateTime(2025, 5, 1),
+        ),
+        SyncStreamStub.assetTrashed(
+          id: 'remote-skipped',
+          checksum: skippedAsset.checksum!,
+          ack: 'asset-remote-skipped',
+          trashedAt: DateTime(2025, 5, 2),
+        ),
+      ];
+
+      await simulateEvents(events);
+
+      final trashArgs =
+          verify(() => mockTrashedLocalAssetRepo.trashLocalAsset(captureAny())).captured.single
+              as Map<String, List<LocalAsset>>;
+      expect(trashArgs.keys, ['album-a']);
+      expect(trashArgs['album-a'], [movedAsset]);
+    });
+
+    test("skips device trashing when no local assets match the remote trash payload", () async {
+      final events = [
+        SyncStreamStub.assetTrashed(
+          id: 'remote-only',
+          checksum: 'checksum-only',
+          ack: 'asset-remote-only-9',
+          trashedAt: DateTime(2025, 6, 1),
+        ),
+      ];
+
+      await simulateEvents(events);
+
+      verify(() => mockLocalAssetRepo.getAssetsFromBackupAlbums(any())).called(1);
+      verifyNever(() => mockAssetMediaRepo.deleteAll(any()));
+      verifyNever(() => mockTrashedLocalAssetRepo.trashLocalAsset(any()));
+    });
+
+    test("requests local deletions lookup by remote ids for permanent remote delete events", () async {
+      when(() => mockLocalAssetRepo.getAssetsFromBackupAlbums(any())).thenAnswer((invocation) async {
+        final Iterable<String> requestedRemoteIds = invocation.positionalArguments.first as Iterable<String>;
+        expect(requestedRemoteIds.toSet(), equals({'remote-asset'}));
+        return {};
+      });
+
+      final events = [SyncStreamStub.assetDeleteV1];
+
+      await simulateEvents(events);
+
+      verify(() => mockLocalAssetRepo.getAssetsFromBackupAlbums(any())).called(1);
+      verifyNever(() => mockAssetMediaRepo.deleteAll(any()));
+      verify(() => mockSyncStreamRepo.deleteAssetsV1(any())).called(1);
+    });
+
+    test("restores trashed local assets once the matching remote assets leave the trash", () async {
+      final trashedAssets = [
+        LocalAssetStub.image1.copyWith(id: 'trashed-1', checksum: 'checksum-trash', remoteId: 'remote-1'),
+      ];
+      when(() => mockTrashedLocalAssetRepo.getToRestore()).thenAnswer((_) async => trashedAssets);
+
+      final restoredIds = ['trashed-1'];
+      when(() => mockAssetMediaRepo.restoreAssetsFromTrash(any())).thenAnswer((invocation) async {
+        final Iterable<LocalAsset> requestedAssets = invocation.positionalArguments.first as Iterable<LocalAsset>;
+        expect(requestedAssets, orderedEquals(trashedAssets));
+        return restoredIds;
+      });
+
+      final events = [
+        SyncStreamStub.assetModified(id: 'remote-1', checksum: 'checksum-trash', ack: 'asset-remote-1-11'),
+      ];
+
+      await simulateEvents(events);
+
+      verify(() => mockTrashedLocalAssetRepo.applyRestoredAssets(restoredIds)).called(1);
+    });
+  });
+
   group('SyncStreamService - Sync Migration', () {
     test('ensure that <2.5.0 migrations run', () async {
       await Store.put(StoreKey.syncMigrationStatus, "[]");

mobile/test/drift/main/generated/schema.dart

@@ -35,7 +35,6 @@ import 'schema_v28.dart' as v28;
 import 'schema_v29.dart' as v29;
 import 'schema_v30.dart' as v30;
 import 'schema_v31.dart' as v31;
-import 'schema_v32.dart' as v32;
 
 class GeneratedHelper implements SchemaInstantiationHelper {
   @override
@@ -103,8 +102,6 @@ class GeneratedHelper implements SchemaInstantiationHelper {
         return v30.DatabaseAtV30(db);
       case 31:
         return v31.DatabaseAtV31(db);
-      case 32:
-        return v32.DatabaseAtV32(db);
       default:
         throw MissingSchemaException(version, versions);
     }
@@ -142,6 +139,5 @@ class GeneratedHelper implements SchemaInstantiationHelper {
     29,
     30,
     31,
-    32,
   ];
 }