refactor: Finish timeline migration by removing AssetGrid wrapper

- Remove AssetGrid wrapper 
- Update all remaining route files to import Timeline directly
- Fix component signatures where needed (onThumbnailClick → onAssetOpen)
- Update album-viewer component to use Timeline
- Update geolocation route with proper callback signature

All routes now use Timeline component directly:
- album-viewer component

The major parts of the refactoring are complete.

.devcontainer/mobile/container-compose-overrides.yml

@@ -12,6 +12,7 @@ services:
       - server_node_modules:/workspaces/immich/server/node_modules
       - web_node_modules:/workspaces/immich/web/node_modules
       - ${UPLOAD_LOCATION}/photos:/data
+      - ${UPLOAD_LOCATION}/photos/upload:/data/upload
       - /etc/localtime:/etc/localtime:ro
 
   database:

.devcontainer/server/container-compose-overrides.yml

@@ -8,7 +8,8 @@ services:
       - IMMICH_SERVER_URL=http://127.0.0.1:2283/
     volumes: !override
       - ..:/workspaces/immich
-      - ${UPLOAD_LOCATION:-upload-devcontainer-volume}${UPLOAD_LOCATION:+/photos}:/data
+      - ${UPLOAD_LOCATION:-upload1-devcontainer-volume}${UPLOAD_LOCATION:+/photos}:/data
+      - ${UPLOAD_LOCATION:-upload2-devcontainer-volume}${UPLOAD_LOCATION:+/photos/upload}:/data/upload
       - /etc/localtime:/etc/localtime:ro
       - pnpm-store:/usr/src/app/.pnpm-store
       - server-node_modules:/usr/src/app/server/node_modules
@@ -23,6 +24,9 @@ services:
       - coverage:/usr/src/app/web/coverage
   immich-web:
     env_file: !reset []
+  init:
+    env_file: !reset []
+    command: sh -c 'find /data -maxdepth 1 ! -path "/data/postgres" -type d -exec chown ${UID:-0}:${GID:-0} {} + 2>/dev/null || true; for path in /usr/src/app/.pnpm-store /usr/src/app/server/node_modules /usr/src/app/server/dist /usr/src/app/.github/node_modules /usr/src/app/cli/node_modules /usr/src/app/docs/node_modules /usr/src/app/e2e/node_modules /usr/src/app/open-api/typescript-sdk/node_modules /usr/src/app/web/.svelte-kit /usr/src/app/web/coverage /usr/src/app/node_modules /usr/src/app/web/node_modules; do [ -e "$$path" ] && chown -R ${UID:-0}:${GID:-0} "$$path" || true; done'
   immich-machine-learning:
     env_file: !reset []
   database:
@@ -38,5 +42,7 @@ services:
   redis:
     env_file: !reset []
 volumes:
-  upload-devcontainer-volume:
+  # Node modules for each service to avoid conflicts and ensure consistent dependencies
+  upload1-devcontainer-volume:
+  upload2-devcontainer-volume:
   postgres-devcontainer-volume:

.github/workflows/build-mobile.yml

@@ -32,18 +32,24 @@ jobs:
     permissions:
       contents: read
     outputs:
-      should_run: ${{ steps.check.outputs.should_run }}
+      should_run: ${{ steps.found_paths.outputs.mobile == 'true' || steps.should_force.outputs.should_force == 'true' }}
     steps:
-      - name: Check what should run
-        id: check
-        uses: immich-app/devtools/actions/pre-job@24820aa4ef67959b0dcf69a438cccf00d7c7042b # pre-job-action-v1.0.1
+      - name: Checkout code
+        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+        with:
+          persist-credentials: false
+
+      - id: found_paths
+        uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
         with:
           filters: |
             mobile:
               - 'mobile/**'
-          force-filters: |
-            - '.github/workflows/build-mobile.yml'
-          force-events: 'workflow_call,workflow_dispatch'
+            workflow:
+              - '.github/workflows/build-mobile.yml'
+      - name: Check if we should force jobs to run
+        id: should_force
+        run: echo "should_force=${{ steps.found_paths.outputs.workflow == 'true' || github.event_name == 'workflow_call' || github.event_name == 'workflow_dispatch' }}" >> "$GITHUB_OUTPUT"
 
   build-sign-android:
     name: Build and sign Android
@@ -51,7 +57,7 @@ jobs:
     permissions:
       contents: read
     # Skip when PR from a fork
-    if: ${{ !github.event.pull_request.head.repo.fork && github.actor != 'dependabot[bot]' && fromJSON(needs.pre-job.outputs.should_run).mobile == true }}
+    if: ${{ !github.event.pull_request.head.repo.fork && github.actor != 'dependabot[bot]' && needs.pre-job.outputs.should_run == 'true' }}
     runs-on: mich
 
     steps:

.github/workflows/close-duplicates.yml

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

.github/workflows/codeql-analysis.yml

@@ -50,7 +50,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@192325c86100d080feab897ff886c34abd4c83a3 # v3.30.3
+        uses: github/codeql-action/init@2d92b76c45b91eb80fc44c74ce3fce0ee94e8f9d # v3.30.0
         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@192325c86100d080feab897ff886c34abd4c83a3 # v3.30.3
+        uses: github/codeql-action/autobuild@2d92b76c45b91eb80fc44c74ce3fce0ee94e8f9d # v3.30.0
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -76,6 +76,6 @@ jobs:
       #   ./location_of_script_within_repo/buildscript.sh
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@192325c86100d080feab897ff886c34abd4c83a3 # v3.30.3
+        uses: github/codeql-action/analyze@2d92b76c45b91eb80fc44c74ce3fce0ee94e8f9d # v3.30.0
         with:
           category: '/language:${{matrix.language}}'

.github/workflows/docker.yml

@@ -20,11 +20,15 @@ jobs:
     permissions:
       contents: read
     outputs:
-      should_run: ${{ steps.check.outputs.should_run }}
+      should_run_server: ${{ steps.found_paths.outputs.server == 'true' || steps.should_force.outputs.should_force == 'true' }}
+      should_run_ml: ${{ steps.found_paths.outputs.machine-learning == 'true' || steps.should_force.outputs.should_force == 'true' }}
     steps:
-      - name: Check what should run
-        id: check
-        uses: immich-app/devtools/actions/pre-job@24820aa4ef67959b0dcf69a438cccf00d7c7042b # pre-job-action-v1.0.1
+      - name: Checkout code
+        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+        with:
+          persist-credentials: false
+      - id: found_paths
+        uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
         with:
           filters: |
             server:
@@ -34,11 +38,14 @@ jobs:
               - 'i18n/**'
             machine-learning:
               - 'machine-learning/**'
-          force-filters: |
-            - '.github/workflows/docker.yml'
-            - '.github/workflows/multi-runner-build.yml'
-            - '.github/actions/image-build'
-          force-events: 'workflow_dispatch,release'
+            workflow:
+              - '.github/workflows/docker.yml'
+              - '.github/workflows/multi-runner-build.yml'
+              - '.github/actions/image-build'
+
+      - name: Check if we should force jobs to run
+        id: should_force
+        run: echo "should_force=${{ steps.found_paths.outputs.workflow == 'true' || github.event_name == 'workflow_dispatch' || github.event_name == 'release' }}" >> "$GITHUB_OUTPUT"
 
   retag_ml:
     name: Re-Tag ML
@@ -46,7 +53,7 @@ jobs:
     permissions:
       contents: read
       packages: write
-    if: ${{ fromJSON(needs.pre-job.outputs.should_run).machine-learning == false && !github.event.pull_request.head.repo.fork }}
+    if: ${{ needs.pre-job.outputs.should_run_ml == 'false' && !github.event.pull_request.head.repo.fork }}
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -75,7 +82,7 @@ jobs:
     permissions:
       contents: read
       packages: write
-    if: ${{ fromJSON(needs.pre-job.outputs.should_run).server == false && !github.event.pull_request.head.repo.fork }}
+    if: ${{ needs.pre-job.outputs.should_run_server == 'false' && !github.event.pull_request.head.repo.fork }}
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -101,7 +108,7 @@ jobs:
   machine-learning:
     name: Build and Push ML
     needs: pre-job
-    if: ${{ fromJSON(needs.pre-job.outputs.should_run).machine-learning == true }}
+    if: ${{ needs.pre-job.outputs.should_run_ml == 'true' }}
     strategy:
       fail-fast: false
       matrix:
@@ -146,7 +153,7 @@ jobs:
   server:
     name: Build and Push Server
     needs: pre-job
-    if: ${{ fromJSON(needs.pre-job.outputs.should_run).server == true }}
+    if: ${{ needs.pre-job.outputs.should_run_server == 'true' }}
     uses: immich-app/devtools/.github/workflows/multi-runner-build.yml@129aeda75a450666ce96e8bc8126652e717917a7 # multi-runner-build-workflow-0.1.1
     permissions:
       contents: read

.github/workflows/docs-build.yml

@@ -18,28 +18,32 @@ jobs:
     permissions:
       contents: read
     outputs:
-      should_run: ${{ steps.check.outputs.should_run }}
+      should_run: ${{ steps.found_paths.outputs.docs == 'true' || steps.found_paths.outputs.open-api == 'true' ||  steps.should_force.outputs.should_force == 'true' }}
     steps:
-      - name: Check what should run
-        id: check
-        uses: immich-app/devtools/actions/pre-job@24820aa4ef67959b0dcf69a438cccf00d7c7042b # pre-job-action-v1.0.1
+      - name: Checkout code
+        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+        with:
+          persist-credentials: false
+      - id: found_paths
+        uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
         with:
           filters: |
             docs:
               - 'docs/**'
+            workflow:
+              - '.github/workflows/docs-build.yml'
             open-api:
               - 'open-api/immich-openapi-specs.json'
-          force-filters: |
-            - '.github/workflows/docs-build.yml'
-          force-events: 'release'
-          force-branches: 'main'
+      - name: Check if we should force jobs to run
+        id: should_force
+        run: echo "should_force=${{ steps.found_paths.outputs.workflow == 'true' || github.event_name == 'release' || github.ref_name == 'main' }}" >> "$GITHUB_OUTPUT"
 
   build:
     name: Docs Build
     needs: pre-job
     permissions:
       contents: read
-    if: ${{ fromJSON(needs.pre-job.outputs.should_run).docs == true }}
+    if: ${{ needs.pre-job.outputs.should_run == 'true' }}
     runs-on: ubuntu-latest
     defaults:
       run:

.github/workflows/prepare-release.yml

@@ -119,7 +119,7 @@ jobs:
           name: release-apk-signed
 
       - name: Create draft release
-        uses: softprops/action-gh-release@6cbd405e2c4e67a21c47fa9e383d020e4e28b836 # v2.3.3
+        uses: softprops/action-gh-release@72f2c25fcb47643c292f7107632f7a47c1df5cd8 # v2.3.2
         with:
           draft: true
           tag_name: ${{ env.IMMICH_VERSION }}

.github/workflows/static_analysis.yml

@@ -17,23 +17,28 @@ jobs:
     permissions:
       contents: read
     outputs:
-      should_run: ${{ steps.check.outputs.should_run }}
+      should_run: ${{ steps.found_paths.outputs.mobile == 'true' || steps.should_force.outputs.should_force == 'true' }}
     steps:
-      - name: Check what should run
-        id: check
-        uses: immich-app/devtools/actions/pre-job@24820aa4ef67959b0dcf69a438cccf00d7c7042b # pre-job-action-v1.0.1
+      - name: Checkout code
+        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+        with:
+          persist-credentials: false
+      - id: found_paths
+        uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
         with:
           filters: |
             mobile:
               - 'mobile/**'
-          force-filters: |
-            - '.github/workflows/static_analysis.yml'
-          force-events: 'workflow_dispatch,release'
+            workflow:
+              - '.github/workflows/static_analysis.yml'
+      - name: Check if we should force jobs to run
+        id: should_force
+        run: echo "should_force=${{ steps.found_paths.outputs.workflow == 'true' || github.event_name == 'release' }}" >> "$GITHUB_OUTPUT"
 
   mobile-dart-analyze:
     name: Run Dart Code Analysis
     needs: pre-job
-    if: ${{ fromJSON(needs.pre-job.outputs.should_run).mobile == true }}
+    if: ${{ needs.pre-job.outputs.should_run == 'true' }}
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -95,9 +100,8 @@ jobs:
       - name: Run dart format
         run: make format
 
-      # TODO: Re-enable after upgrading custom_lint
-      # - name: Run dart custom_lint
-      #   run: dart run custom_lint
+      - name: Run dart custom_lint
+        run: dart run custom_lint
 
       # TODO: Use https://github.com/CQLabs/dcm-action
       - name: Run DCM

.github/workflows/test.yml

@@ -14,11 +14,23 @@ jobs:
     permissions:
       contents: read
     outputs:
-      should_run: ${{ steps.check.outputs.should_run }}
+      should_run_i18n: ${{ steps.found_paths.outputs.i18n == 'true' || steps.should_force.outputs.should_force == 'true' }}
+      should_run_web: ${{ steps.found_paths.outputs.web == 'true' || steps.should_force.outputs.should_force == 'true' }}
+      should_run_server: ${{ steps.found_paths.outputs.server == 'true' || steps.should_force.outputs.should_force == 'true' }}
+      should_run_cli: ${{ steps.found_paths.outputs.cli == 'true' || steps.should_force.outputs.should_force == 'true' }}
+      should_run_e2e: ${{ steps.found_paths.outputs.e2e == 'true' || steps.should_force.outputs.should_force == 'true' }}
+      should_run_mobile: ${{ steps.found_paths.outputs.mobile == 'true' || steps.should_force.outputs.should_force == 'true' }}
+      should_run_ml: ${{ steps.found_paths.outputs.machine-learning == 'true' || steps.should_force.outputs.should_force == 'true' }}
+      should_run_e2e_web: ${{ steps.found_paths.outputs.e2e == 'true' || steps.found_paths.outputs.web == 'true' || steps.should_force.outputs.should_force == 'true' }}
+      should_run_e2e_server_cli: ${{ steps.found_paths.outputs.e2e == 'true' || steps.found_paths.outputs.server == 'true' || steps.found_paths.outputs.cli == 'true' || steps.should_force.outputs.should_force == 'true' }}
+      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: Check what should run
-        id: check
-        uses: immich-app/devtools/actions/pre-job@24820aa4ef67959b0dcf69a438cccf00d7c7042b # pre-job-action-v1.0.1
+      - name: Checkout code
+        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+        with:
+          persist-credentials: false
+      - id: found_paths
+        uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
         with:
           filters: |
             i18n:
@@ -38,16 +50,17 @@ jobs:
               - 'mobile/**'
             machine-learning:
               - 'machine-learning/**'
+            workflow:
+              - '.github/workflows/test.yml'
             .github:
               - '.github/**'
-          force-filters: |
-            - '.github/workflows/test.yml'
-          force-events: 'workflow_dispatch'
-
+      - name: Check if we should force jobs to run
+        id: should_force
+        run: echo "should_force=${{ steps.found_paths.outputs.workflow == 'true' || github.event_name == 'workflow_dispatch' }}" >> "$GITHUB_OUTPUT"
   server-unit-tests:
     name: Test & Lint Server
     needs: pre-job
-    if: ${{ fromJSON(needs.pre-job.outputs.should_run).server == true }}
+    if: ${{ needs.pre-job.outputs.should_run_server == 'true' }}
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -84,7 +97,7 @@ jobs:
   cli-unit-tests:
     name: Unit Test CLI
     needs: pre-job
-    if: ${{ fromJSON(needs.pre-job.outputs.should_run).cli == true }}
+    if: ${{ needs.pre-job.outputs.should_run_cli == 'true' }}
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -124,7 +137,7 @@ jobs:
   cli-unit-tests-win:
     name: Unit Test CLI (Windows)
     needs: pre-job
-    if: ${{ fromJSON(needs.pre-job.outputs.should_run).cli == true }}
+    if: ${{ needs.pre-job.outputs.should_run_cli == 'true' }}
     runs-on: windows-latest
     permissions:
       contents: read
@@ -159,7 +172,7 @@ jobs:
   web-lint:
     name: Lint Web
     needs: pre-job
-    if: ${{ fromJSON(needs.pre-job.outputs.should_run).web == true }}
+    if: ${{ needs.pre-job.outputs.should_run_web == 'true' }}
     runs-on: mich
     permissions:
       contents: read
@@ -196,7 +209,7 @@ jobs:
   web-unit-tests:
     name: Test Web
     needs: pre-job
-    if: ${{ fromJSON(needs.pre-job.outputs.should_run).web == true }}
+    if: ${{ needs.pre-job.outputs.should_run_web == 'true' }}
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -230,7 +243,7 @@ jobs:
   i18n-tests:
     name: Test i18n
     needs: pre-job
-    if: ${{ fromJSON(needs.pre-job.outputs.should_run).i18n == true }}
+    if: ${{ needs.pre-job.outputs.should_run_i18n == 'true' }}
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -268,7 +281,7 @@ jobs:
   e2e-tests-lint:
     name: End-to-End Lint
     needs: pre-job
-    if: ${{ fromJSON(needs.pre-job.outputs.should_run).e2e == true }}
+    if: ${{ needs.pre-job.outputs.should_run_e2e == 'true' }}
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -307,7 +320,7 @@ jobs:
   server-medium-tests:
     name: Medium Tests (Server)
     needs: pre-job
-    if: ${{ fromJSON(needs.pre-job.outputs.should_run).server == true }}
+    if: ${{ needs.pre-job.outputs.should_run_server == 'true' }}
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -335,7 +348,7 @@ jobs:
   e2e-tests-server-cli:
     name: End-to-End Tests (Server & CLI)
     needs: pre-job
-    if: ${{ fromJSON(needs.pre-job.outputs.should_run).e2e == true || fromJSON(needs.pre-job.outputs.should_run).server == true || fromJSON(needs.pre-job.outputs.should_run).cli == true }}
+    if: ${{ needs.pre-job.outputs.should_run_e2e_server_cli == 'true' }}
     runs-on: ${{ matrix.runner }}
     permissions:
       contents: read
@@ -383,7 +396,7 @@ jobs:
   e2e-tests-web:
     name: End-to-End Tests (Web)
     needs: pre-job
-    if: ${{ fromJSON(needs.pre-job.outputs.should_run).e2e == true || fromJSON(needs.pre-job.outputs.should_run).web == true }}
+    if: ${{ needs.pre-job.outputs.should_run_e2e_web == 'true' }}
     runs-on: ${{ matrix.runner }}
     permissions:
       contents: read
@@ -436,7 +449,7 @@ jobs:
   mobile-unit-tests:
     name: Unit Test Mobile
     needs: pre-job
-    if: ${{ fromJSON(needs.pre-job.outputs.should_run).mobile == true }}
+    if: ${{ needs.pre-job.outputs.should_run_mobile == 'true' }}
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -458,7 +471,7 @@ jobs:
   ml-unit-tests:
     name: Unit Test ML
     needs: pre-job
-    if: ${{ fromJSON(needs.pre-job.outputs.should_run).machine-learning == true }}
+    if: ${{ needs.pre-job.outputs.should_run_ml == 'true' }}
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -494,7 +507,7 @@ jobs:
   github-files-formatting:
     name: .github Files Formatting
     needs: pre-job
-    if: ${{ fromJSON(needs.pre-job.outputs.should_run)['.github'] == true }}
+    if: ${{ needs.pre-job.outputs['should_run_.github'] == 'true' }}
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -581,7 +594,7 @@ jobs:
       contents: read
     services:
       postgres:
-        image: ghcr.io/immich-app/postgres:14-vectorchord0.4.3@sha256:da52bbead5d818adaa8077c8dcdaad0aaf93038c31ad8348b51f9f0ec1310a4d
+        image: ghcr.io/immich-app/postgres:14-vectorchord0.4.3@sha256:4f7ee144d4738ad02f6d9376defed7a767b748d185d47eba241578c26a63064b
         env:
           POSTGRES_PASSWORD: postgres
           POSTGRES_USER: postgres

.github/workflows/weblate-lock.yml

@@ -21,24 +21,25 @@ jobs:
     permissions:
       contents: read
     outputs:
-      should_run: ${{ steps.check.outputs.should_run }}
+      should_run: ${{ steps.found_paths.outputs.i18n == 'true' }}
     steps:
-      - name: Check what should run
-        id: check
-        uses: immich-app/devtools/actions/pre-job@24820aa4ef67959b0dcf69a438cccf00d7c7042b # pre-job-action-v1.0.1
+      - name: Checkout code
+        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+        with:
+          persist-credentials: false
+      - id: found_paths
+        uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
         with:
           filters: |
             i18n:
               - 'i18n/!(en)**\.json'
-          exclude-branches: 'chore/translations'
-          skip-force-logic: 'true'
 
   enforce-lock:
     name: Check Weblate Lock
     needs: [pre-job]
     runs-on: ubuntu-latest
     permissions: {}
-    if: ${{ fromJSON(needs.pre-job.outputs.should_run).i18n == true }}
+    if: ${{ needs.pre-job.outputs.should_run == 'true' }}
     steps:
       - name: Bot review status
         env:

CODEOWNERS

@@ -4,4 +4,3 @@
 /web/ @danieldietzler
 /machine-learning/ @mertalev
 /e2e/ @danieldietzler
-/mobile/ @shenlong-tanwen

Makefile

@@ -1,13 +1,13 @@
-dev:
+dev: prepare-volumes
 	@trap 'make dev-down' EXIT; COMPOSE_BAKE=true docker compose -f ./docker/docker-compose.dev.yml up --remove-orphans
 
 dev-down:
 	docker compose -f ./docker/docker-compose.dev.yml down --remove-orphans
 
-dev-update:
+dev-update: prepare-volumes
 	@trap 'make dev-down' EXIT; COMPOSE_BAKE=true docker compose -f ./docker/docker-compose.dev.yml up --build -V --remove-orphans
 
-dev-scale:
+dev-scale: prepare-volumes
 	@trap 'make dev-down' EXIT; COMPOSE_BAKE=true docker compose -f ./docker/docker-compose.dev.yml up --build -V --scale immich-server=3 --remove-orphans
 
 dev-docs:
@@ -23,7 +23,7 @@ e2e-update:
 e2e-down:
 	docker compose -f ./e2e/docker-compose.yml down --remove-orphans
 
-prod:
+prod: 
 	@trap 'make prod-down' EXIT; COMPOSE_BAKE=true docker compose -f ./docker/docker-compose.prod.yml up --build -V --remove-orphans
 
 prod-down:
@@ -33,16 +33,16 @@ prod-scale:
 	@trap 'make prod-down' EXIT; COMPOSE_BAKE=true docker compose -f ./docker/docker-compose.prod.yml up --build -V --scale immich-server=3 --scale immich-microservices=3 --remove-orphans
 
 .PHONY: open-api
-open-api:
+open-api: prepare-volumes
 	cd ./open-api && bash ./bin/generate-open-api.sh
 
