PNPM documentation changes

• Add pnpm action setup step to mobile unit tests workflow
• Required for translation file formatting and sorting operations

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -64,11 +64,6 @@ body:
         - label: Web
         - label: Mobile
 
-  - type: input
-    attributes:
-      label: Device make and model
-      placeholder: Samsung S25 Android 16
-
   - type: textarea
     validations:
       required: true

.github/workflows/build-mobile.yml

@@ -35,7 +35,7 @@ jobs:
       should_run: ${{ steps.found_paths.outputs.mobile == 'true' || steps.should_force.outputs.should_force == 'true' }}
     steps:
       - name: Checkout code
-        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
 
@@ -61,7 +61,7 @@ jobs:
     runs-on: mich
 
     steps:
-      - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ inputs.ref || github.sha }}
           persist-credentials: false
@@ -79,7 +79,7 @@ jobs:
 
       - name: Restore Gradle Cache
         id: cache-gradle-restore
-        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4
+        uses: actions/cache/restore@5a3ec84eff668545956fd18022155c47e93e2684 # v4
         with:
           path: |
             ~/.gradle/caches
@@ -106,7 +106,7 @@ jobs:
         run: flutter pub get
 
       - name: Generate translation file
-        run: dart run easy_localization:generate -S ../i18n && dart run bin/generate_keys.dart
+        run: make translation
         working-directory: ./mobile
 
       - name: Generate platform APIs
@@ -136,7 +136,7 @@ jobs:
 
       - name: Save Gradle Cache
         id: cache-gradle-save
-        uses: actions/cache/save@0400d5f644dc74513175e3cd8d07132dd4860809 # v4
+        uses: actions/cache/save@5a3ec84eff668545956fd18022155c47e93e2684 # v4
         if: github.ref == 'refs/heads/main'
         with:
           path: |

.github/workflows/cache-cleanup.yml

@@ -19,7 +19,7 @@ jobs:
       actions: write
     steps:
       - name: Check out code
-        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
 

.github/workflows/cli.yml

@@ -29,7 +29,7 @@ jobs:
         working-directory: ./cli
 
     steps:
-      - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
 
@@ -65,7 +65,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
 
@@ -76,7 +76,7 @@ jobs:
         uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
+        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
         if: ${{ !github.event.pull_request.head.repo.fork }}
         with:
           registry: ghcr.io
@@ -91,7 +91,7 @@ jobs:
 
       - name: Generate docker image tags
         id: metadata
-        uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.0
+        uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0
         with:
           flavor: |
             latest=false

.github/workflows/close-duplicates.yml

@@ -24,7 +24,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: get_body
     container:
-      image: yshavit/mdq:0.8.0@sha256:c69224d34224a0043d9a3ee46679ba4a2a25afaac445f293d92afe13cd47fcea
+      image: yshavit/mdq:0.7.2
     outputs:
       json: ${{ steps.get_checkbox.outputs.json }}
     steps:

.github/workflows/codeql-analysis.yml

@@ -44,13 +44,13 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@df559355d593797519d70b90fc8edd5db049e7a2 # v3.29.9
+        uses: github/codeql-action/init@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -63,7 +63,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@df559355d593797519d70b90fc8edd5db049e7a2 # v3.29.9
+        uses: github/codeql-action/autobuild@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
 
       # ℹ️ 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
@@ -76,6 +76,6 @@ jobs:
       #   ./location_of_script_within_repo/buildscript.sh
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@df559355d593797519d70b90fc8edd5db049e7a2 # v3.29.9
+        uses: github/codeql-action/analyze@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
         with:
           category: '/language:${{matrix.language}}'

.github/workflows/docker.yml

@@ -24,7 +24,7 @@ jobs:
       should_run_ml: ${{ steps.found_paths.outputs.machine-learning == 'true' || steps.should_force.outputs.should_force == 'true' }}
     steps:
       - name: Checkout code
-        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
       - id: found_paths
@@ -60,7 +60,7 @@ jobs:
         suffix: ['', '-cuda', '-rocm', '-openvino', '-armnn', '-rknn']
     steps:
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
+        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
@@ -89,7 +89,7 @@ jobs:
         suffix: ['']
     steps:
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
+        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}

.github/workflows/docs-build.yml

@@ -21,7 +21,7 @@ jobs:
       should_run: ${{ steps.found_paths.outputs.docs == 'true' || steps.found_paths.outputs.open-api == 'true' ||  steps.should_force.outputs.should_force == 'true' }}
     steps:
       - name: Checkout code
-        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
       - id: found_paths
@@ -51,7 +51,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
 

.github/workflows/docs-deploy.yml

@@ -108,7 +108,7 @@ jobs:
     if: ${{ fromJson(needs.checks.outputs.artifact).found && fromJson(needs.checks.outputs.parameters).shouldDeploy }}
     steps:
       - name: Checkout code
-        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
 

.github/workflows/docs-destroy.yml

@@ -14,7 +14,7 @@ jobs:
       pull-requests: write
     steps:
       - name: Checkout code
-        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
 

.github/workflows/fix-format.yml

@@ -16,13 +16,13 @@ jobs:
     steps:
       - name: Generate a token
         id: generate-token
-        uses: actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b # v2.1.1
+        uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
         with:
           app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
       - name: 'Checkout'
-        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ github.event.pull_request.head.ref }}
           token: ${{ steps.generate-token.outputs.token }}

.github/workflows/prepare-release.yml

@@ -32,13 +32,13 @@ jobs:
     steps:
       - name: Generate a token
         id: generate-token
-        uses: actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b # v2.1.1
+        uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
         with:
           app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
       - name: Checkout
-        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           token: ${{ steps.generate-token.outputs.token }}
           persist-credentials: true
@@ -83,13 +83,13 @@ jobs:
     steps:
       - name: Generate a token
         id: generate-token
-        uses: actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b # v2.1.1
+        uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
         with:
           app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
       - name: Checkout
-        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           token: ${{ steps.generate-token.outputs.token }}
           persist-credentials: false

.github/workflows/sdk.yml

@@ -16,7 +16,7 @@ jobs:
       run:
         working-directory: ./open-api/typescript-sdk
     steps:
-      - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
 

.github/workflows/static_analysis.yml

@@ -20,7 +20,7 @@ jobs:
       should_run: ${{ steps.found_paths.outputs.mobile == 'true' || steps.should_force.outputs.should_force == 'true' }}
     steps:
       - name: Checkout code
-        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
       - id: found_paths
@@ -47,7 +47,7 @@ jobs:
         working-directory: ./mobile
     steps:
       - name: Checkout code
-        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
 
@@ -68,7 +68,7 @@ jobs:
           working-directory: ./mobile
 
       - name: Generate translation file
-        run: dart run easy_localization:generate -S ../i18n && dart run bin/generate_keys.dart
+        run: make translation
 
       - name: Run Build Runner
         run: make build
@@ -116,7 +116,7 @@ jobs:
       actions: read
     steps:
       - name: Checkout repository
-        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
 
@@ -129,7 +129,7 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Upload SARIF file
-        uses: github/codeql-action/upload-sarif@df559355d593797519d70b90fc8edd5db049e7a2 # v3.29.9
+        uses: github/codeql-action/upload-sarif@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
         with:
           sarif_file: results.sarif
           category: zizmor

.github/workflows/test.yml

@@ -26,7 +26,7 @@ jobs:
       should_run_.github: ${{ steps.found_paths.outputs['.github'] == 'true' || steps.should_force.outputs.should_force == 'true' }} # redundant to have should_force but if someone changes the trigger then this won't have to be changed
     steps:
       - name: Checkout code
-        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
       - id: found_paths
@@ -69,7 +69,7 @@ jobs:
         working-directory: ./server
     steps:
       - name: Checkout code
-        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
       - name: Setup pnpm
@@ -106,7 +106,7 @@ jobs:
         working-directory: ./cli
     steps:
       - name: Checkout code
-        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
       - name: Setup pnpm
@@ -146,7 +146,7 @@ jobs:
         working-directory: ./cli
     steps:
       - name: Checkout code
-        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
       - name: Setup pnpm
@@ -181,7 +181,7 @@ jobs:
         working-directory: ./web
     steps:
       - name: Checkout code
-        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
       - name: Setup pnpm
@@ -218,7 +218,7 @@ jobs:
         working-directory: ./web
     steps:
       - name: Checkout code
-        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
       - name: Setup pnpm
@@ -249,7 +249,7 @@ jobs:
       contents: read
     steps:
       - name: Checkout code
-        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
       - name: Setup pnpm
@@ -290,7 +290,7 @@ jobs:
         working-directory: ./e2e
     steps:
       - name: Checkout code
-        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
       - name: Setup pnpm
@@ -329,7 +329,7 @@ jobs:
         working-directory: ./server
     steps:
       - name: Checkout code
-        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
       - name: Setup pnpm
@@ -360,7 +360,7 @@ jobs:
         runner: [ubuntu-latest, ubuntu-24.04-arm]
     steps:
       - name: Checkout code
-        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
           submodules: 'recursive'
@@ -408,7 +408,7 @@ jobs:
         runner: [ubuntu-latest, ubuntu-24.04-arm]
     steps:
       - name: Checkout code
-        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
           submodules: 'recursive'
@@ -454,7 +454,7 @@ jobs:
     permissions:
       contents: read
     steps:
-      - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
       - name: Setup Flutter SDK
@@ -462,8 +462,10 @@ jobs:
         with:
           channel: 'stable'
           flutter-version-file: ./mobile/pubspec.yaml
+      - name: Setup pnpm
+        uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
       - name: Generate translation file
-        run: dart run easy_localization:generate -S ../i18n && dart run bin/generate_keys.dart
+        run: make translation
         working-directory: ./mobile
       - name: Run tests
         working-directory: ./mobile
@@ -479,7 +481,7 @@ jobs:
       run:
         working-directory: ./machine-learning
     steps:
-      - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
       - name: Install uv
@@ -516,7 +518,7 @@ jobs:
         working-directory: ./.github
     steps:
       - name: Checkout code
-        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
       - name: Setup pnpm
@@ -538,7 +540,7 @@ jobs:
     permissions:
       contents: read
     steps:
-      - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
       - name: Run ShellCheck
@@ -553,7 +555,7 @@ jobs:
       contents: read
     steps:
       - name: Checkout code
-        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
       - name: Setup pnpm
@@ -607,7 +609,7 @@ jobs:
         working-directory: ./server
     steps:
       - name: Checkout code
-        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
       - name: Setup pnpm

.github/workflows/weblate-lock.yml

@@ -15,7 +15,7 @@ jobs:
       should_run: ${{ steps.found_paths.outputs.i18n == 'true' && github.head_ref != 'chore/translations'}}
     steps:
       - name: Checkout code
-        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
       - id: found_paths

.gitignore

@@ -5,6 +5,7 @@
 !.vscode/launch.json
 !.vscode/extensions.json
 .idea