-open-api-dart:
+open-api-dart: prepare-volumes
 	cd ./open-api && bash ./bin/generate-open-api.sh dart
 
-open-api-typescript:
+open-api-typescript: prepare-volumes
 	cd ./open-api && bash ./bin/generate-open-api.sh typescript
 
-sql:
+sql: prepare-volumes
 	pnpm --filter immich run sync:sql
 
 attach-server:
@@ -68,6 +68,32 @@ VOLUME_DIRS = \
 # Include .env file if it exists
 -include docker/.env
 
+# Helper function to chown, on error suggest remediation and exit
+define safe_chown
+	CURRENT_OWNER=$$(stat -c '%u:%g' "$(1)" 2>/dev/null || echo "none"); \
+	DESIRED_OWNER="$(or $(UID),0):$(or $(GID),0)"; \
+	if [ "$$CURRENT_OWNER" != "$$DESIRED_OWNER" ] && ! chown -v $(2) $$DESIRED_OWNER "$(1)" 2>/dev/null; then \
+		echo "Permission denied when changing owner of volumes and upload location. Try running 'sudo make prepare-volumes' first."; \
+		exit 1; \
+	fi;
+endef
+# create empty directories and chown
+prepare-volumes:
+	@$(foreach dir,$(VOLUME_DIRS),mkdir -p $(dir);)
+	@$(foreach dir,$(VOLUME_DIRS),$(call safe_chown,$(dir),-R))
+ifneq ($(UPLOAD_LOCATION),)
+ifeq ($(filter /%,$(UPLOAD_LOCATION)),)
+	@mkdir -p "docker/$(UPLOAD_LOCATION)/photos/upload"
+	@$(call safe_chown,docker/$(UPLOAD_LOCATION),)
+	@$(call safe_chown,docker/$(UPLOAD_LOCATION)/photos,-R)
+else
+	@mkdir -p "$(UPLOAD_LOCATION)/photos/upload"
+	@$(call safe_chown,$(UPLOAD_LOCATION),)
+	@$(call safe_chown,$(UPLOAD_LOCATION)/photos,-R)
+endif
+endif
+
+
 MODULES = e2e server web cli sdk docs .github
 
 # directory to package name mapping function

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

@@ -2,37 +2,37 @@
 # Manual edits may be lost in future updates.
 
 provider "registry.opentofu.org/cloudflare/cloudflare" {
-  version     = "4.52.5"
-  constraints = "4.52.5"
+  version     = "4.52.3"
+  constraints = "4.52.3"
   hashes = [
-    "h1:+rfzF+16ZcWZWnTyW/p1HHTzYbPKX8Zt2nIFtR/+f+E=",
-    "h1:18bXaaOSq8MWKuMxo/4y7EB7/i7G90y5QsKHZRmkoDo=",
-    "h1:4vZVOpKeEQZsF2VrARRZFeL37Ed/gD4rRMtfnvWQres=",
-    "h1:BZOsTF83QPKXTAaYqxPKzdl1KRjk/L2qbPpFjM0w28A=",
-    "h1:CDuC+HXLvc1z6wkCRsSDcc/+QENIHEtssYshiWg3opA=",
-    "h1:DE+YFzLnqSe79pI2R4idRGx5QzLdrA7RXvngTkGfZ30=",
-    "h1:DfaJwH3Ml4yrRbdAY4AcDVy0QTQk5T3A622TXzS/u2E=",
-    "h1:EIDXP0W3kgIv2pecrFmqtK/DnlqkyckzBzhxKaXU+4A=",
-    "h1:EV4kYyaOnwGA0bh/3hU6Ezqnt1PFDxopH7i85e48IzY=",
-    "h1:M0iXabfzamU+MPDi0G9XACpbacFKMakmM+Z9HZ8HrsM=",
-    "h1:YWmCbGF/KbsrUzcYVBLscwLizidbp95TDQa0N2qpmVo=",
-    "h1:cxPcCB5gbrpUO1+IXkQYs1YTY50/0IlApCzGea0cwuQ=",
-    "h1:g6DldikTV2HXUu9uoeNY5FuLufgaYWF4ufgZg7wq62s=",
-    "h1:oi/Hrx9pwoQ+Z52CBC+rrowVH387EIj0qvnxQgDeI+0=",
-    "zh:1a3400cb38863b2585968d1876706bcfc67a148e1318a1d325c6c7704adc999b",
-    "zh:4c5062cb9e9da1676f06ae92b8370186d98976cc4c7030d3cd76df12af54282a",
-    "zh:52110f493b5f0587ef77a1cfd1a67001fd4c617b14c6502d732ab47352bdc2f7",
-    "zh:5aa536f9eaeb43823aaf2aa80e7d39b25ef2b383405ed034aa16a28b446a9238",
-    "zh:5cc39459a1c6be8a918f17054e4fbba573825ed5597dcada588fe99614d98a5b",
-    "zh:629ae6a7ba298815131da826474d199312d21cec53a4d5ded4fa56a692e6f072",
-    "zh:719cc7c75dc1d3eb30c22ff5102a017996d9788b948078c7e1c5b3446aeca661",
-    "zh:8698635a3ca04383c1e93b21d6963346bdae54d27177a48e4b1435b7f731731c",
+    "h1:3jU62KY4Oj3xzMwkTQWon1nlIvFkgTCqI93IzUGaa0c=",
+    "h1:BWimtYXrvbzbbuoVcyobjQnXjjOb9X69JFTw+GuPxfk=",
+    "h1:C/KvLEm8dVQ6zG2X4asLDtmw2JW/xu7E8MddtaXniO0=",
+    "h1:Doo0xcLFf+CnfDWjsA7G1NvSLURuwcgyVy8k0NF1gJA=",
+    "h1:Gc3FGDtR8lUWsi9VImnnE5/USDXiIwYsv4Hbl+d2lwY=",
+    "h1:HsDY6s1gup5fW9TeuTUy85QMIld1nDOUFlwsfxIq1ig=",
+    "h1:MnHkB56E4b/kT6WZigsZJnB5rgnCfDVbrLBNxIsEXPY=",
+    "h1:O/FUQEqhtknJNdsaMbIBi2pLWBds2VvN5FsTVVntzb0=",
+    "h1:OKQBynkp0J5DIf5FOl/NR3S2rvh89pY+t5wevYxdTJs=",
+    "h1:On+vPsYV8U/J/8wFZPXjeAgNJqFFQj42vNOKuNKURkY=",
+    "h1:SPkrMRJahxK0uum7FnUugbGN/JepHMH8M71DBtYrvG0=",
+    "h1:bEh1ASPMiin3F36+hTfjMQTBnuDl2DzjzSCdova3JEM=",
+    "h1:dtIK+x5Q1sh5SMPaHBHXhL9XDIqbRW0EBmVZ+KHQB8E=",
+    "h1:kZcwWfODMWWyauZ66oaO/X+xXkqBtrbYwfUFEtspwEc=",
+    "zh:53946fce4a631f1d98c61550821c88edede9169dfe5cc254e09a2ab207f76b3f",
+    "zh:61654a21f1dd4331492d4ef77e9ebff066bc01e1281f92b925e5697c9138d681",
+    "zh:6a54e9d129b276f052a2f1b73ad0b8735fe6a7403c6a8f6aa111e525eeefaf35",
+    "zh:7692374e655c346a630b5a7cd776c5e0b2388900dcd7ab69a3af85d0c31c6c43",
     "zh:890df766e9b839623b1f0437355032a3c006226a6c200cd911e15ee1a9014e9f",
-    "zh:8a9993f1dcadf1dd6ca43b23348abe374605d29945a2fafc07fb3457644e6a54",
-    "zh:b1b9a1e6bcc24d5863a664a411d2dc906373ae7a2399d2d65548ce7377057852",
-    "zh:b270184cdeec277218e84b94cb136fead753da717f9b9dc378e51907f3f00bb0",
-    "zh:dff2bc10071210181726ce270f954995fe42c696e61e2e8f874021fed02521e5",
-    "zh:e8e87b40b6a87dc097b0fdc20d3f725cec0d82abc9cc3755c1f89f8f6e8b0036",
-    "zh:ee964a6573d399a5dd22ce328fb38ca1207797a02248f14b2e4913ee390e7803",
+    "zh:8fe5b792a4d2b1c3a0e573649642962494faa00299baa6aaf813b9a43203dc02",
+    "zh:a0f403a4862df90f09de65c6e939d6cfd069a8dda2dd33f82948bf6f5f1124ef",
+    "zh:a25dc3eb60777b600f8f125d321fe7c50b811c5302b58e9a727ceb749a04e35d",
+    "zh:a2f2ac7dc703c69d2e8c67c9cb5620b5348cb4fd6b98515fbe3f478517b56602",
+    "zh:d452e7bd24445ee14166470cf50f3aca566d46cab5f26f1c5c988c0f3106b697",
+    "zh:e10a52b0294735659eb3f0821ad2006ec097918efe58d31d37a5e3c47efef5f6",
+    "zh:e28dd0954cef9f05adf4d4b440d6f134f605344dfa56307181996675e6550af2",
+    "zh:f1e3b2f43a472280442f01ba71a3c06c9167432e553381132ea5c4a77e0b6dd5",
+    "zh:f71fd63718d38fd43829861e91fe79e16d7b4c7c3d508ae3d077368d89b8e5a0",
+    "zh:faf8d3da4b819c4ae8e565d2b1a684c6a948a086cb299189a5e7b30b2178409d",
   ]
 }

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

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

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

@@ -2,37 +2,37 @@
 # Manual edits may be lost in future updates.
 
 provider "registry.opentofu.org/cloudflare/cloudflare" {
-  version     = "4.52.5"
-  constraints = "4.52.5"
+  version     = "4.52.3"
+  constraints = "4.52.3"
   hashes = [
-    "h1:+rfzF+16ZcWZWnTyW/p1HHTzYbPKX8Zt2nIFtR/+f+E=",
-    "h1:18bXaaOSq8MWKuMxo/4y7EB7/i7G90y5QsKHZRmkoDo=",
-    "h1:4vZVOpKeEQZsF2VrARRZFeL37Ed/gD4rRMtfnvWQres=",
-    "h1:BZOsTF83QPKXTAaYqxPKzdl1KRjk/L2qbPpFjM0w28A=",
-    "h1:CDuC+HXLvc1z6wkCRsSDcc/+QENIHEtssYshiWg3opA=",
-    "h1:DE+YFzLnqSe79pI2R4idRGx5QzLdrA7RXvngTkGfZ30=",
-    "h1:DfaJwH3Ml4yrRbdAY4AcDVy0QTQk5T3A622TXzS/u2E=",
-    "h1:EIDXP0W3kgIv2pecrFmqtK/DnlqkyckzBzhxKaXU+4A=",
-    "h1:EV4kYyaOnwGA0bh/3hU6Ezqnt1PFDxopH7i85e48IzY=",
-    "h1:M0iXabfzamU+MPDi0G9XACpbacFKMakmM+Z9HZ8HrsM=",
-    "h1:YWmCbGF/KbsrUzcYVBLscwLizidbp95TDQa0N2qpmVo=",
-    "h1:cxPcCB5gbrpUO1+IXkQYs1YTY50/0IlApCzGea0cwuQ=",
-    "h1:g6DldikTV2HXUu9uoeNY5FuLufgaYWF4ufgZg7wq62s=",
-    "h1:oi/Hrx9pwoQ+Z52CBC+rrowVH387EIj0qvnxQgDeI+0=",
-    "zh:1a3400cb38863b2585968d1876706bcfc67a148e1318a1d325c6c7704adc999b",
-    "zh:4c5062cb9e9da1676f06ae92b8370186d98976cc4c7030d3cd76df12af54282a",
-    "zh:52110f493b5f0587ef77a1cfd1a67001fd4c617b14c6502d732ab47352bdc2f7",
-    "zh:5aa536f9eaeb43823aaf2aa80e7d39b25ef2b383405ed034aa16a28b446a9238",
-    "zh:5cc39459a1c6be8a918f17054e4fbba573825ed5597dcada588fe99614d98a5b",
-    "zh:629ae6a7ba298815131da826474d199312d21cec53a4d5ded4fa56a692e6f072",
-    "zh:719cc7c75dc1d3eb30c22ff5102a017996d9788b948078c7e1c5b3446aeca661",
-    "zh:8698635a3ca04383c1e93b21d6963346bdae54d27177a48e4b1435b7f731731c",
+    "h1:3jU62KY4Oj3xzMwkTQWon1nlIvFkgTCqI93IzUGaa0c=",
+    "h1:BWimtYXrvbzbbuoVcyobjQnXjjOb9X69JFTw+GuPxfk=",
+    "h1:C/KvLEm8dVQ6zG2X4asLDtmw2JW/xu7E8MddtaXniO0=",
+    "h1:Doo0xcLFf+CnfDWjsA7G1NvSLURuwcgyVy8k0NF1gJA=",
+    "h1:Gc3FGDtR8lUWsi9VImnnE5/USDXiIwYsv4Hbl+d2lwY=",
+    "h1:HsDY6s1gup5fW9TeuTUy85QMIld1nDOUFlwsfxIq1ig=",
+    "h1:MnHkB56E4b/kT6WZigsZJnB5rgnCfDVbrLBNxIsEXPY=",
+    "h1:O/FUQEqhtknJNdsaMbIBi2pLWBds2VvN5FsTVVntzb0=",
+    "h1:OKQBynkp0J5DIf5FOl/NR3S2rvh89pY+t5wevYxdTJs=",
+    "h1:On+vPsYV8U/J/8wFZPXjeAgNJqFFQj42vNOKuNKURkY=",
+    "h1:SPkrMRJahxK0uum7FnUugbGN/JepHMH8M71DBtYrvG0=",
+    "h1:bEh1ASPMiin3F36+hTfjMQTBnuDl2DzjzSCdova3JEM=",
+    "h1:dtIK+x5Q1sh5SMPaHBHXhL9XDIqbRW0EBmVZ+KHQB8E=",
+    "h1:kZcwWfODMWWyauZ66oaO/X+xXkqBtrbYwfUFEtspwEc=",
+    "zh:53946fce4a631f1d98c61550821c88edede9169dfe5cc254e09a2ab207f76b3f",
+    "zh:61654a21f1dd4331492d4ef77e9ebff066bc01e1281f92b925e5697c9138d681",
+    "zh:6a54e9d129b276f052a2f1b73ad0b8735fe6a7403c6a8f6aa111e525eeefaf35",
+    "zh:7692374e655c346a630b5a7cd776c5e0b2388900dcd7ab69a3af85d0c31c6c43",
     "zh:890df766e9b839623b1f0437355032a3c006226a6c200cd911e15ee1a9014e9f",
-    "zh:8a9993f1dcadf1dd6ca43b23348abe374605d29945a2fafc07fb3457644e6a54",
-    "zh:b1b9a1e6bcc24d5863a664a411d2dc906373ae7a2399d2d65548ce7377057852",
-    "zh:b270184cdeec277218e84b94cb136fead753da717f9b9dc378e51907f3f00bb0",
-    "zh:dff2bc10071210181726ce270f954995fe42c696e61e2e8f874021fed02521e5",
-    "zh:e8e87b40b6a87dc097b0fdc20d3f725cec0d82abc9cc3755c1f89f8f6e8b0036",
-    "zh:ee964a6573d399a5dd22ce328fb38ca1207797a02248f14b2e4913ee390e7803",
+    "zh:8fe5b792a4d2b1c3a0e573649642962494faa00299baa6aaf813b9a43203dc02",
+    "zh:a0f403a4862df90f09de65c6e939d6cfd069a8dda2dd33f82948bf6f5f1124ef",
+    "zh:a25dc3eb60777b600f8f125d321fe7c50b811c5302b58e9a727ceb749a04e35d",
+    "zh:a2f2ac7dc703c69d2e8c67c9cb5620b5348cb4fd6b98515fbe3f478517b56602",
+    "zh:d452e7bd24445ee14166470cf50f3aca566d46cab5f26f1c5c988c0f3106b697",
+    "zh:e10a52b0294735659eb3f0821ad2006ec097918efe58d31d37a5e3c47efef5f6",
+    "zh:e28dd0954cef9f05adf4d4b440d6f134f605344dfa56307181996675e6550af2",
+    "zh:f1e3b2f43a472280442f01ba71a3c06c9167432e553381132ea5c4a77e0b6dd5",
+    "zh:f71fd63718d38fd43829861e91fe79e16d7b4c7c3d508ae3d077368d89b8e5a0",
+    "zh:faf8d3da4b819c4ae8e565d2b1a684c6a948a086cb299189a5e7b30b2178409d",
   ]
 }

deployment/modules/cloudflare/docs/config.tf

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

docker/docker-compose.dev.yml

@@ -21,6 +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:-0}:${GID:-0}'
     build:
       context: ../
       dockerfile: server/Dockerfile.dev
@@ -29,6 +30,7 @@ services:
     volumes:
       - ..:/usr/src/app
       - ${UPLOAD_LOCATION}/photos:/data
+      - ${UPLOAD_LOCATION}/photos/upload:/data/upload
       - /etc/localtime:/etc/localtime:ro
       - pnpm-store:/usr/src/app/.pnpm-store
       - server-node_modules:/usr/src/app/server/node_modules
@@ -70,12 +72,17 @@ services:
         condition: service_started
       database:
         condition: service_started
+      init:
+        condition: service_completed_successfully
     healthcheck:
       disable: false
 
   immich-web:
     container_name: immich_web
     image: immich-web-dev:latest
+    # Needed for rootless docker setup, see https://github.com/moby/moby/issues/45919
+    # user: 0:0
+    user: '${UID:-0}:${GID:-0}'
     build:
       context: ../
       dockerfile: server/Dockerfile.dev
@@ -107,6 +114,8 @@ services:
     depends_on:
       immich-server:
         condition: service_started
+      init:
+        condition: service_completed_successfully
 
   immich-machine-learning:
     container_name: immich_machine_learning
@@ -174,6 +183,25 @@ services:
   #   volumes:
   #     - grafana-data:/var/lib/grafana
 
+  init:
+    container_name: init
+    image: busybox@sha256:ab33eacc8251e3807b85bb6dba570e4698c3998eca6f0fc2ccb60575a563ea74
+    env_file:
+      - .env
+    user: 0:0
+    command: sh -c 'find /data -maxdepth 1 -type d -exec chown ${UID:-0}:${GID:-0} {} + 2>/dev/null || true; for path in /usr/src/app/.pnpm-store /usr/src/app/server/node_modules /usr/src/app/server/dist /usr/src/app/.github/node_modules /usr/src/app/cli/node_modules /usr/src/app/docs/node_modules /usr/src/app/e2e/node_modules /usr/src/app/open-api/typescript-sdk/node_modules /usr/src/app/web/.svelte-kit /usr/src/app/web/coverage /usr/src/app/node_modules /usr/src/app/web/node_modules; do [ -e "$$path" ] && chown -R ${UID:-0}:${GID:-0} "$$path" || true; done'
+    volumes:
+      - pnpm-store:/usr/src/app/.pnpm-store
+      - server-node_modules:/usr/src/app/server/node_modules
+      - web-node_modules:/usr/src/app/web/node_modules
+      - github-node_modules:/usr/src/app/.github/node_modules
+      - cli-node_modules:/usr/src/app/cli/node_modules
+      - docs-node_modules:/usr/src/app/docs/node_modules
+      - e2e-node_modules:/usr/src/app/e2e/node_modules
+      - sdk-node_modules:/usr/src/app/open-api/typescript-sdk/node_modules
+      - app-node_modules:/usr/src/app/node_modules
+      - sveltekit:/usr/src/app/web/.svelte-kit
+      - coverage:/usr/src/app/web/coverage
 volumes:
   model-cache:
   prometheus-data:

docs/src/components/community-guides.tsx

@@ -28,12 +28,6 @@ const guides: CommunityGuidesProps[] = [
     description: `synchronize folders in imported library with albums having the folders name.`,
     url: 'https://github.com/immich-app/immich/discussions/3382',
   },