+**/.pnpm-store/**
 
 docker/upload
 docker/library

.pnpmfile.cjs

@@ -18,10 +18,10 @@ module.exports = {
             (dep) => dep.startsWith("@img")
           );
           for (const dep of optionalDeps) {
-            // remove all optionalDependencies from sharp (they will be compiled from source), except:
-            //   include the precompiled musl version of sharp, for web
-            //   include precompiled linux-x64 version of sharp, for server (stage: web-prod)
-            //   include precompiled linux-arm64 version of sharp, for server (stage: web-prod)
+            // remove all optionalDepdencies from sharp (they will be compiled from source), except:
+            //   include the precompiled musl version of sharp, for web/Dockerfile
+            //   include precompiled linux-x64 version of sharp, for server/Dockerfile, stage: web-prod
+            //   include precompiled linux-arm64 version of sharp, for server/Dockerfile, stage: web-prod
             if (
               dep.includes("musl") ||
               dep.includes("linux-x64") ||

cli/README.md

@@ -6,8 +6,10 @@ Please see the [Immich CLI documentation](https://immich.app/docs/features/comma
 
 Before building the CLI, you must build the immich server and the open-api client. To build the server run the following in the server folder:
 
-    $ npm install
-    $ npm run build
+    # if you don't have pnpm installed
+    $ npm install -g pnpm 
+    $ pnpm install
+    $ pnpm build
 
 Then, to build the open-api client run the following in the open-api folder:
 
@@ -15,8 +17,10 @@ Then, to build the open-api client run the following in the open-api folder:
 
 To run the Immich CLI from source, run the following in the cli folder:
 
-    $ npm install
-    $ npm run build
+    # if you don't have pnpm installed
+    $ npm install -g pnpm 
+    $ pnpm install
+    $ pnpm build
     $ ts-node .
 
 You'll need ts-node, the easiest way to install it is to use npm:

cli/package.json

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

docker/docker-compose.dev.yml

@@ -21,7 +21,7 @@ services:
     # extends:
     #   file: hwaccel.transcoding.yml
     #   service: cpu # set to one of [nvenc, quicksync, rkmpp, vaapi, vaapi-wsl] for accelerated transcoding
-    user: '${UID:-1000}:${GID:-1000}'
+    user: "${UID:-1000}:${GID:-1000}"
     build:
       context: ../
       dockerfile: server/Dockerfile
@@ -71,11 +71,10 @@ services:
     image: immich-web-dev:latest
     # Needed for rootless docker setup, see https://github.com/moby/moby/issues/45919
     # user: 0:0
-    user: '${UID:-1000}:${GID:-1000}'
+    user: "${UID:-1000}:${GID:-1000}"
     build:
       context: ../
-      dockerfile: server/Dockerfile
-      target: dev
+      dockerfile: web/Dockerfile
     command: ['immich-web']
     env_file:
       - .env
@@ -121,7 +120,7 @@ services:
 
   redis:
     container_name: immich_redis
-    image: docker.io/valkey/valkey:8-bookworm@sha256:a137a2b60aca1a75130022d6bb96af423fefae4eb55faf395732db3544803280
+    image: docker.io/valkey/valkey:8-bookworm@sha256:5b8f8c333bef895c925f56629d6ba90aea95a4f7391f62411e625267c600b19c
     healthcheck:
       test: redis-cli ping || exit 1
 

docker/docker-compose.prod.yml

@@ -56,7 +56,7 @@ services:
 
   redis:
     container_name: immich_redis
-    image: docker.io/valkey/valkey:8-bookworm@sha256:a137a2b60aca1a75130022d6bb96af423fefae4eb55faf395732db3544803280
+    image: docker.io/valkey/valkey:8-bookworm@sha256:5b8f8c333bef895c925f56629d6ba90aea95a4f7391f62411e625267c600b19c
     healthcheck:
       test: redis-cli ping || exit 1
     restart: always
@@ -95,7 +95,7 @@ services:
     command: ['./run.sh', '-disable-reporting']
     ports:
       - 3000:3000
-    image: grafana/grafana:12.1.1-ubuntu@sha256:d1da838234ff2de93e0065ee1bf0e66d38f948dcc5d718c25fa6237e14b4424a
+    image: grafana/grafana:12.1.0-ubuntu@sha256:397aa30dd1af16cb6c5c9879498e467973a7f87eacf949f6d5a29407a3843809
     volumes:
       - grafana-data:/var/lib/grafana
 

docker/docker-compose.yml

@@ -49,7 +49,7 @@ services:
 
   redis:
     container_name: immich_redis
-    image: docker.io/valkey/valkey:8-bookworm@sha256:a137a2b60aca1a75130022d6bb96af423fefae4eb55faf395732db3544803280
+    image: docker.io/valkey/valkey:8-bookworm@sha256:5b8f8c333bef895c925f56629d6ba90aea95a4f7391f62411e625267c600b19c
     healthcheck:
       test: redis-cli ping || exit 1
     restart: always

docs/.prettierignore

@@ -1,2 +1,7 @@
 build/
 .docusaurus/
+
+# Ignore files for PNPM, NPM and YARN
+pnpm-lock.yaml
+package-lock.json
+yarn.lock

docs/README.md

@@ -11,7 +11,7 @@ $ pnpm install
 ### Local Development
 
 ```
-$ pnpm run start
+$ npm run start
 ```
 
 This command starts a local development server and opens up a browser window. Most changes are reflected live without having to restart the server.
@@ -19,7 +19,7 @@ This command starts a local development server and opens up a browser window. Mo
 ### Build
 
 ```
-$ pnpm run build
+$ npm run build
 ```
 
 This command generates static content into the `build` directory and can be served using any static contents hosting service.
@@ -29,13 +29,13 @@ This command generates static content into the `build` directory and can be serv
 Using SSH:
 
 ```
-$ USE_SSH=true pnpm run deploy
+$ USE_SSH=true npm run deploy
 ```
 
 Not using SSH:
 
 ```
-$ GIT_USER=<Your GitHub username> pnpm run deploy
+$ GIT_USER=<Your GitHub username> npm run deploy
 ```
 
 If you are using GitHub pages for hosting, this command is a convenient way to build the website and push to the `gh-pages` branch.

docs/docs/developer/database-migrations.md

@@ -5,7 +5,7 @@ After making any changes in the `server/src/schema`, a database migration need t
 1. Run the command
 
 ```bash
-pnpm run migrations:generate <migration-name>
+npm run migrations:generate <migration-name>
 ```
 
 2. Check if the migration file makes sense.

docs/docs/developer/devcontainers.md

@@ -205,7 +205,7 @@ When the Dev Container starts, it automatically:
 1. **Runs post-create script** (`container-server-post-create.sh`):
    - Adjusts file permissions for the `node` user
    - Installs dependencies: `pnpm install` in all packages
-   - Builds TypeScript SDK: `pnpm run build` in `open-api/typescript-sdk`
+   - Builds TypeScript SDK: `npm run build` in `open-api/typescript-sdk`
 
 2. **Starts development servers** via VS Code tasks:
    - `Immich API Server (Nest)` - API server with hot-reloading on port 2283
@@ -243,7 +243,7 @@ To connect the mobile app to your Dev Container:
 
 - **Server code** (`/server`): Changes trigger automatic restart
 - **Web code** (`/web`): Changes trigger hot module replacement
-- **Database migrations**: Run `pnpm run sync:sql` in the server directory
+- **Database migrations**: Run `npm run sync:sql` in the server directory
 - **API changes**: Regenerate TypeScript SDK with `make open-api`
 
 ## Testing
@@ -273,19 +273,19 @@ make test-medium-dev    # End-to-end tests
 ```bash
 # Server tests
 cd /workspaces/immich/server
-pnpm test                # Run all tests
-pnpm run test:watch     # Watch mode
-pnpm run test:cov       # Coverage report
+npm test                # Run all tests
+npm run test:watch     # Watch mode
+npm run test:cov       # Coverage report
 
 # Web tests
 cd /workspaces/immich/web
-pnpm test               # Run all tests
-pnpm run test:watch     # Watch mode
+npm test               # Run all tests
+npm run test:watch     # Watch mode
 
 # E2E tests
 cd /workspaces/immich/e2e
-pnpm run test           # Run API tests
-pnpm run test:web       # Run web UI tests
+npm run test           # Run API tests
+npm run test:web       # Run web UI tests
 ```
 
 ### Code Quality Commands

docs/docs/developer/pr-checklist.md

@@ -8,34 +8,34 @@ When contributing code through a pull request, please check the following:
 
 ## Web Checks
 
-- [ ] `pnpm run lint` (linting via ESLint)
-- [ ] `pnpm run format` (formatting via Prettier)
-- [ ] `pnpm run check:svelte` (Type checking via SvelteKit)
-- [ ] `pnpm run check:typescript` (check typescript)
-- [ ] `pnpm test` (unit tests)
+- [ ] `npm run lint` (linting via ESLint)
+- [ ] `npm run format` (formatting via Prettier)
+- [ ] `npm run check:svelte` (Type checking via SvelteKit)
+- [ ] `npm run check:typescript` (check typescript)
+- [ ] `npm test` (unit tests)
 
 ## Documentation
 
-- [ ] `pnpm run format` (formatting via Prettier)
+- [ ] `npm run format` (formatting via Prettier)
 - [ ] Update the `_redirects` file if you have renamed a page or removed it from the documentation.
 
 :::tip AIO
-Run all web checks with `pnpm run check:all`
+Run all web checks with `npm run check:all`
 :::
 
 ## Server Checks
 
-- [ ] `pnpm run lint` (linting via ESLint)
-- [ ] `pnpm run format` (formatting via Prettier)
-- [ ] `pnpm run check` (Type checking via `tsc`)
-- [ ] `pnpm test` (unit tests)
+- [ ] `npm run lint` (linting via ESLint)
+- [ ] `npm run format` (formatting via Prettier)
+- [ ] `npm run check` (Type checking via `tsc`)
+- [ ] `npm test` (unit tests)
 
 :::tip AIO
-Run all server checks with `pnpm run check:all`
+Run all server checks with `npm run check:all`
 :::
 
 :::info Auto Fix
-You can use `pnpm run __:fix` to potentially correct some issues automatically for `pnpm run format` and `lint`.
+You can use `npm run __:fix` to potentially correct some issues automatically for `npm run format` and `lint`.
 :::
 
 ## Mobile Checks

docs/docs/developer/setup.md

@@ -54,20 +54,20 @@ You can access the web from `http://your-machine-ip:3000` or `http://localhost:3
 
 If you only want to do web development connected to an existing, remote backend, follow these steps:
 
-1. Build the Immich SDK - `cd open-api/typescript-sdk && pnpm i && pnpm run build && cd -`
+1. Build the Immich SDK - `cd open-api/typescript-sdk && npm i && npm run build && cd -`
 2. Enter the web directory - `cd web/`
 3. Install web dependencies - `pnpm i`
 4. Start the web development server
 
 ```bash
-IMMICH_SERVER_URL=https://demo.immich.app/ pnpm run dev
+IMMICH_SERVER_URL=https://demo.immich.app/ npm run dev
 ```
 
 If you're using PowerShell on Windows you may need to set the env var separately like so:
 
 ```powershell
 $env:IMMICH_SERVER_URL = "https://demo.immich.app/"
-pnpm run dev
+npm run dev
 ```
 
 #### `@immich/ui`
@@ -75,12 +75,12 @@ pnpm run dev
 To see local changes to `@immich/ui` in Immich, do the following:
 
 1. Install `@immich/ui` as a sibling to `immich/`, for example `/home/user/immich` and `/home/user/ui`
-2. Build the `@immich/ui` project via `pnpm run build`
+2. Build the `@immich/ui` project via `npm run build`
 3. Uncomment the corresponding volume in web service of the `docker/docker-compose.dev.yaml` file (`../../ui:/usr/ui`)
 4. Uncomment the corresponding alias in the `web/vite.config.js` file (`'@immich/ui': path.resolve(\_\_dirname, '../../ui')`)
 5. Uncomment the import statement in `web/src/app.css` file `@import '/usr/ui/dist/theme/default.css';` and comment out `@import '@immich/ui/theme/default.css';`
 6. Start up the stack via `make dev`
-7. After making changes in `@immich/ui`, rebuild it (`pnpm run build`)
+7. After making changes in `@immich/ui`, rebuild it (`npm run build`)
 
 ### Mobile app
 

docs/docs/developer/testing.md

@@ -4,7 +4,7 @@
 
 ### Unit tests
 
-Unit are run by calling `pnpm run test` from the `server/` directory.
+Unit are run by calling `npm run test` from the `server/` directory.
 You need to run `pnpm install` (in `server/`) before _once_.
 
 ### End to end tests
@@ -17,14 +17,14 @@ make e2e
 
 Before you can run the tests, you need to run the following commands _once_:
 
-- `pnpm install` (in `e2e/`)
+- `npm install` (in `e2e/`)
 - `make open-api` (in the project root `/`)
 
 Once the test environment is running, the e2e tests can be run via:
 
 ```bash
 cd e2e/
-pnpm test
+npm test
 ```
 
 The tests check various things including:

docs/static/archived-versions.json

@@ -1,8 +1,4 @@
 [
-  {
-    "label": "v1.139.0",
-    "url": "https://v1.139.0.archive.immich.app"
-  },
   {
     "label": "v1.138.1",
     "url": "https://v1.138.1.archive.immich.app"

e2e/package.json

@@ -1,6 +1,6 @@
 {
   "name": "immich-e2e",
-  "version": "1.139.0",
+  "version": "1.138.1",
   "description": "",
   "main": "index.js",
   "type": "module",
@@ -26,7 +26,7 @@
     "@playwright/test": "^1.44.1",
     "@socket.io/component-emitter": "^3.1.2",
     "@types/luxon": "^3.4.2",
-    "@types/node": "^22.17.1",
+    "@types/node": "^22.17.0",
     "@types/oidc-provider": "^9.0.0",
     "@types/pg": "^8.15.1",
     "@types/pngjs": "^6.0.4",

i18n/en.json

@@ -500,7 +500,7 @@
   "assets": "Assets",
   "assets_added_count": "Added {count, plural, one {# asset} other {# assets}}",
   "assets_added_to_album_count": "Added {count, plural, one {# asset} other {# assets}} to the album",
-  "assets_added_to_albums_count": "Added {assetTotal, plural, one {# asset} other {# assets}} to {albumTotal} albums",
+  "assets_added_to_albums_count": "Added {assetTotal} assets to {albumTotal} albums",
   "assets_cannot_be_added_to_album_count": "{count, plural, one {Asset} other {Assets}} cannot be added to the album",
   "assets_cannot_be_added_to_albums": "{count, plural, one {Asset} other {Assets}} cannot be added to any of the albums",
   "assets_count": "{count, plural, one {# asset} other {# assets}}",

mobile/android/app/CMakeLists.txt

@@ -1,10 +0,0 @@
-cmake_minimum_required(VERSION 3.12)
-
-set(CMAKE_C_STANDARD 17)
-set(CMAKE_C_STANDARD_REQUIRED ON)
-
-project(native_buffer LANGUAGES C)
-
-add_library(native_buffer SHARED
-    src/main/cpp/native_buffer.c
-)

mobile/android/app/build.gradle

@@ -83,12 +83,6 @@ android {
     }
   }
   namespace 'app.alextran.immich'
-
-  externalNativeBuild {
-    cmake {
-      path "CMakeLists.txt"
-    }
-  }
 }
 
 flutter {

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

@@ -1,40 +0,0 @@
-#include <jni.h>
-#include <stdlib.h>
-
-JNIEXPORT jlong JNICALL
-Java_app_alextran_immich_images_ThumbnailsImpl_00024Companion_allocateNative(
-        JNIEnv *env, jclass clazz, jint size) {
-    void *ptr = malloc(size);
-    return (jlong) ptr;
-}
-
-JNIEXPORT jlong JNICALL
-Java_app_alextran_immich_images_ThumbnailsImpl_allocateNative(
-        JNIEnv *env, jclass clazz, jint size) {
-    void *ptr = malloc(size);
-    return (jlong) ptr;
-}
-
-JNIEXPORT void JNICALL
-Java_app_alextran_immich_images_ThumbnailsImpl_00024Companion_freeNative(
-        JNIEnv *env, jclass clazz, jlong address) {
-    free((void *) address);
-}
-
-JNIEXPORT void JNICALL
-Java_app_alextran_immich_images_ThumbnailsImpl_freeNative(
-        JNIEnv *env, jclass clazz, jlong address) {
-    free((void *) address);
-}
-
-JNIEXPORT jobject JNICALL
-Java_app_alextran_immich_images_ThumbnailsImpl_00024Companion_wrapAsBuffer(
-        JNIEnv *env, jclass clazz, jlong address, jint capacity) {
-    return (*env)->NewDirectByteBuffer(env, (void *) address, capacity);
-}
-
-JNIEXPORT jobject JNICALL
-Java_app_alextran_immich_images_ThumbnailsImpl_wrapAsBuffer(
-        JNIEnv *env, jclass clazz, jlong address, jint capacity) {
-    return (*env)->NewDirectByteBuffer(env, (void *) address, capacity);
-}

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

@@ -1,20 +1,7 @@
 package app.alextran.immich
 
-import android.content.Context
-import com.bumptech.glide.GlideBuilder
 import com.bumptech.glide.annotation.GlideModule
-import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPoolAdapter
-import com.bumptech.glide.load.engine.cache.DiskCacheAdapter
-import com.bumptech.glide.load.engine.cache.MemoryCacheAdapter
 import com.bumptech.glide.module.AppGlideModule
 
 @GlideModule
-class AppGlideModule : AppGlideModule() {
-  override fun applyOptions(context: Context, builder: GlideBuilder) {
-    super.applyOptions(context, builder)
-    // disable caching as this is already done on the Flutter side
-    builder.setMemoryCache(MemoryCacheAdapter())
-    builder.setDiskCache(DiskCacheAdapter.Factory())
-    builder.setBitmapPool(BitmapPoolAdapter())
-  }
-}
+class AppGlideModule : AppGlideModule()

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

@@ -3,8 +3,6 @@ package app.alextran.immich
 import android.os.Build
 import android.os.ext.SdkExtensions
 import androidx.annotation.NonNull
-import app.alextran.immich.images.ThumbnailApi
-import app.alextran.immich.images.ThumbnailsImpl
 import app.alextran.immich.sync.NativeSyncApi
 import app.alextran.immich.sync.NativeSyncApiImpl26
 import app.alextran.immich.sync.NativeSyncApiImpl30
@@ -24,7 +22,6 @@ class MainActivity : FlutterFragmentActivity() {
       } else {
         NativeSyncApiImpl30(this)
       }
-      NativeSyncApi.setUp(flutterEngine.dartExecutor.binaryMessenger, nativeSyncApiImpl)
-      ThumbnailApi.setUp(flutterEngine.dartExecutor.binaryMessenger, ThumbnailsImpl(this))
+    NativeSyncApi.setUp(flutterEngine.dartExecutor.binaryMessenger, nativeSyncApiImpl)
   }
 }

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

@@ -1,164 +0,0 @@
-package app.alextran.immich.images;
-
-// Copyright (c) 2023 Evan Wallace
-// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-// The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-import java.nio.ByteBuffer;
-
-// modified to use native allocations
-public final class ThumbHash {
-  /**
-   * Decodes a ThumbHash to an RGBA image. RGB is not be premultiplied by A.
-   *
-   * @param hash The bytes of the ThumbHash.
-   * @return The width, height, and pixels of the rendered placeholder image.
-   */
-  public static Image thumbHashToRGBA(byte[] hash) {
-    // Read the constants
-    int header24 = (hash[0] & 255) | ((hash[1] & 255) << 8) | ((hash[2] & 255) << 16);
-    int header16 = (hash[3] & 255) | ((hash[4] & 255) << 8);
-    float l_dc = (float) (header24 & 63) / 63.0f;
-    float p_dc = (float) ((header24 >> 6) & 63) / 31.5f - 1.0f;
-    float q_dc = (float) ((header24 >> 12) & 63) / 31.5f - 1.0f;
-    float l_scale = (float) ((header24 >> 18) & 31) / 31.0f;
-    boolean hasAlpha = (header24 >> 23) != 0;
-    float p_scale = (float) ((header16 >> 3) & 63) / 63.0f;
-    float q_scale = (float) ((header16 >> 9) & 63) / 63.0f;
-    boolean isLandscape = (header16 >> 15) != 0;
-    int lx = Math.max(3, isLandscape ? hasAlpha ? 5 : 7 : header16 & 7);
-    int ly = Math.max(3, isLandscape ? header16 & 7 : hasAlpha ? 5 : 7);
-    float a_dc = hasAlpha ? (float) (hash[5] & 15) / 15.0f : 1.0f;
-    float a_scale = (float) ((hash[5] >> 4) & 15) / 15.0f;
-
-    // Read the varying factors (boost saturation by 1.25x to compensate for quantization)
-    int ac_start = hasAlpha ? 6 : 5;
-    int ac_index = 0;
-    Channel l_channel = new Channel(lx, ly);
-    Channel p_channel = new Channel(3, 3);
-    Channel q_channel = new Channel(3, 3);
-    Channel a_channel = null;
-    ac_index = l_channel.decode(hash, ac_start, ac_index, l_scale);
-    ac_index = p_channel.decode(hash, ac_start, ac_index, p_scale * 1.25f);
-    ac_index = q_channel.decode(hash, ac_start, ac_index, q_scale * 1.25f);
-    if (hasAlpha) {
-      a_channel = new Channel(5, 5);
-      a_channel.decode(hash, ac_start, ac_index, a_scale);
-    }
-    float[] l_ac = l_channel.ac;
-    float[] p_ac = p_channel.ac;
-    float[] q_ac = q_channel.ac;
-    float[] a_ac = hasAlpha ? a_channel.ac : null;
-
-    // Decode using the DCT into RGB
-    float ratio = thumbHashToApproximateAspectRatio(hash);
-    int w = Math.round(ratio > 1.0f ? 32.0f : 32.0f * ratio);
-    int h = Math.round(ratio > 1.0f ? 32.0f / ratio : 32.0f);
-    int size = w * h * 4;
-    long pointer = ThumbnailsImpl.allocateNative(size);
-    ByteBuffer rgba = ThumbnailsImpl.wrapAsBuffer(pointer, size);
-    int cx_stop = Math.max(lx, hasAlpha ? 5 : 3);
-    int cy_stop = Math.max(ly, hasAlpha ? 5 : 3);
-    float[] fx = new float[cx_stop];
-    float[] fy = new float[cy_stop];
-    for (int y = 0, i = 0; y < h; y++) {
-      for (int x = 0; x < w; x++, i += 4) {
-        float l = l_dc, p = p_dc, q = q_dc, a = a_dc;
-
-        // Precompute the coefficients
-        for (int cx = 0; cx < cx_stop; cx++)
-          fx[cx] = (float) Math.cos(Math.PI / w * (x + 0.5f) * cx);
-        for (int cy = 0; cy < cy_stop; cy++)
-          fy[cy] = (float) Math.cos(Math.PI / h * (y + 0.5f) * cy);
-
-        // Decode L
-        for (int cy = 0, j = 0; cy < ly; cy++) {
-          float fy2 = fy[cy] * 2.0f;
-          for (int cx = cy > 0 ? 0 : 1; cx * ly < lx * (ly - cy); cx++, j++)
-            l += l_ac[j] * fx[cx] * fy2;
-        }
-
-        // Decode P and Q
-        for (int cy = 0, j = 0; cy < 3; cy++) {
-          float fy2 = fy[cy] * 2.0f;
-          for (int cx = cy > 0 ? 0 : 1; cx < 3 - cy; cx++, j++) {
-            float f = fx[cx] * fy2;
-            p += p_ac[j] * f;
-            q += q_ac[j] * f;
-          }
-        }
-
-        // Decode A
-        if (hasAlpha)
-          for (int cy = 0, j = 0; cy < 5; cy++) {
-            float fy2 = fy[cy] * 2.0f;
-            for (int cx = cy > 0 ? 0 : 1; cx < 5 - cy; cx++, j++)
-              a += a_ac[j] * fx[cx] * fy2;
-          }
-
-        // Convert to RGB
-        float b = l - 2.0f / 3.0f * p;
-        float r = (3.0f * l - b + q) / 2.0f;
-        float g = r - q;
-        rgba.put(i, (byte) Math.max(0, Math.round(255.0f * Math.min(1, r))));
-        rgba.put(i + 1, (byte) Math.max(0, Math.round(255.0f * Math.min(1, g))));
-        rgba.put(i + 2, (byte) Math.max(0, Math.round(255.0f * Math.min(1, b))));
-        rgba.put(i + 3, (byte) Math.max(0, Math.round(255.0f * Math.min(1, a))));
-      }
-    }
-    return new Image(w, h, pointer);
-  }
-
-  /**
-   * Extracts the approximate aspect ratio of the original image.
-   *
-   * @param hash The bytes of the ThumbHash.
-   * @return The approximate aspect ratio (i.e. width / height).
-   */
-  public static float thumbHashToApproximateAspectRatio(byte[] hash) {
-    byte header = hash[3];
-    boolean hasAlpha = (hash[2] & 0x80) != 0;
-    boolean isLandscape = (hash[4] & 0x80) != 0;
-    int lx = isLandscape ? hasAlpha ? 5 : 7 : header & 7;
-    int ly = isLandscape ? header & 7 : hasAlpha ? 5 : 7;
-    return (float) lx / (float) ly;
-  }
-
-  public static final class Image {
-    public int width;
-    public int height;
-    public long pointer;
-
-    public Image(int width, int height, long pointer) {
-      this.width = width;
-      this.height = height;
-      this.pointer = pointer;
-    }
-  }
-
-  private static final class Channel {
-    int nx;
-    int ny;
-    float[] ac;
-
-    Channel(int nx, int ny) {
-      this.nx = nx;
-      this.ny = ny;
-      int n = 0;
-      for (int cy = 0; cy < ny; cy++)
-        for (int cx = cy > 0 ? 0 : 1; cx * ny < nx * (ny - cy); cx++)
-          n++;
-      ac = new float[n];
-    }
-
-    int decode(byte[] hash, int start, int index, float scale) {
-      for (int i = 0; i < ac.length; i++) {
-        int data = hash[start + (index >> 1)] >> ((index & 1) << 2);
-        ac[i] = ((float) (data & 15) / 7.5f - 1.0f) * scale;
-        index++;
-      }
-      return index;
-    }
-  }
-}

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

@@ -1,139 +0,0 @@
-// Autogenerated from Pigeon (v26.0.0), do not edit directly.
-// See also: https://pub.dev/packages/pigeon
-@file:Suppress("UNCHECKED_CAST", "ArrayInDataClass")
-
-package app.alextran.immich.images
-
-import android.util.Log
-import io.flutter.plugin.common.BasicMessageChannel
-import io.flutter.plugin.common.BinaryMessenger
-import io.flutter.plugin.common.EventChannel
-import io.flutter.plugin.common.MessageCodec
-import io.flutter.plugin.common.StandardMethodCodec
-import io.flutter.plugin.common.StandardMessageCodec
-import java.io.ByteArrayOutputStream
-import java.nio.ByteBuffer
-private object ThumbnailsPigeonUtils {
-
-  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)
-      )
-    }
-  }
-}
-
-/**
- * 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
-) : Throwable()
-private open class ThumbnailsPigeonCodec : StandardMessageCodec() {
-  override fun readValueOfType(type: Byte, buffer: ByteBuffer): Any? {
-    return     super.readValueOfType(type, buffer)
-  }
-  override fun writeValue(stream: ByteArrayOutputStream, value: Any?)   {
-    super.writeValue(stream, value)
-  }
-}
-
-
-/** Generated interface from Pigeon that represents a handler of messages from Flutter. */
-interface ThumbnailApi {
-  fun requestImage(assetId: String, requestId: Long, width: Long, height: Long, isVideo: Boolean, callback: (Result<Map<String, Long>>) -> Unit)
-  fun cancelImageRequest(requestId: Long)
-  fun getThumbhash(thumbhash: String, callback: (Result<Map<String, Long>>) -> Unit)
-
-  companion object {
-    /** The codec used by ThumbnailApi. */
-    val codec: MessageCodec<Any?> by lazy {
-      ThumbnailsPigeonCodec()
-    }
-    /** Sets up an instance of `ThumbnailApi` to handle messages through the `binaryMessenger`. */
-    @JvmOverloads
-    fun setUp(binaryMessenger: BinaryMessenger, api: ThumbnailApi?, messageChannelSuffix: String = "") {
-      val separatedMessageChannelSuffix = if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else ""
-      run {
-        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.ThumbnailApi.requestImage$separatedMessageChannelSuffix", codec)
-        if (api != null) {
-          channel.setMessageHandler { message, reply ->
-            val args = message as List<Any?>
-            val assetIdArg = args[0] as String
-            val requestIdArg = args[1] as Long
-            val widthArg = args[2] as Long
-            val heightArg = args[3] as Long
-            val isVideoArg = args[4] as Boolean
-            api.requestImage(assetIdArg, requestIdArg, widthArg, heightArg, isVideoArg) { result: Result<Map<String, Long>> ->
-              val error = result.exceptionOrNull()
-              if (error != null) {
-                reply.reply(ThumbnailsPigeonUtils.wrapError(error))
-              } else {
-                val data = result.getOrNull()
-                reply.reply(ThumbnailsPigeonUtils.wrapResult(data))
-              }
-            }
-          }
-        } else {
-          channel.setMessageHandler(null)
-        }
-      }
-      run {
-        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.ThumbnailApi.cancelImageRequest$separatedMessageChannelSuffix", codec)
-        if (api != null) {
-          channel.setMessageHandler { message, reply ->
-            val args = message as List<Any?>
-            val requestIdArg = args[0] as Long
-            val wrapped: List<Any?> = try {
-              api.cancelImageRequest(requestIdArg)
-              listOf(null)
-            } catch (exception: Throwable) {
-              ThumbnailsPigeonUtils.wrapError(exception)
-            }
-            reply.reply(wrapped)
-          }
-        } else {
-          channel.setMessageHandler(null)
-        }
-      }
-      run {
-        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.ThumbnailApi.getThumbhash$separatedMessageChannelSuffix", codec)
-        if (api != null) {
-          channel.setMessageHandler { message, reply ->
-            val args = message as List<Any?>
-            val thumbhashArg = args[0] as String
-            api.getThumbhash(thumbhashArg) { result: Result<Map<String, Long>> ->
-              val error = result.exceptionOrNull()
-              if (error != null) {
-                reply.reply(ThumbnailsPigeonUtils.wrapError(error))
-              } else {
-                val data = result.getOrNull()
-                reply.reply(ThumbnailsPigeonUtils.wrapResult(data))
-              }
-            }
-          }
-        } else {
-          channel.setMessageHandler(null)
-        }
-      }
-    }
-  }
-}

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

@@ -1,230 +0,0 @@
-package app.alextran.immich.images
-
-import android.content.ContentResolver
-import android.content.ContentUris
-import android.content.Context
-import android.graphics.*
-import android.net.Uri
-import android.os.Build
-import android.os.CancellationSignal
-import android.os.OperationCanceledException
-import android.provider.MediaStore
-import android.provider.MediaStore.Images
-import android.provider.MediaStore.Video
-import android.util.Size
-import java.nio.ByteBuffer
-import kotlin.math.*
-import java.util.concurrent.Executors
-import com.bumptech.glide.Glide
-import com.bumptech.glide.Priority
-import com.bumptech.glide.load.DecodeFormat
-import java.util.Base64
-import java.util.HashMap
-import java.util.concurrent.CancellationException
-import java.util.concurrent.ConcurrentHashMap
-import java.util.concurrent.Future
-
-data class Request(
-  val taskFuture: Future<*>,
-  val cancellationSignal: CancellationSignal,
-  val callback: (Result<Map<String, Long>>) -> Unit
-)
-
-class ThumbnailsImpl(context: Context) : ThumbnailApi {
-  private val ctx: Context = context.applicationContext
-  private val resolver: ContentResolver = ctx.contentResolver
-  private val requestThread = Executors.newSingleThreadExecutor()
-  private val threadPool =
-    Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors() / 2 + 1)
-  private val requestMap = ConcurrentHashMap<Long, Request>()
-
-  companion object {
-    val CANCELLED = Result.success<Map<String, Long>>(mapOf())
-    val OPTIONS = BitmapFactory.Options().apply { inPreferredConfig = Bitmap.Config.ARGB_8888 }
-
-    init {
-      System.loadLibrary("native_buffer")
-    }
-
-    @JvmStatic
-    external fun allocateNative(size: Int): Long
-
-    @JvmStatic
-    external fun freeNative(pointer: Long)
-
-    @JvmStatic
-    external fun wrapAsBuffer(address: Long, capacity: Int): ByteBuffer
-  }
-
-  override fun getThumbhash(thumbhash: String, callback: (Result<Map<String, Long>>) -> Unit) {
-    threadPool.execute {
-      try {
-        val bytes = Base64.getDecoder().decode(thumbhash)
-        val image = ThumbHash.thumbHashToRGBA(bytes)
-        val res = mapOf(
-          "pointer" to image.pointer,
-          "width" to image.width.toLong(),
-          "height" to image.height.toLong()
-        )
-        callback(Result.success(res))
-      } catch (e: Exception) {
-        callback(Result.failure(e))
-      }
-    }
-  }
-
-  override fun requestImage(
-    assetId: String,
-    requestId: Long,
-    width: Long,
-    height: Long,
-    isVideo: Boolean,
-    callback: (Result<Map<String, Long>>) -> Unit
-  ) {
-    val signal = CancellationSignal()
-    val task = threadPool.submit {
-      try {
-        getThumbnailBufferInternal(assetId, width, height, isVideo, callback, signal)
-      } catch (e: Exception) {
-        when (e) {
-          is OperationCanceledException -> callback(CANCELLED)
-          is CancellationException -> callback(CANCELLED)
-          else -> callback(Result.failure(e))
-        }
-      } finally {
-        requestMap.remove(requestId)
-      }
-    }
-    val request = Request(task, signal, callback)
-    requestMap[requestId] = request
-  }
-
-  override fun cancelImageRequest(requestId: Long) {
-    val request = requestMap.remove(requestId) ?: return
-    request.taskFuture.cancel(false)
-    request.cancellationSignal.cancel()
-    if (request.taskFuture.isCancelled) {
-      requestThread.execute {
-        try {
-          request.callback(CANCELLED)
-        } catch (_: Exception) {
-        }
-      }
-    }
-  }
-
-  private fun getThumbnailBufferInternal(
-    assetId: String,
-    width: Long,
-    height: Long,
-    isVideo: Boolean,
-    callback: (Result<Map<String, Long>>) -> Unit,
-    signal: CancellationSignal
-  ) {
-    signal.throwIfCanceled()
-    val targetWidth = width.toInt()
-    val targetHeight = height.toInt()
-    val id = assetId.toLong()
-
-    signal.throwIfCanceled()
-    val bitmap = if (isVideo) {
-      decodeVideoThumbnail(id, targetWidth, targetHeight, signal)
-    } else {
-      decodeImage(id, targetWidth, targetHeight, signal)
-    }
-
-    processBitmap(bitmap, callback, signal)
-  }
-
-  private fun processBitmap(
-    bitmap: Bitmap, callback: (Result<Map<String, Long>>) -> Unit, signal: CancellationSignal
-  ) {
-    signal.throwIfCanceled()
-    val actualWidth = bitmap.width
-    val actualHeight = bitmap.height
-
-    val size = actualWidth * actualHeight * 4
-    val pointer = allocateNative(size)
-
-    try {
-      signal.throwIfCanceled()
-      val buffer = wrapAsBuffer(pointer, size)
-      bitmap.copyPixelsToBuffer(buffer)
-      bitmap.recycle()
-      signal.throwIfCanceled()
-      val res = mapOf(
-        "pointer" to pointer,
-        "width" to actualWidth.toLong(),
-        "height" to actualHeight.toLong()
-      )
-      callback(Result.success(res))
-    } catch (e: Exception) {
-      freeNative(pointer)
-      callback(if (e is OperationCanceledException) CANCELLED else Result.failure(e))
-    }
-  }
-
-  private fun decodeImage(
-    id: Long, targetWidth: Int, targetHeight: Int, signal: CancellationSignal
-  ): Bitmap {
-    signal.throwIfCanceled()
-    val uri = ContentUris.withAppendedId(Images.Media.EXTERNAL_CONTENT_URI, id)
-    if (targetHeight > 768 || targetWidth > 768) {
-      return decodeSource(uri, targetWidth, targetHeight, signal)
-    }
-
-    return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-      resolver.loadThumbnail(uri, Size(targetWidth, targetHeight), signal)
-    } else {
-      signal.setOnCancelListener { Images.Thumbnails.cancelThumbnailRequest(resolver, id) }
-      Images.Thumbnails.getThumbnail(resolver, id, Images.Thumbnails.MINI_KIND, OPTIONS)
-    }
-  }
-
-  private fun decodeVideoThumbnail(
-    id: Long, targetWidth: Int, targetHeight: Int, signal: CancellationSignal
-  ): Bitmap {
-    signal.throwIfCanceled()
-    return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-      val uri = ContentUris.withAppendedId(Video.Media.EXTERNAL_CONTENT_URI, id)
-      resolver.loadThumbnail(uri, Size(targetWidth, targetHeight), signal)
-    } else {
-      signal.setOnCancelListener { Video.Thumbnails.cancelThumbnailRequest(resolver, id) }
-      Video.Thumbnails.getThumbnail(resolver, id, Video.Thumbnails.MINI_KIND, OPTIONS)
-    }
-  }
-
-  private fun decodeSource(
-    uri: Uri, targetWidth: Int, targetHeight: Int, signal: CancellationSignal
-  ): Bitmap {
-    signal.throwIfCanceled()
-    return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-      val source = ImageDecoder.createSource(resolver, uri)
-      signal.throwIfCanceled()
-      ImageDecoder.decodeBitmap(source) { decoder, info, _ ->
-        val sampleSize =
-          getSampleSize(info.size.width, info.size.height, targetWidth, targetHeight)
-        decoder.setTargetSampleSize(sampleSize)
-        decoder.allocator = ImageDecoder.ALLOCATOR_SOFTWARE
-        decoder.setTargetColorSpace(ColorSpace.get(ColorSpace.Named.SRGB))
-      }
-    } else {
-      val ref = Glide.with(ctx).asBitmap().priority(Priority.IMMEDIATE).load(uri)
-        .disallowHardwareConfig().format(DecodeFormat.PREFER_ARGB_8888)
-        .submit(targetWidth, targetHeight)
-      signal.setOnCancelListener { Glide.with(ctx).clear(ref) }
-      ref.get()
-    }
-  }
-
-  private fun getSampleSize(fullWidth: Int, fullHeight: Int, reqWidth: Int, reqHeight: Int): Int {
-    return 1 shl max(
-      0, floor(
-        min(
-          log2(fullWidth / reqWidth.toDouble()),
-          log2(fullHeight / reqHeight.toDouble()),
-        )
-      ).toInt()
-    )
-  }
-}