-  {
-    title: 'Immich Podman Quadlets Handbook',
-    description:
-      'A rewrite of the original Immich Docker Compose file using Podman Quadlets, with a set of extra guides in the repository’s wiki.',
-    url: 'https://github.com/linux-universe/immich-podman-quadlets/blob/main/README.md',
-  },
   {
     title: 'Podman/Quadlets Install',
     description: 'Documentation for simple podman setup using quadlets.',

e2e/docker-compose.yml

@@ -38,7 +38,7 @@ services:
     image: redis:6.2-alpine@sha256:7fe72c486b910f6b1a9769c937dad5d63648ddee82e056f47417542dd40825bb
 
   database:
-    image: ghcr.io/immich-app/postgres:14-vectorchord0.3.0@sha256:11ced39d65a92a54d12890ced6a26cc2003f92697d6f0d4d944b98459dba7138
+    image: ghcr.io/immich-app/postgres:14-vectorchord0.3.0@sha256:7a4469b9484e37bf2630a60bc2f02f086dae898143b599ecc1c93f619849ef6b
     command: -c fsync=off -c shared_preload_libraries=vchord.so -c config_file=/var/lib/postgresql/data/postgresql.conf
     environment:
       POSTGRES_PASSWORD: postgres

i18n/en.json

@@ -423,7 +423,6 @@
   "album_remove_user_confirmation": "Are you sure you want to remove {user}?",
   "album_search_not_found": "No albums found matching your search",
   "album_share_no_users": "Looks like you have shared this album with all users or you don't have any user to share with.",
-  "album_summary": "Album summary",
   "album_updated": "Album updated",
   "album_updated_setting_description": "Receive an email notification when a shared album has new assets",
   "album_user_left": "Left {album}",
@@ -495,8 +494,6 @@
   "asset_restored_successfully": "Asset restored successfully",
   "asset_skipped": "Skipped",
   "asset_skipped_in_trash": "In trash",
-  "asset_trashed": "Asset trashed",
-  "asset_troubleshoot": "Asset Troubleshoot",
   "asset_uploaded": "Uploaded",
   "asset_uploading": "Uploading…",
   "asset_viewer_settings_subtitle": "Manage your gallery viewer settings",
@@ -530,10 +527,8 @@
   "autoplay_slideshow": "Autoplay slideshow",
   "back": "Back",
   "back_close_deselect": "Back, close, or deselect",
-  "background_backup_running_error": "Background backup is currently running, cannot start manual backup",
   "background_location_permission": "Background location permission",
   "background_location_permission_content": "In order to switch networks when running in the background, Immich must *always* have precise location access so the app can read the Wi-Fi network's name",
-  "background_options": "Background Options",
   "backup": "Backup",
   "backup_album_selection_page_albums_device": "Albums on device ({count})",
   "backup_album_selection_page_albums_tap": "Tap to include, double tap to exclude",
@@ -541,7 +536,6 @@
   "backup_album_selection_page_select_albums": "Select albums",
   "backup_album_selection_page_selection_info": "Selection Info",
   "backup_album_selection_page_total_assets": "Total unique assets",
-  "backup_albums_sync": "Backup albums synchronization",
   "backup_all": "All",
   "backup_background_service_backup_failed_message": "Failed to backup assets. Retrying…",
   "backup_background_service_connection_failed_message": "Failed to connect to the server. Retrying…",
@@ -658,8 +652,6 @@
   "change_pin_code": "Change PIN code",
   "change_your_password": "Change your password",
   "changed_visibility_successfully": "Changed visibility successfully",
-  "charging": "Charging",
-  "charging_requirement_mobile_backup": "Background backup requires the device to be charging",
   "check_corrupt_asset_backup": "Check for corrupt asset backups",
   "check_corrupt_asset_backup_button": "Perform check",
   "check_corrupt_asset_backup_description": "Run this check only over Wi-Fi and once all assets have been backed-up. The procedure might take a few minutes.",
@@ -746,7 +738,6 @@
   "create_user": "Create user",
   "created": "Created",
   "created_at": "Created",
-  "creating_linked_albums": "Creating linked albums...",
   "crop": "Crop",
   "curated_object_page_title": "Things",
   "current_device": "Current device",
@@ -896,9 +887,7 @@
   "error": "Error",
   "error_change_sort_album": "Failed to change album sort order",
   "error_delete_face": "Error deleting face from asset",
-  "error_getting_places": "Error getting places",
   "error_loading_image": "Error loading image",
-  "error_loading_partners": "Error loading partners: {error}",
   "error_saving_image": "Error: {error}",
   "error_tag_face_bounding_box": "Error tagging face - cannot get bounding box coordinates",
   "error_title": "Error - Something went wrong",
@@ -1063,7 +1052,6 @@
   "favorites_page_no_favorites": "No favorite assets found",
   "feature_photo_updated": "Feature photo updated",
   "features": "Features",
-  "features_in_development": "Features in Development",
   "features_setting_description": "Manage the app features",
   "file_name": "File name",
   "file_name_or_extension": "File name or extension",
@@ -1228,7 +1216,6 @@
   "local": "Local",
   "local_asset_cast_failed": "Unable to cast an asset that is not uploaded to the server",
   "local_assets": "Local Assets",
-  "local_media_summary": "Local Media Summary",
   "local_network": "Local network",
   "local_network_sheet_info": "The app will connect to the server through this URL when using the specified Wi-Fi network",
   "location_permission": "Location permission",
@@ -1240,7 +1227,6 @@
   "location_picker_longitude_hint": "Enter your longitude here",
   "lock": "Lock",
   "locked_folder": "Locked Folder",
-  "log_detail_title": "Log Detail",
   "log_out": "Log out",
   "log_out_all_devices": "Log Out All Devices",
   "logged_in_as": "Logged in as {user}",
@@ -1271,7 +1257,6 @@
   "login_password_changed_success": "Password updated successfully",
   "logout_all_device_confirmation": "Are you sure you want to log out all devices?",
   "logout_this_device_confirmation": "Are you sure you want to log out this device?",
-  "logs": "Logs",
   "longitude": "Longitude",
   "look": "Look",
   "loop_videos": "Loop videos",
@@ -1314,7 +1299,6 @@
   "mark_as_read": "Mark as read",
   "marked_all_as_read": "Marked all as read",
   "matches": "Matches",
-  "matching_assets": "Matching Assets",
   "media_type": "Media type",
   "memories": "Memories",
   "memories_all_caught_up": "All caught up",
@@ -1353,9 +1337,10 @@
   "my_albums": "My albums",
   "name": "Name",
   "name_or_nickname": "Name or nickname",
+  "navigate": "Navigate",
+  "navigate_to_time": "Navigate to Time",
   "network_requirement_photos_upload": "Use cellular data to backup photos",
   "network_requirement_videos_upload": "Use cellular data to backup videos",
-  "network_requirements": "Network Requirements",
   "network_requirements_updated": "Network requirements changed, resetting backup queue",
   "networking_settings": "Networking",
   "networking_subtitle": "Manage the server endpoint settings",
@@ -1380,25 +1365,20 @@
   "no_assets_message": "CLICK TO UPLOAD YOUR FIRST PHOTO",
   "no_assets_to_show": "No assets to show",
   "no_cast_devices_found": "No cast devices found",
-  "no_checksum_local": "No checksum available - cannot fetch local assets",
-  "no_checksum_remote": "No checksum available - cannot fetch remote asset",
   "no_duplicates_found": "No duplicates were found.",
   "no_exif_info_available": "No exif info available",
   "no_explore_results_message": "Upload more photos to explore your collection.",
   "no_favorites_message": "Add favorites to quickly find your best pictures and videos",
   "no_libraries_message": "Create an external library to view your photos and videos",
-  "no_local_assets_found": "No local assets found with this checksum",
   "no_locked_photos_message": "Photos and videos in the locked folder are hidden and won't show up as you browse or search your library.",
   "no_name": "No Name",
   "no_notifications": "No notifications",
   "no_people_found": "No matching people found",
   "no_places": "No places",
-  "no_remote_assets_found": "No remote assets found with this checksum",
   "no_results": "No results",
   "no_results_description": "Try a synonym or more general keyword",
   "no_shared_albums_message": "Create an album to share photos and videos with people in your network",
   "no_uploads_in_progress": "No uploads in progress",
-  "not_available": "N/A",
   "not_in_any_album": "Not in any album",
   "not_selected": "Not selected",
   "note_apply_storage_label_to_previously_uploaded assets": "Note: To apply the Storage Label to previously uploaded assets, run the",
@@ -1609,7 +1589,6 @@
   "regenerating_thumbnails": "Regenerating thumbnails",
   "remote": "Remote",
   "remote_assets": "Remote Assets",
-  "remote_media_summary": "Remote Media Summary",
   "remove": "Remove",
   "remove_assets_album_confirmation": "Are you sure you want to remove {count, plural, one {# asset} other {# assets}} from the album?",
   "remove_assets_shared_link_confirmation": "Are you sure you want to remove {count, plural, one {# asset} other {# assets}} from this shared link?",
@@ -1885,7 +1864,6 @@
   "show_slideshow_transition": "Show slideshow transition",
   "show_supporter_badge": "Supporter badge",
   "show_supporter_badge_description": "Show a supporter badge",
-  "show_text_search_menu": "Show text search menu",
   "shuffle": "Shuffle",
   "sidebar": "Sidebar",
   "sidebar_display_description": "Display a link to the view in the sidebar",
@@ -2118,6 +2096,5 @@
   "yes": "Yes",
   "you_dont_have_any_shared_links": "You don't have any shared links",
   "your_wifi_name": "Your Wi-Fi name",
-  "zoom_image": "Zoom Image",
-  "zoom_to_bounds": "Zoom to bounds"
+  "zoom_image": "Zoom Image"
 }

mise.lock

@@ -3,7 +3,7 @@ version = "3.8.2"
 backend = "asdf:dart"
 
 [tools.flutter]
-version = "3.35.3-stable"
+version = "3.32.8-stable"
 backend = "asdf:flutter"
 
 [tools."github:CQLabs/homebrew-dcm"]

mise.toml

@@ -1,6 +1,6 @@
 [tools]
 node = "22.19.0"
-flutter = "3.35.4"
+flutter = "3.32.8"
 pnpm = "10.14.0"
 dart = "3.8.2"
 

mobile/.fvmrc

@@ -1,3 +1,3 @@
 {
-  "flutter": "3.35.4"
+  "flutter": "3.32.8"
 }

mobile/.vscode/settings.json