mobile/android/fastlane/Fastfile

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

mobile/integration_test/test_utils/general_helper.dart

@@ -4,6 +4,7 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
+import 'package:immich_mobile/infrastructure/repositories/logger_db.repository.dart';
 import 'package:immich_mobile/main.dart' as app;
 import 'package:immich_mobile/providers/db.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
@@ -39,18 +40,15 @@ class ImmichTestHelper {
   static Future<void> loadApp(WidgetTester tester) async {
     await EasyLocalization.ensureInitialized();
     // Clear all data from Isar (reuse existing instance if available)
-    final (isar, drift, logDb) = await Bootstrap.initDB();
-    await Bootstrap.initDomain(isar, drift, logDb);
+    final db = await Bootstrap.initIsar();
+    final logDb = DriftLogger();
+    await Bootstrap.initDomain(db, logDb);
     await Store.clear();
-    await isar.writeTxn(() => isar.clear());
+    await db.writeTxn(() => db.clear());
     // Load main Widget
     await tester.pumpWidget(
       ProviderScope(
-        overrides: [
-          dbProvider.overrideWithValue(isar),
-          isarProvider.overrideWithValue(isar),
-          driftProvider.overrideWith(driftOverride(drift)),
-        ],
+        overrides: [dbProvider.overrideWithValue(db), isarProvider.overrideWithValue(db)],
         child: const app.MainWidget(),
       ),
     );

mobile/ios/Runner.xcodeproj/project.pbxproj

@@ -24,9 +24,6 @@
 		FAC6F89B2D287C890078CB2F /* ShareExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = FAC6F8902D287C890078CB2F /* ShareExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 		FAC6F8B72D287F120078CB2F /* ShareViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAC6F8B52D287F120078CB2F /* ShareViewController.swift */; };
 		FAC6F8B92D287F120078CB2F /* MainInterface.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = FAC6F8B32D287F120078CB2F /* MainInterface.storyboard */; };
-		FEAFA8732E4D42F4001E47FE /* Thumbhash.swift in Sources */ = {isa = PBXBuildFile; fileRef = FEAFA8722E4D42F4001E47FE /* Thumbhash.swift */; };
-		FED3B1962E253E9B0030FD97 /* ThumbnailsImpl.swift in Sources */ = {isa = PBXBuildFile; fileRef = FED3B1942E253E9B0030FD97 /* ThumbnailsImpl.swift */; };
-		FED3B1972E253E9B0030FD97 /* Thumbnails.g.swift in Sources */ = {isa = PBXBuildFile; fileRef = FED3B1932E253E9B0030FD97 /* Thumbnails.g.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -105,9 +102,6 @@
 		FAC6F8B42D287F120078CB2F /* ShareExtension.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = ShareExtension.entitlements; sourceTree = "<group>"; };
 		FAC6F8B52D287F120078CB2F /* ShareViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShareViewController.swift; sourceTree = "<group>"; };
 		FAC7416727DB9F5500C668D8 /* RunnerProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = RunnerProfile.entitlements; sourceTree = "<group>"; };
-		FEAFA8722E4D42F4001E47FE /* Thumbhash.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Thumbhash.swift; sourceTree = "<group>"; };
-		FED3B1932E253E9B0030FD97 /* Thumbnails.g.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Thumbnails.g.swift; sourceTree = "<group>"; };
-		FED3B1942E253E9B0030FD97 /* ThumbnailsImpl.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThumbnailsImpl.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */
@@ -123,6 +117,8 @@
 /* Begin PBXFileSystemSynchronizedRootGroup section */
 		B2CF7F8C2DDE4EBB00744BF6 /* Sync */ = {
 			isa = PBXFileSystemSynchronizedRootGroup;
+			exceptions = (
+			);
 			path = Sync;
 			sourceTree = "<group>";
 		};
@@ -247,7 +243,6 @@
 				1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */,
 				74858FAE1ED2DC5600515810 /* AppDelegate.swift */,
 				74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */,
-				FED3B1952E253E9B0030FD97 /* Images */,
 			);
 			path = Runner;
 			sourceTree = "<group>";
@@ -263,16 +258,6 @@
 			path = ShareExtension;
 			sourceTree = "<group>";
 		};
-		FED3B1952E253E9B0030FD97 /* Images */ = {
-			isa = PBXGroup;
-			children = (
-				FEAFA8722E4D42F4001E47FE /* Thumbhash.swift */,
-				FED3B1932E253E9B0030FD97 /* Thumbnails.g.swift */,
-				FED3B1942E253E9B0030FD97 /* ThumbnailsImpl.swift */,
-			);
-			path = Images;
-			sourceTree = "<group>";
-		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -538,9 +523,6 @@
 			files = (
 				65F32F31299BD2F800CE9261 /* BackgroundServicePlugin.swift in Sources */,
 				74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */,
-				FEAFA8732E4D42F4001E47FE /* Thumbhash.swift in Sources */,
-				FED3B1962E253E9B0030FD97 /* ThumbnailsImpl.swift in Sources */,
-				FED3B1972E253E9B0030FD97 /* Thumbnails.g.swift in Sources */,
 				1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */,
 				65F32F33299D349D00CE9261 /* BackgroundSyncWorker.swift in Sources */,
 			);
@@ -667,7 +649,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 215;
+				CURRENT_PROJECT_VERSION = 213;
 				CUSTOM_GROUP_ID = group.app.immich.share;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_BITCODE = NO;
@@ -811,7 +793,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 215;
+				CURRENT_PROJECT_VERSION = 213;
 				CUSTOM_GROUP_ID = group.app.immich.share;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_BITCODE = NO;
@@ -841,7 +823,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 215;
+				CURRENT_PROJECT_VERSION = 213;
 				CUSTOM_GROUP_ID = group.app.immich.share;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_BITCODE = NO;
@@ -875,7 +857,7 @@
 				CODE_SIGN_ENTITLEMENTS = WidgetExtension/WidgetExtension.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 215;
+				CURRENT_PROJECT_VERSION = 213;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
@@ -918,7 +900,7 @@
 				CODE_SIGN_ENTITLEMENTS = WidgetExtension/WidgetExtension.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 215;
+				CURRENT_PROJECT_VERSION = 213;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
@@ -958,7 +940,7 @@
 				CODE_SIGN_ENTITLEMENTS = WidgetExtension/WidgetExtension.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 215;
+				CURRENT_PROJECT_VERSION = 213;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
@@ -997,7 +979,7 @@
 				CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 215;
+				CURRENT_PROJECT_VERSION = 213;
 				CUSTOM_GROUP_ID = group.app.immich.share;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
@@ -1041,7 +1023,7 @@
 				CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 215;
+				CURRENT_PROJECT_VERSION = 213;
 				CUSTOM_GROUP_ID = group.app.immich.share;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
@@ -1082,7 +1064,7 @@
 				CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 215;
+				CURRENT_PROJECT_VERSION = 213;
 				CUSTOM_GROUP_ID = group.app.immich.share;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;

mobile/ios/Runner/AppDelegate.swift

@@ -25,7 +25,6 @@ import UIKit
     
     let controller: FlutterViewController = window?.rootViewController as! FlutterViewController
     NativeSyncApiSetup.setUp(binaryMessenger: controller.binaryMessenger, api: NativeSyncApiImpl())
-    ThumbnailApiSetup.setUp(binaryMessenger: controller.binaryMessenger, api: ThumbnailApiImpl())
 
     BackgroundServicePlugin.setPluginRegistrantCallback { registry in
       if !registry.hasPlugin("org.cocoapods.path-provider-foundation") {

mobile/ios/Runner/Images/Thumbhash.swift

@@ -1,225 +0,0 @@
-// Copyright (c) 2023 Evan Wallace
-// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-// The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-import Foundation
-
-// NOTE: Swift has an exponential-time type checker and compiling very simple
-// expressions can easily take many seconds, especially when expressions involve
-// numeric type constructors.
-//
-// This file deliberately breaks compound expressions up into separate variables
-// to improve compile time even though this comes at the expense of readability.
-// This is a known workaround for this deficiency in the Swift compiler.
-//
-// The following command is helpful when debugging Swift compile time issues:
-//
-//     swiftc ThumbHash.swift -Xfrontend -debug-time-function-bodies
-//
-// These optimizations brought the compile time for this file from around 2.5
-// seconds to around 250ms (10x faster).
-
-// NOTE: Swift's debug-build performance of for-in loops over numeric ranges is
-// really awful. Debug builds compile a very generic indexing iterator thing
-// that makes many nested calls for every iteration, which makes debug-build
-// performance crawl.
-//
-// This file deliberately avoids for-in loops that loop for more than a few
-// times to improve debug-build run time even though this comes at the expense
-// of readability. Similarly unsafe pointers are used instead of array getters
-// to avoid unnecessary bounds checks, which have extra overhead in debug builds.
-//
-// These optimizations brought the run time to encode and decode 10 ThumbHashes
-// in debug mode from 700ms to 70ms (10x faster).
-
-// changed signature and allocation method to avoid automatic GC
-func thumbHashToRGBA(hash: Data) -> (Int, Int, UnsafeMutableRawBufferPointer) {
-  // Read the constants
-  let h0 = UInt32(hash[0])
-  let h1 = UInt32(hash[1])
-  let h2 = UInt32(hash[2])
-  let h3 = UInt16(hash[3])
-  let h4 = UInt16(hash[4])
-  let header24 = h0 | (h1 << 8) | (h2 << 16)
-  let header16 = h3 | (h4 << 8)
-  let il_dc = header24 & 63
-  let ip_dc = (header24 >> 6) & 63
-  let iq_dc = (header24 >> 12) & 63
-  var l_dc = Float32(il_dc)
-  var p_dc = Float32(ip_dc)
-  var q_dc = Float32(iq_dc)
-  l_dc = l_dc / 63
-  p_dc = p_dc / 31.5 - 1
-  q_dc = q_dc / 31.5 - 1
-  let il_scale = (header24 >> 18) & 31
-  var l_scale = Float32(il_scale)
-  l_scale = l_scale / 31
-  let hasAlpha = (header24 >> 23) != 0
-  let ip_scale = (header16 >> 3) & 63
-  let iq_scale = (header16 >> 9) & 63
-  var p_scale = Float32(ip_scale)
-  var q_scale = Float32(iq_scale)
-  p_scale = p_scale / 63
-  q_scale = q_scale / 63
-  let isLandscape = (header16 >> 15) != 0
-  let lx16 = max(3, isLandscape ? hasAlpha ? 5 : 7 : header16 & 7)
-  let ly16 = max(3, isLandscape ? header16 & 7 : hasAlpha ? 5 : 7)
-  let lx = Int(lx16)
-  let ly = Int(ly16)
-  var a_dc = Float32(1)
-  var a_scale = Float32(1)
-  if hasAlpha {
-    let ia_dc = hash[5] & 15
-    let ia_scale = hash[5] >> 4
-    a_dc = Float32(ia_dc)
-    a_scale = Float32(ia_scale)
-    a_dc /= 15
-    a_scale /= 15
-  }
-  
-  // Read the varying factors (boost saturation by 1.25x to compensate for quantization)
-  let ac_start = hasAlpha ? 6 : 5
-  var ac_index = 0
-  let decodeChannel = { (nx: Int, ny: Int, scale: Float32) -> [Float32] in
-    var ac: [Float32] = []
-    for cy in 0 ..< ny {
-      var cx = cy > 0 ? 0 : 1
-      while cx * ny < nx * (ny - cy) {
-        let iac = (hash[ac_start + (ac_index >> 1)] >> ((ac_index & 1) << 2)) & 15;
-        var fac = Float32(iac)
-        fac = (fac / 7.5 - 1) * scale
-        ac.append(fac)
-        ac_index += 1
-        cx += 1
-      }
-    }
-    return ac
-  }
-  let l_ac = decodeChannel(lx, ly, l_scale)
-  let p_ac = decodeChannel(3, 3, p_scale * 1.25)
-  let q_ac = decodeChannel(3, 3, q_scale * 1.25)
-  let a_ac = hasAlpha ? decodeChannel(5, 5, a_scale) : []
-  
-  // Decode using the DCT into RGB
-  let ratio = thumbHashToApproximateAspectRatio(hash: hash)
-  let fw = round(ratio > 1 ? 32 : 32 * ratio)
-  let fh = round(ratio > 1 ? 32 / ratio : 32)
-  let w = Int(fw)
-  let h = Int(fh)
-  let pointer = UnsafeMutableRawBufferPointer.allocate(
-    byteCount: w * h * 4,
-    alignment: MemoryLayout<UInt8>.alignment
-  )
-  var rgba = pointer.baseAddress!.assumingMemoryBound(to: UInt8.self)
-  let cx_stop = max(lx, hasAlpha ? 5 : 3)
-  let cy_stop = max(ly, hasAlpha ? 5 : 3)
-  var fx = [Float32](repeating: 0, count: cx_stop)
-  var fy = [Float32](repeating: 0, count: cy_stop)
-  fx.withUnsafeMutableBytes { fx in
-    let fx = fx.baseAddress!.bindMemory(to: Float32.self, capacity: fx.count)
-    fy.withUnsafeMutableBytes { fy in
-      let fy = fy.baseAddress!.bindMemory(to: Float32.self, capacity: fy.count)
-      var y = 0
-      while y < h {
-        var x = 0
-        while x < w {
-          var l = l_dc
-          var p = p_dc
-          var q = q_dc
-          var a = a_dc
-          
-          // Precompute the coefficients
-          var cx = 0
-          while cx < cx_stop {
-            let fw = Float32(w)
-            let fxx = Float32(x)
-            let fcx = Float32(cx)
-            fx[cx] = cos(Float32.pi / fw * (fxx + 0.5) * fcx)
-            cx += 1
-          }
-          var cy = 0
-          while cy < cy_stop {
-            let fh = Float32(h)
-            let fyy = Float32(y)
-            let fcy = Float32(cy)
-            fy[cy] = cos(Float32.pi / fh * (fyy + 0.5) * fcy)
-            cy += 1
-          }
-          
-          // Decode L
-          var j = 0
-          cy = 0
-          while cy < ly {
-            var cx = cy > 0 ? 0 : 1
-            let fy2 = fy[cy] * 2
-            while cx * ly < lx * (ly - cy) {
-              l += l_ac[j] * fx[cx] * fy2
-              j += 1
-              cx += 1
-            }
-            cy += 1
-          }
-          
-          // Decode P and Q
-          j = 0
-          cy = 0
-          while cy < 3 {
-            var cx = cy > 0 ? 0 : 1
-            let fy2 = fy[cy] * 2
-            while cx < 3 - cy {
-              let f = fx[cx] * fy2
-              p += p_ac[j] * f
-              q += q_ac[j] * f
-              j += 1
-              cx += 1
-            }
-            cy += 1
-          }
-          
-          // Decode A
-          if hasAlpha {
-            j = 0
-            cy = 0
-            while cy < 5 {
-              var cx = cy > 0 ? 0 : 1
-              let fy2 = fy[cy] * 2
-              while cx < 5 - cy {
-                a += a_ac[j] * fx[cx] * fy2
-                j += 1
-                cx += 1
-              }
-              cy += 1
-            }
-          }
-          
-          // Convert to RGB
-          var b = l - 2 / 3 * p
-          var r = (3 * l - b + q) / 2
-          var g = r - q
-          r = max(0, 255 * min(1, r))
-          g = max(0, 255 * min(1, g))
-          b = max(0, 255 * min(1, b))
-          a = max(0, 255 * min(1, a))
-          rgba[0] = UInt8(r)
-          rgba[1] = UInt8(g)
-          rgba[2] = UInt8(b)
-          rgba[3] = UInt8(a)
-          rgba = rgba.advanced(by: 4)
-          x += 1
-        }
-        y += 1
-      }
-    }
-  }
-  return (w, h, pointer)
-}
-
-func thumbHashToApproximateAspectRatio(hash: Data) -> Float32 {
-  let header = hash[3]
-  let hasAlpha = (hash[2] & 0x80) != 0
-  let isLandscape = (hash[4] & 0x80) != 0
-  let lx = isLandscape ? hasAlpha ? 5 : 7 : header & 7
-  let ly = isLandscape ? header & 7 : hasAlpha ? 5 : 7
-  return Float32(lx) / Float32(ly)
-}

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

@@ -1,138 +0,0 @@
-// Autogenerated from Pigeon (v26.0.0), do not edit directly.
-// See also: https://pub.dev/packages/pigeon
-
-import Foundation
-
-#if os(iOS)
-  import Flutter
-#elseif os(macOS)
-  import FlutterMacOS
-#else
-  #error("Unsupported platform.")
-#endif
-
-private func wrapResult(_ result: Any?) -> [Any?] {
-  return [result]
-}
-
-private func wrapError(_ error: Any) -> [Any?] {
-  if let pigeonError = error as? PigeonError {
-    return [
-      pigeonError.code,
-      pigeonError.message,
-      pigeonError.details,
-    ]
-  }
-  if let flutterError = error as? FlutterError {
-    return [
-      flutterError.code,
-      flutterError.message,
-      flutterError.details,
-    ]
-  }
-  return [
-    "\(error)",
-    "\(type(of: error))",
-    "Stacktrace: \(Thread.callStackSymbols)",
-  ]
-}
-
-private func isNullish(_ value: Any?) -> Bool {
-  return value is NSNull || value == nil
-}
-
-private func nilOrValue<T>(_ value: Any?) -> T? {
-  if value is NSNull { return nil }
-  return value as! T?
-}
-
-
-private class ThumbnailsPigeonCodecReader: FlutterStandardReader {
-}
-
-private class ThumbnailsPigeonCodecWriter: FlutterStandardWriter {
-}
-
-private class ThumbnailsPigeonCodecReaderWriter: FlutterStandardReaderWriter {
-  override func reader(with data: Data) -> FlutterStandardReader {
-    return ThumbnailsPigeonCodecReader(data: data)
-  }
-
-  override func writer(with data: NSMutableData) -> FlutterStandardWriter {
-    return ThumbnailsPigeonCodecWriter(data: data)
-  }
-}
-
-class ThumbnailsPigeonCodec: FlutterStandardMessageCodec, @unchecked Sendable {
-  static let shared = ThumbnailsPigeonCodec(readerWriter: ThumbnailsPigeonCodecReaderWriter())
-}
-
-
-/// Generated protocol from Pigeon that represents a handler of messages from Flutter.
-protocol ThumbnailApi {
-  func requestImage(assetId: String, requestId: Int64, width: Int64, height: Int64, isVideo: Bool, completion: @escaping (Result<[String: Int64], Error>) -> Void)
-  func cancelImageRequest(requestId: Int64) throws
-  func getThumbhash(thumbhash: String, completion: @escaping (Result<[String: Int64], Error>) -> Void)
-}
-
-/// Generated setup class from Pigeon to handle messages through the `binaryMessenger`.
-class ThumbnailApiSetup {
-  static var codec: FlutterStandardMessageCodec { ThumbnailsPigeonCodec.shared }
-  /// Sets up an instance of `ThumbnailApi` to handle messages through the `binaryMessenger`.
-  static func setUp(binaryMessenger: FlutterBinaryMessenger, api: ThumbnailApi?, messageChannelSuffix: String = "") {
-    let channelSuffix = messageChannelSuffix.count > 0 ? ".\(messageChannelSuffix)" : ""
-    let requestImageChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.ThumbnailApi.requestImage\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
-    if let api = api {
-      requestImageChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
-        let assetIdArg = args[0] as! String
-        let requestIdArg = args[1] as! Int64
-        let widthArg = args[2] as! Int64
-        let heightArg = args[3] as! Int64
-        let isVideoArg = args[4] as! Bool
-        api.requestImage(assetId: assetIdArg, requestId: requestIdArg, width: widthArg, height: heightArg, isVideo: isVideoArg) { result in
-          switch result {
-          case .success(let res):
-            reply(wrapResult(res))
-          case .failure(let error):
-            reply(wrapError(error))
-          }
-        }
-      }
-    } else {
-      requestImageChannel.setMessageHandler(nil)
-    }
-    let cancelImageRequestChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.ThumbnailApi.cancelImageRequest\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
-    if let api = api {
-      cancelImageRequestChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
-        let requestIdArg = args[0] as! Int64
-        do {
-          try api.cancelImageRequest(requestId: requestIdArg)
-          reply(wrapResult(nil))
-        } catch {
-          reply(wrapError(error))
-        }
-      }
-    } else {
-      cancelImageRequestChannel.setMessageHandler(nil)
-    }
-    let getThumbhashChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.ThumbnailApi.getThumbhash\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
-    if let api = api {
-      getThumbhashChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
-        let thumbhashArg = args[0] as! String
-        api.getThumbhash(thumbhash: thumbhashArg) { result in
-          switch result {
-          case .success(let res):
-            reply(wrapResult(res))
-          case .failure(let error):
-            reply(wrapError(error))
-          }
-        }
-      }
-    } else {
-      getThumbhashChannel.setMessageHandler(nil)
-    }
-  }
-}

mobile/ios/Runner/Images/ThumbnailsImpl.swift

@@ -1,187 +0,0 @@
-import CryptoKit
-import Flutter
-import MobileCoreServices
-import Photos
-
-class Request {
-  weak var workItem: DispatchWorkItem?
-  var isCancelled = false
-  let callback: (Result<[String: Int64], any Error>) -> Void
-  
-  init(callback: @escaping (Result<[String: Int64], any Error>) -> Void) {
-    self.callback = callback
-  }
-}
-
-class ThumbnailApiImpl: ThumbnailApi {
-  private static let imageManager = PHImageManager.default()
-  private static let fetchOptions = {
-    let fetchOptions = PHFetchOptions()
-    fetchOptions.fetchLimit = 1
-    fetchOptions.wantsIncrementalChangeDetails = false
-    return fetchOptions
-  }()
-  private static let requestOptions = {
-    let requestOptions = PHImageRequestOptions()
-    requestOptions.isNetworkAccessAllowed = true
-    requestOptions.deliveryMode = .highQualityFormat
-    requestOptions.resizeMode = .fast
-    requestOptions.isSynchronous = true
-    requestOptions.version = .current
-    return requestOptions
-  }()
-  
-  private static let assetQueue = DispatchQueue(label: "thumbnail.assets", qos: .userInitiated)
-  private static let requestQueue = DispatchQueue(label: "thumbnail.requests", qos: .userInitiated)
-  private static let cancelQueue = DispatchQueue(label: "thumbnail.cancellation", qos: .default)
-  private static let processingQueue = DispatchQueue(label: "thumbnail.processing", qos: .userInteractive, attributes: .concurrent)
-  
-  private static let rgbColorSpace = CGColorSpaceCreateDeviceRGB()
-  private static let bitmapInfo = CGBitmapInfo(rawValue: CGImageAlphaInfo.premultipliedLast.rawValue).rawValue
-  private static var requests = [Int64: Request]()
-  private static let cancelledResult = Result<[String: Int64], any Error>.success([:])
-  private static let concurrencySemaphore = DispatchSemaphore(value: ProcessInfo.processInfo.activeProcessorCount * 2)
-  private static let assetCache = {
-    let assetCache = NSCache<NSString, PHAsset>()
-    assetCache.countLimit = 10000
-    return assetCache
-  }()
-  
-  func getThumbhash(thumbhash: String, completion: @escaping (Result<[String : Int64], any Error>) -> Void) {
-    Self.processingQueue.async {
-      guard let data = Data(base64Encoded: thumbhash)
-      else { return completion(.failure(PigeonError(code: "", message: "Invalid base64 string: \(thumbhash)", details: nil)))}
-
-      let (width, height, pointer) = thumbHashToRGBA(hash: data)
-      completion(.success(["pointer": Int64(Int(bitPattern: pointer.baseAddress)), "width": Int64(width), "height": Int64(height)]))
-    }
-  }
-  
-  func requestImage(assetId: String, requestId: Int64, width: Int64, height: Int64, isVideo: Bool, completion: @escaping (Result<[String: Int64], any Error>) -> Void) {
-    let request = Request(callback: completion)
-    let item = DispatchWorkItem {
-      if request.isCancelled {
-        return completion(Self.cancelledResult)
-      }
-      
-      Self.concurrencySemaphore.wait()
-      defer {
-        Self.concurrencySemaphore.signal()
-      }
-      
-      if request.isCancelled {
-        return completion(Self.cancelledResult)
-      }
-      
-      guard let asset = Self.requestAsset(assetId: assetId)
-      else {
-        Self.removeRequest(requestId: requestId)
-        completion(.failure(PigeonError(code: "", message: "Could not get asset data for \(assetId)", details: nil)))
-        return
-      }
-      
-      if request.isCancelled {
-        return completion(Self.cancelledResult)
-      }
-      
-      var image: UIImage?
-      Self.imageManager.requestImage(
-        for: asset,
-        targetSize: CGSize(width: Double(width), height: Double(height)),
-        contentMode: .aspectFill,
-        options: Self.requestOptions,
-        resultHandler: { (_image, info) -> Void in
-          image = _image
-        }
-      )
-      
-      if request.isCancelled {
-        return completion(Self.cancelledResult)
-      }
-      
-      guard let image = image,
-            let cgImage = image.cgImage else {
-        Self.removeRequest(requestId: requestId)
-        return completion(.failure(PigeonError(code: "", message: "Could not get pixel data for \(assetId)", details: nil)))
-      }
-      
-      let pointer = UnsafeMutableRawPointer.allocate(
-        byteCount: Int(cgImage.width) * Int(cgImage.height) * 4,
-        alignment: MemoryLayout<UInt8>.alignment
-      )
-      
-      if request.isCancelled {
-        pointer.deallocate()
-        return completion(Self.cancelledResult)
-      }
-      
-      guard let context = CGContext(
-        data: pointer,
-        width: cgImage.width,
-        height: cgImage.height,
-        bitsPerComponent: 8,
-        bytesPerRow: cgImage.width * 4,
-        space: Self.rgbColorSpace,
-        bitmapInfo: Self.bitmapInfo
-      ) else {
-        pointer.deallocate()
-        Self.removeRequest(requestId: requestId)
-        return completion(.failure(PigeonError(code: "", message: "Could not create context for \(assetId)", details: nil)))
-      }
-      
-      if request.isCancelled {
-        pointer.deallocate()
-        return completion(Self.cancelledResult)
-      }
-      
-      context.interpolationQuality = .none
-      context.draw(cgImage, in: CGRect(x: 0, y: 0, width: cgImage.width, height: cgImage.height))
-      
-      if request.isCancelled {
-        pointer.deallocate()
-        return completion(Self.cancelledResult)
-      }
-      
-      completion(.success(["pointer": Int64(Int(bitPattern: pointer)), "width": Int64(cgImage.width), "height": Int64(cgImage.height)]))
-      Self.removeRequest(requestId: requestId)
-    }
-    
-    request.workItem = item
-    Self.addRequest(requestId: requestId, request: request)
-    Self.processingQueue.async(execute: item)
-  }
-  
-  func cancelImageRequest(requestId: Int64) {
-    Self.cancelRequest(requestId: requestId)
-  }
-  
-  private static func addRequest(requestId: Int64, request: Request) -> Void {
-    requestQueue.sync { requests[requestId] = request }
-  }
-  
-  private static func removeRequest(requestId: Int64) -> Void {
-    requestQueue.sync { requests[requestId] = nil }
-  }
-  
-  private static func cancelRequest(requestId: Int64) -> Void {
-    requestQueue.async {
-      guard let request = requests.removeValue(forKey: requestId) else { return }
-      request.isCancelled = true
-      guard let item = request.workItem else { return }
-      if item.isCancelled {
-        cancelQueue.async { request.callback(Self.cancelledResult) }
-      }
-    }
-  }
-  
-  private static func requestAsset(assetId: String) -> PHAsset? {
-    var asset: PHAsset?
-    assetQueue.sync { asset = assetCache.object(forKey: assetId as NSString) }
-    if asset != nil { return asset }
-    
-    guard let asset = PHAsset.fetchAssets(withLocalIdentifiers: [assetId], options: Self.fetchOptions).firstObject
-    else { return nil }
-    assetQueue.async { assetCache.setObject(asset, forKey: assetId as NSString) }
-    return asset
-  }
-}

mobile/ios/Runner/Info.plist

@@ -78,7 +78,7 @@
     <key>CFBundlePackageType</key>
     <string>APPL</string>
     <key>CFBundleShortVersionString</key>
-    <string>1.138.1</string>
+    <string>1.137.2</string>
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleURLTypes</key>
@@ -105,7 +105,7 @@
       </dict>
     </array>
     <key>CFBundleVersion</key>
-    <string>215</string>
+    <string>213</string>
     <key>FLTEnableImpeller</key>
     <true />
     <key>ITSAppUsesNonExemptEncryption</key>
@@ -184,4 +184,4 @@
     <string>We need local network permission to connect to the local server using IP address and
       allow the casting feature to work</string>
   </dict>
-</plist>
+</plist>

mobile/ios/fastlane/Fastfile