@@ -1,8 +1,8 @@
 {
-  "dart.flutterSdkPath": ".fvm/versions/3.35.4",
+  "dart.flutterSdkPath": ".fvm/versions/3.32.8",
   "dart.lineLength": 120,
   "[dart]": {
-    "editor.rulers": [120]
+    "editor.rulers": [120],
   },
   "search.exclude": {
     "**/.fvm": true

mobile/analysis_options.yaml

@@ -43,9 +43,8 @@ analyzer:
     - lib/**/*.g.dart
     - lib/**/*.drift.dart
 
-  # TODO: Re-enable after upgrading custom_lint
-  # plugins:
-  #   - custom_lint
+  plugins:
+    - custom_lint
 
 custom_lint:
   debug: true

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

@@ -3,7 +3,6 @@ package app.alextran.immich
 import android.app.Application
 import androidx.work.Configuration
 import androidx.work.WorkManager
-import app.alextran.immich.background.BackgroundWorkerApiImpl
 
 class ImmichApp : Application() {
   override fun onCreate() {
@@ -15,8 +14,6 @@ class ImmichApp : Application() {
     // Thus, the BackupWorker is not started. If the system kills the process after each initialization
     // (because of low memory etc.), the backup is never performed.
     // As a workaround, we also run a backup check when initializing the application
-
     ContentObserverWorker.startBackupWorker(context = this, delayMilliseconds = 0)
-    BackgroundWorkerApiImpl.enqueueBackgroundWorker(this)
   }
 }

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

@@ -3,7 +3,6 @@ package app.alextran.immich
 import android.content.Context
 import android.os.Build
 import android.os.ext.SdkExtensions
-import app.alextran.immich.background.BackgroundEngineLock
 import app.alextran.immich.background.BackgroundWorkerApiImpl
 import app.alextran.immich.background.BackgroundWorkerFgHostApi
 import app.alextran.immich.connectivity.ConnectivityApi
@@ -26,7 +25,6 @@ class MainActivity : FlutterFragmentActivity() {
     fun registerPlugins(ctx: Context, flutterEngine: FlutterEngine) {
       flutterEngine.plugins.add(BackgroundServicePlugin())
       flutterEngine.plugins.add(HttpSSLOptionsPlugin())
-      flutterEngine.plugins.add(BackgroundEngineLock())
 
       val messenger = flutterEngine.dartExecutor.binaryMessenger
       val nativeSyncApiImpl =

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

@@ -1,33 +0,0 @@
-package app.alextran.immich.background
-
-import android.util.Log
-import androidx.work.WorkManager
-import io.flutter.embedding.engine.FlutterEngineCache
-import io.flutter.embedding.engine.plugins.FlutterPlugin
-import java.util.concurrent.atomic.AtomicInteger
-
-private const val TAG = "BackgroundEngineLock"
-
-class BackgroundEngineLock : FlutterPlugin {
-  companion object {
-    const val ENGINE_CACHE_KEY = "immich::background_worker::engine"
-    var engineCount = AtomicInteger(0)
-  }
-
-  override fun onAttachedToEngine(binding: FlutterPlugin.FlutterPluginBinding) {
-    // work manager task is running while the main app is opened, cancel the worker
-    if (engineCount.incrementAndGet() > 1 && FlutterEngineCache.getInstance()
-        .get(ENGINE_CACHE_KEY) != null
-    ) {
-      WorkManager.getInstance(binding.applicationContext)
-        .cancelUniqueWork(BackgroundWorkerApiImpl.BACKGROUND_WORKER_NAME)
-      FlutterEngineCache.getInstance().remove(ENGINE_CACHE_KEY)
-    }
-    Log.i(TAG, "Flutter engine attached. Attached Engines count: $engineCount")
-  }
-
-  override fun onDetachedFromEngine(binding: FlutterPlugin.FlutterPluginBinding) {
-    engineCount.decrementAndGet()
-    Log.i(TAG, "Flutter engine detached. Attached Engines count: $engineCount")
-  }
-}

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

@@ -37,36 +37,6 @@ private object BackgroundWorkerPigeonUtils {
       )
     }
   }
-  fun deepEquals(a: Any?, b: Any?): Boolean {
-    if (a is ByteArray && b is ByteArray) {
-        return a.contentEquals(b)
-    }
-    if (a is IntArray && b is IntArray) {
-        return a.contentEquals(b)
-    }
-    if (a is LongArray && b is LongArray) {
-        return a.contentEquals(b)
-    }
-    if (a is DoubleArray && b is DoubleArray) {
-        return a.contentEquals(b)
-    }
-    if (a is Array<*> && b is Array<*>) {
-      return a.size == b.size &&
-          a.indices.all{ deepEquals(a[it], b[it]) }
-    }
-    if (a is List<*> && b is List<*>) {
-      return a.size == b.size &&
-          a.indices.all{ deepEquals(a[it], b[it]) }
-    }
-    if (a is Map<*, *> && b is Map<*, *>) {
-      return a.size == b.size && a.all {
-          (b as Map<Any?, Any?>).containsKey(it.key) &&
-          deepEquals(it.value, b[it.key])
-      }
-    }
-    return a == b
-  }
-      
 }
 
 /**
@@ -80,63 +50,18 @@ class FlutterError (
   override val message: String? = null,
   val details: Any? = null
 ) : Throwable()
-
-/** Generated class from Pigeon that represents data sent in messages. */
-data class BackgroundWorkerSettings (
-  val requiresCharging: Boolean,
-  val minimumDelaySeconds: Long
-)
- {
-  companion object {
-    fun fromList(pigeonVar_list: List<Any?>): BackgroundWorkerSettings {
-      val requiresCharging = pigeonVar_list[0] as Boolean
-      val minimumDelaySeconds = pigeonVar_list[1] as Long
-      return BackgroundWorkerSettings(requiresCharging, minimumDelaySeconds)
-    }
-  }
-  fun toList(): List<Any?> {
-    return listOf(
-      requiresCharging,
-      minimumDelaySeconds,
-    )
-  }
-  override fun equals(other: Any?): Boolean {
-    if (other !is BackgroundWorkerSettings) {
-      return false
-    }
-    if (this === other) {
-      return true
-    }
-    return BackgroundWorkerPigeonUtils.deepEquals(toList(), other.toList())  }
-
-  override fun hashCode(): Int = toList().hashCode()
-}
 private open class BackgroundWorkerPigeonCodec : StandardMessageCodec() {
   override fun readValueOfType(type: Byte, buffer: ByteBuffer): Any? {
-    return when (type) {
-      129.toByte() -> {
-        return (readValue(buffer) as? List<Any?>)?.let {
-          BackgroundWorkerSettings.fromList(it)
-        }
-      }
-      else -> super.readValueOfType(type, buffer)
-    }
+    return     super.readValueOfType(type, buffer)
   }
   override fun writeValue(stream: ByteArrayOutputStream, value: Any?)   {
-    when (value) {
-      is BackgroundWorkerSettings -> {
-        stream.write(129)
-        writeValue(stream, value.toList())
-      }
-      else -> super.writeValue(stream, value)
-    }
+    super.writeValue(stream, value)
   }
 }
 
 /** Generated interface from Pigeon that represents a handler of messages from Flutter. */
 interface BackgroundWorkerFgHostApi {
   fun enable()
-  fun configure(settings: BackgroundWorkerSettings)
   fun disable()
 
   companion object {
@@ -164,24 +89,6 @@ interface BackgroundWorkerFgHostApi {
           channel.setMessageHandler(null)
         }
       }
-      run {
-        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.BackgroundWorkerFgHostApi.configure$separatedMessageChannelSuffix", codec)
-        if (api != null) {
-          channel.setMessageHandler { message, reply ->
-            val args = message as List<Any?>
-            val settingsArg = args[0] as BackgroundWorkerSettings
-            val wrapped: List<Any?> = try {
-              api.configure(settingsArg)
-              listOf(null)
-            } catch (exception: Throwable) {
-              BackgroundWorkerPigeonUtils.wrapError(exception)
-            }
-            reply.reply(wrapped)
-          }
-        } else {
-          channel.setMessageHandler(null)
-        }
-      }
       run {
         val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.BackgroundWorkerFgHostApi.disable$separatedMessageChannelSuffix", codec)
         if (api != null) {

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

@@ -19,7 +19,6 @@ import com.google.common.util.concurrent.ListenableFuture
 import com.google.common.util.concurrent.SettableFuture
 import io.flutter.FlutterInjector
 import io.flutter.embedding.engine.FlutterEngine
-import io.flutter.embedding.engine.FlutterEngineCache
 import io.flutter.embedding.engine.dart.DartExecutor
 import io.flutter.embedding.engine.loader.FlutterLoader
 import java.util.concurrent.TimeUnit
@@ -76,9 +75,6 @@ class BackgroundWorker(context: Context, params: WorkerParameters) :
 
     loader.ensureInitializationCompleteAsync(ctx, null, Handler(Looper.getMainLooper())) {
       engine = FlutterEngine(ctx)
-      FlutterEngineCache.getInstance().remove(BackgroundEngineLock.ENGINE_CACHE_KEY);
-      FlutterEngineCache.getInstance()
-        .put(BackgroundEngineLock.ENGINE_CACHE_KEY, engine!!)
 
       // Register custom plugins
       MainActivity.registerPlugins(ctx, engine!!)
@@ -192,7 +188,6 @@ class BackgroundWorker(context: Context, params: WorkerParameters) :
     isComplete = true
     engine?.destroy()
     engine = null
-    FlutterEngineCache.getInstance().remove(BackgroundEngineLock.ENGINE_CACHE_KEY);
     flutterApi = null
     notificationManager.cancel(NOTIFICATION_ID)
     waitForForegroundPromotion()

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

@@ -1,7 +1,6 @@
 package app.alextran.immich.background
 
 import android.content.Context
-import android.content.SharedPreferences
 import android.provider.MediaStore
 import android.util.Log
 import androidx.work.BackoffPolicy
@@ -11,7 +10,7 @@ import androidx.work.OneTimeWorkRequest
 import androidx.work.WorkManager
 import java.util.concurrent.TimeUnit
 
-private const val TAG = "BackgroundWorkerApiImpl"
+private const val TAG = "BackgroundUploadImpl"
 
 class BackgroundWorkerApiImpl(context: Context) : BackgroundWorkerFgHostApi {
   private val ctx: Context = context.applicationContext
@@ -20,34 +19,25 @@ class BackgroundWorkerApiImpl(context: Context) : BackgroundWorkerFgHostApi {
     enqueueMediaObserver(ctx)
   }
 
-  override fun configure(settings: BackgroundWorkerSettings) {
-    BackgroundWorkerPreferences(ctx).updateSettings(settings)
-    enqueueMediaObserver(ctx)
-  }
-
   override fun disable() {
-    WorkManager.getInstance(ctx).apply {
-      cancelUniqueWork(OBSERVER_WORKER_NAME)
-      cancelUniqueWork(BACKGROUND_WORKER_NAME)
-    }
+    WorkManager.getInstance(ctx).cancelUniqueWork(OBSERVER_WORKER_NAME)
+    WorkManager.getInstance(ctx).cancelUniqueWork(BACKGROUND_WORKER_NAME)
     Log.i(TAG, "Cancelled background upload tasks")
   }
 
   companion object {
-    const val BACKGROUND_WORKER_NAME = "immich/BackgroundWorkerV1"
+    private const val BACKGROUND_WORKER_NAME = "immich/BackgroundWorkerV1"
     private const val OBSERVER_WORKER_NAME = "immich/MediaObserverV1"
 
     fun enqueueMediaObserver(ctx: Context) {
-      val settings = BackgroundWorkerPreferences(ctx).getSettings()
-      val constraints = Constraints.Builder().apply {
-        addContentUriTrigger(MediaStore.Images.Media.INTERNAL_CONTENT_URI, true)
-        addContentUriTrigger(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, true)
-        addContentUriTrigger(MediaStore.Video.Media.INTERNAL_CONTENT_URI, true)
-        addContentUriTrigger(MediaStore.Video.Media.EXTERNAL_CONTENT_URI, true)
-        setTriggerContentUpdateDelay(settings.minimumDelaySeconds, TimeUnit.SECONDS)
-        setTriggerContentMaxDelay(settings.minimumDelaySeconds * 10, TimeUnit.MINUTES)
-        setRequiresCharging(settings.requiresCharging)
-      }.build()
+      val constraints = Constraints.Builder()
+        .addContentUriTrigger(MediaStore.Images.Media.INTERNAL_CONTENT_URI, true)
+        .addContentUriTrigger(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, true)
+        .addContentUriTrigger(MediaStore.Video.Media.INTERNAL_CONTENT_URI, true)
+        .addContentUriTrigger(MediaStore.Video.Media.EXTERNAL_CONTENT_URI, true)
+        .setTriggerContentUpdateDelay(30, TimeUnit.SECONDS)
+        .setTriggerContentMaxDelay(3, TimeUnit.MINUTES)
+        .build()
 
       val work = OneTimeWorkRequest.Builder(MediaObserver::class.java)
         .setConstraints(constraints)
@@ -55,10 +45,7 @@ class BackgroundWorkerApiImpl(context: Context) : BackgroundWorkerFgHostApi {
       WorkManager.getInstance(ctx)
         .enqueueUniqueWork(OBSERVER_WORKER_NAME, ExistingWorkPolicy.REPLACE, work)
 
-      Log.i(
-        TAG,
-        "Enqueued media observer worker with name: $OBSERVER_WORKER_NAME and settings: $settings"
-      )
+      Log.i(TAG, "Enqueued media observer worker with name: $OBSERVER_WORKER_NAME")
     }
 
     fun enqueueBackgroundWorker(ctx: Context) {
@@ -69,39 +56,9 @@ class BackgroundWorkerApiImpl(context: Context) : BackgroundWorkerFgHostApi {
         .setBackoffCriteria(BackoffPolicy.EXPONENTIAL, 1, TimeUnit.MINUTES)
         .build()
       WorkManager.getInstance(ctx)
-        .enqueueUniqueWork(BACKGROUND_WORKER_NAME, ExistingWorkPolicy.KEEP, work)
+        .enqueueUniqueWork(BACKGROUND_WORKER_NAME, ExistingWorkPolicy.REPLACE, work)
 
       Log.i(TAG, "Enqueued background worker with name: $BACKGROUND_WORKER_NAME")
     }
   }
 }
-
-private class BackgroundWorkerPreferences(private val ctx: Context) {
-  companion object {
-    private const val SHARED_PREF_NAME = "Immich::BackgroundWorker"
-    private const val SHARED_PREF_MIN_DELAY_KEY = "BackgroundWorker::minDelaySeconds"
-    private const val SHARED_PREF_REQUIRE_CHARGING_KEY = "BackgroundWorker::requireCharging"
-
-    private const val DEFAULT_MIN_DELAY_SECONDS = 30L
-    private const val DEFAULT_REQUIRE_CHARGING = false
-  }
-
-  private val sp: SharedPreferences by lazy {
-    ctx.getSharedPreferences(SHARED_PREF_NAME, Context.MODE_PRIVATE)
-  }
-
-  fun updateSettings(settings: BackgroundWorkerSettings) {
-    sp.edit().apply {
-      putLong(SHARED_PREF_MIN_DELAY_KEY, settings.minimumDelaySeconds)
-      putBoolean(SHARED_PREF_REQUIRE_CHARGING_KEY, settings.requiresCharging)
-      apply()
-    }
-  }
-
-  fun getSettings(): BackgroundWorkerSettings {
-    return BackgroundWorkerSettings(
-      minimumDelaySeconds = sp.getLong(SHARED_PREF_MIN_DELAY_KEY, DEFAULT_MIN_DELAY_SECONDS),
-      requiresCharging = sp.getBoolean(SHARED_PREF_REQUIRE_CHARGING_KEY, DEFAULT_REQUIRE_CHARGING),
-    )
-  }
-}

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

@@ -8,6 +8,7 @@ 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
@@ -18,6 +19,7 @@ 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
@@ -200,10 +202,8 @@ class ThumbnailsImpl(context: Context) : ThumbnailApi {
       val source = ImageDecoder.createSource(resolver, uri)
       signal.throwIfCanceled()
       ImageDecoder.decodeBitmap(source) { decoder, info, _ ->
-        if (targetWidth > 0 && targetHeight > 0) {
-          val sample = max(1, min(info.size.width / targetWidth, info.size.height / targetHeight))
-          decoder.setTargetSampleSize(sample)
-        }
+        val sampleSize = max(1, min(info.size.width / targetWidth, info.size.height / targetHeight))
+        decoder.setTargetSampleSize(sampleSize)
         decoder.allocator = ImageDecoder.ALLOCATOR_SOFTWARE
         decoder.setTargetColorSpace(ColorSpace.get(ColorSpace.Named.SRGB))
       }

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

@@ -209,40 +209,6 @@ data class SyncDelta (
 
   override fun hashCode(): Int = toList().hashCode()
 }
-
-/** Generated class from Pigeon that represents data sent in messages. */
-data class HashResult (
-  val assetId: String,
-  val error: String? = null,
-  val hash: String? = null
-)
- {
-  companion object {
-    fun fromList(pigeonVar_list: List<Any?>): HashResult {
-      val assetId = pigeonVar_list[0] as String
-      val error = pigeonVar_list[1] as String?
-      val hash = pigeonVar_list[2] as String?
-      return HashResult(assetId, error, hash)
-    }
-  }
-  fun toList(): List<Any?> {
-    return listOf(
-      assetId,
-      error,
-      hash,
-    )
-  }
-  override fun equals(other: Any?): Boolean {
-    if (other !is HashResult) {
-      return false
-    }
-    if (this === other) {
-      return true
-    }
-    return MessagesPigeonUtils.deepEquals(toList(), other.toList())  }
-
-  override fun hashCode(): Int = toList().hashCode()
-}
 private open class MessagesPigeonCodec : StandardMessageCodec() {
   override fun readValueOfType(type: Byte, buffer: ByteBuffer): Any? {
     return when (type) {
@@ -261,11 +227,6 @@ private open class MessagesPigeonCodec : StandardMessageCodec() {
           SyncDelta.fromList(it)
         }
       }
-      132.toByte() -> {
-        return (readValue(buffer) as? List<Any?>)?.let {
-          HashResult.fromList(it)
-        }
-      }
       else -> super.readValueOfType(type, buffer)
     }
   }
@@ -283,16 +244,11 @@ private open class MessagesPigeonCodec : StandardMessageCodec() {
         stream.write(131)
         writeValue(stream, value.toList())
       }
-      is HashResult -> {
-        stream.write(132)
-        writeValue(stream, value.toList())
-      }
       else -> super.writeValue(stream, value)
     }
   }
 }
 
-
 /** Generated interface from Pigeon that represents a handler of messages from Flutter. */
 interface NativeSyncApi {
   fun shouldFullSync(): Boolean
@@ -303,8 +259,7 @@ interface NativeSyncApi {
   fun getAlbums(): List<PlatformAlbum>
   fun getAssetsCountSince(albumId: String, timestamp: Long): Long
   fun getAssetsForAlbum(albumId: String, updatedTimeCond: Long?): List<PlatformAsset>
-  fun hashAssets(assetIds: List<String>, allowNetworkAccess: Boolean, callback: (Result<List<HashResult>>) -> Unit)
-  fun cancelHashing()
+  fun hashPaths(paths: List<String>): List<ByteArray?>
 
   companion object {
     /** The codec used by NativeSyncApi. */
@@ -447,33 +402,13 @@ interface NativeSyncApi {
         }
       }
       run {
-        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.NativeSyncApi.hashAssets$separatedMessageChannelSuffix", codec, taskQueue)
+        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.NativeSyncApi.hashPaths$separatedMessageChannelSuffix", codec, taskQueue)
         if (api != null) {
           channel.setMessageHandler { message, reply ->
             val args = message as List<Any?>
-            val assetIdsArg = args[0] as List<String>
-            val allowNetworkAccessArg = args[1] as Boolean
-            api.hashAssets(assetIdsArg, allowNetworkAccessArg) { result: Result<List<HashResult>> ->
-              val error = result.exceptionOrNull()
-              if (error != null) {
-                reply.reply(MessagesPigeonUtils.wrapError(error))
-              } else {
-                val data = result.getOrNull()
-                reply.reply(MessagesPigeonUtils.wrapResult(data))
-              }
-            }
-          }
-        } else {
-          channel.setMessageHandler(null)
-        }
-      }
-      run {
-        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.NativeSyncApi.cancelHashing$separatedMessageChannelSuffix", codec)
-        if (api != null) {
-          channel.setMessageHandler { _, reply ->
+            val pathsArg = args[0] as List<String>
             val wrapped: List<Any?> = try {
-              api.cancelHashing()
-              listOf(null)
+              listOf(api.hashPaths(pathsArg))
             } catch (exception: Throwable) {
               MessagesPigeonUtils.wrapError(exception)
             }

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

@@ -1,25 +1,14 @@
 package app.alextran.immich.sync
 
 import android.annotation.SuppressLint
-import android.content.ContentUris
 import android.content.Context
 import android.database.Cursor
 import android.provider.MediaStore
-import android.util.Base64
+import android.util.Log
 import androidx.core.database.getStringOrNull
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.ensureActive
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.sync.Semaphore
-import kotlinx.coroutines.sync.withPermit
 import java.io.File
+import java.io.FileInputStream
 import java.security.MessageDigest
-import kotlin.coroutines.cancellation.CancellationException
-import kotlin.coroutines.coroutineContext
 
 sealed class AssetResult {
   data class ValidAsset(val asset: PlatformAsset, val albumId: String) : AssetResult()
@@ -30,12 +19,8 @@ sealed class AssetResult {
 open class NativeSyncApiImplBase(context: Context) {
   private val ctx: Context = context.applicationContext
 
-  private var hashTask: Job? = null
-
   companion object {
-    private const val MAX_CONCURRENT_HASH_OPERATIONS = 16
-    private val hashSemaphore = Semaphore(MAX_CONCURRENT_HASH_OPERATIONS)
-    private const val HASHING_CANCELLED_CODE = "HASH_CANCELLED"
+    private const val TAG = "NativeSyncApiImplBase"
 
     const val MEDIA_SELECTION =
       "(${MediaStore.Files.FileColumns.MEDIA_TYPE} = ? OR ${MediaStore.Files.FileColumns.MEDIA_TYPE} = ?)"
@@ -230,74 +215,23 @@ open class NativeSyncApiImplBase(context: Context) {
       .toList()
   }
 
-  fun hashAssets(
-    assetIds: List<String>,
-    // allowNetworkAccess is only used on the iOS implementation
-    @Suppress("UNUSED_PARAMETER") allowNetworkAccess: Boolean,
-    callback: (Result<List<HashResult>>) -> Unit
-  ) {
-    if (assetIds.isEmpty()) {
-      callback(Result.success(emptyList()))
-      return
-    }
+  fun hashPaths(paths: List<String>): List<ByteArray?> {
+    val buffer = ByteArray(HASH_BUFFER_SIZE)
+    val digest = MessageDigest.getInstance("SHA-1")
 
-    hashTask?.cancel()
-    hashTask = CoroutineScope(Dispatchers.IO).launch {
+    return paths.map { path ->
       try {
-        val results = assetIds.map { assetId ->
-          async {
-            hashSemaphore.withPermit {
-              ensureActive()
-              hashAsset(assetId)
-            }
+        FileInputStream(path).use { file ->
+          var bytesRead: Int
+          while (file.read(buffer).also { bytesRead = it } > 0) {
+            digest.update(buffer, 0, bytesRead)
           }
-        }.awaitAll()
-
-        callback(Result.success(results))
-      } catch (e: CancellationException) {
-        callback(
-          Result.failure(
-            FlutterError(
-              HASHING_CANCELLED_CODE,
-              "Hashing operation was cancelled",
-              null
-            )
-          )
-        )
+        }
+        digest.digest()
       } catch (e: Exception) {
-        callback(Result.failure(e))
+        Log.w(TAG, "Failed to hash file $path: $e")
+        null
       }
     }
   }
-
-  private suspend fun hashAsset(assetId: String): HashResult {
-    return try {
-      val assetUri = ContentUris.withAppendedId(
-        MediaStore.Files.getContentUri(MediaStore.VOLUME_EXTERNAL),
-        assetId.toLong()
-      )
-
-      val digest = MessageDigest.getInstance("SHA-1")
-      ctx.contentResolver.openInputStream(assetUri)?.use { inputStream ->
-        var bytesRead: Int
-        val buffer = ByteArray(HASH_BUFFER_SIZE)
-        while (inputStream.read(buffer).also { bytesRead = it } > 0) {
-          coroutineContext.ensureActive()
-          digest.update(buffer, 0, bytesRead)
-        }
-      } ?: return HashResult(assetId, "Cannot open input stream for asset", null)
-
-      val hashString = Base64.encodeToString(digest.digest(), Base64.NO_WRAP)
-      HashResult(assetId, null, hashString)
-    } catch (e: SecurityException) {
-      HashResult(assetId, "Permission denied accessing asset: ${e.message}", null)
-    } catch (e: Exception) {
-      HashResult(assetId, "Failed to hash asset: ${e.message}", null)
-    }
-  }
-
-  fun cancelHashing() {
-    hashTask?.cancel()
-    hashTask = null
-  }
 }

mobile/ios/.gitignore

@@ -4,6 +4,7 @@
 *.moved-aside
 *.pbxuser
 *.perspectivev3
+**/*sync/
 .sconsign.dblite
 .tags*
 **/.vagrant/

mobile/ios/Flutter/AppFrameworkInfo.plist

@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>13.0</string>
+  <string>12.0</string>
 </dict>
 </plist>

mobile/ios/Podfile.lock

@@ -253,7 +253,7 @@ SPEC CHECKSUMS:
   DKImagePickerController: 946cec48c7873164274ecc4624d19e3da4c1ef3c
   DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60
   file_picker: a0560bc09d61de87f12d246fc47d2119e6ef37be
-  Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
+  Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
   flutter_local_notifications: ad39620c743ea4c15127860f4b5641649a988100
   flutter_native_splash: c32d145d68aeda5502d5f543ee38c192065986cf
   flutter_secure_storage: 1ed9476fba7e7a782b22888f956cce43e2c62f13

mobile/ios/Runner.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 77;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -133,6 +133,8 @@
 /* Begin PBXFileSystemSynchronizedRootGroup section */
 		B2CF7F8C2DDE4EBB00744BF6 /* Sync */ = {
 			isa = PBXFileSystemSynchronizedRootGroup;
+			exceptions = (
+			);
 			path = Sync;
 			sourceTree = "<group>";
 		};
@@ -519,14 +521,10 @@
 			inputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			inputPaths = (
-			);
 			name = "[CP] Copy Pods Resources";
 			outputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
 			);
-			outputPaths = (
-			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
@@ -555,14 +553,10 @@
 			inputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			inputPaths = (
-			);
 			name = "[CP] Embed Pods Frameworks";
 			outputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
 			);
-			outputPaths = (
-			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";

mobile/ios/Runner/Background/BackgroundWorker.g.swift

@@ -50,119 +50,11 @@ private func nilOrValue<T>(_ value: Any?) -> T? {
   return value as! T?
 }
 
-func deepEqualsBackgroundWorker(_ lhs: Any?, _ rhs: Any?) -> Bool {
-  let cleanLhs = nilOrValue(lhs) as Any?
-  let cleanRhs = nilOrValue(rhs) as Any?
-  switch (cleanLhs, cleanRhs) {
-  case (nil, nil):
-    return true
-
-  case (nil, _), (_, nil):
-    return false
-
-  case is (Void, Void):
-    return true
-
-  case let (cleanLhsHashable, cleanRhsHashable) as (AnyHashable, AnyHashable):
-    return cleanLhsHashable == cleanRhsHashable
-
-  case let (cleanLhsArray, cleanRhsArray) as ([Any?], [Any?]):
-    guard cleanLhsArray.count == cleanRhsArray.count else { return false }
-    for (index, element) in cleanLhsArray.enumerated() {
-      if !deepEqualsBackgroundWorker(element, cleanRhsArray[index]) {
-        return false
-      }
-    }
-    return true
-
-  case let (cleanLhsDictionary, cleanRhsDictionary) as ([AnyHashable: Any?], [AnyHashable: Any?]):
-    guard cleanLhsDictionary.count == cleanRhsDictionary.count else { return false }
-    for (key, cleanLhsValue) in cleanLhsDictionary {
-      guard cleanRhsDictionary.index(forKey: key) != nil else { return false }
-      if !deepEqualsBackgroundWorker(cleanLhsValue, cleanRhsDictionary[key]!) {
-        return false
-      }
-    }
-    return true
-
-  default:
-    // Any other type shouldn't be able to be used with pigeon. File an issue if you find this to be untrue.
-    return false
-  }
-}
-
-func deepHashBackgroundWorker(value: Any?, hasher: inout Hasher) {
-  if let valueList = value as? [AnyHashable] {
-     for item in valueList { deepHashBackgroundWorker(value: item, hasher: &hasher) }
-     return
-  }
-
-  if let valueDict = value as? [AnyHashable: AnyHashable] {
-    for key in valueDict.keys { 
-      hasher.combine(key)
-      deepHashBackgroundWorker(value: valueDict[key]!, hasher: &hasher)
-    }
-    return
-  }
-
-  if let hashableValue = value as? AnyHashable {
-    hasher.combine(hashableValue.hashValue)
-  }
-
-  return hasher.combine(String(describing: value))
-}
-
-    
-
-/// Generated class from Pigeon that represents data sent in messages.
-struct BackgroundWorkerSettings: Hashable {
-  var requiresCharging: Bool
-  var minimumDelaySeconds: Int64
-
-
-  // swift-format-ignore: AlwaysUseLowerCamelCase
-  static func fromList(_ pigeonVar_list: [Any?]) -> BackgroundWorkerSettings? {
-    let requiresCharging = pigeonVar_list[0] as! Bool
-    let minimumDelaySeconds = pigeonVar_list[1] as! Int64
-
-    return BackgroundWorkerSettings(
-      requiresCharging: requiresCharging,
-      minimumDelaySeconds: minimumDelaySeconds
-    )
-  }
-  func toList() -> [Any?] {
-    return [
-      requiresCharging,
-      minimumDelaySeconds,
-    ]
-  }
-  static func == (lhs: BackgroundWorkerSettings, rhs: BackgroundWorkerSettings) -> Bool {
-    return deepEqualsBackgroundWorker(lhs.toList(), rhs.toList())  }
-  func hash(into hasher: inout Hasher) {
-    deepHashBackgroundWorker(value: toList(), hasher: &hasher)
-  }
-}
 
 private class BackgroundWorkerPigeonCodecReader: FlutterStandardReader {
-  override func readValue(ofType type: UInt8) -> Any? {
-    switch type {
-    case 129:
-      return BackgroundWorkerSettings.fromList(self.readValue() as! [Any?])
-    default:
-      return super.readValue(ofType: type)
-    }
-  }
 }
 
 private class BackgroundWorkerPigeonCodecWriter: FlutterStandardWriter {
-  override func writeValue(_ value: Any) {
-    if let value = value as? BackgroundWorkerSettings {
-      super.writeByte(129)
-      super.writeValue(value.toList())
-    } else {
-      super.writeValue(value)
-    }
-  }
 }
 
 private class BackgroundWorkerPigeonCodecReaderWriter: FlutterStandardReaderWriter {
@@ -182,7 +74,6 @@ class BackgroundWorkerPigeonCodec: FlutterStandardMessageCodec, @unchecked Senda
 /// Generated protocol from Pigeon that represents a handler of messages from Flutter.
 protocol BackgroundWorkerFgHostApi {
   func enable() throws
-  func configure(settings: BackgroundWorkerSettings) throws
   func disable() throws
 }
 
@@ -205,21 +96,6 @@ class BackgroundWorkerFgHostApiSetup {
     } else {
       enableChannel.setMessageHandler(nil)
     }
-    let configureChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.BackgroundWorkerFgHostApi.configure\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
-    if let api = api {
-      configureChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
-        let settingsArg = args[0] as! BackgroundWorkerSettings
-        do {
-          try api.configure(settings: settingsArg)
-          reply(wrapResult(nil))
-        } catch {
-          reply(wrapError(error))
-        }
-      }
-    } else {
-      configureChannel.setMessageHandler(nil)
-    }
     let disableChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.BackgroundWorkerFgHostApi.disable\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       disableChannel.setMessageHandler { _, reply in

mobile/ios/Runner/Background/BackgroundWorkerApiImpl.swift

@@ -5,22 +5,17 @@ class BackgroundWorkerApiImpl: BackgroundWorkerFgHostApi {
   func enable() throws {
     BackgroundWorkerApiImpl.scheduleRefreshWorker()
     BackgroundWorkerApiImpl.scheduleProcessingWorker()
-    print("BackgroundWorkerApiImpl:enable Background worker scheduled")
-  }
-  
-  func configure(settings: BackgroundWorkerSettings) throws {
-    // Android only
+    print("BackgroundUploadImpl:enbale Background worker scheduled")
   }
   
   func disable() throws {
     BGTaskScheduler.shared.cancel(taskRequestWithIdentifier: BackgroundWorkerApiImpl.refreshTaskID);
     BGTaskScheduler.shared.cancel(taskRequestWithIdentifier: BackgroundWorkerApiImpl.processingTaskID);
-    print("BackgroundWorkerApiImpl:disableUploadWorker Disabled background workers")
+    print("BackgroundUploadImpl:disableUploadWorker Disabled background workers")
   }
   
   private static let refreshTaskID = "app.alextran.immich.background.refreshUpload"
   private static let processingTaskID = "app.alextran.immich.background.processingUpload"
-  private static let taskSemaphore = DispatchSemaphore(value: 1)
 
   public static func registerBackgroundWorkers() {
       BGTaskScheduler.shared.register(
@@ -64,18 +59,12 @@ class BackgroundWorkerApiImpl: BackgroundWorkerFgHostApi {
   
   private static func handleBackgroundRefresh(task: BGAppRefreshTask) {
     scheduleRefreshWorker()
-    // If another task is running, cede the background time back to the OS
-    if taskSemaphore.wait(timeout: .now()) == .success {
-      // Restrict the refresh task to run only for a maximum of (maxSeconds) seconds
-      runBackgroundWorker(task: task, taskType: .refresh, maxSeconds: 20)
-    } else {
-      task.setTaskCompleted(success: false)
-    }
+    // Restrict the refresh task to run only for a maximum of (maxSeconds) seconds
+    runBackgroundWorker(task: task, taskType: .refresh, maxSeconds: 20)
   }
   
   private static func handleBackgroundProcessing(task: BGProcessingTask) {
     scheduleProcessingWorker()
-    taskSemaphore.wait()
     // There are no restrictions for processing tasks. Although, the OS could signal expiration at any time
     runBackgroundWorker(task: task, taskType: .processing, maxSeconds: nil)
   }
@@ -91,7 +80,6 @@ class BackgroundWorkerApiImpl: BackgroundWorkerFgHostApi {
    *   - maxSeconds: Optional timeout for the operation in seconds
    */
   private static func runBackgroundWorker(task: BGTask, taskType: BackgroundTaskType, maxSeconds: Int?) {
-    defer { taskSemaphore.signal() }
     let semaphore = DispatchSemaphore(value: 0)
     var isSuccess = true
     

mobile/ios/Runner/Images/ThumbnailsImpl.swift

@@ -105,7 +105,7 @@ class ThumbnailApiImpl: ThumbnailApi {
       var image: UIImage?
       Self.imageManager.requestImage(
         for: asset,
-        targetSize: width > 0 && height > 0 ? CGSize(width: Double(width), height: Double(height)) : PHImageManagerMaximumSize,
+        targetSize: CGSize(width: Double(width), height: Double(height)),
         contentMode: .aspectFill,
         options: Self.requestOptions,
         resultHandler: { (_image, info) -> Void in

mobile/ios/Runner/Sync/Messages.g.swift

@@ -267,39 +267,6 @@ struct SyncDelta: Hashable {
   }
 }
 
-/// Generated class from Pigeon that represents data sent in messages.
-struct HashResult: Hashable {
-  var assetId: String
-  var error: String? = nil
-  var hash: String? = nil
-
-
-  // swift-format-ignore: AlwaysUseLowerCamelCase
-  static func fromList(_ pigeonVar_list: [Any?]) -> HashResult? {
-    let assetId = pigeonVar_list[0] as! String
-    let error: String? = nilOrValue(pigeonVar_list[1])
-    let hash: String? = nilOrValue(pigeonVar_list[2])
-
-    return HashResult(
-      assetId: assetId,
-      error: error,
-      hash: hash
-    )
-  }
-  func toList() -> [Any?] {
-    return [
-      assetId,
-      error,
-      hash,
-    ]
-  }
-  static func == (lhs: HashResult, rhs: HashResult) -> Bool {
-    return deepEqualsMessages(lhs.toList(), rhs.toList())  }
-  func hash(into hasher: inout Hasher) {
-    deepHashMessages(value: toList(), hasher: &hasher)
-  }
-}
-
 private class MessagesPigeonCodecReader: FlutterStandardReader {
   override func readValue(ofType type: UInt8) -> Any? {
     switch type {
@@ -309,8 +276,6 @@ private class MessagesPigeonCodecReader: FlutterStandardReader {
       return PlatformAlbum.fromList(self.readValue() as! [Any?])
     case 131:
       return SyncDelta.fromList(self.readValue() as! [Any?])
-    case 132:
-      return HashResult.fromList(self.readValue() as! [Any?])
     default:
       return super.readValue(ofType: type)
     }
@@ -328,9 +293,6 @@ private class MessagesPigeonCodecWriter: FlutterStandardWriter {
     } else if let value = value as? SyncDelta {
       super.writeByte(131)
       super.writeValue(value.toList())
-    } else if let value = value as? HashResult {
-      super.writeByte(132)
-      super.writeValue(value.toList())
     } else {
       super.writeValue(value)
     }
@@ -351,7 +313,6 @@ class MessagesPigeonCodec: FlutterStandardMessageCodec, @unchecked Sendable {
   static let shared = MessagesPigeonCodec(readerWriter: MessagesPigeonCodecReaderWriter())
 }
 
-
 /// Generated protocol from Pigeon that represents a handler of messages from Flutter.
 protocol NativeSyncApi {
   func shouldFullSync() throws -> Bool
@@ -362,8 +323,7 @@ protocol NativeSyncApi {
   func getAlbums() throws -> [PlatformAlbum]
   func getAssetsCountSince(albumId: String, timestamp: Int64) throws -> Int64
   func getAssetsForAlbum(albumId: String, updatedTimeCond: Int64?) throws -> [PlatformAsset]
-  func hashAssets(assetIds: [String], allowNetworkAccess: Bool, completion: @escaping (Result<[HashResult], Error>) -> Void)
-  func cancelHashing() throws
+  func hashPaths(paths: [String]) throws -> [FlutterStandardTypedData?]
 }
 
 /// Generated setup class from Pigeon to handle messages through the `binaryMessenger`.
@@ -499,38 +459,22 @@ class NativeSyncApiSetup {
     } else {
       getAssetsForAlbumChannel.setMessageHandler(nil)
     }
-    let hashAssetsChannel = taskQueue == nil
-      ? FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.NativeSyncApi.hashAssets\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
-      : FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.NativeSyncApi.hashAssets\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec, taskQueue: taskQueue)
+    let hashPathsChannel = taskQueue == nil
+      ? FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.NativeSyncApi.hashPaths\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
+      : FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.NativeSyncApi.hashPaths\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec, taskQueue: taskQueue)
     if let api = api {
-      hashAssetsChannel.setMessageHandler { message, reply in
+      hashPathsChannel.setMessageHandler { message, reply in
         let args = message as! [Any?]
-        let assetIdsArg = args[0] as! [String]
-        let allowNetworkAccessArg = args[1] as! Bool
-        api.hashAssets(assetIds: assetIdsArg, allowNetworkAccess: allowNetworkAccessArg) { result in
-          switch result {
-          case .success(let res):
-            reply(wrapResult(res))
-          case .failure(let error):
-            reply(wrapError(error))
-          }
-        }
-      }
-    } else {
-      hashAssetsChannel.setMessageHandler(nil)
-    }
-    let cancelHashingChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.NativeSyncApi.cancelHashing\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
-    if let api = api {
-      cancelHashingChannel.setMessageHandler { _, reply in
+        let pathsArg = args[0] as! [String]
         do {
-          try api.cancelHashing()
-          reply(wrapResult(nil))
+          let result = try api.hashPaths(paths: pathsArg)
+          reply(wrapResult(result))
         } catch {
           reply(wrapError(error))
         }
       }
     } else {
-      cancelHashingChannel.setMessageHandler(nil)
+      hashPathsChannel.setMessageHandler(nil)
     }
   }
 }

mobile/ios/Runner/Sync/MessagesImpl.swift

@@ -17,16 +17,30 @@ struct AssetWrapper: Hashable, Equatable {
   }
 }
 
+extension PHAsset {
+  func toPlatformAsset() -> PlatformAsset {
+    return PlatformAsset(
+      id: localIdentifier,
+      name: title(),
+      type: Int64(mediaType.rawValue),
+      createdAt: creationDate.map { Int64($0.timeIntervalSince1970) },
+      updatedAt: modificationDate.map { Int64($0.timeIntervalSince1970) },
+      width: Int64(pixelWidth),
+      height: Int64(pixelHeight),
+      durationInSeconds: Int64(duration),
+      orientation: 0,
+      isFavorite: isFavorite
+    )
+  }
+}
+
 class NativeSyncApiImpl: NativeSyncApi {
   private let defaults: UserDefaults
   private let changeTokenKey = "immich:changeToken"
   private let albumTypes: [PHAssetCollectionType] = [.album, .smartAlbum]
   private let recoveredAlbumSubType = 1000000219
   
-  private var hashTask: Task<Void, Error>?
-  private static let hashCancelledCode = "HASH_CANCELLED"
-  private static let hashCancelled = Result<[HashResult], Error>.failure(PigeonError(code: hashCancelledCode, message: "Hashing cancelled", details: nil))
-  
+  private let hashBufferSize = 2 * 1024 * 1024
   
   init(with defaults: UserDefaults = .standard) {
     self.defaults = defaults
@@ -82,7 +96,7 @@ class NativeSyncApiImpl: NativeSyncApi {
       let collections = PHAssetCollection.fetchAssetCollections(with: type, subtype: .any, options: nil)
       for i in 0..<collections.count {
         let album = collections.object(at: i)
-        
+      
         // Ignore recovered album
         if(album.assetCollectionSubtype.rawValue == self.recoveredAlbumSubType) {
           continue;
@@ -240,7 +254,7 @@ class NativeSyncApiImpl: NativeSyncApi {
       let date = NSDate(timeIntervalSince1970: TimeInterval(updatedTimeCond!))
       options.predicate = NSPredicate(format: "creationDate > %@ OR modificationDate > %@", date, date)
     }
-    
+
     let result = PHAsset.fetchAssets(in: album, options: options)
     if(result.count == 0) {
       return []
@@ -253,114 +267,23 @@ class NativeSyncApiImpl: NativeSyncApi {
     return assets
   }
   
-  func hashAssets(assetIds: [String], allowNetworkAccess: Bool, completion: @escaping (Result<[HashResult], Error>) -> Void) {
-    if let prevTask = hashTask {
-      prevTask.cancel()
-      hashTask = nil
-    }
-    hashTask = Task { [weak self] in
-      var missingAssetIds = Set(assetIds)
-      var assets = [PHAsset]()
-      assets.reserveCapacity(assetIds.count)
-      PHAsset.fetchAssets(withLocalIdentifiers: assetIds, options: nil).enumerateObjects { (asset, _, stop) in
-        if Task.isCancelled {
-          stop.pointee = true
-          return
-        }
-        missingAssetIds.remove(asset.localIdentifier)
-        assets.append(asset)
-      }
-      
-      if Task.isCancelled {
-        return completion(Self.hashCancelled)
-      }
-      
-      await withTaskGroup(of: HashResult?.self) { taskGroup in
-        var results = [HashResult]()
-        results.reserveCapacity(assets.count)
-        for asset in assets {
-          if Task.isCancelled {
-            return completion(Self.hashCancelled)
+  func hashPaths(paths: [String]) throws -> [FlutterStandardTypedData?] {
+      return paths.map { path in
+          guard let file = FileHandle(forReadingAtPath: path) else {
+              print("Cannot open file: \(path)")
+              return nil
           }
-          taskGroup.addTask {
-            guard let self = self else { return nil }
-            return await self.hashAsset(asset, allowNetworkAccess: allowNetworkAccess)
-          }
-        }
-        
-        for await result in taskGroup {
-          guard let result = result else {
-            return completion(Self.hashCancelled)
-          }
-          results.append(result)
-        }
-        
-        for missing in missingAssetIds {
-          results.append(HashResult(assetId: missing, error: "Asset not found in library", hash: nil))
-        }
-        
-        completion(.success(results))
+          
+          var hasher = Insecure.SHA1()
+          while autoreleasepool(invoking: {
+              let chunk = file.readData(ofLength: hashBufferSize)
+              guard !chunk.isEmpty else { return false }
+              hasher.update(data: chunk)
+              return true
+          }) { }
+          
+          let digest = hasher.finalize()
+          return FlutterStandardTypedData(bytes: Data(digest))
       }
-    }
-  }
-  
-  func cancelHashing() {
-    hashTask?.cancel()
-    hashTask = nil
-  }
-  
-  private func hashAsset(_ asset: PHAsset, allowNetworkAccess: Bool) async -> HashResult? {
-    class RequestRef {
-      var id: PHAssetResourceDataRequestID?
-    }
-    let requestRef = RequestRef()
-    return await withTaskCancellationHandler(operation: {
-      if Task.isCancelled {
-        return nil
-      }
-      
-      guard let resource = asset.getResource() else {
-        return HashResult(assetId: asset.localIdentifier, error: "Cannot get asset resource", hash: nil)
-      }
-      
-      if Task.isCancelled {
-        return nil
-      }
-      
-      let options = PHAssetResourceRequestOptions()
-      options.isNetworkAccessAllowed = allowNetworkAccess
-      
-      return await withCheckedContinuation { continuation in
-        var hasher = Insecure.SHA1()
-        
-        requestRef.id = PHAssetResourceManager.default().requestData(
-          for: resource,
-          options: options,
-          dataReceivedHandler: { data in
-            hasher.update(data: data)
-          },
-          completionHandler: { error in
-            let result: HashResult? = switch (error) {
-            case let e as PHPhotosError where e.code == .userCancelled: nil
-            case let .some(e): HashResult(
-              assetId: asset.localIdentifier,
-              error: "Failed to hash asset: \(e.localizedDescription)",
-              hash: nil
-            )
-            case .none:
-              HashResult(
-                assetId: asset.localIdentifier,
-                error: nil,
-                hash: Data(hasher.finalize()).base64EncodedString()
-              )
-            }
-            continuation.resume(returning: result)
-          }
-        )
-      }
-    }, onCancel: {
-      guard let requestId = requestRef.id else { return }
-      PHAssetResourceManager.default().cancelDataRequest(requestId)
-    })
   }
 }

mobile/ios/Runner/Sync/PHAssetExtensions.swift

@@ -1,77 +0,0 @@
-import Photos
-
-extension PHAsset {
-  func toPlatformAsset() -> PlatformAsset {
-    return PlatformAsset(
-      id: localIdentifier,
-      name: title,
-      type: Int64(mediaType.rawValue),
-      createdAt: creationDate.map { Int64($0.timeIntervalSince1970) },
-      updatedAt: modificationDate.map { Int64($0.timeIntervalSince1970) },
-      width: Int64(pixelWidth),
-      height: Int64(pixelHeight),
-      durationInSeconds: Int64(duration),
-      orientation: 0,
-      isFavorite: isFavorite
-    )
-  }
-
-  var title: String {
-    return filename ?? originalFilename ?? "<unknown>"
-  }
-
-  var filename: String? {
-    return value(forKey: "filename") as? String
-  }
-
-  // This method is expected to be slow as it goes through the asset resources to fetch the originalFilename
-  var originalFilename: String? {
-    return getResource()?.originalFilename
-  }
-
-  func getResource() -> PHAssetResource? {
-    let resources = PHAssetResource.assetResources(for: self)
-
-    let filteredResources = resources.filter { $0.isMediaResource && isValidResourceType($0.type) }
-
-    guard !filteredResources.isEmpty else {
-      return nil
-    }
-
-    if filteredResources.count == 1 {
-      return filteredResources.first
-    }
-
-    if let currentResource = filteredResources.first(where: { $0.isCurrent }) {
-      return currentResource
-    }
-
-    if let fullSizeResource = filteredResources.first(where: { isFullSizeResourceType($0.type) }) {
-      return fullSizeResource
-    }
-
-    return nil
-  }
-
-  private func isValidResourceType(_ type: PHAssetResourceType) -> Bool {
-    switch mediaType {
-    case .image:
-      return [.photo, .alternatePhoto, .fullSizePhoto].contains(type)
-    case .video:
-      return [.video, .fullSizeVideo, .fullSizePairedVideo].contains(type)
-    default:
-      return false
-    }
-  }
-
-  private func isFullSizeResourceType(_ type: PHAssetResourceType) -> Bool {
-    switch mediaType {
-    case .image:
-      return type == .fullSizePhoto
-    case .video:
-      return type == .fullSizeVideo
-    default:
-      return false
-    }
-  }
-}

mobile/ios/Runner/Sync/PHAssetResourceExtensions.swift

@@ -1,16 +0,0 @@
-
-import Photos
-
-extension PHAssetResource {
-  var isCurrent: Bool {
-    return value(forKey: "isCurrent") as? Bool ?? false
-  }
-  
-  var isMediaResource: Bool {
-    var isMedia = type != .adjustmentData
-    if #available(iOS 17, *) {
-      isMedia = isMedia && type != .photoProxy
-    }
-    return isMedia
-  }
-}

mobile/lib/constants/constants.dart

@@ -1,5 +1,3 @@
-import 'dart:io';
-
 const int noDbId = -9223372036854775808; // from Isar
 const double downloadCompleted = -1;
 const double downloadFailed = -2;
@@ -12,7 +10,7 @@ const int kSyncEventBatchSize = 5000;
 const int kFetchLocalAssetsBatchSize = 40000;
 
 // Hash batch limits
-final int kBatchHashFileLimit = Platform.isIOS ? 32 : 512;
+const int kBatchHashFileLimit = 256;
 const int kBatchHashSizeLimit = 1024 * 1024 * 1024; // 1GB
 
 // Secure storage keys

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

@@ -40,12 +40,13 @@ class AssetService {
 
   Future<List<RemoteAsset>> getStack(RemoteAsset asset) async {
     if (asset.stackId == null) {
-      return const [];
+      return [];
     }
 
-    final stack = await _remoteAssetRepository.getStackChildren(asset);
-    // Include the primary asset in the stack as the first item
-    return [asset, ...stack];
+    return _remoteAssetRepository.getStackChildren(asset).then((assets) {
+      // Include the primary asset in the stack as the first item
+      return [asset, ...assets];
+    });
   }
 
   Future<ExifInfo?> getExif(BaseAsset asset) async {

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

@@ -43,17 +43,6 @@ class BackgroundWorkerFgService {
   // TODO: Move this call to native side once old timeline is removed
   Future<void> enable() => _foregroundHostApi.enable();
 
-  Future<void> configure({int? minimumDelaySeconds, bool? requireCharging}) => _foregroundHostApi.configure(
-    BackgroundWorkerSettings(
-      minimumDelaySeconds:
-          minimumDelaySeconds ??
-          Store.get(AppSettingsEnum.backupTriggerDelay.storeKey, AppSettingsEnum.backupTriggerDelay.defaultValue),
-      requiresCharging:
-          requireCharging ??
-          Store.get(AppSettingsEnum.backupRequireCharging.storeKey, AppSettingsEnum.backupRequireCharging.defaultValue),
-    ),
-  );
-
   Future<void> disable() => _foregroundHostApi.disable();
 }
 
@@ -184,7 +173,6 @@ class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {
 
     try {
       final backgroundSyncManager = _ref.read(backgroundSyncProvider);
-      final nativeSyncApi = _ref.read(nativeSyncApiProvider);
       _isCleanedUp = true;
       _ref.dispose();
 
@@ -200,7 +188,7 @@ class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {
         _drift.close(),
         _driftLogger.close(),
         backgroundSyncManager.cancel(),
-        nativeSyncApi.cancelHashing(),
+        backgroundSyncManager.cancelLocal(),
       ];
 
       if (_isar.isOpen) {

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

@@ -1,18 +1,20 @@
-import 'package:flutter/services.dart';
+import 'dart:convert';
+
 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/local_album.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/local_asset.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/storage.repository.dart';
 import 'package:immich_mobile/platform/native_sync_api.g.dart';
 import 'package:logging/logging.dart';
 
-const String _kHashCancelledCode = "HASH_CANCELLED";
-
 class HashService {
-  final int _batchSize;
+  final int batchSizeLimit;
+  final int batchFileLimit;
   final DriftLocalAlbumRepository _localAlbumRepository;
   final DriftLocalAssetRepository _localAssetRepository;
+  final StorageRepository _storageRepository;
   final NativeSyncApi _nativeSyncApi;
   final bool Function()? _cancelChecker;
   final _log = Logger('HashService');
@@ -20,42 +22,37 @@ class HashService {
   HashService({
     required DriftLocalAlbumRepository localAlbumRepository,
     required DriftLocalAssetRepository localAssetRepository,
+    required StorageRepository storageRepository,
     required NativeSyncApi nativeSyncApi,
     bool Function()? cancelChecker,
-    int? batchSize,
+    this.batchSizeLimit = kBatchHashSizeLimit,
+    this.batchFileLimit = kBatchHashFileLimit,
   }) : _localAlbumRepository = localAlbumRepository,
        _localAssetRepository = localAssetRepository,
+       _storageRepository = storageRepository,
        _cancelChecker = cancelChecker,
-       _nativeSyncApi = nativeSyncApi,
-       _batchSize = batchSize ?? kBatchHashFileLimit;
+       _nativeSyncApi = nativeSyncApi;
 
   bool get isCancelled => _cancelChecker?.call() ?? false;
 
   Future<void> hashAssets() async {
     _log.info("Starting hashing of assets");
     final Stopwatch stopwatch = Stopwatch()..start();
-    try {
-      // Sorted by backupSelection followed by isCloud
-      final localAlbums = await _localAlbumRepository.getBackupAlbums();
+    // Sorted by backupSelection followed by isCloud
+    final localAlbums = await _localAlbumRepository.getAll(
+      sortBy: {SortLocalAlbumsBy.backupSelection, SortLocalAlbumsBy.isIosSharedAlbum},
+    );
 
-      for (final album in localAlbums) {
-        if (isCancelled) {
-          _log.warning("Hashing cancelled. Stopped processing albums.");
-          break;
-        }
+    for (final album in localAlbums) {
+      if (isCancelled) {
+        _log.warning("Hashing cancelled. Stopped processing albums.");
+        break;
+      }
 
-        final assetsToHash = await _localAlbumRepository.getAssetsToHash(album.id);
-        if (assetsToHash.isNotEmpty) {
-          await _hashAssets(album, assetsToHash);
-        }
+      final assetsToHash = await _localAlbumRepository.getAssetsToHash(album.id);
+      if (assetsToHash.isNotEmpty) {
+        await _hashAssets(album, assetsToHash);
       }
-    } on PlatformException catch (e) {
-      if (e.code == _kHashCancelledCode) {
-        _log.warning("Hashing cancelled by platform");
-        return;
-      }
-    } catch (e, s) {
-      _log.severe("Error during hashing", e, s);
     }
 
     stopwatch.stop();
@@ -66,7 +63,8 @@ class HashService {
   /// with hash for those that were successfully hashed. Hashes are looked up in a table
   /// [LocalAssetHashEntity] by local id. Only missing entries are newly hashed and added to the DB.
   Future<void> _hashAssets(LocalAlbum album, List<LocalAsset> assetsToHash) async {
-    final toHash = <String, LocalAsset>{};
+    int bytesProcessed = 0;
+    final toHash = <_AssetToPath>[];
 
     for (final asset in assetsToHash) {
       if (isCancelled) {
@@ -74,10 +72,21 @@ class HashService {
         return;
       }
 
-      toHash[asset.id] = asset;
-      if (toHash.length == _batchSize) {
+      final file = await _storageRepository.getFileForAsset(asset.id);
+      if (file == null) {
+        _log.warning(
+          "Cannot get file for asset ${asset.id}, name: ${asset.name}, created on: ${asset.createdAt} from album: ${album.name}",
+        );
+        continue;
+      }
+
+      bytesProcessed += await file.length();
+      toHash.add(_AssetToPath(asset: asset, path: file.path));
+
+      if (toHash.length >= batchFileLimit || bytesProcessed >= batchSizeLimit) {
         await _processBatch(album, toHash);
         toHash.clear();
+        bytesProcessed = 0;
       }
     }
 
@@ -85,36 +94,33 @@ class HashService {
   }
 
   /// Processes a batch of assets.
-  Future<void> _processBatch(LocalAlbum album, Map<String, LocalAsset> toHash) async {
+  Future<void> _processBatch(LocalAlbum album, List<_AssetToPath> toHash) async {
     if (toHash.isEmpty) {
       return;
     }
 
     _log.fine("Hashing ${toHash.length} files");
 
-    final hashed = <String, String>{};
-    final hashResults = await _nativeSyncApi.hashAssets(
-      toHash.keys.toList(),
-      allowNetworkAccess: album.backupSelection == BackupSelection.selected,
-    );
+    final hashed = <LocalAsset>[];
+    final hashes = await _nativeSyncApi.hashPaths(toHash.map((e) => e.path).toList());
     assert(
-      hashResults.length == toHash.length,
-      "Hashes length does not match toHash length: ${hashResults.length} != ${toHash.length}",
+      hashes.length == toHash.length,
+      "Hashes length does not match toHash length: ${hashes.length} != ${toHash.length}",
     );
 
-    for (int i = 0; i < hashResults.length; i++) {
+    for (int i = 0; i < hashes.length; i++) {
       if (isCancelled) {
         _log.warning("Hashing cancelled. Stopped processing batch.");
         return;
       }
 
-      final hashResult = hashResults[i];
-      if (hashResult.hash != null) {
-        hashed[hashResult.assetId] = hashResult.hash!;
+      final hash = hashes[i];
+      final asset = toHash[i].asset;
+      if (hash?.length == 20) {
+        hashed.add(asset.copyWith(checksum: base64.encode(hash!)));
       } else {
-        final asset = toHash[hashResult.assetId];
         _log.warning(
-          "Failed to hash asset with id: ${hashResult.assetId}, name: ${asset?.name}, createdAt: ${asset?.createdAt}, from album: ${album.name}. Error: ${hashResult.error ?? "unknown"}",
+          "Failed to hash file for ${asset.id}: ${asset.name} created at ${asset.createdAt} from album: ${album.name}",
         );
       }
     }
@@ -122,5 +128,13 @@ class HashService {
     _log.fine("Hashed ${hashed.length}/${toHash.length} assets");
 
     await _localAssetRepository.updateHashes(hashed);
+    await _storageRepository.clearCache();
   }
 }
+
+class _AssetToPath {
+  final LocalAsset asset;
+  final String path;
+
+  const _AssetToPath({required this.asset, required this.path});
+}

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

@@ -36,17 +36,17 @@ class DriftLocalAssetRepository extends DriftDatabaseRepository {
 
   Stream<LocalAsset?> watch(String id) => _assetSelectable(id).watchSingleOrNull();
 
-  Future<void> updateHashes(Map<String, String> hashes) {
+  Future<void> updateHashes(Iterable<LocalAsset> hashes) {
     if (hashes.isEmpty) {
       return Future.value();
     }
 
     return _db.batch((batch) async {
-      for (final entry in hashes.entries) {
+      for (final asset in hashes) {
         batch.update(
           _db.localAssetEntity,
-          LocalAssetEntityCompanion(checksum: Value(entry.value)),
-          where: (e) => e.id.equals(entry.key),
+          LocalAssetEntityCompanion(checksum: Value(asset.checksum)),
+          where: (e) => e.id.equals(asset.id),
         );
       }
     });

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

@@ -62,13 +62,12 @@ class RemoteAssetRepository extends DriftDatabaseRepository {
   }
 
   Future<List<RemoteAsset>> getStackChildren(RemoteAsset asset) {
-    final stackId = asset.stackId;
-    if (stackId == null) {
-      return Future.value(const []);
+    if (asset.stackId == null) {
+      return Future.value([]);
     }
 
     final query = _db.remoteAssetEntity.select()
-      ..where((row) => row.stackId.equals(stackId) & row.id.equals(asset.id).not())
+      ..where((row) => row.stackId.equals(asset.stackId!) & row.id.equals(asset.id).not())
       ..orderBy([(row) => OrderingTerm.desc(row.createdAt)]);
 
     return query.map((row) => row.toDto()).get();

mobile/lib/pages/album/album_options.page.dart

@@ -169,7 +169,7 @@ class AlbumOptionsPage extends HookConsumerWidget {
                   album.activityEnabled = value;
                 }
               },
-              activeThumbColor: activityEnabled.value ? context.primaryColor : context.themeData.disabledColor,
+              activeColor: activityEnabled.value ? context.primaryColor : context.themeData.disabledColor,
               dense: true,
               title: Text(
                 "comments_and_likes",

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

@@ -205,9 +205,9 @@ class BackupControllerPage extends HookConsumerWidget {
     }
 
     buildBackgroundBackupInfo() {
-      return ListTile(
-        leading: const Icon(Icons.info_outline_rounded),
-        title: Text('background_backup_running_error'.tr()),
+      return const ListTile(
+        leading: Icon(Icons.info_outline_rounded),
+        title: Text("Background backup is currently running, cannot start manual backup"),
       );
     }
 

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

@@ -1,19 +1,15 @@
-import 'dart:async';
 import 'dart:io';
 
 import 'package:auto_route/auto_route.dart';
-import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/album/local_album.model.dart';
-import 'package:immich_mobile/domain/services/sync_linked_album.service.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/providers/app_settings.provider.dart';
-import 'package:immich_mobile/providers/background_sync.provider.dart';
+import 'package:immich_mobile/domain/services/sync_linked_album.service.dart';
 import 'package:immich_mobile/providers/backup/backup_album.provider.dart';
 import 'package:immich_mobile/providers/backup/drift_backup.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:immich_mobile/widgets/backup/drift_album_info_list_tile.dart';
@@ -67,6 +63,16 @@ class _DriftBackupAlbumSelectionPageState extends ConsumerState<DriftBackupAlbum
       });
       await _handleLinkedAlbumFuture;
     }
+
+    // Restart backup if total count changed and backup is enabled
+    final currentTotalAssetCount = ref.read(driftBackupProvider.select((p) => p.totalCount));
+    final totalChanged = currentTotalAssetCount != _initialTotalAssetCount;
+    final isBackupEnabled = ref.read(appSettingsServiceProvider).getSetting(AppSettingsEnum.enableBackup);
+
+    if (totalChanged && isBackupEnabled) {
+      await ref.read(driftBackupProvider.notifier).cancel();
+      await ref.read(driftBackupProvider.notifier).startBackup(user.id);
+    }
   }
 
   @override
@@ -95,27 +101,6 @@ class _DriftBackupAlbumSelectionPageState extends ConsumerState<DriftBackupAlbum
       onPopInvokedWithResult: (didPop, _) async {
         if (!didPop) {
           await _handlePagePopped();
-
-          final user = ref.read(currentUserProvider);
-          if (user == null) {
-            return;
-          }
-
-          final isBackupEnabled = ref.read(appSettingsServiceProvider).getSetting(AppSettingsEnum.enableBackup);
-          await ref.read(driftBackupProvider.notifier).getBackupStatus(user.id);
-          final currentTotalAssetCount = ref.read(driftBackupProvider.select((p) => p.totalCount));
-          final totalChanged = currentTotalAssetCount != _initialTotalAssetCount;
-          final backupNotifier = ref.read(driftBackupProvider.notifier);
-          final backgroundSync = ref.read(backgroundSyncProvider);
-          final nativeSync = ref.read(nativeSyncApiProvider);
-          if (totalChanged) {
-            // Waits for hashing to be cancelled before starting a new one
-            unawaited(nativeSync.cancelHashing().whenComplete(() => backgroundSync.hashAssets()));
-            if (isBackupEnabled) {
-              unawaited(backupNotifier.cancel().whenComplete(() => backupNotifier.startBackup(user.id)));
-            }
-          }
-
           Navigator.of(context).pop();
         }
       },
@@ -264,7 +249,7 @@ class _DriftBackupAlbumSelectionPageState extends ConsumerState<DriftBackupAlbum
                           mainAxisSize: MainAxisSize.max,
                           children: [
                             const CircularProgressIndicator(strokeWidth: 4),
-                            Text('creating_linked_albums'.tr(), style: context.textTheme.labelLarge),
+                            Text("Creating linked albums...", style: context.textTheme.labelLarge),
                           ],
                         ),
                       ),

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

@@ -1,5 +1,4 @@
 import 'package:auto_route/auto_route.dart';
-import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
@@ -59,10 +58,8 @@ class DriftBackupAssetDetailPage extends ConsumerWidget {
                           overflow: TextOverflow.ellipsis,
                         );
                       },
-                      error: (error, stackTrace) => Text(
-                        'error_saving_image'.tr(args: [error.toString()]),
-                        style: TextStyle(color: context.colorScheme.error),
-                      ),
+                      error: (error, stackTrace) =>
+                          Text('Error: $error', style: TextStyle(color: context.colorScheme.error)),
                       loading: () => const SizedBox(height: 16, width: 16, child: CircularProgressIndicator.adaptive()),
                     ),
                   ],
@@ -86,7 +83,7 @@ class DriftBackupAssetDetailPage extends ConsumerWidget {
           );
         },
         error: (Object error, StackTrace stackTrace) {
-          return Center(child: Text('error_saving_image'.tr(args: [error.toString()])));
+          return Center(child: Text('Error: $error'));
         },
         loading: () {
           return const SizedBox(height: 48, width: 48, child: Center(child: CircularProgressIndicator.adaptive()));

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

@@ -1,5 +1,4 @@
 import 'package:auto_route/auto_route.dart';
-import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -9,6 +8,7 @@ import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/theme_extensions.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/services/immich_logger.service.dart';
+import 'package:intl/intl.dart';
 
 @RoutePage()
 class AppLogPage extends HookConsumerWidget {
@@ -49,7 +49,7 @@ class AppLogPage extends HookConsumerWidget {
 
     return Scaffold(
       appBar: AppBar(
-        title: Text('logs'.tr(), style: const TextStyle(fontWeight: FontWeight.bold, fontSize: 16.0)),
+        title: const Text("Logs", style: TextStyle(fontWeight: FontWeight.bold, fontSize: 16.0)),
         scrolledUnderElevation: 1,
         elevation: 2,
         actions: [

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

@@ -1,5 +1,4 @@
 import 'package:auto_route/auto_route.dart';
-import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -37,7 +36,7 @@ class AppLogDetailPage extends HookConsumerWidget {
                       context.scaffoldMessenger.showSnackBar(
                         SnackBar(
                           content: Text(
-                            "copied_to_clipboard".tr(),
+                            "Copied to clipboard",
                             style: context.textTheme.bodyLarge?.copyWith(color: context.primaryColor),
                           ),
                         ),
@@ -98,7 +97,7 @@ class AppLogDetailPage extends HookConsumerWidget {
     }
 
     return Scaffold(
-      appBar: AppBar(title: Text("log_detail_title".tr())),
+      appBar: AppBar(title: const Text("Log Detail")),
       body: SafeArea(
         child: ListView(
           children: [

mobile/lib/pages/library/partner/drift_partner.page.dart

@@ -134,7 +134,7 @@ class _SharedToPartnerList extends ConsumerWidget {
         );
       },
       loading: () => const Center(child: CircularProgressIndicator()),
-      error: (error, stack) => Center(child: Text('error_loading_partners'.tr(args: [error.toString()]))),
+      error: (error, stack) => Center(child: Text("Error loading partners: $error")),
     );
   }
 }

mobile/lib/pages/library/places/places_collection.page.dart

@@ -85,7 +85,7 @@ class PlacesCollectionPage extends HookConsumerWidget {
                 },
               );
             },
-            error: (error, stask) => Text('error_getting_places'.tr()),
+            error: (error, stask) => const Text('Error getting places'),
             loading: () => const Center(child: CircularProgressIndicator()),
           ),
         ],

mobile/lib/pages/library/shared_link/shared_link_edit.page.dart

@@ -112,7 +112,7 @@ class SharedLinkEditPage extends HookConsumerWidget {
       return SwitchListTile.adaptive(
         value: showMetadata.value,
         onChanged: newShareLink.value.isEmpty ? (value) => showMetadata.value = value : null,
-        activeThumbColor: colorScheme.primary,
+        activeColor: colorScheme.primary,
         dense: true,
         title: Text("show_metadata", style: themeData.textTheme.labelLarge?.copyWith(fontWeight: FontWeight.bold)).tr(),
       );
@@ -122,7 +122,7 @@ class SharedLinkEditPage extends HookConsumerWidget {
       return SwitchListTile.adaptive(
         value: allowDownload.value,
         onChanged: newShareLink.value.isEmpty ? (value) => allowDownload.value = value : null,
-        activeThumbColor: colorScheme.primary,
+        activeColor: colorScheme.primary,
         dense: true,
         title: Text(
           "allow_public_user_to_download",
@@ -135,7 +135,7 @@ class SharedLinkEditPage extends HookConsumerWidget {
       return SwitchListTile.adaptive(
         value: allowUpload.value,
         onChanged: newShareLink.value.isEmpty ? (value) => allowUpload.value = value : null,
-        activeThumbColor: colorScheme.primary,
+        activeColor: colorScheme.primary,
         dense: true,
         title: Text(
           "allow_public_user_to_upload",
@@ -148,7 +148,7 @@ class SharedLinkEditPage extends HookConsumerWidget {
       return SwitchListTile.adaptive(
         value: editExpiry.value,
         onChanged: newShareLink.value.isEmpty ? (value) => editExpiry.value = value : null,
-        activeThumbColor: colorScheme.primary,
+        activeColor: colorScheme.primary,
         dense: true,
         title: Text(
           "change_expiration_time",

mobile/lib/pages/search/search.page.dart

@@ -435,7 +435,7 @@ class SearchPage extends HookConsumerWidget {
                     }
                   },
                   icon: const Icon(Icons.more_vert_rounded),
-                  tooltip: 'show_text_search_menu'.tr(),
+                  tooltip: 'Show text search menu',
                 );
               },
               menuChildren: [

mobile/lib/platform/background_worker_api.g.dart

@@ -25,57 +25,6 @@ List<Object?> wrapResponse({Object? result, PlatformException? error, bool empty
   return <Object?>[error.code, error.message, error.details];
 }
 
-bool _deepEquals(Object? a, Object? b) {
-  if (a is List && b is List) {
-    return a.length == b.length && a.indexed.every(((int, dynamic) item) => _deepEquals(item.$2, b[item.$1]));
-  }
-  if (a is Map && b is Map) {
-    return a.length == b.length &&
-        a.entries.every(
-          (MapEntry<Object?, Object?> entry) =>
-              (b as Map<Object?, Object?>).containsKey(entry.key) && _deepEquals(entry.value, b[entry.key]),
-        );
-  }
-  return a == b;
-}
-
-class BackgroundWorkerSettings {
-  BackgroundWorkerSettings({required this.requiresCharging, required this.minimumDelaySeconds});
-
-  bool requiresCharging;
-
-  int minimumDelaySeconds;
-
-  List<Object?> _toList() {
-    return <Object?>[requiresCharging, minimumDelaySeconds];
-  }
-
-  Object encode() {
-    return _toList();
-  }
-
-  static BackgroundWorkerSettings decode(Object result) {
-    result as List<Object?>;
-    return BackgroundWorkerSettings(requiresCharging: result[0]! as bool, minimumDelaySeconds: result[1]! as int);
-  }
-
-  @override
-  // ignore: avoid_equals_and_hash_code_on_mutable_classes
-  bool operator ==(Object other) {
-    if (other is! BackgroundWorkerSettings || other.runtimeType != runtimeType) {
-      return false;
-    }
-    if (identical(this, other)) {
-      return true;
-    }
-    return _deepEquals(encode(), other.encode());
-  }
-
-  @override
-  // ignore: avoid_equals_and_hash_code_on_mutable_classes
-  int get hashCode => Object.hashAll(_toList());
-}
-
 class _PigeonCodec extends StandardMessageCodec {
   const _PigeonCodec();
   @override
@@ -83,9 +32,6 @@ class _PigeonCodec extends StandardMessageCodec {
     if (value is int) {
       buffer.putUint8(4);
       buffer.putInt64(value);
-    } else if (value is BackgroundWorkerSettings) {
-      buffer.putUint8(129);
-      writeValue(buffer, value.encode());
     } else {
       super.writeValue(buffer, value);
     }
@@ -94,8 +40,6 @@ class _PigeonCodec extends StandardMessageCodec {
   @override
   Object? readValueOfType(int type, ReadBuffer buffer) {
     switch (type) {
-      case 129:
-        return BackgroundWorkerSettings.decode(readValue(buffer)!);
       default:
         return super.readValueOfType(type, buffer);
     }
@@ -138,29 +82,6 @@ class BackgroundWorkerFgHostApi {
     }
   }
 
-  Future<void> configure(BackgroundWorkerSettings settings) async {
-    final String pigeonVar_channelName =
-        'dev.flutter.pigeon.immich_mobile.BackgroundWorkerFgHostApi.configure$pigeonVar_messageChannelSuffix';
-    final BasicMessageChannel<Object?> pigeonVar_channel = BasicMessageChannel<Object?>(
-      pigeonVar_channelName,
-      pigeonChannelCodec,
-      binaryMessenger: pigeonVar_binaryMessenger,
-    );
-    final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(<Object?>[settings]);
-    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<void> disable() async {
     final String pigeonVar_channelName =
         'dev.flutter.pigeon.immich_mobile.BackgroundWorkerFgHostApi.disable$pigeonVar_messageChannelSuffix';

mobile/lib/platform/native_sync_api.g.dart

@@ -205,45 +205,6 @@ class SyncDelta {
   int get hashCode => Object.hashAll(_toList());
 }
 
-class HashResult {
-  HashResult({required this.assetId, this.error, this.hash});
-
-  String assetId;
-
-  String? error;
-
-  String? hash;
-
-  List<Object?> _toList() {
-    return <Object?>[assetId, error, hash];
-  }
-
-  Object encode() {
-    return _toList();
-  }
-
-  static HashResult decode(Object result) {
-    result as List<Object?>;
-    return HashResult(assetId: result[0]! as String, error: result[1] as String?, hash: result[2] as String?);
-  }
-
-  @override
-  // ignore: avoid_equals_and_hash_code_on_mutable_classes
-  bool operator ==(Object other) {
-    if (other is! HashResult || other.runtimeType != runtimeType) {
-      return false;
-    }
-    if (identical(this, other)) {
-      return true;
-    }
-    return _deepEquals(encode(), other.encode());
-  }
-
-  @override
-  // ignore: avoid_equals_and_hash_code_on_mutable_classes
-  int get hashCode => Object.hashAll(_toList());
-}
-
 class _PigeonCodec extends StandardMessageCodec {
   const _PigeonCodec();
   @override
@@ -260,9 +221,6 @@ class _PigeonCodec extends StandardMessageCodec {
     } else if (value is SyncDelta) {
       buffer.putUint8(131);
       writeValue(buffer, value.encode());
-    } else if (value is HashResult) {
-      buffer.putUint8(132);
-      writeValue(buffer, value.encode());
     } else {
       super.writeValue(buffer, value);
     }
@@ -277,8 +235,6 @@ class _PigeonCodec extends StandardMessageCodec {
         return PlatformAlbum.decode(readValue(buffer)!);
       case 131:
         return SyncDelta.decode(readValue(buffer)!);
-      case 132:
-        return HashResult.decode(readValue(buffer)!);
       default:
         return super.readValueOfType(type, buffer);
     }
@@ -512,15 +468,15 @@ class NativeSyncApi {
     }
   }
 
-  Future<List<HashResult>> hashAssets(List<String> assetIds, {bool allowNetworkAccess = false}) async {
+  Future<List<Uint8List?>> hashPaths(List<String> paths) async {
     final String pigeonVar_channelName =
-        'dev.flutter.pigeon.immich_mobile.NativeSyncApi.hashAssets$pigeonVar_messageChannelSuffix';
+        'dev.flutter.pigeon.immich_mobile.NativeSyncApi.hashPaths$pigeonVar_messageChannelSuffix';
     final BasicMessageChannel<Object?> pigeonVar_channel = BasicMessageChannel<Object?>(
       pigeonVar_channelName,
       pigeonChannelCodec,
       binaryMessenger: pigeonVar_binaryMessenger,
     );
-    final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(<Object?>[assetIds, allowNetworkAccess]);
+    final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(<Object?>[paths]);
     final List<Object?>? pigeonVar_replyList = await pigeonVar_sendFuture as List<Object?>?;
     if (pigeonVar_replyList == null) {
       throw _createConnectionError(pigeonVar_channelName);
@@ -536,30 +492,7 @@ class NativeSyncApi {
         message: 'Host platform returned null value for non-null return value.',
       );
     } else {
-      return (pigeonVar_replyList[0] as List<Object?>?)!.cast<HashResult>();
-    }
-  }
-
-  Future<void> cancelHashing() async {
-    final String pigeonVar_channelName =
-        'dev.flutter.pigeon.immich_mobile.NativeSyncApi.cancelHashing$pigeonVar_messageChannelSuffix';
-    final BasicMessageChannel<Object?> pigeonVar_channel = BasicMessageChannel<Object?>(
-      pigeonVar_channelName,
-      pigeonChannelCodec,
-      binaryMessenger: pigeonVar_binaryMessenger,
-    );
-    final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(null);
-    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;
+      return (pigeonVar_replyList[0] as List<Object?>?)!.cast<Uint8List?>();
     }
   }
 }

mobile/lib/presentation/pages/dev/feat_in_development.page.dart

@@ -2,7 +2,6 @@ import 'dart:async';
 
 import 'package:auto_route/auto_route.dart';
 import 'package:drift/drift.dart' hide Column;
-import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
@@ -136,7 +135,7 @@ class FeatInDevPage extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      appBar: AppBar(title: Text('features_in_development'.tr()), centerTitle: true),
+      appBar: AppBar(title: const Text('Features in Development'), centerTitle: true),
       body: Column(
         children: [
           Flexible(

mobile/lib/presentation/pages/dev/main_timeline.page.dart

@@ -15,7 +15,6 @@ class MainTimelinePage extends ConsumerWidget {
     return Timeline(
       topSliverWidget: const SliverToBoxAdapter(child: DriftMemoryLane()),
       topSliverWidgetHeight: hasMemories ? 200 : 0,
-      showStorageIndicator: true,
     );
   }
 }

mobile/lib/presentation/pages/dev/media_stat.page.dart

@@ -1,6 +1,5 @@
 import 'package:auto_route/auto_route.dart';
 import 'package:collection/collection.dart';
-import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
@@ -56,7 +55,7 @@ class LocalMediaSummaryPage extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      appBar: AppBar(title: Text('local_media_summary'.tr())),
+      appBar: AppBar(title: const Text('Local Media Summary')),
       body: Consumer(
         builder: (ctx, ref, __) {
           final db = ref.watch(driftProvider);
@@ -79,7 +78,7 @@ class LocalMediaSummaryPage extends StatelessWidget {
                     const Divider(),
                     Padding(
                       padding: const EdgeInsets.only(left: 15),
-                      child: Text("album_summary".tr(), style: ctx.textTheme.titleMedium),
+                      child: Text("Album summary", style: ctx.textTheme.titleMedium),
                     ),
                   ],
                 ),
@@ -136,7 +135,7 @@ class RemoteMediaSummaryPage extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      appBar: AppBar(title: Text('remote_media_summary'.tr())),
+      appBar: AppBar(title: const Text('Remote Media Summary')),
       body: Consumer(
         builder: (ctx, ref, __) {
           final db = ref.watch(driftProvider);
@@ -159,7 +158,7 @@ class RemoteMediaSummaryPage extends StatelessWidget {
                     const Divider(),
                     Padding(
                       padding: const EdgeInsets.only(left: 15),
-                      child: Text("album_summary".tr(), style: ctx.textTheme.titleMedium),
+                      child: Text("Album summary", style: ctx.textTheme.titleMedium),
                     ),
                   ],
                 ),

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

@@ -208,7 +208,7 @@ class DriftAlbumOptionsPage extends HookConsumerWidget {
                 activityEnabled.value = value;
                 await ref.read(remoteAlbumProvider.notifier).setActivityStatus(album.id, value);
               },
-              activeThumbColor: activityEnabled.value ? context.primaryColor : context.themeData.disabledColor,
+              activeColor: activityEnabled.value ? context.primaryColor : context.themeData.disabledColor,
               dense: true,
               title: Text(
                 "comments_and_likes",

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

@@ -1,5 +1,4 @@
 import 'package:auto_route/auto_route.dart';
-import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
@@ -15,7 +14,7 @@ class AssetTroubleshootPage extends ConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     return Scaffold(
-      appBar: AppBar(title: Text('asset_troubleshoot'.tr())),
+      appBar: AppBar(title: const Text("Asset Troubleshoot")),
       body: SingleChildScrollView(
         child: Padding(
           padding: const EdgeInsets.all(16.0),
@@ -38,23 +37,20 @@ class _AssetDetailsView extends ConsumerWidget {
       children: [
         _AssetPropertiesSection(asset: asset),
         const SizedBox(height: 16),
-        Text(
-          'matching_assets'.tr(),
-          style: Theme.of(context).textTheme.titleMedium?.copyWith(fontWeight: FontWeight.bold),
-        ),
+        Text('Matching Assets', style: Theme.of(context).textTheme.titleMedium?.copyWith(fontWeight: FontWeight.bold)),
         if (asset.checksum != null) ...[
           _LocalAssetsSection(asset: asset),
           const SizedBox(height: 16),
           _RemoteAssetSection(asset: asset),
         ] else ...[
-          _PropertySectionCard(
+          const _PropertySectionCard(
             title: 'Local Assets',
-            properties: [_PropertyItem(label: 'Status', value: 'no_checksum_local'.tr())],
+            properties: [_PropertyItem(label: 'Status', value: 'No checksum available - cannot fetch local assets')],
           ),
           const SizedBox(height: 16),
-          _PropertySectionCard(
+          const _PropertySectionCard(
             title: 'Remote Assets',
-            properties: [_PropertyItem(label: 'Status', value: 'no_checksum_remote'.tr())],
+            properties: [_PropertyItem(label: 'Status', value: 'No checksum available - cannot fetch remote asset')],
           ),
         ],
       ],
@@ -226,9 +222,9 @@ class _LocalAssetsSection extends ConsumerWidget {
         }
 
         if (localAssets.isEmpty) {
-          return _PropertySectionCard(
+          return const _PropertySectionCard(
             title: 'Local Assets',
-            properties: [_PropertyItem(label: 'Status', value: 'no_local_assets_found'.tr())],
+            properties: [_PropertyItem(label: 'Status', value: 'No local assets found with this checksum')],
           );
         }
 
@@ -285,9 +281,9 @@ class _RemoteAssetSection extends ConsumerWidget {
         final remoteAsset = snapshot.data;
 
         if (remoteAsset == null) {
-          return _PropertySectionCard(
+          return const _PropertySectionCard(
             title: 'Remote Assets',
-            properties: [_PropertyItem(label: 'Status', value: 'no_remote_assets_found'.tr())],
+            properties: [_PropertyItem(label: 'Status', value: 'No remote asset found with this checksum')],
           );
         }
 
@@ -340,10 +336,7 @@ class _PropertyItem extends StatelessWidget {
             child: Text('$label:', style: const TextStyle(fontWeight: FontWeight.w500)),
           ),
           Expanded(
-            child: Text(
-              value ?? 'not_available'.tr(),
-              style: TextStyle(color: Theme.of(context).colorScheme.secondary),
-            ),
+            child: Text(value ?? 'N/A', style: TextStyle(color: Theme.of(context).colorScheme.secondary)),
           ),
         ],
       ),

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

@@ -1,5 +1,4 @@
 import 'package:auto_route/auto_route.dart';
-import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/user.model.dart';
@@ -303,9 +302,7 @@ class _LocalAlbumsCollectionCard extends ConsumerWidget {
                         }).toList();
                       },
                       error: (error, _) {
-                        return [
-                          Center(child: Text('error_saving_image'.tr(args: [error.toString()]))),
-                        ];
+                        return [Center(child: Text('Error: $error'))];
                       },
                       loading: () {
                         return [const Center(child: CircularProgressIndicator())];

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

@@ -1,5 +1,4 @@
 import 'package:auto_route/auto_route.dart';
-import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
@@ -47,9 +46,9 @@ class _AlbumList extends ConsumerWidget {
       ),
       data: (albums) {
         if (albums.isEmpty) {
-          return SliverToBoxAdapter(
+          return const SliverToBoxAdapter(
             child: Center(
-              child: Padding(padding: const EdgeInsets.all(20.0), child: Text('no_albums_yet'.tr())),
+              child: Padding(padding: EdgeInsets.all(20.0), child: Text('No albums found')),
             ),
           );
         }

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

@@ -26,7 +26,6 @@ class LocalTimelinePage extends StatelessWidget {
       child: Timeline(
         appBar: MesmerizingSliverAppBar(title: album.name),
         bottomSheet: const LocalAlbumBottomSheet(),
-        showStorageIndicator: true,
       ),
     );
   }

mobile/lib/presentation/pages/search/drift_search.page.dart

@@ -440,7 +440,7 @@ class DriftSearchPage extends HookConsumerWidget {
                     }
                   },
                   icon: const Icon(Icons.more_vert_rounded),
-                  tooltip: 'show_text_search_menu'.tr(),
+                  tooltip: 'Show text search menu',
                 );
               },
               menuChildren: [
@@ -633,7 +633,6 @@ class _SearchResultGrid extends ConsumerWidget {
             groupBy: GroupAssetsBy.none,
             appBar: null,
             bottomSheet: const GeneralBottomSheet(minChildSize: 0.20),
-            withScrubber: false,
           ),
         ),
       ),

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

@@ -1,5 +1,4 @@
 import 'package:collection/collection.dart';
-import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
@@ -59,7 +58,7 @@ class LikeActivityActionButton extends ConsumerWidget {
         label: "like".t(context: context),
         menuItem: menuItem,
       ),
-      error: (error, stack) => Text('error_saving_image'.tr(args: [error.toString()])),
+      error: (error, stack) => Text("Error: $error"),
     );
   }
 }

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

@@ -504,9 +504,9 @@ class _AlbumList extends ConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     if (albums.isEmpty) {
-      return SliverToBoxAdapter(
+      return const SliverToBoxAdapter(
         child: Center(
-          child: Padding(padding: const EdgeInsets.all(20.0), child: Text('album_search_not_found'.tr())),
+          child: Padding(padding: EdgeInsets.all(20.0), child: Text('No albums found')),
         ),
       );
     }
@@ -599,9 +599,9 @@ class _AlbumGrid extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     if (albums.isEmpty) {
-      return SliverToBoxAdapter(
+      return const SliverToBoxAdapter(
         child: Center(
-          child: Padding(padding: const EdgeInsets.all(20.0), child: Text('album_search_not_found'.tr())),
+          child: Padding(padding: EdgeInsets.all(20.0), child: Text('No albums found')),
         ),
       );
     }

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

@@ -2,11 +2,11 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
 
-class StackChildrenNotifier extends AutoDisposeFamilyAsyncNotifier<List<RemoteAsset>, BaseAsset> {
+class StackChildrenNotifier extends AutoDisposeFamilyAsyncNotifier<List<RemoteAsset>, BaseAsset?> {
   @override
-  Future<List<RemoteAsset>> build(BaseAsset asset) {
-    if (asset is! RemoteAsset || asset.stackId == null) {
-      return Future.value(const []);
+  Future<List<RemoteAsset>> build(BaseAsset? asset) async {
+    if (asset == null || asset is! RemoteAsset || asset.stackId == null) {
+      return const [];
     }
 
     return ref.watch(assetServiceProvider).getStack(asset);
@@ -14,4 +14,4 @@ class StackChildrenNotifier extends AutoDisposeFamilyAsyncNotifier<List<RemoteAs
 }
 
 final stackChildrenNotifier = AsyncNotifierProvider.autoDispose
-    .family<StackChildrenNotifier, List<RemoteAsset>, BaseAsset>(StackChildrenNotifier.new);
+    .family<StackChildrenNotifier, List<RemoteAsset>, BaseAsset?>(StackChildrenNotifier.new);

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

@@ -3,7 +3,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_stack.provider.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_viewer.state.dart';
-import 'package:immich_mobile/presentation/widgets/images/thumbnail.widget.dart';
+import 'package:immich_mobile/presentation/widgets/images/image_provider.dart';
 import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asset.provider.dart';
 
 class AssetStackRow extends ConsumerWidget {
@@ -11,25 +11,27 @@ class AssetStackRow extends ConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final asset = ref.watch(assetViewerProvider.select((state) => state.currentAsset));
-    if (asset == null) {
-      return const SizedBox.shrink();
-    }
-
-    final stackChildren = ref.watch(stackChildrenNotifier(asset)).valueOrNull;
-    if (stackChildren == null || stackChildren.isEmpty) {
-      return const SizedBox.shrink();
-    }
-
+    int opacity = ref.watch(assetViewerProvider.select((state) => state.backgroundOpacity));
     final showControls = ref.watch(assetViewerProvider.select((s) => s.showingControls));
-    final opacity = showControls ? ref.watch(assetViewerProvider.select((state) => state.backgroundOpacity)) : 0;
+
+    if (!showControls) {
+      opacity = 0;
+    }
+
+    final asset = ref.watch(assetViewerProvider.select((s) => s.currentAsset));
 
     return IgnorePointer(
       ignoring: opacity < 255,
       child: AnimatedOpacity(
         opacity: opacity / 255,
         duration: Durations.short2,
-        child: _StackList(stack: stackChildren),
+        child: ref
+            .watch(stackChildrenNotifier(asset))
+            .when(
+              data: (state) => SizedBox.square(dimension: 80, child: _StackList(stack: state)),
+              error: (_, __) => const SizedBox.shrink(),
+              loading: () => const SizedBox.shrink(),
+            ),
       ),
     );
   }
@@ -42,77 +44,58 @@ class _StackList extends ConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    return Center(
-      child: SingleChildScrollView(
-        scrollDirection: Axis.horizontal,
-        child: Padding(
-          padding: const EdgeInsets.only(left: 10.0, right: 10.0, bottom: 20.0),
-          child: Row(
-            mainAxisAlignment: MainAxisAlignment.center,
-            spacing: 5.0,
-            children: List.generate(stack.length, (i) {
-              final asset = stack[i];
-              return _StackItem(key: ValueKey(asset.heroTag), asset: asset, index: i);
-            }),
+    return ListView.builder(
+      scrollDirection: Axis.horizontal,
+      padding: const EdgeInsets.only(left: 5, right: 5, bottom: 30),
+      itemCount: stack.length,
+      itemBuilder: (ctx, index) {
+        final asset = stack[index];
+        return Padding(
+          padding: const EdgeInsets.only(right: 5),
+          child: GestureDetector(
+            onTap: () {
+              ref.read(assetViewerProvider.notifier).setStackIndex(index);
+              ref.read(currentAssetNotifier.notifier).setAsset(asset);
+            },
+            child: Container(
+              height: 60,
+              width: 60,
+              decoration: index == ref.watch(assetViewerProvider.select((s) => s.stackIndex))
+                  ? const BoxDecoration(
+                      color: Colors.white,
+                      borderRadius: BorderRadius.all(Radius.circular(6)),
+                      border: Border.fromBorderSide(BorderSide(color: Colors.white, width: 2)),
+                    )
+                  : const BoxDecoration(
+                      color: Colors.white,
+                      borderRadius: BorderRadius.all(Radius.circular(6)),
+                      border: null,
+                    ),
+              child: ClipRRect(
+                borderRadius: const BorderRadius.all(Radius.circular(4)),
+                child: Stack(
+                  fit: StackFit.expand,
+                  children: [
+                    Image(
+                      fit: BoxFit.cover,
+                      image: getThumbnailImageProvider(remoteId: asset.id, size: const Size.square(60)),
+                    ),
+                    if (asset.isVideo)
+                      const Icon(
+                        Icons.play_circle_outline_rounded,
+                        color: Colors.white,
+                        size: 16,
+                        shadows: [
+                          Shadow(blurRadius: 5.0, color: Color.fromRGBO(0, 0, 0, 0.6), offset: Offset(0.0, 0.0)),
+                        ],
+                      ),
+                  ],
+                ),
+              ),
+            ),
           ),
-        ),
-      ),
-    );
-  }
-}
-
-class _StackItem extends ConsumerStatefulWidget {
-  final RemoteAsset asset;
-  final int index;
-
-  const _StackItem({super.key, required this.asset, required this.index});
-
-  @override
-  ConsumerState<_StackItem> createState() => _StackItemState();
-}
-
-class _StackItemState extends ConsumerState<_StackItem> {
-  void _onTap() {
-    ref.read(currentAssetNotifier.notifier).setAsset(widget.asset);
-    ref.read(assetViewerProvider.notifier).setStackIndex(widget.index);
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    const playIcon = Center(
-      child: Icon(
-        Icons.play_circle_outline_rounded,
-        color: Colors.white,
-        size: 16,
-        shadows: [Shadow(blurRadius: 5.0, color: Color.fromRGBO(0, 0, 0, 0.6), offset: Offset(0.0, 0.0))],
-      ),
-    );
-    const selectedDecoration = BoxDecoration(
-      border: Border.fromBorderSide(BorderSide(color: Colors.white, width: 2)),
-      borderRadius: BorderRadius.all(Radius.circular(10)),
-    );
-    const unselectedDecoration = BoxDecoration(
-      border: Border.fromBorderSide(BorderSide(color: Colors.grey, width: 0.5)),
-      borderRadius: BorderRadius.all(Radius.circular(10)),
-    );
-
-    Widget thumbnail = Thumbnail.fromAsset(asset: widget.asset, size: const Size(60, 40));
-    if (widget.asset.isVideo) {
-      thumbnail = Stack(children: [thumbnail, playIcon]);
-    }
-    thumbnail = ClipRRect(borderRadius: const BorderRadius.all(Radius.circular(10)), child: thumbnail);
-    final isSelected = ref.watch(assetViewerProvider.select((s) => s.stackIndex == widget.index));
-    return SizedBox(
-      width: 60,
-      height: 40,
-      child: GestureDetector(
-        onTap: _onTap,
-        child: DecoratedBox(
-          decoration: isSelected ? selectedDecoration : unselectedDecoration,
-          position: DecorationPosition.foreground,
-          child: thumbnail,
-        ),
-      ),
+        );
+      },
     );
   }
 }

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

@@ -61,15 +61,6 @@ class AssetViewer extends ConsumerStatefulWidget {
   ConsumerState createState() => _AssetViewerState();
 
   static void setAsset(WidgetRef ref, BaseAsset asset) {
-    ref.read(assetViewerProvider.notifier).reset();
-    _setAsset(ref, asset);
-  }
-
-  void changeAsset(WidgetRef ref, BaseAsset asset) {
-    _setAsset(ref, asset);
-  }
-
-  static void _setAsset(WidgetRef ref, BaseAsset asset) {
     // Always holds the current asset from the timeline
     ref.read(assetViewerProvider.notifier).setAsset(asset);
     // The currentAssetNotifier actually holds the current asset that is displayed
@@ -116,8 +107,6 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
   ImageStream? _prevPreCacheStream;
   ImageStream? _nextPreCacheStream;
 
-  KeepAliveLink? _stackChildrenKeepAlive;
-
   @override
   void initState() {
     super.initState();
@@ -128,10 +117,6 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
     WidgetsBinding.instance.addPostFrameCallback(_onAssetInit);
     reloadSubscription = EventStream.shared.listen(_onEvent);
     heroOffset = widget.heroOffset ?? TabsRouterScope.of(context)?.controller.activeIndex ?? 0;
-    final asset = ref.read(currentAssetNotifier);
-    if (asset != null) {
-      _stackChildrenKeepAlive = ref.read(stackChildrenNotifier(asset).notifier).ref.keepAlive();
-    }
   }
 
   @override
@@ -143,7 +128,6 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
     _prevPreCacheStream?.removeListener(_dummyListener);
     _nextPreCacheStream?.removeListener(_dummyListener);
     SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
-    _stackChildrenKeepAlive?.close();
     super.dispose();
   }
 
@@ -204,11 +188,9 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
       return;
     }
 
-    widget.changeAsset(ref, asset);
+    AssetViewer.setAsset(ref, asset);
     _precacheAssets(index);
     _handleCasting();
-    _stackChildrenKeepAlive?.close();
-    _stackChildrenKeepAlive = ref.read(stackChildrenNotifier(asset).notifier).ref.keepAlive();
   }
 
   void _handleCasting() {
@@ -536,7 +518,7 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
     BaseAsset displayAsset = asset;
     final stackChildren = ref.read(stackChildrenNotifier(asset)).valueOrNull;
     if (stackChildren != null && stackChildren.isNotEmpty) {
-      displayAsset = stackChildren.elementAt(ref.read(assetViewerProvider).stackIndex);
+      displayAsset = stackChildren.elementAt(ref.read(assetViewerProvider.select((s) => s.stackIndex)));
     }
 
     final isPlayingMotionVideo = ref.read(isPlayingMotionVideoProvider);

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

@@ -68,16 +68,12 @@ class AssetViewerState {
       stackIndex.hashCode;
 }
 
-class AssetViewerStateNotifier extends Notifier<AssetViewerState> {
+class AssetViewerStateNotifier extends AutoDisposeNotifier<AssetViewerState> {
   @override
   AssetViewerState build() {
     return const AssetViewerState();
   }
 
-  void reset() {
-    state = const AssetViewerState();
-  }
-
   void setAsset(BaseAsset? asset) {
     if (asset == state.currentAsset) {
       return;
@@ -121,4 +117,6 @@ class AssetViewerStateNotifier extends Notifier<AssetViewerState> {
   }
 }
 
-final assetViewerProvider = NotifierProvider<AssetViewerStateNotifier, AssetViewerState>(AssetViewerStateNotifier.new);
+final assetViewerProvider = AutoDisposeNotifierProvider<AssetViewerStateNotifier, AssetViewerState>(
+  AssetViewerStateNotifier.new,
+);

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

@@ -87,7 +87,7 @@ class _GeneralBottomSheetState extends ConsumerState<GeneralBottomSheet> {
 
     return BaseBottomSheet(
       controller: sheetController,
-      initialChildSize: widget.minChildSize ?? 0.15,
+      initialChildSize: 0.45,
       minChildSize: widget.minChildSize,
       maxChildSize: 0.85,
       shouldCloseOnMinExtent: false,

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

@@ -84,8 +84,7 @@ class _RemoteAlbumBottomSheetState extends ConsumerState<RemoteAlbumBottomSheet>
 
     return BaseBottomSheet(
       controller: sheetController,
-      initialChildSize: 0.22,
-      minChildSize: 0.22,
+      initialChildSize: 0.45,
       maxChildSize: 0.85,
       shouldCloseOnMinExtent: false,
       actions: [

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

@@ -96,7 +96,7 @@ mixin CancellableImageProviderMixin<T extends Object> on CancellableImageProvide
 
     final operation = cachedOperation;
     if (operation != null) {
-      cachedOperation = null;
+      this.cachedOperation = null;
       operation.cancel();
     }
   }

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

@@ -4,8 +4,6 @@ import 'dart:ui';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/domain/models/store.model.dart';
-import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/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';
@@ -90,26 +88,13 @@ class LocalFullImageProvider extends CancellableImageProvider<LocalFullImageProv
     }
 
     final devicePixelRatio = PlatformDispatcher.instance.views.first.devicePixelRatio;
-    var request = this.request = LocalImageRequest(
+    final request = this.request = LocalImageRequest(
       localId: key.id,
       size: Size(size.width * devicePixelRatio, size.height * devicePixelRatio),
       assetType: key.assetType,
     );
 
     yield* loadRequest(request, decode);
-
-    if (!Store.get(StoreKey.loadOriginal, false)) {
-      return;
-    }
-
-    if (isCancelled) {
-      evict();
-      return;
-    }
-
-    request = this.request = LocalImageRequest(localId: key.id, assetType: key.assetType, size: Size.zero);
-
-    yield* loadRequest(request, decode);
   }
 
   @override

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

@@ -326,7 +326,7 @@ class _ThumbnailRenderBox extends RenderBox {
         image: _previousImage!,
         fit: _fit,
         filterQuality: FilterQuality.low,
-        opacity: 1.0,
+        opacity: 1.0 - _fadeValue,
       );
     } else if (_image == null || _fadeValue < 1.0) {
       final paint = Paint()..shader = _placeholderGradient.createShader(rect);

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

@@ -32,7 +32,7 @@ class Timeline extends StatelessWidget {
     super.key,
     this.topSliverWidget,
     this.topSliverWidgetHeight,
-    this.showStorageIndicator = false,
+    this.showStorageIndicator,
     this.withStack = false,
     this.appBar = const ImmichSliverAppBar(floating: true, pinned: false, snap: false),
     this.bottomSheet = const GeneralBottomSheet(minChildSize: 0.18),
@@ -42,7 +42,7 @@ class Timeline extends StatelessWidget {
 
   final Widget? topSliverWidget;
   final double? topSliverWidgetHeight;
-  final bool showStorageIndicator;
+  final bool? showStorageIndicator;
   final Widget? appBar;
   final Widget? bottomSheet;
   final bool withStack;
@@ -129,11 +129,7 @@ class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
   void _onEvent(Event event) {
     switch (event) {
       case ScrollToTopEvent():
-        ref.read(timelineStateProvider.notifier).setScrubbing(true);
-        _scrollController
-            .animateTo(0, duration: const Duration(milliseconds: 250), curve: Curves.easeInOut)
-            .whenComplete(() => ref.read(timelineStateProvider.notifier).setScrubbing(false));
-
+        _scrollController.animateTo(0, duration: const Duration(milliseconds: 250), curve: Curves.easeInOut);
       case ScrollToDateEvent scrollToDateEvent:
         _scrollToDate(scrollToDateEvent.date);
       case TimelineReloadEvent():
@@ -360,14 +356,7 @@ class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
                   children: [
                     timeline,
                     if (!isSelectionMode && isMultiSelectEnabled) ...[
-                      Positioned(
-                        top: MediaQuery.paddingOf(context).top,
-                        left: 25,
-                        child: const SizedBox(
-                          height: kToolbarHeight,
-                          child: Center(child: _MultiSelectStatusButton()),
-                        ),
-                      ),
+                      const Positioned(top: 60, left: 25, child: _MultiSelectStatusButton()),
                       if (widget.bottomSheet != null) widget.bottomSheet!,
                     ],
                   ],

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

@@ -10,6 +10,7 @@ import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/cancel.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/storage.provider.dart';
 
 final syncStreamServiceProvider = Provider(
   (ref) => SyncStreamService(
@@ -34,6 +35,7 @@ final hashServiceProvider = Provider(
   (ref) => HashService(
     localAlbumRepository: ref.watch(localAlbumRepository),
     localAssetRepository: ref.watch(localAssetRepository),
+    storageRepository: ref.watch(storageRepositoryProvider),
     nativeSyncApi: ref.watch(nativeSyncApiProvider),
   ),
 );

mobile/lib/services/app_settings.service.dart

@@ -50,8 +50,6 @@ enum AppSettingsEnum<T> {
   enableBackup<bool>(StoreKey.enableBackup, null, false),
   useCellularForUploadVideos<bool>(StoreKey.useWifiForUploadVideos, null, false),
   useCellularForUploadPhotos<bool>(StoreKey.useWifiForUploadPhotos, null, false),
-  backupRequireCharging<bool>(StoreKey.backupRequireCharging, null, false),
-  backupTriggerDelay<int>(StoreKey.backupTriggerDelay, null, 30),
   readonlyModeEnabled<bool>(StoreKey.readonlyModeEnabled, "readonlyModeEnabled", false);
 
   const AppSettingsEnum(this.storeKey, this.hiveKey, this.defaultValue);

mobile/lib/services/hash.service.dart

@@ -16,10 +16,9 @@ class HashService {
     required IsarDeviceAssetRepository deviceAssetRepository,
     required BackgroundService backgroundService,
     this.batchSizeLimit = kBatchHashSizeLimit,
-    int? batchFileLimit,
+    this.batchFileLimit = kBatchHashFileLimit,
   }) : _deviceAssetRepository = deviceAssetRepository,
-       _backgroundService = backgroundService,
-       batchFileLimit = batchFileLimit ?? kBatchHashFileLimit;
+       _backgroundService = backgroundService;
 
   final IsarDeviceAssetRepository _deviceAssetRepository;
   final BackgroundService _backgroundService;

mobile/lib/utils/action_button.utils.dart

@@ -102,7 +102,7 @@ enum ActionButtonType {
             context.asset.hasRemote,
       ActionButtonType.deleteLocal =>
         !context.isInLockedView && //
-            context.asset.hasLocal,
+            context.asset.storage == AssetState.local,
       ActionButtonType.upload =>
         !context.isInLockedView && //
             context.asset.storage == AssetState.local,

mobile/lib/utils/migration.dart

@@ -62,7 +62,30 @@ Future<void> migrateDatabaseIfNeeded(Isar db, Drift drift) async {
     await Store.populateCache();
   }
 
-  await handleBetaMigration(version, await _isNewInstallation(db, drift), SyncStreamRepository(drift));
+  // Handle migration only for this version
+  // TODO: remove when old timeline is removed
+  final needBetaMigration = Store.tryGet(StoreKey.needBetaMigration);
+  if (version == 15 && needBetaMigration == null) {
+    // Check both databases directly instead of relying on cache
+
+    final isBeta = Store.tryGet(StoreKey.betaTimeline);
+    final isNewInstallation = await _isNewInstallation(db, drift);
+
+    // For new installations, no migration needed
+    // For existing installations, only migrate if beta timeline is not enabled (null or false)
+    if (isNewInstallation || isBeta == true) {
+      await Store.put(StoreKey.needBetaMigration, false);
+      await Store.put(StoreKey.betaTimeline, true);
+    } else {
+      await drift.reset();
+      await Store.put(StoreKey.needBetaMigration, true);
+    }
+  }
+
+  if (version < 16) {
+    await SyncStreamRepository(drift).reset();
+    await Store.put(StoreKey.shouldResetSync, true);
+  }
 
   if (targetVersion >= 12) {
     await Store.put(StoreKey.version, targetVersion);
@@ -76,37 +99,6 @@ Future<void> migrateDatabaseIfNeeded(Isar db, Drift drift) async {
   }
 }
 
-Future<void> handleBetaMigration(int version, bool isNewInstallation, SyncStreamRepository syncStreamRepository) async {
-  // Handle migration only for this version
-  // TODO: remove when old timeline is removed
-  final isBeta = Store.tryGet(StoreKey.betaTimeline);
-  final needBetaMigration = Store.tryGet(StoreKey.needBetaMigration);
-  if (version <= 15 && needBetaMigration == null) {
-    // For new installations, no migration needed
-    // For existing installations, only migrate if beta timeline is not enabled (null or false)
-    if (isNewInstallation || isBeta == true) {
-      await Store.put(StoreKey.needBetaMigration, false);
-      await Store.put(StoreKey.betaTimeline, true);
-    } else {
-      await Store.put(StoreKey.needBetaMigration, true);
-    }
-  }
-
-  if (version > 15) {
-    if (isBeta == null || isBeta) {
-      await Store.put(StoreKey.needBetaMigration, false);
-      await Store.put(StoreKey.betaTimeline, true);
-    } else {
-      await Store.put(StoreKey.needBetaMigration, false);
-    }
-  }
-
-  if (version < 16) {
-    await syncStreamRepository.reset();
-    await Store.put(StoreKey.shouldResetSync, true);
-  }
-}
-
 Future<bool> _isNewInstallation(Isar db, Drift drift) async {
   try {
     final isarUserCount = await db.users.count();

mobile/lib/widgets/asset_viewer/bottom_gallery_bar.dart

@@ -98,12 +98,7 @@ class BottomGalleryBar extends ConsumerWidget {
         if (isDeleted) {
           // Can only trash assets stored in server. Local assets are always permanently removed for now
           if (context.mounted && asset.isRemote && isStackPrimaryAsset) {
-            ImmichToast.show(
-              durationInSecond: 1,
-              context: context,
-              msg: 'asset_trashed'.tr(),
-              gravity: ToastGravity.BOTTOM,
-            );
+            ImmichToast.show(durationInSecond: 1, context: context, msg: 'Asset trashed', gravity: ToastGravity.BOTTOM);
           }
           removeAssetFromStack();
         }

mobile/lib/widgets/asset_viewer/cast_dialog.dart

@@ -29,7 +29,7 @@ class CastDialog extends ConsumerWidget {
           future: ref.read(castProvider.notifier).getDevices(),
           builder: (context, snapshot) {
             if (snapshot.hasError) {
-              return Text('error_saving_image'.tr(args: [snapshot.error.toString()]));
+              return Text('Error: ${snapshot.error.toString()}');
             } else if (!snapshot.hasData) {
               return const SizedBox(height: 48, child: Center(child: CircularProgressIndicator()));
             }

mobile/lib/widgets/common/remote_album_sliver_app_bar.dart

@@ -75,79 +75,86 @@ class _MesmerizingSliverAppBarState extends ConsumerState<RemoteAlbumSliverAppBa
         const Shadow(offset: Offset(0, 2), blurRadius: 0, color: Colors.transparent),
     ];
 
-    return SliverAppBar(
-      expandedHeight: 400.0,
-      floating: false,
-      pinned: true,
-      snap: false,
-      elevation: 0,
-      leading: isMultiSelectEnabled
-          ? const SizedBox.shrink()
-          : IconButton(
-              icon: Icon(
-                Platform.isIOS ? Icons.arrow_back_ios_new_rounded : Icons.arrow_back,
-                color: actionIconColor,
-                shadows: actionIconShadows,
+    if (isMultiSelectEnabled) {
+      return SliverToBoxAdapter(
+        child: switch (_scrollProgress) {
+          < 0.8 => const SizedBox(height: 120),
+          _ => const SizedBox(height: 452),
+        },
+      );
+    } else {
+      return SliverAppBar(
+        expandedHeight: 400.0,
+        floating: false,
+        pinned: true,
+        snap: false,
+        elevation: 0,
+        leading: IconButton(
+          icon: Icon(
+            Platform.isIOS ? Icons.arrow_back_ios_new_rounded : Icons.arrow_back,
+            color: actionIconColor,
+            shadows: actionIconShadows,
+          ),
+          onPressed: () => context.navigateTo(const TabShellRoute(children: [DriftAlbumsRoute()])),
+        ),
+        actions: [
+          if (widget.onToggleAlbumOrder != null)
+            IconButton(
+              icon: Icon(Icons.swap_vert_rounded, color: actionIconColor, shadows: actionIconShadows),
+              onPressed: widget.onToggleAlbumOrder,
+            ),
+          if (currentAlbum.isActivityEnabled && currentAlbum.isShared)
+            IconButton(
+              icon: Icon(Icons.chat_outlined, color: actionIconColor, shadows: actionIconShadows),
+              onPressed: widget.onActivity,
+            ),
+          if (widget.onShowOptions != null)
+            IconButton(
+              icon: Icon(Icons.more_vert, color: actionIconColor, shadows: actionIconShadows),
+              onPressed: widget.onShowOptions,
+            ),
+        ],
+        title: Builder(
+          builder: (context) {
+            final settings = context.dependOnInheritedWidgetOfExactType<FlexibleSpaceBarSettings>();
+            final scrollProgress = _calculateScrollProgress(settings);
+
+            return AnimatedSwitcher(
+              duration: const Duration(milliseconds: 200),
+              child: scrollProgress > 0.95
+                  ? Text(
+                      currentAlbum.name,
+                      style: TextStyle(color: context.primaryColor, fontWeight: FontWeight.w600, fontSize: 18),
+                    )
+                  : null,
+            );
+          },
+        ),
+        flexibleSpace: Builder(
+          builder: (context) {
+            final settings = context.dependOnInheritedWidgetOfExactType<FlexibleSpaceBarSettings>();
+            final scrollProgress = _calculateScrollProgress(settings);
+
+            // Update scroll progress for the leading button
+            WidgetsBinding.instance.addPostFrameCallback((_) {
+              if (mounted && _scrollProgress != scrollProgress) {
+                setState(() {
+                  _scrollProgress = scrollProgress;
+                });
+              }
+            });
+
+            return FlexibleSpaceBar(
+              background: _ExpandedBackground(
+                scrollProgress: scrollProgress,
+                icon: widget.icon,
+                onEditTitle: widget.onEditTitle,
               ),
-              onPressed: () => context.navigateTo(const TabShellRoute(children: [DriftAlbumsRoute()])),
-            ),
-      actions: [
-        if (widget.onToggleAlbumOrder != null)
-          IconButton(
-            icon: Icon(Icons.swap_vert_rounded, color: actionIconColor, shadows: actionIconShadows),
-            onPressed: widget.onToggleAlbumOrder,
-          ),
-        if (currentAlbum.isActivityEnabled && currentAlbum.isShared)
-          IconButton(
-            icon: Icon(Icons.chat_outlined, color: actionIconColor, shadows: actionIconShadows),
-            onPressed: widget.onActivity,
-          ),
-        if (widget.onShowOptions != null)
-          IconButton(
-            icon: Icon(Icons.more_vert, color: actionIconColor, shadows: actionIconShadows),
-            onPressed: widget.onShowOptions,
-          ),
-      ],
-      title: Builder(
-        builder: (context) {
-          final settings = context.dependOnInheritedWidgetOfExactType<FlexibleSpaceBarSettings>();
-          final scrollProgress = _calculateScrollProgress(settings);
-
-          return AnimatedSwitcher(
-            duration: const Duration(milliseconds: 200),
-            child: scrollProgress > 0.95
-                ? Text(
-                    currentAlbum.name,
-                    style: TextStyle(color: context.primaryColor, fontWeight: FontWeight.w600, fontSize: 18),
-                  )
-                : null,
-          );
-        },
-      ),
-      flexibleSpace: Builder(
-        builder: (context) {
-          final settings = context.dependOnInheritedWidgetOfExactType<FlexibleSpaceBarSettings>();
-          final scrollProgress = _calculateScrollProgress(settings);
-
-          // Update scroll progress for the leading button
-          WidgetsBinding.instance.addPostFrameCallback((_) {
-            if (mounted && _scrollProgress != scrollProgress) {
-              setState(() {
-                _scrollProgress = scrollProgress;
-              });
-            }
-          });
-
-          return FlexibleSpaceBar(
-            background: _ExpandedBackground(
-              scrollProgress: scrollProgress,
-              icon: widget.icon,
-              onEditTitle: widget.onEditTitle,
-            ),
-          );
-        },
-      ),
-    );
+            );
+          },
+        ),
+      );
+    }
   }
 }
 

mobile/lib/widgets/map/map_asset_grid.dart

@@ -275,7 +275,7 @@ class _MapSheetDragRegion extends StatelessWidget {
                   child: IconButton(
                     icon: Icon(Icons.map_outlined, color: context.textTheme.displayLarge?.color),
                     iconSize: 24,
-                    tooltip: 'zoom_to_bounds'.tr(),
+                    tooltip: 'Zoom to bounds',
                     onPressed: () => onZoomToAsset?.call(value!),
                   ),
                 ),

mobile/lib/widgets/map/map_settings/map_settings_list_tile.dart

@@ -13,7 +13,7 @@ class MapSettingsListTile extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return SwitchListTile.adaptive(
-      activeThumbColor: context.primaryColor,
+      activeColor: context.primaryColor,
       title: Text(title, style: context.textTheme.labelLarge?.copyWith(fontWeight: FontWeight.bold)).tr(),
       value: selected,
       onChanged: onChanged,

mobile/lib/widgets/photo_view/src/core/photo_view_core.dart

@@ -350,8 +350,8 @@ class PhotoViewCoreState extends State<PhotoViewCore>
           final computedScale = useImageScale ? 1.0 : scale;
 
           final matrix = Matrix4.identity()
-            ..translateByDouble(value.position.dx, value.position.dy, 0, 1.0)
-            ..scaleByDouble(computedScale, computedScale, computedScale, 1.0)
+            ..translate(value.position.dx, value.position.dy)
+            ..scale(computedScale)
             ..rotateZ(value.rotation);
 
           final Widget customChildLayout = CustomSingleChildLayout(

mobile/lib/widgets/search/search_filter/media_type_picker.dart

@@ -13,19 +13,40 @@ class MediaTypePicker extends HookWidget {
   Widget build(BuildContext context) {
     final selectedMediaType = useState(filter ?? AssetType.other);
 
-    return RadioGroup(
-      onChanged: (value) {
-        selectedMediaType.value = value!;
-        onSelect(value);
-      },
-      groupValue: selectedMediaType.value,
-      child: Column(
-        children: [
-          RadioListTile(key: const Key("all"), title: const Text("all").tr(), value: AssetType.other),
-          RadioListTile(key: const Key("image"), title: const Text("image").tr(), value: AssetType.image),
-          RadioListTile(key: const Key("video"), title: const Text("video").tr(), value: AssetType.video),
-        ],
-      ),
+    return ListView(
+      shrinkWrap: true,
+      children: [
+        RadioListTile(
+          key: const Key("all"),
+          title: const Text("all").tr(),
+          value: AssetType.other,
+          onChanged: (value) {
+            selectedMediaType.value = value!;
+            onSelect(value);
+          },
+          groupValue: selectedMediaType.value,
+        ),
+        RadioListTile(
+          key: const Key("image"),
+          title: const Text("image").tr(),
+          value: AssetType.image,
+          onChanged: (value) {
+            selectedMediaType.value = value!;
+            onSelect(value);
+          },
+          groupValue: selectedMediaType.value,
+        ),
+        RadioListTile(
+          key: const Key("video"),
+          title: const Text("video").tr(),
+          value: AssetType.video,
+          onChanged: (value) {
+            selectedMediaType.value = value!;
+            onSelect(value);
+          },
+          groupValue: selectedMediaType.value,
+        ),
+      ],
     );
   }
 }

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

@@ -1,19 +1,14 @@
-import 'dart:async';
-
-import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/album/local_album.model.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
-import 'package:immich_mobile/domain/services/sync_linked_album.service.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/providers/app_settings.provider.dart';
+import 'package:immich_mobile/domain/services/sync_linked_album.service.dart';
 import 'package:immich_mobile/providers/background_sync.provider.dart';
 import 'package:immich_mobile/providers/backup/backup_album.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:immich_mobile/widgets/settings/settings_sub_page_scaffold.dart';
@@ -23,40 +18,12 @@ class DriftBackupSettings extends ConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    return SettingsSubPageScaffold(
+    return const SettingsSubPageScaffold(
       settings: [
-        Padding(
-          padding: const EdgeInsets.only(left: 16.0),
-          child: Text(
-            "network_requirements".t(context: context).toUpperCase(),
-            style: context.textTheme.labelSmall?.copyWith(color: context.colorScheme.onSurface.withValues(alpha: 0.7)),
-          ),
-        ),
-        const _UseWifiForUploadVideosButton(),
-        const _UseWifiForUploadPhotosButton(),
-        if (CurrentPlatform.isAndroid) ...[
-          const Divider(),
-          Padding(
-            padding: const EdgeInsets.only(left: 16.0),
-            child: Text(
-              "background_options".t(context: context).toUpperCase(),
-              style: context.textTheme.labelSmall?.copyWith(
-                color: context.colorScheme.onSurface.withValues(alpha: 0.7),
-              ),
-            ),
-          ),
-          const _BackupOnlyWhenChargingButton(),
-          const _BackupDelaySlider(),
-        ],
-        const Divider(),
-        Padding(
-          padding: const EdgeInsets.only(left: 16.0),
-          child: Text(
-            "backup_albums_sync".t(context: context).toUpperCase(),
-            style: context.textTheme.labelSmall?.copyWith(color: context.colorScheme.onSurface.withValues(alpha: 0.7)),
-          ),
-        ),
-        const _AlbumSyncActionButton(),
+        _UseWifiForUploadVideosButton(),
+        _UseWifiForUploadPhotosButton(),
+        Divider(indent: 16, endIndent: 16),
+        _AlbumSyncActionButton(),
       ],
     );
   }
@@ -184,76 +151,34 @@ class _AlbumSyncActionButtonState extends ConsumerState<_AlbumSyncActionButton>
   }
 }
 
-class _SettingsSwitchTile extends ConsumerStatefulWidget {
-  final AppSettingsEnum<bool> appSettingsEnum;
-  final String titleKey;
-  final String subtitleKey;
-  final void Function(bool?)? onChanged;
-
-  const _SettingsSwitchTile({
-    required this.appSettingsEnum,
-    required this.titleKey,
-    required this.subtitleKey,
-    this.onChanged,
-  });
-
-  @override
-  ConsumerState createState() => _SettingsSwitchTileState();
-}
-
-class _SettingsSwitchTileState extends ConsumerState<_SettingsSwitchTile> {
-  late final Stream<bool?> valueStream;
-  late final StreamSubscription<bool?> subscription;
-
-  @override
-  void initState() {
-    super.initState();
-    valueStream = Store.watch(widget.appSettingsEnum.storeKey).asBroadcastStream();
-    subscription = valueStream.listen((value) {
-      widget.onChanged?.call(value);
-    });
-  }
-
-  @override
-  void dispose() {
-    subscription.cancel();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return ListTile(
-      title: Text(
-        widget.titleKey.t(context: context),
-        style: context.textTheme.titleMedium?.copyWith(color: context.primaryColor),
-      ),
-      subtitle: Text(widget.subtitleKey.t(context: context), style: context.textTheme.labelLarge),
-      trailing: StreamBuilder(
-        stream: valueStream,
-        initialData: Store.tryGet(widget.appSettingsEnum.storeKey) ?? widget.appSettingsEnum.defaultValue,
-        builder: (context, snapshot) {
-          final value = snapshot.data ?? false;
-          return Switch(
-            value: value,
-            onChanged: (bool newValue) async {
-              await ref.read(appSettingsServiceProvider).setSetting(widget.appSettingsEnum, newValue);
-            },
-          );
-        },
-      ),
-    );
-  }
-}
-
 class _UseWifiForUploadVideosButton extends ConsumerWidget {
   const _UseWifiForUploadVideosButton();
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    return const _SettingsSwitchTile(
-      appSettingsEnum: AppSettingsEnum.useCellularForUploadVideos,
-      titleKey: "videos",
-      subtitleKey: "network_requirement_videos_upload",
+    final valueStream = Store.watch(StoreKey.useWifiForUploadVideos);
+
+    return ListTile(
+      title: Text(
+        "videos".t(context: context),
+        style: context.textTheme.titleMedium?.copyWith(color: context.primaryColor),
+      ),
+      subtitle: Text("network_requirement_videos_upload".t(context: context), style: context.textTheme.labelLarge),
+      trailing: StreamBuilder(
+        stream: valueStream,
+        initialData: Store.tryGet(StoreKey.useWifiForUploadVideos) ?? false,
+        builder: (context, snapshot) {
+          final value = snapshot.data ?? false;
+          return Switch(
+            value: value,
+            onChanged: (bool newValue) async {
+              await ref
+                  .read(appSettingsServiceProvider)
+                  .setSetting(AppSettingsEnum.useCellularForUploadVideos, newValue);
+            },
+          );
+        },
+      ),
     );
   }
 }
@@ -263,117 +188,29 @@ class _UseWifiForUploadPhotosButton extends ConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    return const _SettingsSwitchTile(
-      appSettingsEnum: AppSettingsEnum.useCellularForUploadPhotos,
-      titleKey: "photos",
-      subtitleKey: "network_requirement_photos_upload",
-    );
-  }
-}
-
-class _BackupOnlyWhenChargingButton extends ConsumerWidget {
-  const _BackupOnlyWhenChargingButton();
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    return _SettingsSwitchTile(
-      appSettingsEnum: AppSettingsEnum.backupRequireCharging,
-      titleKey: "charging",
-      subtitleKey: "charging_requirement_mobile_backup",
-      onChanged: (value) {
-        ref.read(backgroundWorkerFgServiceProvider).configure(requireCharging: value ?? false);
-      },
-    );
-  }
-}
-
-class _BackupDelaySlider extends ConsumerStatefulWidget {
-  const _BackupDelaySlider();
-
-  @override
-  ConsumerState<_BackupDelaySlider> createState() => _BackupDelaySliderState();
-}
-
-class _BackupDelaySliderState extends ConsumerState<_BackupDelaySlider> {
-  late final Stream<int?> valueStream;
-  late final StreamSubscription<int?> subscription;
-  late int currentValue;
-
-  static int backupDelayToSliderValue(int ms) => switch (ms) {
-    5 => 0,
-    30 => 1,
-    120 => 2,
-    _ => 3,
-  };
-
-  static int backupDelayToSeconds(int v) => switch (v) {
-    0 => 5,
-    1 => 30,
-    2 => 120,
-    _ => 600,
-  };
-
-  static String formatBackupDelaySliderValue(int v) => switch (v) {
-    0 => 'setting_notifications_notify_seconds'.tr(namedArgs: {'count': '5'}),
-    1 => 'setting_notifications_notify_seconds'.tr(namedArgs: {'count': '30'}),
-    2 => 'setting_notifications_notify_minutes'.tr(namedArgs: {'count': '2'}),
-    _ => 'setting_notifications_notify_minutes'.tr(namedArgs: {'count': '10'}),
-  };
-
-  @override
-  void initState() {
-    super.initState();
-    final initialValue =
-        Store.tryGet(AppSettingsEnum.backupTriggerDelay.storeKey) ?? AppSettingsEnum.backupTriggerDelay.defaultValue;
-    currentValue = backupDelayToSliderValue(initialValue);
-
-    valueStream = Store.watch(AppSettingsEnum.backupTriggerDelay.storeKey).asBroadcastStream();
-    subscription = valueStream.listen((value) {
-      if (mounted && value != null) {
-        setState(() {
-          currentValue = backupDelayToSliderValue(value);
-        });
-      }
-    });
-  }
-
-  @override
-  void dispose() {
-    subscription.cancel();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        Padding(
-          padding: const EdgeInsets.only(left: 16.0, top: 8.0),
-          child: Text(
-            'backup_controller_page_background_delay'.tr(
-              namedArgs: {'duration': formatBackupDelaySliderValue(currentValue)},
-            ),
-            style: context.textTheme.titleMedium?.copyWith(color: context.primaryColor),
-          ),
-        ),
-        Slider(
-          value: currentValue.toDouble(),
-          onChanged: (double v) {
-            setState(() {
-              currentValue = v.toInt();
-            });
-          },
-          onChangeEnd: (double v) async {
-            final milliseconds = backupDelayToSeconds(v.toInt());
-            await ref.read(appSettingsServiceProvider).setSetting(AppSettingsEnum.backupTriggerDelay, milliseconds);
-          },
-          max: 3.0,
-          min: 0.0,
-          divisions: 3,
-          label: formatBackupDelaySliderValue(currentValue),
-        ),
-      ],
+    final valueStream = Store.watch(StoreKey.useWifiForUploadPhotos);
+
+    return ListTile(
+      title: Text(
+        "photos".t(context: context),
+        style: context.textTheme.titleMedium?.copyWith(color: context.primaryColor),
+      ),
+      subtitle: Text("network_requirement_photos_upload".t(context: context), style: context.textTheme.labelLarge),
+      trailing: StreamBuilder(
+        stream: valueStream,
+        initialData: Store.tryGet(StoreKey.useWifiForUploadPhotos) ?? false,
+        builder: (context, snapshot) {
+          final value = snapshot.data ?? false;
+          return Switch(
+            value: value,
+            onChanged: (bool newValue) async {
+              await ref
+                  .read(appSettingsServiceProvider)
+                  .setSetting(AppSettingsEnum.useCellularForUploadPhotos, newValue);
+            },
+          );
+        },
+      ),
     );
   }
 }

mobile/lib/widgets/settings/beta_timeline_list_tile.dart

@@ -62,7 +62,7 @@ class BetaTimelineListTile extends ConsumerWidget {
         trailing: Switch.adaptive(
           value: betaTimelineValue,
           onChanged: onSwitchChanged,
-          activeThumbColor: context.primaryColor,
+          activeColor: context.primaryColor,
         ),
         onTap: () => onSwitchChanged(!betaTimelineValue),
       ),

mobile/lib/widgets/settings/preference_settings/primary_color_setting.dart

@@ -115,7 +115,7 @@ class PrimaryColorSetting extends HookConsumerWidget {
               child: SwitchListTile.adaptive(
                 contentPadding: const EdgeInsets.symmetric(vertical: 6, horizontal: 20),
                 dense: true,
-                activeThumbColor: context.primaryColor,
+                activeColor: context.primaryColor,
                 tileColor: context.colorScheme.surfaceContainerHigh,
                 shape: const RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(15))),
                 title: Text(