@@ -22,7 +22,7 @@ platform :ios do
       path: "./Runner.xcodeproj",
     )
     increment_version_number(
-      version_number: "1.139.0"
+      version_number: "1.138.1"
     )
     increment_build_number(
       build_number: latest_testflight_build_number + 1,

mobile/lib/constants/constants.dart

@@ -26,7 +26,7 @@ const String kDownloadGroupLivePhoto = 'group_livephoto';
 
 // Timeline constants
 const int kTimelineNoneSegmentSize = 120;
-const int kTimelineAssetLoadBatchSize = 1024;
+const int kTimelineAssetLoadBatchSize = 256;
 const int kTimelineAssetLoadOppositeSize = 64;
 
 // Widget keys

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

@@ -15,7 +15,7 @@ import 'package:logging/logging.dart';
 /// via [IStoreRepository]
 class LogService {
   final LogRepository _logRepository;
-  final IStoreRepository _storeRepository;
+  final IsarStoreRepository _storeRepository;
 
   final List<LogMessage> _msgBuffer = [];
 
@@ -38,7 +38,7 @@ class LogService {
 
   static Future<LogService> init({
     required LogRepository logRepository,
-    required IStoreRepository storeRepository,
+    required IsarStoreRepository storeRepository,
     bool shouldBuffer = true,
   }) async {
     _instance ??= await create(
@@ -51,7 +51,7 @@ class LogService {
 
   static Future<LogService> create({
     required LogRepository logRepository,
-    required IStoreRepository storeRepository,
+    required IsarStoreRepository storeRepository,
     bool shouldBuffer = true,
   }) async {
     final instance = LogService._(logRepository, storeRepository, shouldBuffer);
@@ -92,7 +92,7 @@ class LogService {
   }
 
   Future<void> setLogLevel(LogLevel level) async {
-    await _storeRepository.upsert(StoreKey.logLevel, level.index);
+    await _storeRepository.insert(StoreKey.logLevel, level.index);
     Logger.root.level = level.toLevel();
   }
 

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

@@ -6,13 +6,13 @@ import 'package:immich_mobile/infrastructure/repositories/store.repository.dart'
 /// Provides access to a persistent key-value store with an in-memory cache.
 /// Listens for repository changes to keep the cache updated.
 class StoreService {
-  final IStoreRepository _storeRepository;
+  final IsarStoreRepository _storeRepository;
 
   /// In-memory cache. Keys are [StoreKey.id]
   final Map<int, Object?> _cache = {};
-  late final StreamSubscription<List<StoreDto>> _storeUpdateSubscription;
+  late final StreamSubscription<StoreDto> _storeUpdateSubscription;
 
-  StoreService._({required IStoreRepository isarStoreRepository}) : _storeRepository = isarStoreRepository;
+  StoreService._({required IsarStoreRepository storeRepository}) : _storeRepository = storeRepository;
 
   // TODO: Temporary typedef to make minimal changes. Remove this and make the presentation layer access store through a provider
   static StoreService? _instance;
@@ -24,29 +24,27 @@ class StoreService {
   }
 
   // TODO: Replace the implementation with the one from create after removing the typedef
-  static Future<StoreService> init({required IStoreRepository storeRepository}) async {
+  static Future<StoreService> init({required IsarStoreRepository storeRepository}) async {
     _instance ??= await create(storeRepository: storeRepository);
     return _instance!;
   }
 
-  static Future<StoreService> create({required IStoreRepository storeRepository}) async {
-    final instance = StoreService._(isarStoreRepository: storeRepository);
-    await instance.populateCache();
+  static Future<StoreService> create({required IsarStoreRepository storeRepository}) async {
+    final instance = StoreService._(storeRepository: storeRepository);
+    await instance._populateCache();
     instance._storeUpdateSubscription = instance._listenForChange();
     return instance;
   }
 
-  Future<void> populateCache() async {
+  Future<void> _populateCache() async {
     final storeValues = await _storeRepository.getAll();
     for (StoreDto storeValue in storeValues) {
       _cache[storeValue.key.id] = storeValue.value;
     }
   }
 
-  StreamSubscription<List<StoreDto>> _listenForChange() => _storeRepository.watchAll().listen((events) {
-    for (final event in events) {
-      _cache[event.key.id] = event.value;
-    }
+  StreamSubscription<StoreDto> _listenForChange() => _storeRepository.watchAll().listen((event) {
+    _cache[event.key.id] = event.value;
   });
 
   /// Disposes the store and cancels the subscription. To reuse the store call init() again
@@ -71,7 +69,7 @@ class StoreService {
   /// Stores the [value] for the [key]. Skips write if value hasn't changed.
   Future<void> put<U extends StoreKey<T>, T>(U key, T value) async {
     if (_cache[key.id] == value) return;
-    await _storeRepository.upsert(key, value);
+    await _storeRepository.insert(key, value);
     _cache[key.id] = value;
   }
 

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

@@ -1,5 +1,3 @@
-import 'package:drift/drift.dart';
-import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';
 import 'package:isar/isar.dart';
 
 part 'store.entity.g.dart';
@@ -13,13 +11,3 @@ class StoreValue {
 
   const StoreValue(this.id, {this.intValue, this.strValue});
 }
-
-class StoreEntity extends Table with DriftDefaultsMixin {
-  IntColumn get id => integer()();
-
-  TextColumn get stringValue => text().nullable()();
-  IntColumn get intValue => integer().nullable()();
-
-  @override
-  Set<Column> get primaryKey => {id};
-}

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

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

mobile/lib/infrastructure/loaders/image_request.dart

@@ -1,86 +0,0 @@
-import 'dart:async';
-import 'dart:ffi';
-import 'dart:io';
-import 'dart:ui' as ui;
-
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-import 'package:ffi/ffi.dart';
-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/providers/image/cache/remote_image_cache_manager.dart';
-import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
-import 'package:logging/logging.dart';
-
-part 'local_image_request.dart';
-part 'thumbhash_image_request.dart';
-part 'remote_image_request.dart';
-
-abstract class ImageRequest {
-  static int _nextRequestId = 0;
-
-  final int requestId = _nextRequestId++;
-  bool _isCancelled = false;
-
-  get isCancelled => _isCancelled;
-
-  ImageRequest();
-
-  Future<ImageInfo?> load(ImageDecoderCallback decode, {double scale = 1.0});
-
-  void cancel() {
-    if (_isCancelled) {
-      return;
-    }
-    _isCancelled = true;
-    return _onCancelled();
-  }
-
-  void _onCancelled();
-
-  Future<ui.FrameInfo?> _fromPlatformImage(Map<String, int> info) async {
-    final address = info['pointer'];
-    if (address == null) {
-      return null;
-    }
-
-    final pointer = Pointer<Uint8>.fromAddress(address);
-    if (_isCancelled) {
-      malloc.free(pointer);
-      return null;
-    }
-
-    final int actualWidth;
-    final int actualHeight;
-    final int actualSize;
-    final ui.ImmutableBuffer buffer;
-    try {
-      actualWidth = info['width']!;
-      actualHeight = info['height']!;
-      actualSize = actualWidth * actualHeight * 4;
-      buffer = await ImmutableBuffer.fromUint8List(pointer.asTypedList(actualSize));
-    } finally {
-      malloc.free(pointer);
-    }
-
-    if (_isCancelled) {
-      buffer.dispose();
-      return null;
-    }
-
-    final descriptor = ui.ImageDescriptor.raw(
-      buffer,
-      width: actualWidth,
-      height: actualHeight,
-      pixelFormat: ui.PixelFormat.rgba8888,
-    );
-    final codec = await descriptor.instantiateCodec();
-    if (_isCancelled) {
-      buffer.dispose();
-      descriptor.dispose();
-      codec.dispose();
-      return null;
-    }
-
-    return await codec.getNextFrame();
-  }
-}

mobile/lib/infrastructure/loaders/local_image_request.dart

@@ -1,35 +0,0 @@
-part of 'image_request.dart';
-
-class LocalImageRequest extends ImageRequest {
-  final String localId;
-  final int width;
-  final int height;
-  final AssetType assetType;
-
-  LocalImageRequest({required this.localId, required ui.Size size, required this.assetType})
-    : width = size.width.toInt(),
-      height = size.height.toInt();
-
-  @override
-  Future<ImageInfo?> load(ImageDecoderCallback decode, {double scale = 1.0}) async {
-    if (_isCancelled) {
-      return null;
-    }
-
-    final Map<String, int> info = await thumbnailApi.requestImage(
-      localId,
-      requestId: requestId,
-      width: width,
-      height: height,
-      isVideo: assetType == AssetType.video,
-    );
-
-    final frame = await _fromPlatformImage(info);
-    return frame == null ? null : ImageInfo(image: frame.image, scale: scale);
-  }
-
-  @override
-  Future<void> _onCancelled() {
-    return thumbnailApi.cancelImageRequest(requestId);
-  }
-}

mobile/lib/infrastructure/loaders/remote_image_request.dart

@@ -1,136 +0,0 @@
-part of 'image_request.dart';
-
-class RemoteImageRequest extends ImageRequest {
-  static final log = Logger('RemoteImageRequest');
-  static final client = HttpClient()..maxConnectionsPerHost = 16;
-  final RemoteCacheManager? cacheManager;
-  final String uri;
-  final Map<String, String> headers;
-  HttpClientRequest? _request;
-
-  RemoteImageRequest({required this.uri, required this.headers, this.cacheManager});
-
-  @override
-  Future<ImageInfo?> load(ImageDecoderCallback decode, {double scale = 1.0}) async {
-    if (_isCancelled) {
-      return null;
-    }
-
-    // TODO: the cache manager makes everything sequential with its DB calls and its operations cannot be cancelled,
-    //  so it ends up being a bottleneck.  We only prefer fetching from it when it can skip the DB call.
-    final cachedFileImage = await _loadCachedFile(uri, decode, scale, inMemoryOnly: true);
-    if (cachedFileImage != null) {
-      return cachedFileImage;
-    }
-
-    try {
-      final buffer = await _downloadImage(uri);
-      if (buffer == null) {
-        return null;
-      }
-
-      return await _decodeBuffer(buffer, decode, scale);
-    } catch (e) {
-      if (_isCancelled) {
-        return null;
-      }
-
-      final cachedFileImage = await _loadCachedFile(uri, decode, scale, inMemoryOnly: false);
-      if (cachedFileImage != null) {
-        return cachedFileImage;
-      }
-
-      rethrow;
-    } finally {
-      _request = null;
-    }
-  }
-
-  Future<ImmutableBuffer?> _downloadImage(String url) async {
-    if (_isCancelled) {
-      return null;
-    }
-
-    final request = _request = await client.getUrl(Uri.parse(url));
-    if (_isCancelled) {
-      request.abort();
-      return _request = null;
-    }
-
-    for (final entry in headers.entries) {
-      request.headers.set(entry.key, entry.value);
-    }
-    final response = await request.close();
-    if (_isCancelled) {
-      return null;
-    }
-    final bytes = Uint8List(response.contentLength);
-    int offset = 0;
-    final subscription = response.listen((List<int> chunk) {
-      // this is important to break the response stream if the request is cancelled
-      if (_isCancelled) {
-        throw StateError('Cancelled request');
-      }
-      bytes.setAll(offset, chunk);
-      offset += chunk.length;
-    }, cancelOnError: true);
-    cacheManager?.putStreamedFile(url, response);
-    await subscription.asFuture();
-    return await ImmutableBuffer.fromUint8List(bytes);
-  }
-
-  Future<ImageInfo?> _loadCachedFile(
-    String url,
-    ImageDecoderCallback decode,
-    double scale, {
-    required bool inMemoryOnly,
-  }) async {
-    final cacheManager = this.cacheManager;
-    if (_isCancelled || cacheManager == null) {
-      return null;
-    }
-
-    final file = await (inMemoryOnly ? cacheManager.getFileFromMemory(url) : cacheManager.getFileFromCache(url));
-    if (_isCancelled || file == null) {
-      return null;
-    }
-
-    try {
-      final buffer = await ImmutableBuffer.fromFilePath(file.file.path);
-      return await _decodeBuffer(buffer, decode, scale);
-    } catch (e) {
-      log.severe('Failed to decode cached image', e);
-      _evictFile(url);
-      return null;
-    }
-  }
-
-  Future<void> _evictFile(String url) async {
-    try {
-      await cacheManager?.removeFile(url);
-    } catch (e) {
-      log.severe('Failed to remove cached image', e);
-    }
-  }
-
-  Future<ImageInfo?> _decodeBuffer(ImmutableBuffer buffer, ImageDecoderCallback decode, scale) async {
-    if (_isCancelled) {
-      buffer.dispose();
-      return null;
-    }
-    final codec = await decode(buffer);
-    if (_isCancelled) {
-      buffer.dispose();
-      codec.dispose();
-      return null;
-    }
-    final frame = await codec.getNextFrame();
-    return ImageInfo(image: frame.image, scale: scale);
-  }
-
-  @override
-  void _onCancelled() {
-    _request?.abort();
-    _request = null;
-  }
-}

mobile/lib/infrastructure/loaders/thumbhash_image_request.dart

@@ -1,21 +0,0 @@
-part of 'image_request.dart';
-
-class ThumbhashImageRequest extends ImageRequest {
-  final String thumbhash;
-
-  ThumbhashImageRequest({required this.thumbhash});
-
-  @override
-  Future<ImageInfo?> load(ImageDecoderCallback decode, {double scale = 1.0}) async {
-    if (_isCancelled) {
-      return null;
-    }
-
-    final Map<String, int> info = await thumbnailApi.getThumbhash(thumbhash);
-    final frame = await _fromPlatformImage(info);
-    return frame == null ? null : ImageInfo(image: frame.image, scale: scale);
-  }
-
-  @override
-  void _onCancelled() {}
-}

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

@@ -0,0 +1,18 @@
+import 'dart:typed_data';
+import 'dart:ui';
+
+import 'package:photo_manager/photo_manager.dart';
+
+class AssetMediaRepository {
+  const AssetMediaRepository();
+
+  Future<Uint8List?> getThumbnail(String id, {int quality = 80, Size size = const Size.square(256)}) => AssetEntity(
+    id: id,
+    // The below fields are not used in thumbnailDataWithSize but are required
+    // to create an AssetEntity instance. It is faster to create a dummy AssetEntity
+    // instance than to fetch the asset from the device first.
+    typeInt: AssetType.image.index,
+    width: size.width.toInt(),
+    height: size.height.toInt(),
+  ).thumbnailDataWithSize(ThumbnailSize(size.width.toInt(), size.height.toInt()), quality: quality);
+}

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

@@ -1,5 +1,3 @@
-import 'dart:async';
-
 import 'package:drift/drift.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/album/local_album.model.dart';
@@ -137,22 +135,4 @@ class DriftBackupRepository extends DriftDatabaseRepository {
 
     return query.map((localAsset) => localAsset.toDto()).get();
   }
-
-  FutureOr<List<LocalAlbum>> getSourceAlbums(String localAssetId) {
-    final query = _db.localAlbumEntity.select()
-      ..where(
-        (lae) =>
-            existsQuery(
-              _db.localAlbumAssetEntity.selectOnly()
-                ..addColumns([_db.localAlbumAssetEntity.albumId])
-                ..where(
-                  _db.localAlbumAssetEntity.albumId.equalsExp(lae.id) &
-                      _db.localAlbumAssetEntity.assetId.equals(localAssetId),
-                ),
-            ) &
-            lae.backupSelection.equalsValue(BackupSelection.selected),
-      )
-      ..orderBy([(lae) => OrderingTerm.asc(lae.name)]);
-    return query.map((localAlbum) => localAlbum.toDto()).get();
-  }
 }

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

@@ -18,7 +18,6 @@ import 'package:immich_mobile/infrastructure/entities/remote_album_asset.entity.
 import 'package:immich_mobile/infrastructure/entities/remote_album_user.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_asset.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/user.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/user_metadata.entity.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.steps.dart';
@@ -59,7 +58,6 @@ class IsarDatabaseRepository implements IDatabaseRepository {
     StackEntity,
     PersonEntity,
     AssetFaceEntity,
-    StoreEntity,
   ],
   include: {'package:immich_mobile/infrastructure/entities/merged_asset.drift'},
 )
@@ -68,7 +66,7 @@ class Drift extends $Drift implements IDatabaseRepository {
     : super(executor ?? driftDatabase(name: 'immich', native: const DriftNativeOptions(shareAcrossIsolates: true)));
 
   @override
-  int get schemaVersion => 8;
+  int get schemaVersion => 7;
 
   @override
   MigrationStrategy get migration => MigrationStrategy(
@@ -120,9 +118,6 @@ class Drift extends $Drift implements IDatabaseRepository {
           from6To7: (m, v7) async {
             await m.createIndex(v7.idxLatLng);
           },
-          from7To8: (m, v8) async {
-            await m.create(v8.storeEntity);
-          },
         ),
       );
 

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

@@ -33,11 +33,9 @@ import 'package:immich_mobile/infrastructure/entities/person.entity.drift.dart'
     as i15;
 import 'package:immich_mobile/infrastructure/entities/asset_face.entity.drift.dart'
     as i16;
-import 'package:immich_mobile/infrastructure/entities/store.entity.drift.dart'
-    as i17;
 import 'package:immich_mobile/infrastructure/entities/merged_asset.drift.dart'
-    as i18;
-import 'package:drift/internal/modular.dart' as i19;
+    as i17;
+import 'package:drift/internal/modular.dart' as i18;
 
 abstract class $Drift extends i0.GeneratedDatabase {
   $Drift(i0.QueryExecutor e) : super(e);
@@ -71,10 +69,9 @@ abstract class $Drift extends i0.GeneratedDatabase {
   late final i15.$PersonEntityTable personEntity = i15.$PersonEntityTable(this);
   late final i16.$AssetFaceEntityTable assetFaceEntity = i16
       .$AssetFaceEntityTable(this);
-  late final i17.$StoreEntityTable storeEntity = i17.$StoreEntityTable(this);
-  i18.MergedAssetDrift get mergedAssetDrift => i19.ReadDatabaseContainer(
+  i17.MergedAssetDrift get mergedAssetDrift => i18.ReadDatabaseContainer(
     this,
-  ).accessor<i18.MergedAssetDrift>(i18.MergedAssetDrift.new);
+  ).accessor<i17.MergedAssetDrift>(i17.MergedAssetDrift.new);
   @override
   Iterable<i0.TableInfo<i0.Table, Object?>> get allTables =>
       allSchemaEntities.whereType<i0.TableInfo<i0.Table, Object?>>();
@@ -101,7 +98,6 @@ abstract class $Drift extends i0.GeneratedDatabase {
     memoryAssetEntity,
     personEntity,
     assetFaceEntity,
-    storeEntity,
     i9.idxLatLng,
   ];
   @override
@@ -317,6 +313,4 @@ class $DriftManager {
       i15.$$PersonEntityTableTableManager(_db, _db.personEntity);
   i16.$$AssetFaceEntityTableTableManager get assetFaceEntity =>
       i16.$$AssetFaceEntityTableTableManager(_db, _db.assetFaceEntity);
-  i17.$$StoreEntityTableTableManager get storeEntity =>
-      i17.$$StoreEntityTableTableManager(_db, _db.storeEntity);
 }

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

@@ -3049,392 +3049,6 @@ final class Schema7 extends i0.VersionedSchema {
   );
 }
 
-final class Schema8 extends i0.VersionedSchema {
-  Schema8({required super.database}) : super(version: 8);
-  @override
-  late final List<i1.DatabaseSchemaEntity> entities = [
-    userEntity,
-    remoteAssetEntity,
-    stackEntity,
-    localAssetEntity,
-    localAlbumEntity,
-    localAlbumAssetEntity,
-    idxLocalAssetChecksum,
-    idxRemoteAssetOwnerChecksum,
-    uQRemoteAssetsOwnerChecksum,
-    uQRemoteAssetsOwnerLibraryChecksum,
-    idxRemoteAssetChecksum,
-    userMetadataEntity,
-    partnerEntity,
-    remoteExifEntity,
-    remoteAlbumEntity,
-    remoteAlbumAssetEntity,
-    remoteAlbumUserEntity,
-    memoryEntity,
-    memoryAssetEntity,
-    personEntity,
-    assetFaceEntity,
-    storeEntity,
-    idxLatLng,
-  ];
-  late final Shape16 userEntity = Shape16(
-    source: i0.VersionedTable(
-      entityName: 'user_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_0,
-        _column_1,
-        _column_2,
-        _column_3,
-        _column_84,
-        _column_85,
-        _column_5,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape17 remoteAssetEntity = Shape17(
-    source: i0.VersionedTable(
-      entityName: 'remote_asset_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_1,
-        _column_8,
-        _column_9,
-        _column_5,
-        _column_10,
-        _column_11,
-        _column_12,
-        _column_0,
-        _column_13,
-        _column_14,
-        _column_15,
-        _column_16,
-        _column_17,
-        _column_18,
-        _column_19,
-        _column_20,
-        _column_21,
-        _column_86,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape3 stackEntity = Shape3(
-    source: i0.VersionedTable(
-      entityName: 'stack_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [_column_0, _column_9, _column_5, _column_15, _column_75],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape2 localAssetEntity = Shape2(
-    source: i0.VersionedTable(
-      entityName: 'local_asset_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_1,
-        _column_8,
-        _column_9,
-        _column_5,
-        _column_10,
-        _column_11,
-        _column_12,
-        _column_0,
-        _column_22,
-        _column_14,
-        _column_23,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape6 localAlbumEntity = Shape6(
-    source: i0.VersionedTable(
-      entityName: 'local_album_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_0,
-        _column_1,
-        _column_5,
-        _column_31,
-        _column_32,
-        _column_33,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape7 localAlbumAssetEntity = Shape7(
-    source: i0.VersionedTable(
-      entityName: 'local_album_asset_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(asset_id, album_id)'],
-      columns: [_column_34, _column_35],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  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 idxRemoteAssetOwnerChecksum = i1.Index(
-    'idx_remote_asset_owner_checksum',
-    'CREATE INDEX IF NOT EXISTS idx_remote_asset_owner_checksum ON remote_asset_entity (owner_id, checksum)',
-  );
-  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)',
-  );
-  late final Shape4 userMetadataEntity = Shape4(
-    source: i0.VersionedTable(
-      entityName: 'user_metadata_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(user_id, "key")'],
-      columns: [_column_25, _column_26, _column_27],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape5 partnerEntity = Shape5(
-    source: i0.VersionedTable(
-      entityName: 'partner_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(shared_by_id, shared_with_id)'],
-      columns: [_column_28, _column_29, _column_30],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape8 remoteExifEntity = Shape8(
-    source: i0.VersionedTable(
-      entityName: 'remote_exif_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(asset_id)'],
-      columns: [
-        _column_36,
-        _column_37,
-        _column_38,
-        _column_39,
-        _column_40,
-        _column_41,
-        _column_11,
-        _column_10,
-        _column_42,
-        _column_43,
-        _column_44,
-        _column_45,
-        _column_46,
-        _column_47,
-        _column_48,
-        _column_49,
-        _column_50,
-        _column_51,
-        _column_52,
-        _column_53,
-        _column_54,
-        _column_55,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape9 remoteAlbumEntity = Shape9(
-    source: i0.VersionedTable(
-      entityName: 'remote_album_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_0,
-        _column_1,
-        _column_56,
-        _column_9,
-        _column_5,
-        _column_15,
-        _column_57,
-        _column_58,
-        _column_59,
-      ],
-      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_36, _column_60],
-      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_60, _column_25, _column_61],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape11 memoryEntity = Shape11(
-    source: i0.VersionedTable(
-      entityName: 'memory_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_0,
-        _column_9,
-        _column_5,
-        _column_18,
-        _column_15,
-        _column_8,
-        _column_62,
-        _column_63,
-        _column_64,
-        _column_65,
-        _column_66,
-        _column_67,
-      ],
-      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_36, _column_68],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape14 personEntity = Shape14(
-    source: i0.VersionedTable(
-      entityName: 'person_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_0,
-        _column_9,
-        _column_5,
-        _column_15,
-        _column_1,
-        _column_69,
-        _column_71,
-        _column_72,
-        _column_73,
-        _column_74,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape15 assetFaceEntity = Shape15(
-    source: i0.VersionedTable(
-      entityName: 'asset_face_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_0,
-        _column_36,
-        _column_76,
-        _column_77,
-        _column_78,
-        _column_79,
-        _column_80,
-        _column_81,
-        _column_82,
-        _column_83,
-      ],
-      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_87, _column_88, _column_89],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  final i1.Index idxLatLng = i1.Index(
-    'idx_lat_lng',
-    'CREATE INDEX IF NOT EXISTS idx_lat_lng ON remote_exif_entity (latitude, longitude)',
-  );
-}
-
-class Shape18 extends i0.VersionedTable {
-  Shape18({required super.source, required super.alias}) : super.aliased();
-  i1.GeneratedColumn<int> get id =>
-      columnsByName['id']! as i1.GeneratedColumn<int>;
-  i1.GeneratedColumn<String> get stringValue =>
-      columnsByName['string_value']! as i1.GeneratedColumn<String>;
-  i1.GeneratedColumn<int> get intValue =>
-      columnsByName['int_value']! as i1.GeneratedColumn<int>;
-}
-
-i1.GeneratedColumn<int> _column_87(String aliasedName) =>
-    i1.GeneratedColumn<int>(
-      'id',
-      aliasedName,
-      false,
-      type: i1.DriftSqlType.int,
-    );
-i1.GeneratedColumn<String> _column_88(String aliasedName) =>
-    i1.GeneratedColumn<String>(
-      'string_value',
-      aliasedName,
-      true,
-      type: i1.DriftSqlType.string,
-    );
-i1.GeneratedColumn<int> _column_89(String aliasedName) =>
-    i1.GeneratedColumn<int>(
-      'int_value',
-      aliasedName,
-      true,
-      type: i1.DriftSqlType.int,
-    );
 i0.MigrationStepWithVersion migrationSteps({
   required Future<void> Function(i1.Migrator m, Schema2 schema) from1To2,
   required Future<void> Function(i1.Migrator m, Schema3 schema) from2To3,
@@ -3442,7 +3056,6 @@ i0.MigrationStepWithVersion migrationSteps({
   required Future<void> Function(i1.Migrator m, Schema5 schema) from4To5,
   required Future<void> Function(i1.Migrator m, Schema6 schema) from5To6,
   required Future<void> Function(i1.Migrator m, Schema7 schema) from6To7,
-  required Future<void> Function(i1.Migrator m, Schema8 schema) from7To8,
 }) {
   return (currentVersion, database) async {
     switch (currentVersion) {
@@ -3476,11 +3089,6 @@ i0.MigrationStepWithVersion migrationSteps({
         final migrator = i1.Migrator(database, schema);
         await from6To7(migrator, schema);
         return 7;
-      case 7:
-        final schema = Schema8(database: database);
-        final migrator = i1.Migrator(database, schema);
-        await from7To8(migrator, schema);
-        return 8;
       default:
         throw ArgumentError.value('Unknown migration from $currentVersion');
     }
@@ -3494,7 +3102,6 @@ i1.OnUpgrade stepByStep({
   required Future<void> Function(i1.Migrator m, Schema5 schema) from4To5,
   required Future<void> Function(i1.Migrator m, Schema6 schema) from5To6,
   required Future<void> Function(i1.Migrator m, Schema7 schema) from6To7,
-  required Future<void> Function(i1.Migrator m, Schema8 schema) from7To8,
 }) => i0.VersionedSchema.stepByStepHelper(
   step: migrationSteps(
     from1To2: from1To2,
@@ -3503,6 +3110,5 @@ i1.OnUpgrade stepByStep({
     from4To5: from4To5,
     from5To6: from5To6,
     from6To7: from6To7,
-    from7To8: from7To8,
   ),
 );

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

@@ -56,9 +56,8 @@ class DriftLocalAlbumRepository extends DriftDatabaseRepository {
     final assetsToDelete = _platform.isIOS ? await _getUniqueAssetsInAlbum(albumId) : await getAssetIds(albumId);
     await _deleteAssets(assetsToDelete);
 
-    await _db.managers.localAlbumEntity
-        .filter((a) => a.id.equals(albumId) & a.backupSelection.equals(BackupSelection.none))
-        .delete();
+    // All the other assets that are still associated will be unlinked automatically on-cascade
+    await _db.managers.localAlbumEntity.filter((a) => a.id.equals(albumId)).delete();
   });
 
   Future<void> syncDeletes(String albumId, Iterable<String> assetIdsToKeep) async {
@@ -153,10 +152,7 @@ class DriftLocalAlbumRepository extends DriftDatabaseRepository {
         await deleteSmt.go();
       }
 
-      // Only remove albums that are not explicitly selected or excluded from backups
-      await _db.localAlbumEntity.deleteWhere(
-        (f) => f.marker_.isNotNull() & f.backupSelection.equalsValue(BackupSelection.none),
-      );
+      await _db.localAlbumEntity.deleteWhere((f) => f.marker_.isNotNull());
     });
   }
 

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

@@ -1,30 +1,16 @@
-import 'package:drift/drift.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/domain/models/user.model.dart';
 import 'package:immich_mobile/infrastructure/entities/store.entity.dart';
-import 'package:immich_mobile/infrastructure/entities/store.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/user.repository.dart';
 import 'package:isar/isar.dart';
 
-// Temporary interface until Isar is removed to make the service work with both Isar and Sqlite
-abstract class IStoreRepository {
-  Future<bool> deleteAll();
-  Stream<List<StoreDto<Object>>> watchAll();
-  Future<void> delete<T>(StoreKey<T> key);
-  Future<bool> upsert<T>(StoreKey<T> key, T value);
-  Future<T?> tryGet<T>(StoreKey<T> key);
-  Stream<T?> watch<T>(StoreKey<T> key);
-  Future<List<StoreDto<Object>>> getAll();
-}
-
-class IsarStoreRepository extends IsarDatabaseRepository implements IStoreRepository {
+class IsarStoreRepository extends IsarDatabaseRepository {
   final Isar _db;
   final validStoreKeys = StoreKey.values.map((e) => e.id).toSet();
 
   IsarStoreRepository(super.db) : _db = db;
 
-  @override
   Future<bool> deleteAll() async {
     return await transaction(() async {
       await _db.storeValues.clear();
@@ -32,29 +18,25 @@ class IsarStoreRepository extends IsarDatabaseRepository implements IStoreReposi
     });
   }
 
-  @override
-  Stream<List<StoreDto<Object>>> watchAll() {
+  Stream<StoreDto<Object>> watchAll() {
     return _db.storeValues
         .filter()
         .anyOf(validStoreKeys, (query, id) => query.idEqualTo(id))
         .watch(fireImmediately: true)
-        .asyncMap((entities) => Future.wait(entities.map((entity) => _toUpdateEvent(entity))));
+        .asyncExpand((entities) => Stream.fromFutures(entities.map((e) async => _toUpdateEvent(e))));
   }
 
-  @override
   Future<void> delete<T>(StoreKey<T> key) async {
     return await transaction(() async => await _db.storeValues.delete(key.id));
   }
 
-  @override
-  Future<bool> upsert<T>(StoreKey<T> key, T value) async {
+  Future<bool> insert<T>(StoreKey<T> key, T value) async {
     return await transaction(() async {
       await _db.storeValues.put(await _fromValue(key, value));
       return true;
     });
   }
 
-  @override
   Future<T?> tryGet<T>(StoreKey<T> key) async {
     final entity = (await _db.storeValues.get(key.id));
     if (entity == null) {
@@ -63,7 +45,13 @@ class IsarStoreRepository extends IsarDatabaseRepository implements IStoreReposi
     return await _toValue(key, entity);
   }
 
-  @override
+  Future<bool> update<T>(StoreKey<T> key, T value) async {
+    return await transaction(() async {
+      await _db.storeValues.put(await _fromValue(key, value));
+      return true;
+    });
+  }
+
   Stream<T?> watch<T>(StoreKey<T> key) async* {
     yield* _db.storeValues
         .watchObject(key.id, fireImmediately: true)
@@ -100,93 +88,8 @@ class IsarStoreRepository extends IsarDatabaseRepository implements IStoreReposi
     return StoreValue(key.id, intValue: intValue, strValue: strValue);
   }
 
-  @override
   Future<List<StoreDto<Object>>> getAll() async {
     final entities = await _db.storeValues.filter().anyOf(validStoreKeys, (query, id) => query.idEqualTo(id)).findAll();
     return Future.wait(entities.map((e) => _toUpdateEvent(e)).toList());
   }
 }
-
-class DriftStoreRepository extends DriftDatabaseRepository implements IStoreRepository {
-  final Drift _db;
-  final validStoreKeys = StoreKey.values.map((e) => e.id).toSet();
-
-  DriftStoreRepository(super.db) : _db = db;
-
-  @override
-  Future<bool> deleteAll() async {
-    await _db.storeEntity.deleteAll();
-    return true;
-  }
-
-  @override
-  Future<List<StoreDto<Object>>> getAll() async {
-    final query = _db.storeEntity.select()..where((entity) => entity.id.isIn(validStoreKeys));
-    return query.asyncMap((entity) => _toUpdateEvent(entity)).get();
-  }
-
-  @override
-  Stream<List<StoreDto<Object>>> watchAll() {
-    final query = _db.storeEntity.select()..where((entity) => entity.id.isIn(validStoreKeys));
-
-    return query.asyncMap((entity) => _toUpdateEvent(entity)).watch();
-  }
-
-  @override
-  Future<void> delete<T>(StoreKey<T> key) async {
-    await _db.storeEntity.deleteWhere((entity) => entity.id.equals(key.id));
-    return;
-  }
-
-  @override
-  Future<bool> upsert<T>(StoreKey<T> key, T value) async {
-    await _db.storeEntity.insertOnConflictUpdate(await _fromValue(key, value));
-    return true;
-  }
-
-  @override
-  Future<T?> tryGet<T>(StoreKey<T> key) async {
-    final entity = await _db.managers.storeEntity.filter((entity) => entity.id.equals(key.id)).getSingleOrNull();
-    if (entity == null) {
-      return null;
-    }
-    return await _toValue(key, entity);
-  }
-
-  @override
-  Stream<T?> watch<T>(StoreKey<T> key) async* {
-    final query = _db.storeEntity.select()..where((entity) => entity.id.equals(key.id));
-
-    yield* query.watchSingleOrNull().asyncMap((e) async => e == null ? null : await _toValue(key, e));
-  }
-
-  Future<StoreDto<Object>> _toUpdateEvent(StoreEntityData entity) async {
-    final key = StoreKey.values.firstWhere((e) => e.id == entity.id) as StoreKey<Object>;
-    final value = await _toValue(key, entity);
-    return StoreDto(key, value);
-  }
-
-  Future<T?> _toValue<T>(StoreKey<T> key, StoreEntityData entity) async =>
-      switch (key.type) {
-            const (int) => entity.intValue,
-            const (String) => entity.stringValue,
-            const (bool) => entity.intValue == 1,
-            const (DateTime) => entity.intValue == null ? null : DateTime.fromMillisecondsSinceEpoch(entity.intValue!),
-            const (UserDto) =>
-              entity.stringValue == null ? null : await DriftUserRepository(_db).get(entity.stringValue!),
-            _ => null,
-          }
-          as T?;
-
-  Future<StoreEntityCompanion> _fromValue<T>(StoreKey<T> key, T value) async {
-    final (int? intValue, String? strValue) = switch (key.type) {
-      const (int) => (value as int, null),
-      const (String) => (null, value as String),
-      const (bool) => ((value as bool) ? 1 : 0, null),
-      const (DateTime) => ((value as DateTime).millisecondsSinceEpoch, null),
-      const (UserDto) => (null, (await DriftUserRepository(_db).upsert(value as UserDto)).id),
-      _ => throw UnsupportedError("Unsupported primitive type: ${key.type} for key: ${key.name}"),
-    };
-    return StoreEntityCompanion(id: Value(key.id), intValue: Value(intValue), stringValue: Value(strValue));
-  }
-}

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

@@ -1,8 +1,6 @@
-import 'package:drift/drift.dart';
 import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/user.model.dart';
 import 'package:immich_mobile/infrastructure/entities/user.entity.dart' as entity;
-import 'package:immich_mobile/infrastructure/entities/user.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:isar/isar.dart';
 
@@ -65,40 +63,3 @@ class IsarUserRepository extends IsarDatabaseRepository {
     return true;
   }
 }
-
-class DriftUserRepository extends DriftDatabaseRepository {
-  final Drift _db;
-  const DriftUserRepository(super.db) : _db = db;
-
-  Future<UserDto?> get(String id) =>
-      _db.managers.userEntity.filter((user) => user.id.equals(id)).getSingleOrNull().then((user) => user?.toDto());
-
-  Future<UserDto> upsert(UserDto user) async {
-    await _db.userEntity.insertOnConflictUpdate(
-      UserEntityCompanion(
-        id: Value(user.id),
-        isAdmin: Value(user.isAdmin),
-        updatedAt: Value(user.updatedAt),
-        name: Value(user.name),
-        email: Value(user.email),
-        hasProfileImage: Value(user.hasProfileImage),
-        profileChangedAt: Value(user.profileChangedAt),
-      ),
-    );
-    return user;
-  }
-}
-
-extension on UserEntityData {
-  UserDto toDto() {
-    return UserDto(
-      id: id,
-      email: email,
-      name: name,
-      isAdmin: isAdmin,
-      updatedAt: updatedAt,
-      profileChangedAt: profileChangedAt,
-      hasProfileImage: hasProfileImage,
-    );
-  }
-}

mobile/lib/main.dart

@@ -14,6 +14,7 @@ import 'package:immich_mobile/constants/constants.dart';
 import 'package:immich_mobile/constants/locales.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/generated/codegen_loader.g.dart';
+import 'package:immich_mobile/infrastructure/repositories/logger_db.repository.dart';
 import 'package:immich_mobile/providers/app_life_cycle.provider.dart';
 import 'package:immich_mobile/providers/asset_viewer/share_intent_upload.provider.dart';
 import 'package:immich_mobile/providers/db.provider.dart';
@@ -40,21 +41,18 @@ import 'package:worker_manager/worker_manager.dart';
 
 void main() async {
   ImmichWidgetsBinding();
-  final (isar, drift, logDb) = await Bootstrap.initDB();
-  await Bootstrap.initDomain(isar, drift, logDb);
+  final db = await Bootstrap.initIsar();
+  final logDb = DriftLogger();
+  await Bootstrap.initDomain(db, logDb);
   await initApp();
   // Warm-up isolate pool for worker manager
   await workerManager.init(dynamicSpawning: true);
-  await migrateDatabaseIfNeeded(isar, drift);
+  await migrateDatabaseIfNeeded(db);
   HttpSSLOptions.apply();
 
   runApp(
     ProviderScope(
-      overrides: [
-        dbProvider.overrideWithValue(isar),
-        isarProvider.overrideWithValue(isar),
-        driftProvider.overrideWith(driftOverride(drift)),
-      ],
+      overrides: [dbProvider.overrideWithValue(db), isarProvider.overrideWithValue(db)],
       child: const MainWidget(),
     ),
   );
@@ -96,9 +94,7 @@ Future<void> initApp() async {
   // Initialize the file downloader
   await FileDownloader().configure(
     // maxConcurrent: 6, maxConcurrentByHost(server):6, maxConcurrentByGroup: 3
-
-    // On Android, if files are larger than 256MB, run in foreground service
-    globalConfig: [(Config.holdingQueue, (6, 6, 3)), (Config.runInForegroundIfFileLargerThan, 256)],
+    globalConfig: (Config.holdingQueue, (6, 6, 3)),
   );
 
   await FileDownloader().trackTasksInGroup(kDownloadGroupLivePhoto, markDownloadedComplete: false);
@@ -186,13 +182,6 @@ class ImmichAppState extends ConsumerState<ImmichApp> with WidgetsBindingObserve
       complete: TaskNotification('upload_finished'.tr(), '${'file_name'.tr()}: {displayName}'),
       progressBar: true,
     );
-
-    FileDownloader().configureNotificationForGroup(
-      kBackupGroup,
-      running: TaskNotification('uploading_media'.tr(), '${'file_name'.tr()}: {displayName}'),
-      complete: TaskNotification('upload_finished'.tr(), '${'file_name'.tr()}: {displayName}'),
-      progressBar: true,
-    );
   }
 
   Future<DeepLink> _deepLinkBuilder(PlatformDeepLink deepLink) async {

mobile/lib/pages/backup/drift_backup.page.dart

@@ -249,7 +249,6 @@ class _RemainderCard extends ConsumerWidget {
       title: "backup_controller_page_remainder".tr(),
       subtitle: "backup_controller_page_remainder_sub".tr(),
       info: remainderCount.toString(),
-      onTap: () => context.pushRoute(const DriftBackupAssetDetailRoute()),
     );
   }
 }

mobile/lib/pages/backup/drift_backup_asset_detail.page.dart

@@ -1,94 +0,0 @@
-import 'package:auto_route/auto_route.dart';
-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/timeline.model.dart';
-import 'package:immich_mobile/domain/utils/event_stream.dart';
-import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/extensions/theme_extensions.dart';
-import 'package:immich_mobile/extensions/translate_extensions.dart';
-import 'package:immich_mobile/pages/common/large_leading_tile.dart';
-import 'package:immich_mobile/presentation/widgets/images/thumbnail.widget.dart';
-import 'package:immich_mobile/providers/backup/drift_backup.provider.dart';
-import 'package:immich_mobile/routing/router.dart';
-
-@RoutePage()
-class DriftBackupAssetDetailPage extends ConsumerWidget {
-  const DriftBackupAssetDetailPage({super.key});
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    AsyncValue<List<LocalAsset>> result = ref.watch(driftBackupCandidateProvider);
-    return Scaffold(
-      appBar: AppBar(title: Text('backup_controller_page_remainder'.t(context: context))),
-      body: result.when(
-        data: (List<LocalAsset> candidates) {
-          return ListView.separated(
-            padding: const EdgeInsets.only(top: 16.0),
-            separatorBuilder: (context, index) => Divider(color: context.colorScheme.outlineVariant),
-            itemCount: candidates.length,
-            itemBuilder: (context, index) {
-              final asset = candidates[index];
-              final albumsAsyncValue = ref.watch(driftCandidateBackupAlbumInfoProvider(asset.id));
-              return LargeLeadingTile(
-                title: Text(
-                  asset.name,
-                  style: context.textTheme.labelLarge?.copyWith(fontWeight: FontWeight.w500, fontSize: 16),
-                ),
-                subtitle: Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: [
-                    Text(
-                      asset.createdAt.toString(),
-                      style: TextStyle(fontSize: 13.0, color: context.colorScheme.onSurfaceSecondary),
-                    ),
-                    Text(
-                      asset.checksum ?? "N/A",
-                      style: TextStyle(fontSize: 13.0, color: context.colorScheme.onSurfaceSecondary),
-                      overflow: TextOverflow.ellipsis,
-                    ),
-                    albumsAsyncValue.when(
-                      data: (albums) {
-                        if (albums.isEmpty) {
-                          return const SizedBox.shrink();
-                        }
-                        return Text(
-                          albums.map((a) => a.name).join(', '),
-                          style: context.textTheme.labelLarge?.copyWith(color: context.primaryColor),
-                          overflow: TextOverflow.ellipsis,
-                        );
-                      },
-                      error: (error, stackTrace) =>
-                          Text('Error: $error', style: TextStyle(color: context.colorScheme.error)),
-                      loading: () => const SizedBox(height: 16, width: 16, child: CircularProgressIndicator.adaptive()),
-                    ),
-                  ],
-                ),
-                leading: ClipRRect(
-                  borderRadius: const BorderRadius.all(Radius.circular(12)),
-                  child: SizedBox(
-                    width: 64,
-                    height: 64,
-                    child: Thumbnail.fromAsset(asset: asset, size: const Size(64, 64), fit: BoxFit.cover),
-                  ),
-                ),
-                trailing: const Padding(padding: EdgeInsets.only(right: 24, left: 8), child: Icon(Icons.image_search)),
-                onTap: () async {
-                  await context.maybePop();
-                  await context.navigateTo(const TabShellRoute(children: [MainTimelineRoute()]));
-                  EventStream.shared.emit(ScrollToDateEvent(asset.createdAt));
-                },
-              );
-            },
-          );
-        },
-        error: (Object error, StackTrace stackTrace) {
-          return Center(child: Text('Error: $error'));
-        },
-        loading: () {
-          return const SizedBox(height: 48, width: 48, child: Center(child: CircularProgressIndicator.adaptive()));
-        },
-      ),
-    );
-  }
-}

mobile/lib/pages/backup/drift_upload_detail.page.dart

@@ -224,7 +224,7 @@ class FileDetailDialog extends ConsumerWidget {
                           borderRadius: const BorderRadius.all(Radius.circular(12)),
                         ),
                         child: asset != null
-                            ? Thumbnail.fromAsset(asset: asset, size: const Size(128, 128), fit: BoxFit.cover)
+                            ? Thumbnail(asset: asset, size: const Size(512, 512), fit: BoxFit.cover)
                             : null,
                       ),
                     ),

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

@@ -5,7 +5,6 @@ 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/infrastructure/repositories/store.repository.dart';
 import 'package:immich_mobile/providers/album/album.provider.dart';
 import 'package:immich_mobile/providers/asset.provider.dart';
 import 'package:immich_mobile/providers/background_sync.provider.dart';
@@ -14,8 +13,8 @@ import 'package:immich_mobile/providers/backup/manual_upload.provider.dart';
 import 'package:immich_mobile/providers/gallery_permission.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
 import 'package:immich_mobile/providers/websocket.provider.dart';
+import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/utils/migration.dart';
-import 'package:logging/logging.dart';
 import 'package:permission_handler/permission_handler.dart';
 
 @RoutePage()
@@ -29,7 +28,7 @@ class ChangeExperiencePage extends ConsumerStatefulWidget {
 }
 
 class _ChangeExperiencePageState extends ConsumerState<ChangeExperiencePage> {
-  AsyncValue<bool> hasMigrated = const AsyncValue.loading();
+  bool hasMigrated = false;
 
   @override
   void initState() {
@@ -38,60 +37,46 @@ class _ChangeExperiencePageState extends ConsumerState<ChangeExperiencePage> {
   }
 
   Future<void> _handleMigration() async {
-    try {
-      if (widget.switchingToBeta) {
-        final assetNotifier = ref.read(assetProvider.notifier);
-        if (assetNotifier.mounted) {
-          assetNotifier.dispose();
-        }
-        final albumNotifier = ref.read(albumProvider.notifier);
-        if (albumNotifier.mounted) {
-          albumNotifier.dispose();
-        }
-
-        // Cancel uploads
-        await Store.put(StoreKey.backgroundBackup, false);
-        ref
-            .read(backupProvider.notifier)
-            .configureBackgroundBackup(enabled: false, onBatteryInfo: () {}, onError: (_) {});
-        ref.read(backupProvider.notifier).setAutoBackup(false);
-        ref.read(backupProvider.notifier).cancelBackup();
-        ref.read(manualUploadProvider.notifier).cancelBackup();
-        // Start listening to new websocket events
-        ref.read(websocketProvider.notifier).stopListenToOldEvents();
-        ref.read(websocketProvider.notifier).startListeningToBetaEvents();
-
-        final permission = await ref.read(galleryPermissionNotifier.notifier).requestGalleryPermission();
-
-        if (permission.isGranted) {
-          await ref.read(backgroundSyncProvider).syncLocal(full: true);
-          await migrateDeviceAssetToSqlite(ref.read(isarProvider), ref.read(driftProvider));
-          await migrateBackupAlbumsToSqlite(ref.read(isarProvider), ref.read(driftProvider));
-          await migrateStoreToSqlite(ref.read(isarProvider), ref.read(driftProvider));
-        }
-      } else {
-        await ref.read(backgroundSyncProvider).cancel();
-        ref.read(websocketProvider.notifier).stopListeningToBetaEvents();
-        ref.read(websocketProvider.notifier).startListeningToOldEvents();
-        await migrateStoreToIsar(ref.read(isarProvider), ref.read(driftProvider));
+    if (widget.switchingToBeta) {
+      final assetNotifier = ref.read(assetProvider.notifier);
+      if (assetNotifier.mounted) {
+        assetNotifier.dispose();
+      }
+      final albumNotifier = ref.read(albumProvider.notifier);
+      if (albumNotifier.mounted) {
+        albumNotifier.dispose();
       }
 
-      await IsarStoreRepository(ref.read(isarProvider)).upsert(StoreKey.betaTimeline, widget.switchingToBeta);
-      await DriftStoreRepository(ref.read(driftProvider)).upsert(StoreKey.betaTimeline, widget.switchingToBeta);
+      // Cancel uploads
+      await Store.put(StoreKey.backgroundBackup, false);
+      ref
+          .read(backupProvider.notifier)
+          .configureBackgroundBackup(enabled: false, onBatteryInfo: () {}, onError: (_) {});
+      ref.read(backupProvider.notifier).setAutoBackup(false);
+      ref.read(backupProvider.notifier).cancelBackup();
+      ref.read(manualUploadProvider.notifier).cancelBackup();
+      // Start listening to new websocket events
+      ref.read(websocketProvider.notifier).stopListenToOldEvents();
+      ref.read(websocketProvider.notifier).startListeningToBetaEvents();
 
-      if (mounted) {
-        setState(() {
-          HapticFeedback.heavyImpact();
-          hasMigrated = const AsyncValue.data(true);
-        });
-      }
-    } catch (e, s) {
-      Logger("ChangeExperiencePage").severe("Error during migration", e, s);
-      if (mounted) {
-        setState(() {
-          hasMigrated = AsyncValue.error(e, s);
-        });
+      final permission = await ref.read(galleryPermissionNotifier.notifier).requestGalleryPermission();
+
+      if (permission.isGranted) {
+        await ref.read(backgroundSyncProvider).syncLocal(full: true);
+        await migrateDeviceAssetToSqlite(ref.read(isarProvider), ref.read(driftProvider));
+        await migrateBackupAlbumsToSqlite(ref.read(isarProvider), ref.read(driftProvider));
       }
+    } else {
+      await ref.read(backgroundSyncProvider).cancel();
+      ref.read(websocketProvider.notifier).stopListeningToBetaEvents();
+      ref.read(websocketProvider.notifier).startListeningToOldEvents();
+    }
+
+    if (mounted) {
+      setState(() {
+        HapticFeedback.heavyImpact();
+        hasMigrated = true;
+      });
     }
   }
 
@@ -104,34 +89,44 @@ class _ChangeExperiencePageState extends ConsumerState<ChangeExperiencePage> {
           children: [
             AnimatedSwitcher(
               duration: Durations.long4,
-              child: hasMigrated.when(
-                data: (data) => const Icon(Icons.check_circle_rounded, color: Colors.green, size: 48.0),
-                error: (error, stackTrace) => const Icon(Icons.error, color: Colors.red, size: 48.0),
-                loading: () => const SizedBox(width: 50.0, height: 50.0, child: CircularProgressIndicator()),
-              ),
+              child: hasMigrated
+                  ? const Icon(Icons.check_circle_rounded, color: Colors.green, size: 48.0)
+                  : const SizedBox(width: 50.0, height: 50.0, child: CircularProgressIndicator()),
             ),
             const SizedBox(height: 16.0),
-            SizedBox(
-              width: 300.0,
-              child: AnimatedSwitcher(
-                duration: Durations.long4,
-                child: hasMigrated.when(
-                  data: (data) => Text(
-                    "Migration success!\nPlease close and reopen the app to apply changes",
-                    style: context.textTheme.titleMedium,
-                    textAlign: TextAlign.center,
+            Center(
+              child: Column(
+                children: [
+                  SizedBox(
+                    width: 300.0,
+                    child: AnimatedSwitcher(
+                      duration: Durations.long4,
+                      child: hasMigrated
+                          ? Text(
+                              "Migration success!",
+                              style: context.textTheme.titleMedium,
+                              textAlign: TextAlign.center,
+                            )
+                          : Text(
+                              "Data migration in progress...\nPlease wait and don't close this page",
+                              style: context.textTheme.titleMedium,
+                              textAlign: TextAlign.center,
+                            ),
+                    ),
                   ),
-                  error: (error, stackTrace) => Text(
-                    "Migration failed!\nError: $error",
-                    style: context.textTheme.titleMedium,
-                    textAlign: TextAlign.center,
-                  ),
-                  loading: () => Text(
-                    "Data migration in progress...\nPlease wait and don't close this page",
-                    style: context.textTheme.titleMedium,
-                    textAlign: TextAlign.center,
-                  ),
-                ),
+                  if (hasMigrated)
+                    Padding(
+                      padding: const EdgeInsets.only(top: 16.0),
+                      child: ElevatedButton(
+                        onPressed: () {
+                          context.replaceRoute(
+                            widget.switchingToBeta ? const TabShellRoute() : const TabControllerRoute(),
+                          );
+                        },
+                        child: const Text("Continue"),
+                      ),
+                    ),
+                ],
               ),
             ),
           ],

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

@@ -134,10 +134,6 @@ void _onNavigationSelected(TabsRouter router, int index, WidgetRef ref) {
     ref.read(remoteAlbumProvider.notifier).refresh();
   }
 
-  if (index == 3) {
-    ref.invalidate(localAlbumProvider);
-  }
-
   ref.read(hapticFeedbackProvider.notifier).selectionClick();
   router.setActiveIndex(index);
   ref.read(tabProvider.notifier).state = TabEnum.values[index];

mobile/lib/platform/thumbnail_api.g.dart

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

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

@@ -119,7 +119,7 @@ class _DriftCreateAlbumPageState extends ConsumerState<DriftCreateAlbumPage> {
           final asset = selectedAssets.elementAt(index);
           return GestureDetector(
             onTap: onBackgroundTapped,
-            child: Thumbnail.fromAsset(asset: asset),
+            child: Thumbnail(asset: asset),
           );
         }, childCount: selectedAssets.length),
       ),

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

@@ -163,11 +163,7 @@ class _PlaceTile extends StatelessWidget {
       title: Text(place.$1, style: context.textTheme.titleMedium?.copyWith(fontWeight: FontWeight.w500)),
       leading: ClipRRect(
         borderRadius: const BorderRadius.all(Radius.circular(20)),
-        child: SizedBox(
-          width: 80,
-          height: 80,
-          child: Thumbnail.remote(remoteId: place.$2, fit: BoxFit.cover),
-        ),
+        child: Thumbnail(size: const Size(80, 80), fit: BoxFit.cover, remoteId: place.$2),
       ),
     );
   }

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

@@ -458,7 +458,7 @@ class _AlbumList extends ConsumerWidget {
             leading: album.thumbnailAssetId != null
                 ? ClipRRect(
                     borderRadius: const BorderRadius.all(Radius.circular(15)),
-                    child: SizedBox(width: 80, height: 80, child: Thumbnail.remote(remoteId: album.thumbnailAssetId!)),
+                    child: SizedBox(width: 80, height: 80, child: Thumbnail(remoteId: album.thumbnailAssetId)),
                   )
                 : SizedBox(
                     width: 80,
@@ -577,7 +577,7 @@ class _GridAlbumCard extends ConsumerWidget {
                 child: SizedBox(
                   width: double.infinity,
                   child: album.thumbnailAssetId != null
-                      ? Thumbnail.remote(remoteId: album.thumbnailAssetId!)
+                      ? Thumbnail(remoteId: album.thumbnailAssetId)
                       : Container(
                           color: context.colorScheme.surfaceContainerHighest,
                           child: const Icon(Icons.photo_album_rounded, size: 40, color: Colors.grey),

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

@@ -25,7 +25,6 @@ import 'package:immich_mobile/providers/asset_viewer/video_player_value_provider
 import 'package:immich_mobile/providers/cast.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asset.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
-import 'package:immich_mobile/widgets/common/immich_loading_indicator.dart';
 import 'package:immich_mobile/widgets/photo_view/photo_view.dart';
 import 'package:immich_mobile/widgets/photo_view/photo_view_gallery.dart';
 import 'package:platform/platform.dart';
@@ -64,7 +63,6 @@ const double _kBottomSheetMinimumExtent = 0.4;
 const double _kBottomSheetSnapExtent = 0.7;
 
 class _AssetViewerState extends ConsumerState<AssetViewer> {
-  static final _dummyListener = ImageStreamListener((image, _) => image.dispose());
   late PageController pageController;
   late DraggableScrollableController bottomSheetController;
   PersistentBottomSheetController? sheetCloseController;
@@ -92,9 +90,6 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
   // Delayed operations that should be cancelled on disposal
   final List<Timer> _delayedOperations = [];
 
-  ImageStream? _prevPreCacheStream;
-  ImageStream? _nextPreCacheStream;
-
   @override
   void initState() {
     super.initState();
@@ -115,8 +110,6 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
     bottomSheetController.dispose();
     _cancelTimers();
     reloadSubscription?.cancel();
-    _prevPreCacheStream?.removeListener(_dummyListener);
-    _nextPreCacheStream?.removeListener(_dummyListener);
     super.dispose();
   }
 
@@ -137,9 +130,27 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
   double _getVerticalOffsetForBottomSheet(double extent) =>
       (context.height * extent) - (context.height * _kBottomSheetMinimumExtent);
 
-  ImageStream _precacheImage(BaseAsset asset) {
-    final provider = getFullImageProvider(asset, size: context.sizeData);
-    return provider.resolve(ImageConfiguration.empty)..addListener(_dummyListener);
+  Future<void> _precacheImage(int index) async {
+    if (!mounted) {
+      return;
+    }
+
+    final timelineService = ref.read(timelineServiceProvider);
+    final asset = await timelineService.getAssetAsync(index);
+
+    if (asset == null || !mounted) {
+      return;
+    }
+
+    final screenSize = Size(context.width, context.height);
+
+    // Precache both thumbnail and full image for smooth transitions
+    unawaited(
+      Future.wait([
+        precacheImage(getThumbnailImageProvider(asset: asset), context, onError: (_, __) {}),
+        precacheImage(getFullImageProvider(asset, size: screenSize), context, onError: (_, __) {}),
+      ]),
+    );
   }
 
   void _onAssetChanged(int index) async {
@@ -165,19 +176,13 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
     _cancelTimers();
     // This will trigger the pre-caching of adjacent assets ensuring
     // that they are ready when the user navigates to them.
-    final timer = Timer(Durations.medium4, () async {
+    final timer = Timer(Durations.medium4, () {
       // Check if widget is still mounted before proceeding
       if (!mounted) return;
 
-      final (prevAsset, nextAsset) = await (
-        timelineService.getAssetAsync(index - 1),
-        timelineService.getAssetAsync(index + 1),
-      ).wait;
-      if (!mounted) return;
-      _prevPreCacheStream?.removeListener(_dummyListener);
-      _nextPreCacheStream?.removeListener(_dummyListener);
-      _prevPreCacheStream = prevAsset != null ? _precacheImage(prevAsset) : null;
-      _nextPreCacheStream = nextAsset != null ? _precacheImage(nextAsset) : null;
+      for (final offset in [-1, 1]) {
+        unawaited(_precacheImage(index + offset));
+      }
     });
     _delayedOperations.add(timer);
 
@@ -473,7 +478,30 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
   }
 
   Widget _placeholderBuilder(BuildContext ctx, ImageChunkEvent? progress, int index) {
-    return const Center(child: ImmichLoadingIndicator());
+    final timelineService = ref.read(timelineServiceProvider);
+    final asset = timelineService.getAssetSafe(index);
+
+    // If asset is not available in buffer, show a loading container
+    if (asset == null) {
+      return Container(
+        width: double.infinity,
+        height: double.infinity,
+        color: backgroundColor,
+        child: const Center(child: CircularProgressIndicator()),
+      );
+    }
+
+    BaseAsset displayAsset = asset;
+    final stackChildren = ref.read(stackChildrenNotifier(asset)).valueOrNull;
+    if (stackChildren != null && stackChildren.isNotEmpty) {
+      displayAsset = stackChildren.elementAt(ref.read(assetViewerProvider.select((s) => s.stackIndex)));
+    }
+    return Container(
+      width: double.infinity,
+      height: double.infinity,
+      color: backgroundColor,
+      child: Thumbnail(asset: displayAsset, fit: BoxFit.contain),
+    );
   }
 
   void _onScaleStateChanged(PhotoViewScaleState scaleState) {
@@ -536,7 +564,7 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
         width: size.width,
         height: size.height,
         color: backgroundColor,
-        child: Thumbnail.fromAsset(asset: asset, fit: BoxFit.contain),
+        child: Thumbnail(asset: asset, fit: BoxFit.contain),
       ),
     );
   }

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

@@ -6,7 +6,6 @@ import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/timeline.model.dart';
 import 'package:immich_mobile/domain/utils/event_stream.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/cast_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/favorite_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/motion_photo_action_button.widget.dart';
@@ -68,7 +67,7 @@ class ViewerTopAppBar extends ConsumerWidget implements PreferredSizeWidget {
             EventStream.shared.emit(ScrollToDateEvent(asset.createdAt));
           },
           icon: const Icon(Icons.image_search),
-          tooltip: 'view_in_timeline'.t(context: context),
+          tooltip: 'view_in_timeline',
         ),
       if (asset.hasRemote && isOwner && !asset.isFavorite)
         const FavoriteActionButton(source: ActionSource.viewer, menuItem: true),

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

@@ -1,114 +1,17 @@
-import 'package:async/async.dart';
 import 'package:flutter/widgets.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/setting.model.dart';
 import 'package:immich_mobile/domain/services/setting.service.dart';
-import 'package:immich_mobile/infrastructure/loaders/image_request.dart';
 import 'package:immich_mobile/presentation/widgets/images/local_image_provider.dart';
 import 'package:immich_mobile/presentation/widgets/images/remote_image_provider.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/constants.dart';
-import 'package:logging/logging.dart';
-
-abstract class CancellableImageProvider<T extends Object> extends ImageProvider<T> {
-  void cancel();
-}
-
-mixin CancellableImageProviderMixin<T extends Object> on CancellableImageProvider<T> {
-  static final _log = Logger('CancellableImageProviderMixin');
-
-  bool isCancelled = false;
-  ImageRequest? request;
-  CancelableOperation<ImageInfo?>? cachedOperation;
-
-  ImageInfo? getInitialImage(CancellableImageProvider provider) {
-    final completer = CancelableCompleter<ImageInfo?>(onCancel: provider.cancel);
-    final cachedStream = provider.resolve(const ImageConfiguration());
-    ImageInfo? cachedImage;
-    final listener = ImageStreamListener((image, synchronousCall) {
-      if (synchronousCall) {
-        cachedImage = image;
-      }
-
-      if (!completer.isCompleted) {
-        completer.complete(image);
-      }
-    }, onError: completer.completeError);
-
-    cachedStream.addListener(listener);
-    if (cachedImage != null) {
-      cachedStream.removeListener(listener);
-      return cachedImage;
-    }
-
-    completer.operation.valueOrCancellation().whenComplete(() {
-      cachedStream.removeListener(listener);
-      cachedOperation = null;
-    });
-    cachedOperation = completer.operation;
-    return null;
-  }
-
-  Stream<ImageInfo> loadRequest(ImageRequest request, ImageDecoderCallback decode) async* {
-    if (isCancelled) {
-      evict();
-      return;
-    }
-
-    this.request = request;
-
-    try {
-      final image = await request.load(decode);
-      if (image == null || isCancelled) {
-        evict();
-        return;
-      }
-      yield image;
-    } finally {
-      this.request = null;
-    }
-  }
-
-  Stream<ImageInfo> initialImageStream() async* {
-    final cachedOperation = this.cachedOperation;
-    if (cachedOperation == null) {
-      return;
-    }
-
-    try {
-      final cachedImage = await cachedOperation.valueOrCancellation();
-      if (cachedImage != null && !isCancelled) {
-        yield cachedImage;
-      }
-    } catch (e, stack) {
-      _log.severe('Error loading initial image', e, stack);
-    } finally {
-      this.cachedOperation = null;
-    }
-  }
-
-  @override
-  void cancel() {
-    isCancelled = true;
-    final request = this.request;
-    if (request != null) {
-      this.request = null;
-      request.cancel();
-    }
-
-    final operation = cachedOperation;
-    if (operation != null) {
-      this.cachedOperation = null;
-      operation.cancel();
-    }
-  }
-}
 
 ImageProvider getFullImageProvider(BaseAsset asset, {Size size = const Size(1080, 1920)}) {
   // Create new provider and cache it
   final ImageProvider provider;
   if (_shouldUseLocalAsset(asset)) {
     final id = asset is LocalAsset ? asset.id : (asset as RemoteAsset).localId!;
-    provider = LocalFullImageProvider(id: id, size: size, assetType: asset.type);
+    provider = LocalFullImageProvider(id: id, size: size, type: asset.type, updatedAt: asset.updatedAt);
   } else {
     final String assetId;
     if (asset is LocalAsset && asset.hasRemote) {
@@ -133,7 +36,7 @@ ImageProvider getThumbnailImageProvider({BaseAsset? asset, String? remoteId, Siz
 
   if (_shouldUseLocalAsset(asset!)) {
     final id = asset is LocalAsset ? asset.id : (asset as RemoteAsset).localId!;
-    return LocalThumbProvider(id: id, size: size, assetType: asset.type);
+    return LocalThumbProvider(id: id, updatedAt: asset.updatedAt, size: size);
   }
 
   final String assetId;
@@ -150,3 +53,26 @@ ImageProvider getThumbnailImageProvider({BaseAsset? asset, String? remoteId, Siz
 
 bool _shouldUseLocalAsset(BaseAsset asset) =>
     asset.hasLocal && (!asset.hasRemote || !AppSetting.get(Setting.preferRemoteImage));
+
+ImageInfo? getCachedImage(ImageProvider key) {
+  ImageInfo? thumbnail;
+  final ImageStreamCompleter? stream = PaintingBinding.instance.imageCache.putIfAbsent(
+    key,
+    () => throw Exception(), // don't bother loading if it isn't cached
+    onError: (_, __) {},
+  );
+
+  if (stream != null) {
+    void listener(ImageInfo info, bool synchronousCall) {
+      thumbnail = info;
+    }
+
+    try {
+      stream.addListener(ImageStreamListener(listener));
+    } finally {
+      stream.removeListener(ImageStreamListener(listener));
+    }
+  }
+
+  return thumbnail;
+}

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

@@ -26,7 +26,7 @@ class LocalAlbumThumbnail extends ConsumerWidget {
 
         return ClipRRect(
           borderRadius: const BorderRadius.all(Radius.circular(16)),
-          child: Thumbnail.fromAsset(asset: data),
+          child: Thumbnail(asset: data),
         );
       },
       error: (error, stack) {

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

@@ -1,21 +1,36 @@
 import 'dart:async';
+import 'dart:io';
 import 'dart:ui';
 
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
+import 'package:flutter_cache_manager/flutter_cache_manager.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/infrastructure/loaders/image_request.dart';
-import 'package:immich_mobile/presentation/widgets/images/image_provider.dart';
+import 'package:immich_mobile/domain/models/setting.model.dart';
+import 'package:immich_mobile/domain/services/setting.service.dart';
+import 'package:immich_mobile/extensions/codec_extensions.dart';
+import 'package:immich_mobile/infrastructure/repositories/asset_media.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/storage.repository.dart';
 import 'package:immich_mobile/presentation/widgets/images/one_frame_multi_image_stream_completer.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/constants.dart';
+import 'package:immich_mobile/providers/image/cache/thumbnail_image_cache_manager.dart';
+import 'package:immich_mobile/providers/image/exceptions/image_loading_exception.dart';
+import 'package:logging/logging.dart';
+
+class LocalThumbProvider extends ImageProvider<LocalThumbProvider> {
+  final AssetMediaRepository _assetMediaRepository = const AssetMediaRepository();
+  final CacheManager? cacheManager;
 
-class LocalThumbProvider extends CancellableImageProvider<LocalThumbProvider>
-    with CancellableImageProviderMixin<LocalThumbProvider> {
   final String id;
+  final DateTime updatedAt;
   final Size size;
-  final AssetType assetType;
 
-  LocalThumbProvider({required this.id, required this.assetType, this.size = kThumbnailResolution});
+  const LocalThumbProvider({
+    required this.id,
+    required this.updatedAt,
+    this.size = kThumbnailResolution,
+    this.cacheManager,
+  });
 
   @override
   Future<LocalThumbProvider> obtainKey(ImageConfiguration configuration) {
@@ -24,40 +39,63 @@ class LocalThumbProvider extends CancellableImageProvider<LocalThumbProvider>
 
   @override
   ImageStreamCompleter loadImage(LocalThumbProvider key, ImageDecoderCallback decode) {
-    return OneFramePlaceholderImageStreamCompleter(
-      _codec(key, decode),
+    final cache = cacheManager ?? ThumbnailImageCacheManager();
+    return MultiFrameImageStreamCompleter(
+      codec: _codec(key, cache, decode),
+      scale: 1.0,
       informationCollector: () => <DiagnosticsNode>[
         DiagnosticsProperty<String>('Id', key.id),
+        DiagnosticsProperty<DateTime>('Updated at', key.updatedAt),
         DiagnosticsProperty<Size>('Size', key.size),
       ],
-      onDispose: cancel,
     );
   }
 
-  Stream<ImageInfo> _codec(LocalThumbProvider key, ImageDecoderCallback decode) {
-    return loadRequest(LocalImageRequest(localId: key.id, size: key.size, assetType: key.assetType), decode);
+  Future<Codec> _codec(LocalThumbProvider key, CacheManager cache, ImageDecoderCallback decode) async {
+    final cacheKey = '${key.id}-${key.updatedAt}-${key.size.width}x${key.size.height}';
+
+    final fileFromCache = await cache.getFileFromCache(cacheKey);
+    if (fileFromCache != null) {
+      try {
+        final buffer = await ImmutableBuffer.fromFilePath(fileFromCache.file.path);
+        return decode(buffer);
+      } catch (_) {}
+    }
+
+    final thumbnailBytes = await _assetMediaRepository.getThumbnail(key.id, size: key.size);
+    if (thumbnailBytes == null) {
+      PaintingBinding.instance.imageCache.evict(key);
+      throw StateError("Loading thumb for local photo ${key.id} failed");
+    }
+
+    final buffer = await ImmutableBuffer.fromUint8List(thumbnailBytes);
+    unawaited(cache.putFile(cacheKey, thumbnailBytes));
+    return decode(buffer);
   }
 
   @override
   bool operator ==(Object other) {
     if (identical(this, other)) return true;
     if (other is LocalThumbProvider) {
-      return id == other.id;
+      return id == other.id && updatedAt == other.updatedAt;
     }
     return false;
   }
 
   @override
-  int get hashCode => id.hashCode;
+  int get hashCode => id.hashCode ^ updatedAt.hashCode;
 }
 
-class LocalFullImageProvider extends CancellableImageProvider<LocalFullImageProvider>
-    with CancellableImageProviderMixin<LocalFullImageProvider> {
+class LocalFullImageProvider extends ImageProvider<LocalFullImageProvider> {
+  final AssetMediaRepository _assetMediaRepository = const AssetMediaRepository();
+  final StorageRepository _storageRepository = const StorageRepository();
+
   final String id;
   final Size size;
-  final AssetType assetType;
+  final AssetType type;
+  final DateTime updatedAt; // temporary, only exists to fetch cached thumbnail until local disk cache is removed
 
-  LocalFullImageProvider({required this.id, required this.assetType, required this.size});
+  const LocalFullImageProvider({required this.id, required this.size, required this.type, required this.updatedAt});
 
   @override
   Future<LocalFullImageProvider> obtainKey(ImageConfiguration configuration) {
@@ -68,43 +106,114 @@ class LocalFullImageProvider extends CancellableImageProvider<LocalFullImageProv
   ImageStreamCompleter loadImage(LocalFullImageProvider key, ImageDecoderCallback decode) {
     return OneFramePlaceholderImageStreamCompleter(
       _codec(key, decode),
-      initialImage: getInitialImage(LocalThumbProvider(id: key.id, assetType: key.assetType)),
       informationCollector: () => <DiagnosticsNode>[
-        DiagnosticsProperty<ImageProvider>('Image provider', this),
         DiagnosticsProperty<String>('Id', key.id),
+        DiagnosticsProperty<DateTime>('Updated at', key.updatedAt),
         DiagnosticsProperty<Size>('Size', key.size),
       ],
-      onDispose: cancel,
     );
   }
 
+  // Streams in each stage of the image as we ask for it
   Stream<ImageInfo> _codec(LocalFullImageProvider key, ImageDecoderCallback decode) async* {
-    yield* initialImageStream();
+    try {
+      // First, yield the thumbnail image from LocalThumbProvider
+      final thumbProvider = LocalThumbProvider(id: key.id, updatedAt: key.updatedAt);
+      try {
+        final thumbCodec = await thumbProvider._codec(
+          thumbProvider,
+          thumbProvider.cacheManager ?? ThumbnailImageCacheManager(),
+          decode,
+        );
+        final thumbImageInfo = await thumbCodec.getImageInfo();
+        yield thumbImageInfo;
+      } catch (_) {}
 
-    if (isCancelled) {
-      evict();
+      // Then proceed with the main image loading stream
+      final mainStream = switch (key.type) {
+        AssetType.image => _decodeProgressive(key, decode),
+        AssetType.video => _getThumbnailCodec(key, decode),
+        _ => throw StateError('Unsupported asset type ${key.type}'),
+      };
+
+      await for (final imageInfo in mainStream) {
+        yield imageInfo;
+      }
+    } catch (error, stack) {
+      Logger('ImmichLocalImageProvider').severe('Error loading local image ${key.id}', error, stack);
+      throw const ImageLoadingException('Could not load image from local storage');
+    }
+  }
+
+  Stream<ImageInfo> _getThumbnailCodec(LocalFullImageProvider key, ImageDecoderCallback decode) async* {
+    final thumbBytes = await _assetMediaRepository.getThumbnail(key.id, size: key.size);
+    if (thumbBytes == null) {
+      throw StateError("Failed to load preview for ${key.id}");
+    }
+    final buffer = await ImmutableBuffer.fromUint8List(thumbBytes);
+    final codec = await decode(buffer);
+    yield await codec.getImageInfo();
+  }
+
+  Stream<ImageInfo> _decodeProgressive(LocalFullImageProvider key, ImageDecoderCallback decode) async* {
+    final file = await _storageRepository.getFileForAsset(key.id);
+    if (file == null) {
+      throw StateError("Opening file for asset ${key.id} failed");
+    }
+
+    final fileSize = await file.length();
+    final devicePixelRatio = PlatformDispatcher.instance.views.first.devicePixelRatio;
+    final isLargeFile = fileSize > 20 * 1024 * 1024; // 20MB
+    final isHEIC = file.path.toLowerCase().contains(RegExp(r'\.(heic|heif)$'));
+    final isProgressive = isLargeFile || (isHEIC && !Platform.isIOS);
+
+    if (isProgressive) {
+      try {
+        final progressiveMultiplier = devicePixelRatio >= 3.0 ? 1.3 : 1.2;
+        final size = Size(
+          (key.size.width * progressiveMultiplier).clamp(256, 1024),
+          (key.size.height * progressiveMultiplier).clamp(256, 1024),
+        );
+        final mediumThumb = await _assetMediaRepository.getThumbnail(key.id, size: size);
+        if (mediumThumb != null) {
+          final mediumBuffer = await ImmutableBuffer.fromUint8List(mediumThumb);
+          final codec = await decode(mediumBuffer);
+          yield await codec.getImageInfo();
+        }
+      } catch (_) {}
+    }
+
+    // Load original only when the file is smaller or if the user wants to load original images
+    // Or load a slightly larger image for progressive loading
+    if (isProgressive && !(AppSetting.get(Setting.loadOriginal))) {
+      final progressiveMultiplier = devicePixelRatio >= 3.0 ? 2.0 : 1.6;
+      final size = Size(
+        (key.size.width * progressiveMultiplier).clamp(512, 2048),
+        (key.size.height * progressiveMultiplier).clamp(512, 2048),
+      );
+      final highThumb = await _assetMediaRepository.getThumbnail(key.id, size: size);
+      if (highThumb != null) {
+        final highBuffer = await ImmutableBuffer.fromUint8List(highThumb);
+        final codec = await decode(highBuffer);
+        yield await codec.getImageInfo();
+      }
       return;
     }
 
-    final devicePixelRatio = PlatformDispatcher.instance.views.first.devicePixelRatio;
-    final request = LocalImageRequest(
-      localId: key.id,
-      size: Size(size.width * devicePixelRatio, size.height * devicePixelRatio),
-      assetType: key.assetType,
-    );
-
-    yield* loadRequest(request, decode);
+    final buffer = await ImmutableBuffer.fromFilePath(file.path);
+    final codec = await decode(buffer);
+    yield await codec.getImageInfo();
   }
 
   @override
   bool operator ==(Object other) {
     if (identical(this, other)) return true;
     if (other is LocalFullImageProvider) {
-      return id == other.id && size == other.size;
+      return id == other.id && size == other.size && type == other.type;
     }
     return false;
   }
 
   @override
-  int get hashCode => id.hashCode ^ size.hashCode;
+  int get hashCode => id.hashCode ^ size.hashCode ^ type.hashCode;
 }

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

@@ -9,7 +9,7 @@ import 'package:flutter/painting.dart';
 
 /// An ImageStreamCompleter with support for loading multiple images.
 class OneFramePlaceholderImageStreamCompleter extends ImageStreamCompleter {
-  void Function()? _onDispose;
+  ImageInfo? _initialImage;
 
   /// The constructor to create an OneFramePlaceholderImageStreamCompleter. The [images]
   /// should be the primary images to display (typically asynchronously as they load).
@@ -19,14 +19,10 @@ class OneFramePlaceholderImageStreamCompleter extends ImageStreamCompleter {
     Stream<ImageInfo> images, {
     ImageInfo? initialImage,
     InformationCollector? informationCollector,
-    void Function()? onDispose,
   }) {
-    if (initialImage != null) {
-      setImage(initialImage);
-    }
-    _onDispose = onDispose;
+    _initialImage = initialImage;
     images.listen(
-      setImage,
+      _onImage,
       onError: (Object error, StackTrace stack) {
         reportError(
           context: ErrorDescription('resolving a single-frame image stream'),
@@ -39,13 +35,33 @@ class OneFramePlaceholderImageStreamCompleter extends ImageStreamCompleter {
     );
   }
 
+  void _onImage(ImageInfo image) {
+    setImage(image);
+    _initialImage?.dispose();
+    _initialImage = null;
+  }
+
+  @override
+  void addListener(ImageStreamListener listener) {
+    final initialImage = _initialImage;
+    if (initialImage != null) {
+      try {
+        listener.onImage(initialImage.clone(), true);
+      } catch (exception, stack) {
+        reportError(
+          context: ErrorDescription('by a synchronously-called image listener'),
+          exception: exception,
+          stack: stack,
+        );
+      }
+    }
+    super.addListener(listener);
+  }
+
   @override
   void onDisposed() {
-    final onDispose = _onDispose;
-    if (onDispose != null) {
-      _onDispose = null;
-      onDispose();
-    }
+    _initialImage?.dispose();
+    _initialImage = null;
     super.onDisposed();
   }
 }

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

@@ -1,22 +1,23 @@
 import 'dart:async';
+import 'dart:ui';
 
 import 'package:flutter/foundation.dart';
 import 'package:flutter/painting.dart';
+import 'package:flutter_cache_manager/flutter_cache_manager.dart';
 import 'package:immich_mobile/domain/models/setting.model.dart';
 import 'package:immich_mobile/domain/services/setting.service.dart';
-import 'package:immich_mobile/infrastructure/loaders/image_request.dart';
+import 'package:immich_mobile/extensions/codec_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/images/image_provider.dart';
 import 'package:immich_mobile/presentation/widgets/images/one_frame_multi_image_stream_completer.dart';
+import 'package:immich_mobile/providers/image/cache/image_loader.dart';
 import 'package:immich_mobile/providers/image/cache/remote_image_cache_manager.dart';
-import 'package:immich_mobile/services/api.service.dart';
 import 'package:immich_mobile/utils/image_url_builder.dart';
 
-class RemoteThumbProvider extends CancellableImageProvider<RemoteThumbProvider>
-    with CancellableImageProviderMixin<RemoteThumbProvider> {
-  static final cacheManager = RemoteThumbnailCacheManager();
+class RemoteThumbProvider extends ImageProvider<RemoteThumbProvider> {
   final String assetId;
+  final CacheManager? cacheManager;
 
-  RemoteThumbProvider({required this.assetId});
+  const RemoteThumbProvider({required this.assetId, this.cacheManager});
 
   @override
   Future<RemoteThumbProvider> obtainKey(ImageConfiguration configuration) {
@@ -25,23 +26,33 @@ class RemoteThumbProvider extends CancellableImageProvider<RemoteThumbProvider>
 
   @override
   ImageStreamCompleter loadImage(RemoteThumbProvider key, ImageDecoderCallback decode) {
-    return OneFramePlaceholderImageStreamCompleter(
-      _codec(key, decode),
+    final cache = cacheManager ?? RemoteImageCacheManager();
+    final chunkController = StreamController<ImageChunkEvent>();
+    return MultiFrameImageStreamCompleter(
+      codec: _codec(key, cache, decode, chunkController),
+      scale: 1.0,
+      chunkEvents: chunkController.stream,
       informationCollector: () => <DiagnosticsNode>[
         DiagnosticsProperty<ImageProvider>('Image provider', this),
         DiagnosticsProperty<String>('Asset Id', key.assetId),
       ],
-      onDispose: cancel,
     );
   }
 
-  Stream<ImageInfo> _codec(RemoteThumbProvider key, ImageDecoderCallback decode) {
-    final request = RemoteImageRequest(
-      uri: getThumbnailUrlForRemoteId(key.assetId),
-      headers: ApiService.getRequestHeaders(),
-      cacheManager: cacheManager,
-    );
-    return loadRequest(request, decode);
+  Future<Codec> _codec(
+    RemoteThumbProvider key,
+    CacheManager cache,
+    ImageDecoderCallback decode,
+    StreamController<ImageChunkEvent> chunkController,
+  ) async {
+    final preview = getThumbnailUrlForRemoteId(key.assetId);
+
+    return ImageLoader.loadImageFromCache(
+      preview,
+      cache: cache,
+      decode: decode,
+      chunkEvents: chunkController,
+    ).whenComplete(chunkController.close);
   }
 
   @override
@@ -58,12 +69,11 @@ class RemoteThumbProvider extends CancellableImageProvider<RemoteThumbProvider>
   int get hashCode => assetId.hashCode;
 }
 
-class RemoteFullImageProvider extends CancellableImageProvider<RemoteFullImageProvider>
-    with CancellableImageProviderMixin<RemoteFullImageProvider> {
-  static final cacheManager = RemoteThumbnailCacheManager();
+class RemoteFullImageProvider extends ImageProvider<RemoteFullImageProvider> {
   final String assetId;
+  final CacheManager? cacheManager;
 
-  RemoteFullImageProvider({required this.assetId});
+  const RemoteFullImageProvider({required this.assetId, this.cacheManager});
 
   @override
   Future<RemoteFullImageProvider> obtainKey(ImageConfiguration configuration) {
@@ -72,49 +82,28 @@ class RemoteFullImageProvider extends CancellableImageProvider<RemoteFullImagePr
 
   @override
   ImageStreamCompleter loadImage(RemoteFullImageProvider key, ImageDecoderCallback decode) {
+    final cache = cacheManager ?? RemoteImageCacheManager();
     return OneFramePlaceholderImageStreamCompleter(
-      _codec(key, decode),
-      initialImage: getInitialImage(RemoteThumbProvider(assetId: key.assetId)),
-      informationCollector: () => <DiagnosticsNode>[
-        DiagnosticsProperty<ImageProvider>('Image provider', this),
-        DiagnosticsProperty<String>('Asset Id', key.assetId),
-      ],
-      onDispose: cancel,
+      _codec(key, cache, decode),
+      initialImage: getCachedImage(RemoteThumbProvider(assetId: key.assetId)),
     );
   }
 
-  Stream<ImageInfo> _codec(RemoteFullImageProvider key, ImageDecoderCallback decode) async* {
-    yield* initialImageStream();
-
-    if (isCancelled) {
-      evict();
-      return;
-    }
-
-    final headers = ApiService.getRequestHeaders();
-    try {
-      final request = RemoteImageRequest(
-        uri: getPreviewUrlForRemoteId(key.assetId),
-        headers: headers,
-        cacheManager: cacheManager,
-      );
-      yield* loadRequest(request, decode);
-    } finally {
-      request = null;
-    }
-
-    if (isCancelled) {
-      evict();
-      return;
-    }
+  Stream<ImageInfo> _codec(RemoteFullImageProvider key, CacheManager cache, ImageDecoderCallback decode) async* {
+    final codec = await ImageLoader.loadImageFromCache(
+      getPreviewUrlForRemoteId(key.assetId),
+      cache: cache,
+      decode: decode,
+    );
+    yield await codec.getImageInfo();
 
     if (AppSetting.get(Setting.loadOriginal)) {
-      try {
-        final request = RemoteImageRequest(uri: getOriginalUrlForRemoteId(key.assetId), headers: headers);
-        yield* loadRequest(request, decode);
-      } finally {
-        request = null;
-      }
+      final codec = await ImageLoader.loadImageFromCache(
+        getOriginalUrlForRemoteId(key.assetId),
+        cache: cache,
+        decode: decode,
+      );
+      yield await codec.getImageInfo();
     }
   }
 

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

@@ -1,14 +1,14 @@
+import 'dart:convert' hide Codec;
+import 'dart:ui';
+
 import 'package:flutter/foundation.dart';
 import 'package:flutter/rendering.dart';
-import 'package:immich_mobile/infrastructure/loaders/image_request.dart';
-import 'package:immich_mobile/presentation/widgets/images/image_provider.dart';
-import 'package:immich_mobile/presentation/widgets/images/one_frame_multi_image_stream_completer.dart';
+import 'package:thumbhash/thumbhash.dart';
 
-class ThumbHashProvider extends CancellableImageProvider<ThumbHashProvider>
-    with CancellableImageProviderMixin<ThumbHashProvider> {
+class ThumbHashProvider extends ImageProvider<ThumbHashProvider> {
   final String thumbHash;
 
-  ThumbHashProvider({required this.thumbHash});
+  const ThumbHashProvider({required this.thumbHash});
 
   @override
   Future<ThumbHashProvider> obtainKey(ImageConfiguration configuration) {
@@ -17,11 +17,12 @@ class ThumbHashProvider extends CancellableImageProvider<ThumbHashProvider>
 
   @override
   ImageStreamCompleter loadImage(ThumbHashProvider key, ImageDecoderCallback decode) {
-    return OneFramePlaceholderImageStreamCompleter(_loadCodec(key, decode))..addOnLastListenerRemovedCallback(cancel);
+    return MultiFrameImageStreamCompleter(codec: _loadCodec(key, decode), scale: 1.0);
   }
 
-  Stream<ImageInfo> _loadCodec(ThumbHashProvider key, ImageDecoderCallback decode) {
-    return loadRequest(ThumbhashImageRequest(thumbhash: key.thumbHash), decode);
+  Future<Codec> _loadCodec(ThumbHashProvider key, ImageDecoderCallback decode) async {
+    final image = thumbHashToRGBA(base64Decode(key.thumbHash));
+    return decode(await ImmutableBuffer.fromUint8List(rgbaToBmp(image)));
   }
 
   @override

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

@@ -1,367 +1,61 @@
-import 'dart:ui' as ui;
-
 import 'package:flutter/material.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/extensions/theme_extensions.dart';
-import 'package:immich_mobile/presentation/widgets/images/local_image_provider.dart';
-import 'package:immich_mobile/presentation/widgets/images/remote_image_provider.dart';
+import 'package:immich_mobile/presentation/widgets/images/image_provider.dart';
 import 'package:immich_mobile/presentation/widgets/images/thumb_hash_provider.dart';
-import 'package:immich_mobile/presentation/widgets/timeline/constants.dart';
+import 'package:immich_mobile/widgets/asset_grid/thumbnail_placeholder.dart';
+import 'package:immich_mobile/widgets/common/fade_in_placeholder_image.dart';
 import 'package:logging/logging.dart';
+import 'package:octo_image/octo_image.dart';
 
-final log = Logger('ThumbnailWidget');
+class Thumbnail extends StatelessWidget {
+  const Thumbnail({this.asset, this.remoteId, this.size = const Size.square(256), this.fit = BoxFit.cover, super.key})
+    : assert(asset != null || remoteId != null, 'Either asset or remoteId must be provided');
 
-enum ThumbhashMode { enabled, disabled, only }
-
-class Thumbnail extends StatefulWidget {
-  final ImageProvider? imageProvider;
-  final ImageProvider? thumbhashProvider;
+  final BaseAsset? asset;
+  final String? remoteId;
+  final Size size;
   final BoxFit fit;
 
-  const Thumbnail({this.imageProvider, this.fit = BoxFit.cover, this.thumbhashProvider, super.key});
-
-  Thumbnail.remote({required String remoteId, this.fit = BoxFit.cover, Size size = kThumbnailResolution, super.key})
-    : imageProvider = RemoteThumbProvider(assetId: remoteId),
-      thumbhashProvider = null;
-
-  Thumbnail.fromAsset({
-    required BaseAsset? asset,
-    this.fit = BoxFit.cover,
-
-    /// The logical UI size of the thumbnail. This is only used to determine the ideal image resolution and does not affect the widget size.
-    Size size = kThumbnailResolution,
-    super.key,
-  }) : thumbhashProvider = switch (asset) {
-         RemoteAsset() when asset.thumbHash != null && asset.localId == null => ThumbHashProvider(
-           thumbHash: asset.thumbHash!,
-         ),
-         _ => null,
-       },
-       imageProvider = switch (asset) {
-         RemoteAsset() =>
-           asset.localId == null
-               ? RemoteThumbProvider(assetId: asset.id)
-               : LocalThumbProvider(id: asset.localId!, size: size, assetType: asset.type),
-         LocalAsset() => LocalThumbProvider(id: asset.id, size: size, assetType: asset.type),
-         _ => null,
-       };
-
-  @override
-  State<Thumbnail> createState() => _ThumbnailState();
-}
-
-class _ThumbnailState extends State<Thumbnail> with SingleTickerProviderStateMixin {
-  ui.Image? _providerImage;
-  ui.Image? _previousImage;
-
-  late AnimationController _fadeController;
-  late Animation<double> _fadeAnimation;
-
-  ImageStream? _imageStream;
-  ImageStreamListener? _imageStreamListener;
-  ImageStream? _thumbhashStream;
-  ImageStreamListener? _thumbhashStreamListener;
-
-  static final _gradientCache = <ColorScheme, Gradient>{};
-
-  @override
-  void initState() {
-    super.initState();
-    _fadeController = AnimationController(duration: const Duration(milliseconds: 100), vsync: this);
-    _fadeAnimation = CurvedAnimation(parent: _fadeController, curve: Curves.easeOut);
-    _fadeController.addStatusListener(_onAnimationStatusChanged);
-    _loadImage();
-  }
-
-  void _onAnimationStatusChanged(AnimationStatus status) {
-    if (status == AnimationStatus.completed) {
-      _previousImage?.dispose();
-      _previousImage = null;
-    }
-  }
-
-  void _loadFromThumbhashProvider() {
-    _stopListeningToThumbhashStream();
-    final thumbhashProvider = widget.thumbhashProvider;
-    if (thumbhashProvider == null || _providerImage != null) return;
-
-    final thumbhashStream = _thumbhashStream = thumbhashProvider.resolve(ImageConfiguration.empty);
-    final thumbhashStreamListener = _thumbhashStreamListener = ImageStreamListener(
-      (ImageInfo imageInfo, bool synchronousCall) {
-        _stopListeningToThumbhashStream();
-        if (!mounted || _providerImage != null) {
-          imageInfo.dispose();
-          return;
-        }
-
-        setState(() {
-          _providerImage = imageInfo.image;
-        });
-      },
-      onError: (exception, stackTrace) {
-        log.severe('Error loading thumbhash', exception, stackTrace);
-        _stopListeningToThumbhashStream();
-      },
-    );
-    thumbhashStream.addListener(thumbhashStreamListener);
-  }
-
-  void _loadFromImageProvider() {
-    _stopListeningToImageStream();
-    final imageProvider = widget.imageProvider;
-    if (imageProvider == null) return;
-
-    final imageStream = _imageStream = imageProvider.resolve(ImageConfiguration.empty);
-    final imageStreamListener = _imageStreamListener = ImageStreamListener(
-      (ImageInfo imageInfo, bool synchronousCall) {
-        _stopListeningToStream();
-        if (!mounted) {
-          imageInfo.dispose();
-          return;
-        }
-
-        if (_providerImage == imageInfo.image) {
-          return;
-        }
-
-        if (synchronousCall && _providerImage == null) {
-          _fadeController.value = 1.0;
-        } else if (_fadeController.isAnimating) {
-          _fadeController.forward();
-        } else {
-          _fadeController.forward(from: 0.0);
-        }
-
-        setState(() {
-          _previousImage?.dispose();
-          if (_providerImage != null) {
-            _previousImage = _providerImage;
-          } else {
-            _previousImage = null;
-          }
-          _providerImage = imageInfo.image;
-        });
-      },
-      onError: (exception, stackTrace) {
-        log.severe('Error loading image: $exception', exception, stackTrace);
-        _stopListeningToImageStream();
-      },
-    );
-    imageStream.addListener(imageStreamListener);
-  }
-
-  void _stopListeningToImageStream() {
-    if (_imageStreamListener != null && _imageStream != null) {
-      _imageStream!.removeListener(_imageStreamListener!);
-    }
-    _imageStream = null;
-    _imageStreamListener = null;
-  }
-
-  void _stopListeningToThumbhashStream() {
-    if (_thumbhashStreamListener != null && _thumbhashStream != null) {
-      _thumbhashStream!.removeListener(_thumbhashStreamListener!);
-    }
-    _thumbhashStream = null;
-    _thumbhashStreamListener = null;
-  }
-
-  void _stopListeningToStream() {
-    _stopListeningToImageStream();
-    _stopListeningToThumbhashStream();
-  }
-
-  @override
-  void didUpdateWidget(Thumbnail oldWidget) {
-    super.didUpdateWidget(oldWidget);
-
-    if (widget.imageProvider != oldWidget.imageProvider) {
-      if (_fadeController.isAnimating) {
-        _fadeController.stop();
-        _previousImage?.dispose();
-        _previousImage = null;
-      }
-      _loadFromImageProvider();
-    }
-
-    if (_providerImage == null && oldWidget.thumbhashProvider != widget.thumbhashProvider) {
-      _loadFromThumbhashProvider();
-    }
-  }
-
-  @override
-  void reassemble() {
-    super.reassemble();
-    _loadImage();
-  }
-
-  void _loadImage() {
-    _loadFromImageProvider();
-    _loadFromThumbhashProvider();
-  }
-
   @override
   Widget build(BuildContext context) {
-    final colorScheme = context.colorScheme;
-    final gradient = _gradientCache[colorScheme] ??= LinearGradient(
-      colors: [colorScheme.surfaceContainer, colorScheme.surfaceContainer.darken(amount: .1)],
-      begin: Alignment.topCenter,
-      end: Alignment.bottomCenter,
-    );
+    final thumbHash = asset is RemoteAsset ? (asset as RemoteAsset).thumbHash : null;
+    final provider = getThumbnailImageProvider(asset: asset, remoteId: remoteId);
 
-    return AnimatedBuilder(
-      animation: _fadeAnimation,
-      builder: (context, child) {
-        return _ThumbnailLeaf(
-          image: _providerImage,
-          previousImage: _previousImage,
-          fadeValue: _fadeAnimation.value,
-          fit: widget.fit,
-          placeholderGradient: gradient,
-        );
-      },
-    );
-  }
-
-  @override
-  void dispose() {
-    _fadeController.removeStatusListener(_onAnimationStatusChanged);
-    _fadeController.dispose();
-    _stopListeningToStream();
-    _providerImage?.dispose();
-    _previousImage?.dispose();
-    super.dispose();
-  }
-}
-
-class _ThumbnailLeaf extends LeafRenderObjectWidget {
-  final ui.Image? image;
-  final ui.Image? previousImage;
-  final double fadeValue;
-  final BoxFit fit;
-  final Gradient placeholderGradient;
-
-  const _ThumbnailLeaf({
-    required this.image,
-    required this.previousImage,
-    required this.fadeValue,
-    required this.fit,
-    required this.placeholderGradient,
-  });
-
-  @override
-  RenderObject createRenderObject(BuildContext context) {
-    return _ThumbnailRenderBox(
-      image: image,
-      previousImage: previousImage,
-      fadeValue: fadeValue,
+    return OctoImage.fromSet(
+      image: provider,
+      octoSet: OctoSet(
+        placeholderBuilder: _blurHashPlaceholderBuilder(thumbHash, fit: fit),
+        errorBuilder: _blurHashErrorBuilder(thumbHash, provider: provider, fit: fit, asset: asset),
+      ),
+      fadeOutDuration: const Duration(milliseconds: 100),
+      fadeInDuration: Duration.zero,
+      width: size.width,
+      height: size.height,
       fit: fit,
-      placeholderGradient: placeholderGradient,
+      placeholderFadeInDuration: Duration.zero,
     );
   }
-
-  @override
-  void updateRenderObject(BuildContext context, _ThumbnailRenderBox renderObject) {
-    renderObject
-      ..image = image
-      ..previousImage = previousImage
-      ..fadeValue = fadeValue
-      ..fit = fit
-      ..placeholderGradient = placeholderGradient;
-  }
 }
 
-class _ThumbnailRenderBox extends RenderBox {
-  ui.Image? _image;
-  ui.Image? _previousImage;
-  double _fadeValue;
-  BoxFit _fit;
-  Gradient _placeholderGradient;
-
-  @override
-  bool isRepaintBoundary = true;
-
-  _ThumbnailRenderBox({
-    required ui.Image? image,
-    required ui.Image? previousImage,
-    required double fadeValue,
-    required BoxFit fit,
-    required Gradient placeholderGradient,
-  }) : _image = image,
-       _previousImage = previousImage,
-       _fadeValue = fadeValue,
-       _fit = fit,
-       _placeholderGradient = placeholderGradient;
-
-  @override
-  void paint(PaintingContext context, Offset offset) {
-    final rect = offset & size;
-    final canvas = context.canvas;
-
-    if (_previousImage != null && _fadeValue < 1.0) {
-      paintImage(
-        canvas: canvas,
-        rect: rect,
-        image: _previousImage!,
-        fit: _fit,
-        filterQuality: FilterQuality.low,
-        opacity: 1.0 - _fadeValue,
-      );
-    } else if (_image == null || _fadeValue < 1.0) {
-      final paint = Paint()..shader = _placeholderGradient.createShader(rect);
-      canvas.drawRect(rect, paint);
-    }
-
-    if (_image != null) {
-      paintImage(
-        canvas: canvas,
-        rect: rect,
-        image: _image!,
-        fit: _fit,
-        filterQuality: FilterQuality.low,
-        opacity: _fadeValue,
-      );
-    }
-  }
-
-  @override
-  void performLayout() {
-    size = constraints.biggest;
-  }
-
-  set image(ui.Image? value) {
-    if (_image != value) {
-      _image = value;
-      markNeedsPaint();
-    }
-  }
-
-  set previousImage(ui.Image? value) {
-    if (_previousImage != value) {
-      _previousImage = value;
-      markNeedsPaint();
-    }
-  }
-
-  set fadeValue(double value) {
-    if (_fadeValue != value) {
-      _fadeValue = value;
-      markNeedsPaint();
-    }
-  }
-
-  set fit(BoxFit value) {
-    if (_fit != value) {
-      _fit = value;
-      markNeedsPaint();
-    }
-  }
-
-  set placeholderGradient(Gradient value) {
-    if (_placeholderGradient != value) {
-      _placeholderGradient = value;
-      markNeedsPaint();
-    }
-  }
+OctoPlaceholderBuilder _blurHashPlaceholderBuilder(String? thumbHash, {BoxFit? fit}) {
+  return (context) => thumbHash == null
+      ? const ThumbnailPlaceholder()
+      : FadeInPlaceholderImage(
+          placeholder: const ThumbnailPlaceholder(),
+          image: ThumbHashProvider(thumbHash: thumbHash),
+          fit: fit ?? BoxFit.cover,
+        );
 }
+
+OctoErrorBuilder _blurHashErrorBuilder(String? blurhash, {BaseAsset? asset, ImageProvider? provider, BoxFit? fit}) =>
+    (context, e, s) {
+      Logger("ImThumbnail").warning("Error loading thumbnail for ${asset?.name}", e, s);
+      provider?.evict();
+      return Stack(
+        alignment: Alignment.center,
+        children: [
+          _blurHashPlaceholderBuilder(blurhash, fit: fit)(context),
+          const Opacity(opacity: 0.75, child: Icon(Icons.error_outline_rounded)),
+        ],
+      );
+    };

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

@@ -7,14 +7,13 @@ import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/duration_extensions.dart';
 import 'package:immich_mobile/extensions/theme_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/images/thumbnail.widget.dart';
-import 'package:immich_mobile/presentation/widgets/timeline/constants.dart';
 import 'package:immich_mobile/providers/infrastructure/setting.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 
 class ThumbnailTile extends ConsumerWidget {
   const ThumbnailTile(
     this.asset, {
-    this.size = kThumbnailResolution,
+    this.size = const Size.square(256),
     this.fit = BoxFit.cover,
     this.showStorageIndicator,
     this.lockSelection = false,
@@ -22,7 +21,7 @@ class ThumbnailTile extends ConsumerWidget {
     super.key,
   });
 
-  final BaseAsset? asset;
+  final BaseAsset asset;
   final Size size;
   final BoxFit fit;
   final bool? showStorageIndicator;
@@ -31,7 +30,6 @@ class ThumbnailTile extends ConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final asset = this.asset;
     final heroIndex = heroOffset ?? TabsRouterScope.of(context)?.controller.activeIndex ?? 0;
 
     final assetContainerColor = context.isDarkTheme
@@ -54,7 +52,7 @@ class ThumbnailTile extends ConsumerWidget {
           )
         : const BoxDecoration();
 
-    final hasStack = asset is RemoteAsset && asset.stackId != null;
+    final hasStack = asset is RemoteAsset && (asset as RemoteAsset).stackId != null;
 
     final bool storageIndicator =
         showStorageIndicator ?? ref.watch(settingsProvider.select((s) => s.get(Setting.showStorageIndicator)));
@@ -73,8 +71,8 @@ class ThumbnailTile extends ConsumerWidget {
               children: [
                 Positioned.fill(
                   child: Hero(
-                    tag: '${asset?.heroTag ?? ''}_$heroIndex',
-                    child: Thumbnail.fromAsset(asset: asset, size: size),
+                    tag: '${asset.heroTag}_$heroIndex',
+                    child: Thumbnail(asset: asset, fit: fit, size: size),
                   ),
                 ),
                 if (hasStack)
@@ -85,7 +83,7 @@ class ThumbnailTile extends ConsumerWidget {
                       child: const _TileOverlayIcon(Icons.burst_mode_rounded),
                     ),
                   ),
-                if (asset != null && asset.isVideo)
+                if (asset.isVideo)
                   Align(
                     alignment: Alignment.topRight,
                     child: Padding(
@@ -93,7 +91,7 @@ class ThumbnailTile extends ConsumerWidget {
                       child: _VideoIndicator(asset.duration),
                     ),
                   ),
-                if (storageIndicator && asset != null)
+                if (storageIndicator)
                   switch (asset.storage) {
                     AssetState.local => const Align(
                       alignment: Alignment.bottomRight,
@@ -117,7 +115,7 @@ class ThumbnailTile extends ConsumerWidget {
                       ),
                     ),
                   },
-                if (asset != null && asset.isFavorite)
+                if (asset.isFavorite)
                   const Align(
                     alignment: Alignment.bottomLeft,
                     child: Padding(

mobile/lib/presentation/widgets/memory/memory_lane.widget.dart

@@ -61,7 +61,7 @@ class DriftMemoryCard extends ConsumerWidget {
             child: SizedBox(
               width: 205,
               height: 200,
-              child: Thumbnail.remote(remoteId: memory.assets[0].id, fit: BoxFit.cover),
+              child: Thumbnail(remoteId: memory.assets[0].id, fit: BoxFit.cover),
             ),
           ),
           Positioned(

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

@@ -2,7 +2,7 @@ import 'dart:ui';
 
 const double kTimelineHeaderExtent = 80.0;
 const Size kTimelineFixedTileExtent = Size.square(256);
-const Size kThumbnailResolution = kTimelineFixedTileExtent; // TODO: make the resolution vary based on actual tile size
+const Size kThumbnailResolution = kTimelineFixedTileExtent;
 const double kTimelineSpacing = 2.0;
 const int kTimelineColumnCount = 3;
 

mobile/lib/providers/backup/drift_backup.provider.dart

@@ -8,10 +8,6 @@ import 'package:flutter/widgets.dart';
 import 'package:hooks_riverpod/hooks_riverpod.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/repositories/backup.repository.dart';
-import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/services/upload.service.dart';
 import 'package:logging/logging.dart';
 
@@ -360,19 +356,3 @@ class DriftBackupNotifier extends StateNotifier<DriftBackupState> {
     super.dispose();
   }
 }
-
-final driftBackupCandidateProvider = FutureProvider.autoDispose<List<LocalAsset>>((ref) async {
-  final user = ref.watch(currentUserProvider);
-  if (user == null) {
-    return [];
-  }
-
-  return ref.read(backupRepositoryProvider).getCandidates(user.id);
-});
-
-final driftCandidateBackupAlbumInfoProvider = FutureProvider.autoDispose.family<List<LocalAlbum>, String>((
-  ref,
-  assetId,
-) {
-  return ref.read(backupRepositoryProvider).getSourceAlbums(assetId);
-});

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

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

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

@@ -18,9 +18,7 @@ final localAlbumServiceProvider = Provider<LocalAlbumService>(
 );
 
 final localAlbumProvider = FutureProvider<List<LocalAlbum>>(
-  (ref) => LocalAlbumService(ref.watch(localAlbumRepository))
-      .getAll(sortBy: {SortLocalAlbumsBy.newestAsset})
-      .then((albums) => albums.where((album) => album.assetCount > 0).toList()),
+  (ref) => LocalAlbumService(ref.watch(localAlbumRepository)).getAll(sortBy: {SortLocalAlbumsBy.newestAsset}),
 );
 
 final localAlbumThumbnailProvider = FutureProvider.family<LocalAsset?, String>(

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

@@ -10,12 +10,9 @@ part 'db.provider.g.dart';
 @Riverpod(keepAlive: true)
 Isar isar(Ref ref) => throw UnimplementedError('isar');
 
-Drift Function(Ref ref) driftOverride(Drift drift) => (ref) {
+final driftProvider = Provider<Drift>((ref) {
+  final drift = Drift();
   ref.onDispose(() => unawaited(drift.close()));
   ref.keepAlive();
   return drift;
-};
-
-final driftProvider = Provider<Drift>(
-  (ref) => throw UnimplementedError("driftProvider must be overridden in the isolate's ProviderContainer before use"),
-);
+});

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

@@ -1,7 +1,4 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/platform/native_sync_api.g.dart';
-import 'package:immich_mobile/platform/thumbnail_api.g.dart';
 
 final nativeSyncApiProvider = Provider<NativeSyncApi>((_) => NativeSyncApi());
-
-final thumbnailApi = ThumbnailApi();

mobile/lib/routing/router.dart

@@ -28,7 +28,6 @@ import 'package:immich_mobile/pages/backup/backup_controller.page.dart';
 import 'package:immich_mobile/pages/backup/backup_options.page.dart';
 import 'package:immich_mobile/pages/backup/drift_backup.page.dart';
 import 'package:immich_mobile/pages/backup/drift_backup_album_selection.page.dart';
-import 'package:immich_mobile/pages/backup/drift_backup_asset_detail.page.dart';
 import 'package:immich_mobile/pages/backup/drift_backup_options.page.dart';
 import 'package:immich_mobile/pages/backup/drift_upload_detail.page.dart';
 import 'package:immich_mobile/pages/backup/failed_backup_status.page.dart';
@@ -342,7 +341,6 @@ class AppRouter extends RootStackRouter {
     AutoRoute(page: DriftCropImageRoute.page),
     AutoRoute(page: DriftFilterImageRoute.page),
     AutoRoute(page: DriftActivitiesRoute.page, guards: [_authGuard, _duplicateGuard]),
-    AutoRoute(page: DriftBackupAssetDetailRoute.page, guards: [_authGuard, _duplicateGuard]),
     // required to handle all deeplinks in deep_link.service.dart
     // auto_route_library#1722
     RedirectRoute(path: '*', redirectTo: '/'),

mobile/lib/routing/router.gr.dart

@@ -796,22 +796,6 @@ class DriftBackupAlbumSelectionRoute extends PageRouteInfo<void> {
   );
 }
 
-/// generated route for
-/// [DriftBackupAssetDetailPage]
-class DriftBackupAssetDetailRoute extends PageRouteInfo<void> {
-  const DriftBackupAssetDetailRoute({List<PageRouteInfo>? children})
-    : super(DriftBackupAssetDetailRoute.name, initialChildren: children);
-
-  static const String name = 'DriftBackupAssetDetailRoute';
-
-  static PageInfo page = PageInfo(
-    name,
-    builder: (data) {
-      return const DriftBackupAssetDetailPage();
-    },
-  );
-}
-
 /// generated route for
 /// [DriftBackupOptionsPage]
 class DriftBackupOptionsRoute extends PageRouteInfo<void> {

mobile/lib/services/background.service.dart

@@ -14,6 +14,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/entities/backup_album.entity.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
+import 'package:immich_mobile/infrastructure/repositories/logger_db.repository.dart';
 import 'package:immich_mobile/models/backup/backup_candidate.model.dart';
 import 'package:immich_mobile/models/backup/current_upload_asset.model.dart';
 import 'package:immich_mobile/models/backup/error_upload_asset.model.dart';
@@ -330,16 +331,11 @@ class BackgroundService {
   }
 
   Future<bool> _onAssetsChanged() async {
-    final (isar, drift, logDb) = await Bootstrap.initDB();
-    await Bootstrap.initDomain(isar, drift, logDb);
+    final db = await Bootstrap.initIsar();
+    final logDb = DriftLogger();
+    await Bootstrap.initDomain(db, logDb);
 
-    final ref = ProviderContainer(
-      overrides: [
-        dbProvider.overrideWithValue(isar),
-        isarProvider.overrideWithValue(isar),
-        driftProvider.overrideWith(driftOverride(drift)),
-      ],
-    );
+    final ref = ProviderContainer(overrides: [dbProvider.overrideWithValue(db), isarProvider.overrideWithValue(db)]);
 
     HttpSSLOptions.apply();
     ref.read(apiServiceProvider).setAccessToken(Store.get(StoreKey.accessToken));