dart generator

2026-06-04 05:45:24 -04:00 · 2026-05-31 10:08:03 +05:30
844 changed files with 41431 additions and 89539 deletions
@@ -15,7 +15,7 @@ services:
    volumes:
      - ${UPLOAD_LOCATION:-upload-devcontainer-volume}${UPLOAD_LOCATION:+/photos}:/data
      - /etc/localtime:/etc/localtime:ro
-      - build_cache:/buildcache
+      - pnpm_store_server:/buildcache/pnpm-store
      - ../packages/plugin-core:/build/plugins/immich-plugin-core
  immich-web:
    env_file: !reset []
@@ -0,0 +1 @@
+custom: ['https://buy.immich.app', 'https://immich.store']
@@ -51,7 +51,7 @@ jobs:
      should_run: ${{ steps.check.outputs.should_run }}
    steps:
      - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@9db058b2e6eec20e07760b0e17a0505c78ec3191 # create-workflow-token-action-v2.0.1
+        uses: immich-app/devtools/actions/create-workflow-token@caa599d954228439ea3e8ce1c3328f41ab120ee6 # create-workflow-token-action-v2.0.0
        with:
          client-id: ${{ secrets.PUSH_O_MATIC_APP_CLIENT_ID }}
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
@@ -79,7 +79,7 @@ jobs:

    steps:
      - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@9db058b2e6eec20e07760b0e17a0505c78ec3191 # create-workflow-token-action-v2.0.1
+        uses: immich-app/devtools/actions/create-workflow-token@caa599d954228439ea3e8ce1c3328f41ab120ee6 # create-workflow-token-action-v2.0.0
        with:
          client-id: ${{ secrets.PUSH_O_MATIC_APP_CLIENT_ID }}
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
@@ -201,7 +201,7 @@ jobs:

    steps:
      - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@9db058b2e6eec20e07760b0e17a0505c78ec3191 # create-workflow-token-action-v2.0.1
+        uses: immich-app/devtools/actions/create-workflow-token@caa599d954228439ea3e8ce1c3328f41ab120ee6 # create-workflow-token-action-v2.0.0
        with:
          client-id: ${{ secrets.PUSH_O_MATIC_APP_CLIENT_ID }}
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
@@ -19,7 +19,7 @@ jobs:
      actions: write
    steps:
      - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@9db058b2e6eec20e07760b0e17a0505c78ec3191 # create-workflow-token-action-v2.0.1
+        uses: immich-app/devtools/actions/create-workflow-token@caa599d954228439ea3e8ce1c3328f41ab120ee6 # create-workflow-token-action-v2.0.0
        with:
          client-id: ${{ secrets.PUSH_O_MATIC_APP_CLIENT_ID }}
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
@@ -4,7 +4,6 @@ on:
  pull_request:
    paths:
      - 'open-api/**'
-      - 'mobile/lib/utils/openapi_patching.dart'
      - '.github/workflows/check-openapi.yml'

 concurrency:
@@ -25,40 +24,8 @@ jobs:
          persist-credentials: false

      - name: Check for breaking API changes
-        uses: oasdiff/oasdiff-action/breaking@50e6a3413e5aa9c3ae4d8393c34745be44288b46 # v0.0.48
+        uses: oasdiff/oasdiff-action/breaking@6147a58e5d1249a12f42fc864ab791d571a30015 # v0.0.47
        with:
          base: https://raw.githubusercontent.com/${{ github.repository }}/main/open-api/immich-openapi-specs.json
          revision: open-api/immich-openapi-specs.json
          fail-on: ERR
-
-  check-mobile-patches:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-    steps:
-      - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-        with:
-          persist-credentials: false
-
-      - name: Setup Mise
-        uses: immich-app/devtools/actions/use-mise@7b8610a904d57da241e4ddba17fa62b62b15aed4 # use-mise-action-v2.0.2
-        with:
-          github_token: ${{ github.token }}
-
-      - name: Get packages
-        working-directory: ./mobile
-        run: flutter pub get
-
-      - name: Fetch base spec from main
-        run: |
-          curl -fsSL \
-            "https://raw.githubusercontent.com/${{ github.repository }}/main/open-api/immich-openapi-specs.json" \
-            -o /tmp/base-spec.json
-
-      - name: Check newly-required fields have a backward-compat patch
-        working-directory: ./mobile
-        env:
-          OPENAPI_BASE_SPEC: /tmp/base-spec.json
-          OPENAPI_REVISION_SPEC: ../open-api/immich-openapi-specs.json
-        run: flutter test test/openapi_patches_coverage.dart
@@ -31,7 +31,7 @@ jobs:
        working-directory: ./packages/cli
    steps:
      - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@9db058b2e6eec20e07760b0e17a0505c78ec3191 # create-workflow-token-action-v2.0.1
+        uses: immich-app/devtools/actions/create-workflow-token@caa599d954228439ea3e8ce1c3328f41ab120ee6 # create-workflow-token-action-v2.0.0
        with:
          client-id: ${{ secrets.PUSH_O_MATIC_APP_CLIENT_ID }}
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
@@ -49,9 +49,7 @@ jobs:

      - name: Publish
        if: ${{ github.event_name == 'release' }}
-        env:
-          NPM_TAG: ${{ github.event.release.prerelease && 'rc' || 'latest' }}
-        run: mise run ci-publish -- --tag "$NPM_TAG"
+        run: mise run ci-publish

  docker:
    name: Docker
@@ -63,7 +61,7 @@ jobs:

    steps:
      - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@9db058b2e6eec20e07760b0e17a0505c78ec3191 # create-workflow-token-action-v2.0.1
+        uses: immich-app/devtools/actions/create-workflow-token@caa599d954228439ea3e8ce1c3328f41ab120ee6 # create-workflow-token-action-v2.0.0
        with:
          client-id: ${{ secrets.PUSH_O_MATIC_APP_CLIENT_ID }}
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
@@ -75,13 +73,13 @@ jobs:
          token: ${{ steps.token.outputs.token }}

      - name: Set up QEMU
-        uses: docker/setup-qemu-action@06116385d9baf250c9f4dcb4858b16962ea869c3 # v4.1.0
+        uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4.0.0

      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4.1.0
+        uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0

      - name: Login to GitHub Container Registry
-        uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
+        uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
        if: ${{ !github.event.pull_request.head.repo.fork }}
        with:
          registry: ghcr.io
@@ -96,7 +94,7 @@ jobs:

      - name: Generate docker image tags
        id: metadata
-        uses: docker/metadata-action@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9 # v6.1.0
+        uses: docker/metadata-action@030e881283bb7a6894de51c315a6bfe6a94e05cf # v6.0.0
        with:
          flavor: |
            latest=false
@@ -104,10 +102,10 @@ jobs:
            name=ghcr.io/${{ github.repository_owner }}/immich-cli
          tags: |
            type=raw,value=${{ steps.package-version.outputs.version }},enable=${{ github.event_name == 'release' }}
-            type=raw,value=latest,enable=${{ github.event_name == 'release' && !github.event.release.prerelease }}
+            type=raw,value=latest,enable=${{ github.event_name == 'release' }}

      - name: Build and push image
-        uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # v7.2.0
+        uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7.1.0
        with:
          file: packages/cli/Dockerfile
          platforms: linux/amd64,linux/arm64
@@ -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:e73f60195b39748c4876f23e3e6cd22a68a9754acec8aef1fd6979fd52cd2c9f
+      image: ghcr.io/immich-app/mdq:main@sha256:0a8b8867773a0f8368061f47578603f438349f8f1f28b0e16105f481e5c794e0
    outputs:
      checked: ${{ steps.get_checkbox.outputs.checked }}
    steps:
@@ -44,7 +44,7 @@ jobs:

    steps:
      - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@9db058b2e6eec20e07760b0e17a0505c78ec3191 # create-workflow-token-action-v2.0.1
+        uses: immich-app/devtools/actions/create-workflow-token@caa599d954228439ea3e8ce1c3328f41ab120ee6 # create-workflow-token-action-v2.0.0
        with:
          client-id: ${{ secrets.PUSH_O_MATIC_APP_CLIENT_ID }}
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
@@ -57,7 +57,7 @@ jobs:

      # Initializes the CodeQL tools for scanning.
      - name: Initialize CodeQL
-        uses: github/codeql-action/init@7211b7c8077ea37d8641b6271f6a365a22a5fbfa # v4.36.0
+        uses: github/codeql-action/init@9e0d7b8d25671d64c341c19c0152d693099fb5ba # v4.35.5
        with:
          languages: ${{ matrix.language }}
          # If you wish to specify custom queries, you can do so here or in a config file.
@@ -70,7 +70,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@7211b7c8077ea37d8641b6271f6a365a22a5fbfa # v4.36.0
+        uses: github/codeql-action/autobuild@9e0d7b8d25671d64c341c19c0152d693099fb5ba # v4.35.5

      # ℹ️ Command-line programs to run using the OS shell.
      # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -83,6 +83,6 @@ jobs:
      #   ./location_of_script_within_repo/buildscript.sh

      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@7211b7c8077ea37d8641b6271f6a365a22a5fbfa # v4.36.0
+        uses: github/codeql-action/analyze@9e0d7b8d25671d64c341c19c0152d693099fb5ba # v4.35.5
        with:
          category: '/language:${{matrix.language}}'
@@ -23,7 +23,7 @@ jobs:
      should_run: ${{ steps.check.outputs.should_run }}
    steps:
      - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@9db058b2e6eec20e07760b0e17a0505c78ec3191 # create-workflow-token-action-v2.0.1
+        uses: immich-app/devtools/actions/create-workflow-token@caa599d954228439ea3e8ce1c3328f41ab120ee6 # create-workflow-token-action-v2.0.0
        with:
          client-id: ${{ secrets.PUSH_O_MATIC_APP_CLIENT_ID }}
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
@@ -60,7 +60,7 @@ jobs:
        suffix: ['', '-cuda', '-rocm', '-openvino', '-armnn', '-rknn']
    steps:
      - name: Login to GitHub Container Registry
-        uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
+        uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
        with:
          registry: ghcr.io
          username: ${{ github.repository_owner }}
@@ -90,7 +90,7 @@ jobs:
        suffix: ['']
    steps:
      - name: Login to GitHub Container Registry
-        uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
+        uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
        with:
          registry: ghcr.io
          username: ${{ github.repository_owner }}
@@ -132,7 +132,7 @@ jobs:
            suffixes: '-rocm'
            platforms: linux/amd64
            runner-mapping: '{"linux/amd64": "pokedex-large"}'
-    uses: immich-app/devtools/.github/workflows/multi-runner-build.yml@db54dcf16fbb12c43479a23749ceea0ad1b4a704 # multi-runner-build-workflow-v3.0.0
+    uses: immich-app/devtools/.github/workflows/multi-runner-build.yml@5813c7c4f7016c748ae7ac5d5f684846649d4d20 # multi-runner-build-workflow-v2.4.0
    permissions:
      contents: read
      actions: read
@@ -147,7 +147,7 @@ jobs:
      platforms: ${{ matrix.platforms }}
      runner-mapping: ${{ matrix.runner-mapping }}
      suffixes: ${{ matrix.suffixes }}
-      dockerhub-push: ${{ github.event_name == 'release' && !github.event.release.prerelease }}
+      dockerhub-push: ${{ github.event_name == 'release' }}
      build-args: |
        DEVICE=${{ matrix.device }}

@@ -155,7 +155,7 @@ jobs:
    name: Build and Push Server
    needs: pre-job
    if: ${{ fromJSON(needs.pre-job.outputs.should_run).server == true }}
-    uses: immich-app/devtools/.github/workflows/multi-runner-build.yml@db54dcf16fbb12c43479a23749ceea0ad1b4a704 # multi-runner-build-workflow-v3.0.0
+    uses: immich-app/devtools/.github/workflows/multi-runner-build.yml@5813c7c4f7016c748ae7ac5d5f684846649d4d20 # multi-runner-build-workflow-v2.4.0
    permissions:
      contents: read
      actions: read
@@ -167,7 +167,7 @@ jobs:
      image: immich-server
      context: .
      dockerfile: server/Dockerfile
-      dockerhub-push: ${{ github.event_name == 'release' && !github.event.release.prerelease }}
+      dockerhub-push: ${{ github.event_name == 'release' }}
      build-args: |
        DEVICE=cpu

@@ -21,7 +21,7 @@ jobs:
      should_run: ${{ steps.check.outputs.should_run }}
    steps:
      - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@9db058b2e6eec20e07760b0e17a0505c78ec3191 # create-workflow-token-action-v2.0.1
+        uses: immich-app/devtools/actions/create-workflow-token@caa599d954228439ea3e8ce1c3328f41ab120ee6 # create-workflow-token-action-v2.0.0
        with:
          client-id: ${{ secrets.PUSH_O_MATIC_APP_CLIENT_ID }}
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
@@ -54,7 +54,7 @@ jobs:

    steps:
      - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@9db058b2e6eec20e07760b0e17a0505c78ec3191 # create-workflow-token-action-v2.0.1
+        uses: immich-app/devtools/actions/create-workflow-token@caa599d954228439ea3e8ce1c3328f41ab120ee6 # create-workflow-token-action-v2.0.0
        with:
          client-id: ${{ secrets.PUSH_O_MATIC_APP_CLIENT_ID }}
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
@@ -20,7 +20,7 @@ jobs:
      artifact: ${{ steps.get-artifact.outputs.result }}
    steps:
      - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@9db058b2e6eec20e07760b0e17a0505c78ec3191 # create-workflow-token-action-v2.0.1
+        uses: immich-app/devtools/actions/create-workflow-token@caa599d954228439ea3e8ce1c3328f41ab120ee6 # create-workflow-token-action-v2.0.0
        with:
          client-id: ${{ secrets.PUSH_O_MATIC_APP_CLIENT_ID }}
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
@@ -98,16 +98,9 @@ jobs:
                shouldDeploy: true
              };
            } else if (eventType == "release") {
-              const tag = context.payload.workflow_run.head_branch;
-              const { data: release } = await github.rest.repos.getReleaseByTag({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                tag,
-              });
              parameters = {
                event: "release",
-                name: tag,
-                prerelease: release.prerelease,
+                name: context.payload.workflow_run.head_branch,
                shouldDeploy: !isFork
              };
            }
@@ -126,7 +119,7 @@ jobs:
    if: ${{ fromJson(needs.checks.outputs.artifact).found && fromJson(needs.checks.outputs.parameters).shouldDeploy }}
    steps:
      - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@9db058b2e6eec20e07760b0e17a0505c78ec3191 # create-workflow-token-action-v2.0.1
+        uses: immich-app/devtools/actions/create-workflow-token@caa599d954228439ea3e8ce1c3328f41ab120ee6 # create-workflow-token-action-v2.0.0
        with:
          client-id: ${{ secrets.PUSH_O_MATIC_APP_CLIENT_ID }}
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
@@ -153,7 +146,6 @@ jobs:
            const parameters = JSON.parse(process.env.PARAM_JSON);
            core.setOutput("event", parameters.event);
            core.setOutput("name", parameters.name);
-            core.setOutput("prerelease", parameters.prerelease);
            core.setOutput("shouldDeploy", parameters.shouldDeploy);

      - name: Download artifact
@@ -211,7 +203,7 @@ jobs:
        run: mise run //docs:deploy

      - name: Deploy Docs Release Domain
-        if: ${{ steps.parameters.outputs.event == 'release' && steps.parameters.outputs.prerelease != 'true' }}
+        if: ${{ steps.parameters.outputs.event == 'release' }}
        env:
          TF_VAR_prefix_name: ${{ steps.parameters.outputs.name}}
          CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
@@ -17,7 +17,7 @@ jobs:
      pull-requests: write
    steps:
      - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@9db058b2e6eec20e07760b0e17a0505c78ec3191 # create-workflow-token-action-v2.0.1
+        uses: immich-app/devtools/actions/create-workflow-token@caa599d954228439ea3e8ce1c3328f41ab120ee6 # create-workflow-token-action-v2.0.0
        with:
          client-id: ${{ secrets.PUSH_O_MATIC_APP_CLIENT_ID }}
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
@@ -15,7 +15,7 @@ jobs:
      pull-requests: write
    steps:
      - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@9db058b2e6eec20e07760b0e17a0505c78ec3191 # create-workflow-token-action-v2.0.1
+        uses: immich-app/devtools/actions/create-workflow-token@caa599d954228439ea3e8ce1c3328f41ab120ee6 # create-workflow-token-action-v2.0.0
        with:
          client-id: ${{ secrets.PUSH_O_MATIC_APP_CLIENT_ID }}
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
@@ -14,7 +14,7 @@ jobs:
      pull-requests: write
    steps:
      - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@9db058b2e6eec20e07760b0e17a0505c78ec3191 # create-workflow-token-action-v2.0.1
+        uses: immich-app/devtools/actions/create-workflow-token@caa599d954228439ea3e8ce1c3328f41ab120ee6 # create-workflow-token-action-v2.0.0
        with:
          client-id: ${{ secrets.PUSH_O_MATIC_APP_CLIENT_ID }}
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
@@ -12,7 +12,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@9db058b2e6eec20e07760b0e17a0505c78ec3191 # create-workflow-token-action-v2.0.1
+        uses: immich-app/devtools/actions/create-workflow-token@caa599d954228439ea3e8ce1c3328f41ab120ee6 # create-workflow-token-action-v2.0.0
        with:
          client-id: ${{ secrets.PUSH_O_MATIC_APP_CLIENT_ID }}
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
@@ -49,7 +49,7 @@ jobs:
    permissions: {} # No job-level permissions are needed because it uses the app-token
    steps:
      - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@9db058b2e6eec20e07760b0e17a0505c78ec3191 # create-workflow-token-action-v2.0.1
+        uses: immich-app/devtools/actions/create-workflow-token@caa599d954228439ea3e8ce1c3328f41ab120ee6 # create-workflow-token-action-v2.0.0
        with:
          client-id: ${{ secrets.PUSH_O_MATIC_APP_CLIENT_ID }}
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
@@ -137,7 +137,7 @@ jobs:
          github-token: ${{ steps.generate-token.outputs.token }}

      - name: Create draft release
-        uses: softprops/action-gh-release@b4309332981a82ec1c5618f44dd2e27cc8bfbfda # v3.0.0
+        uses: softprops/action-gh-release@3bb12739c298aeb8a4eeaf626c5b8d85266b0e65 # v2.6.2
        with:
          draft: true
          tag_name: ${{ needs.bump_version.outputs.version }}
@@ -14,7 +14,7 @@ jobs:
      pull-requests: write
    steps:
      - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@9db058b2e6eec20e07760b0e17a0505c78ec3191 # create-workflow-token-action-v2.0.1
+        uses: immich-app/devtools/actions/create-workflow-token@caa599d954228439ea3e8ce1c3328f41ab120ee6 # create-workflow-token-action-v2.0.0
        with:
          client-id: ${{ secrets.PUSH_O_MATIC_APP_CLIENT_ID }}
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
@@ -32,7 +32,7 @@ jobs:
      pull-requests: write
    steps:
      - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@9db058b2e6eec20e07760b0e17a0505c78ec3191 # create-workflow-token-action-v2.0.1
+        uses: immich-app/devtools/actions/create-workflow-token@caa599d954228439ea3e8ce1c3328f41ab120ee6 # create-workflow-token-action-v2.0.0
        with:
          client-id: ${{ secrets.PUSH_O_MATIC_APP_CLIENT_ID }}
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
@@ -16,7 +16,7 @@ jobs:
      packages: write
    steps:
      - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@9db058b2e6eec20e07760b0e17a0505c78ec3191 # create-workflow-token-action-v2.0.1
+        uses: immich-app/devtools/actions/create-workflow-token@caa599d954228439ea3e8ce1c3328f41ab120ee6 # create-workflow-token-action-v2.0.0
        with:
          client-id: ${{ secrets.PUSH_O_MATIC_APP_CLIENT_ID }}
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
@@ -39,6 +39,4 @@ jobs:
        run: pnpm --filter @immich/sdk build

      - name: Publish
-        env:
-          NPM_TAG: ${{ github.event.release.prerelease && 'rc' || 'latest' }}
-        run: pnpm --filter @immich/sdk publish --provenance --no-git-checks --tag "$NPM_TAG"
+        run: pnpm --filter @immich/sdk publish --provenance --no-git-checks
@@ -20,7 +20,7 @@ jobs:
      should_run: ${{ steps.check.outputs.should_run }}
    steps:
      - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@9db058b2e6eec20e07760b0e17a0505c78ec3191 # create-workflow-token-action-v2.0.1
+        uses: immich-app/devtools/actions/create-workflow-token@caa599d954228439ea3e8ce1c3328f41ab120ee6 # create-workflow-token-action-v2.0.0
        with:
          client-id: ${{ secrets.PUSH_O_MATIC_APP_CLIENT_ID }}
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
@@ -49,7 +49,7 @@ jobs:
        working-directory: ./mobile
    steps:
      - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@9db058b2e6eec20e07760b0e17a0505c78ec3191 # create-workflow-token-action-v2.0.1
+        uses: immich-app/devtools/actions/create-workflow-token@caa599d954228439ea3e8ce1c3328f41ab120ee6 # create-workflow-token-action-v2.0.0
        with:
          client-id: ${{ secrets.PUSH_O_MATIC_APP_CLIENT_ID }}
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
@@ -72,6 +72,10 @@ jobs:
        run: flutter pub get
        working-directory: ./mobile/packages/ui

+      - name: Install dependencies for UI Showcase
+        run: flutter pub get
+        working-directory: ./mobile/packages/ui/showcase
+
      - name: Generate translation files
        run: mise //mobile:codegen:translation

@@ -17,7 +17,7 @@ jobs:
      should_run: ${{ steps.check.outputs.should_run }}
    steps:
      - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@9db058b2e6eec20e07760b0e17a0505c78ec3191 # create-workflow-token-action-v2.0.1
+        uses: immich-app/devtools/actions/create-workflow-token@caa599d954228439ea3e8ce1c3328f41ab120ee6 # create-workflow-token-action-v2.0.0
        with:
          client-id: ${{ secrets.PUSH_O_MATIC_APP_CLIENT_ID }}
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
@@ -71,7 +71,7 @@ jobs:
      contents: read
    steps:
      - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@9db058b2e6eec20e07760b0e17a0505c78ec3191 # create-workflow-token-action-v2.0.1
+        uses: immich-app/devtools/actions/create-workflow-token@caa599d954228439ea3e8ce1c3328f41ab120ee6 # create-workflow-token-action-v2.0.0
        with:
          client-id: ${{ secrets.PUSH_O_MATIC_APP_CLIENT_ID }}
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
@@ -102,7 +102,7 @@ jobs:
        working-directory: ./packages/cli
    steps:
      - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@9db058b2e6eec20e07760b0e17a0505c78ec3191 # create-workflow-token-action-v2.0.1
+        uses: immich-app/devtools/actions/create-workflow-token@caa599d954228439ea3e8ce1c3328f41ab120ee6 # create-workflow-token-action-v2.0.0
        with:
          client-id: ${{ secrets.PUSH_O_MATIC_APP_CLIENT_ID }}
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
@@ -133,7 +133,7 @@ jobs:
        working-directory: ./packages/cli
    steps:
      - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@9db058b2e6eec20e07760b0e17a0505c78ec3191 # create-workflow-token-action-v2.0.1
+        uses: immich-app/devtools/actions/create-workflow-token@caa599d954228439ea3e8ce1c3328f41ab120ee6 # create-workflow-token-action-v2.0.0
        with:
          client-id: ${{ secrets.PUSH_O_MATIC_APP_CLIENT_ID }}
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
@@ -177,7 +177,7 @@ jobs:
        working-directory: ./web
    steps:
      - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@9db058b2e6eec20e07760b0e17a0505c78ec3191 # create-workflow-token-action-v2.0.1
+        uses: immich-app/devtools/actions/create-workflow-token@caa599d954228439ea3e8ce1c3328f41ab120ee6 # create-workflow-token-action-v2.0.0
        with:
          client-id: ${{ secrets.PUSH_O_MATIC_APP_CLIENT_ID }}
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
@@ -215,7 +215,7 @@ jobs:
        working-directory: ./web
    steps:
      - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@9db058b2e6eec20e07760b0e17a0505c78ec3191 # create-workflow-token-action-v2.0.1
+        uses: immich-app/devtools/actions/create-workflow-token@caa599d954228439ea3e8ce1c3328f41ab120ee6 # create-workflow-token-action-v2.0.0
        with:
          client-id: ${{ secrets.PUSH_O_MATIC_APP_CLIENT_ID }}
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
@@ -243,7 +243,7 @@ jobs:
      contents: read
    steps:
      - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@9db058b2e6eec20e07760b0e17a0505c78ec3191 # create-workflow-token-action-v2.0.1
+        uses: immich-app/devtools/actions/create-workflow-token@caa599d954228439ea3e8ce1c3328f41ab120ee6 # create-workflow-token-action-v2.0.0
        with:
          client-id: ${{ secrets.PUSH_O_MATIC_APP_CLIENT_ID }}
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
@@ -293,7 +293,7 @@ jobs:
        working-directory: ./e2e
    steps:
      - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@9db058b2e6eec20e07760b0e17a0505c78ec3191 # create-workflow-token-action-v2.0.1
+        uses: immich-app/devtools/actions/create-workflow-token@caa599d954228439ea3e8ce1c3328f41ab120ee6 # create-workflow-token-action-v2.0.0
        with:
          client-id: ${{ secrets.PUSH_O_MATIC_APP_CLIENT_ID }}
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
@@ -325,7 +325,7 @@ jobs:
        working-directory: ./server
    steps:
      - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@9db058b2e6eec20e07760b0e17a0505c78ec3191 # create-workflow-token-action-v2.0.1
+        uses: immich-app/devtools/actions/create-workflow-token@caa599d954228439ea3e8ce1c3328f41ab120ee6 # create-workflow-token-action-v2.0.0
        with:
          client-id: ${{ secrets.PUSH_O_MATIC_APP_CLIENT_ID }}
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
@@ -361,7 +361,7 @@ jobs:
        runner: [ubuntu-latest, ubuntu-24.04-arm]
    steps:
      - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@9db058b2e6eec20e07760b0e17a0505c78ec3191 # create-workflow-token-action-v2.0.1
+        uses: immich-app/devtools/actions/create-workflow-token@caa599d954228439ea3e8ce1c3328f41ab120ee6 # create-workflow-token-action-v2.0.0
        with:
          client-id: ${{ secrets.PUSH_O_MATIC_APP_CLIENT_ID }}
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
@@ -374,7 +374,7 @@ jobs:
          token: ${{ steps.token.outputs.token }}

      - name: Setup pnpm
-        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
+        uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v5.0.0

      - name: Setup Node
        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
@@ -438,7 +438,7 @@ jobs:
        runner: [ubuntu-latest, ubuntu-24.04-arm]
    steps:
      - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@9db058b2e6eec20e07760b0e17a0505c78ec3191 # create-workflow-token-action-v2.0.1
+        uses: immich-app/devtools/actions/create-workflow-token@caa599d954228439ea3e8ce1c3328f41ab120ee6 # create-workflow-token-action-v2.0.0
        with:
          client-id: ${{ secrets.PUSH_O_MATIC_APP_CLIENT_ID }}
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
@@ -451,7 +451,7 @@ jobs:
          token: ${{ steps.token.outputs.token }}

      - name: Setup pnpm
-        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
+        uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v5.0.0

      - name: Setup Node
        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
@@ -546,7 +546,7 @@ jobs:
      contents: read
    steps:
      - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@9db058b2e6eec20e07760b0e17a0505c78ec3191 # create-workflow-token-action-v2.0.1
+        uses: immich-app/devtools/actions/create-workflow-token@caa599d954228439ea3e8ce1c3328f41ab120ee6 # create-workflow-token-action-v2.0.0
        with:
          client-id: ${{ secrets.PUSH_O_MATIC_APP_CLIENT_ID }}
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
@@ -583,7 +583,7 @@ jobs:
        working-directory: ./machine-learning
    steps:
      - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@9db058b2e6eec20e07760b0e17a0505c78ec3191 # create-workflow-token-action-v2.0.1
+        uses: immich-app/devtools/actions/create-workflow-token@caa599d954228439ea3e8ce1c3328f41ab120ee6 # create-workflow-token-action-v2.0.0
        with:
          client-id: ${{ secrets.PUSH_O_MATIC_APP_CLIENT_ID }}
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
@@ -613,7 +613,7 @@ jobs:
        working-directory: ./.github
    steps:
      - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@9db058b2e6eec20e07760b0e17a0505c78ec3191 # create-workflow-token-action-v2.0.1
+        uses: immich-app/devtools/actions/create-workflow-token@caa599d954228439ea3e8ce1c3328f41ab120ee6 # create-workflow-token-action-v2.0.0
        with:
          client-id: ${{ secrets.PUSH_O_MATIC_APP_CLIENT_ID }}
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
@@ -643,7 +643,7 @@ jobs:
      contents: read
    steps:
      - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@9db058b2e6eec20e07760b0e17a0505c78ec3191 # create-workflow-token-action-v2.0.1
+        uses: immich-app/devtools/actions/create-workflow-token@caa599d954228439ea3e8ce1c3328f41ab120ee6 # create-workflow-token-action-v2.0.0
        with:
          client-id: ${{ secrets.PUSH_O_MATIC_APP_CLIENT_ID }}
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
@@ -664,7 +664,7 @@ jobs:
      contents: read
    steps:
      - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@9db058b2e6eec20e07760b0e17a0505c78ec3191 # create-workflow-token-action-v2.0.1
+        uses: immich-app/devtools/actions/create-workflow-token@caa599d954228439ea3e8ce1c3328f41ab120ee6 # create-workflow-token-action-v2.0.0
        with:
          client-id: ${{ secrets.PUSH_O_MATIC_APP_CLIENT_ID }}
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
@@ -722,7 +722,7 @@ jobs:
          - 5432:5432
    steps:
      - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@9db058b2e6eec20e07760b0e17a0505c78ec3191 # create-workflow-token-action-v2.0.1
+        uses: immich-app/devtools/actions/create-workflow-token@caa599d954228439ea3e8ce1c3328f41ab120ee6 # create-workflow-token-action-v2.0.0
        with:
          client-id: ${{ secrets.PUSH_O_MATIC_APP_CLIENT_ID }}
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
@@ -24,7 +24,7 @@ jobs:
      should_run: ${{ steps.check.outputs.should_run }}
    steps:
      - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@9db058b2e6eec20e07760b0e17a0505c78ec3191 # create-workflow-token-action-v2.0.1
+        uses: immich-app/devtools/actions/create-workflow-token@caa599d954228439ea3e8ce1c3328f41ab120ee6 # create-workflow-token-action-v2.0.0
        with:
          client-id: ${{ secrets.PUSH_O_MATIC_APP_CLIENT_ID }}
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
@@ -47,7 +47,7 @@ jobs:
    if: ${{ fromJSON(needs.pre-job.outputs.should_run).i18n == true }}
    steps:
      - id: token
-        uses: immich-app/devtools/actions/create-workflow-token@9db058b2e6eec20e07760b0e17a0505c78ec3191 # create-workflow-token-action-v2.0.1
+        uses: immich-app/devtools/actions/create-workflow-token@caa599d954228439ea3e8ce1c3328f41ab120ee6 # create-workflow-token-action-v2.0.0
        with:
          client-id: ${{ secrets.PUSH_O_MATIC_APP_CLIENT_ID }}
          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
@@ -0,0 +1,134 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation
+in our community a harassment-free experience for everyone, regardless
+of age, body size, visible or invisible disability, ethnicity, sex
+characteristics, gender identity and expression, level of experience,
+education, socio-economic status, nationality, personal appearance,
+race, religion, or sexual identity and orientation.
+
+We pledge to act and interact in ways that contribute to an open,
+welcoming, diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for
+our community include:
+
+- Demonstrating empathy and kindness toward other people
+- Being respectful of differing opinions, viewpoints, and experiences
+- Giving and gracefully accepting constructive feedback
+- Accepting responsibility and apologizing to those affected by our
+  mistakes, and learning from the experience
+- Focusing on what is best not just for us as individuals, but for the
+  overall community
+
+Examples of unacceptable behavior include:
+
+- The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+- Trolling, insulting or derogatory comments, and personal or
+  political attacks
+- Public or private harassment
+- Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+- Other conduct which could reasonably be considered inappropriate in
+  a professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our
+standards of acceptable behavior and will take appropriate and fair
+corrective action in response to any behavior that they deem
+inappropriate, threatening, offensive, or harmful.
+
+Community leaders have the right and responsibility to remove, edit,
+or reject comments, commits, code, wiki edits, issues, and other
+contributions that are not aligned to this Code of Conduct, and will
+communicate reasons for moderation decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also
+applies when an individual is officially representing the community in
+public spaces. Examples of representing our community include using an
+official e-mail address, posting via an official social media account,
+or acting as an appointed representative at an online or offline
+event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior
+may be reported to the community leaders responsible for enforcement
+at our Discord channel. All complaints
+will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and
+security of the reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in
+determining the consequences for any action they deem in violation of
+this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior
+deemed unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders,
+providing clarity around the nature of the violation and an
+explanation of why the behavior was inappropriate. A public apology
+may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued
+behavior. No interaction with the people involved, including
+unsolicited interaction with those enforcing the Code of Conduct, for
+a specified period of time. This includes avoiding interactions in
+community spaces as well as external channels like social
+media. Violating these terms may lead to a temporary or permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards,
+including sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or
+public communication with the community for a specified period of
+time. No public or private interaction with the people involved,
+including unsolicited interaction with those enforcing the Code of
+Conduct, is allowed during this period. Violating these terms may lead
+to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of
+community standards, including sustained inappropriate behavior,
+harassment of an individual, or aggression toward or disparagement of
+classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction
+within the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor
+Covenant][homepage], version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of
+conduct enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the
+FAQ at https://www.contributor-covenant.org/faq. Translations are
+available at https://www.contributor-covenant.org/translations.
@@ -0,0 +1,5 @@
+# Security Policy
+
+## Reporting a Vulnerability
+
+Please report security issues to `security@immich.app`
@@ -154,7 +154,7 @@ services:

  redis:
    container_name: immich_redis
-    image: docker.io/valkey/valkey:9@sha256:4963247afc4cd33c7d3b2d2816b9f7f8eeebab148d29056c2ca4d7cbc966f2d9
+    image: docker.io/valkey/valkey:9@sha256:8436e10bc65c94886a91d4415b6a6dfa9cb5a306fb3b996e5bb67cd2b4854193
    healthcheck:
      test: redis-cli ping || exit 1

@@ -56,7 +56,7 @@ services:

  redis:
    container_name: immich_redis
-    image: docker.io/valkey/valkey:9@sha256:4963247afc4cd33c7d3b2d2816b9f7f8eeebab148d29056c2ca4d7cbc966f2d9
+    image: docker.io/valkey/valkey:9@sha256:8436e10bc65c94886a91d4415b6a6dfa9cb5a306fb3b996e5bb67cd2b4854193
    healthcheck:
      test: redis-cli ping || exit 1
    restart: always
@@ -85,7 +85,7 @@ services:
    container_name: immich_prometheus
    ports:
      - 9090:9090
-    image: prom/prometheus@sha256:69f5241418838263316593f7274a304b095c40bcf22e57272865da91bd60a8ac
+    image: prom/prometheus@sha256:e4254400b85610324913f0dc4acf92603d9984e7519414c5a12811aa6146acc3
    volumes:
      - ./prometheus.yml:/etc/prometheus/prometheus.yml
      - prometheus-data:/prometheus
@@ -61,7 +61,7 @@ services:

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

  redis:
    container_name: immich_redis
-    image: docker.io/valkey/valkey:9@sha256:4963247afc4cd33c7d3b2d2816b9f7f8eeebab148d29056c2ca4d7cbc966f2d9
+    image: docker.io/valkey/valkey:9@sha256:8436e10bc65c94886a91d4415b6a6dfa9cb5a306fb3b996e5bb67cd2b4854193
    healthcheck:
      test: redis-cli ping || exit 1
    restart: always
@@ -109,24 +109,6 @@ mise //mobile:translation

 The mobile app asks you what backend to connect to. You can utilize the demo backend (https://demo.immich.app/) if you don't need to change server code or upload photos. Alternatively, you can run the server yourself per the instructions above.

-#### UI components and widget previews
-
-Shared design-system widgets (buttons, inputs, forms) live in the
-[`immich_ui` package](https://github.com/immich-app/immich/tree/main/mobile/packages/ui/)
-under `mobile/packages/ui/`. Components are defined in `lib/src/components/`
-and have matching previews in `lib/src/previews/`.
-
-To inspect a component in isolation with a light/dark toggle and hot reload,
-launch [Flutter's Widget Previewer](https://docs.flutter.dev/tools/widget-previewer):
-
-```bash
-cd mobile/packages/ui
-flutter widget-preview start
-```
-
-In VS Code or Android Studio with the Flutter plugin, the previewer
-auto-starts when you open the **Flutter Widget Preview** tab in the sidebar.
-
 ## IDE setup

 ### Lint / format extensions
@@ -44,7 +44,7 @@ services:

  redis:
    container_name: immich-e2e-redis
-    image: docker.io/valkey/valkey:9@sha256:4963247afc4cd33c7d3b2d2816b9f7f8eeebab148d29056c2ca4d7cbc966f2d9
+    image: docker.io/valkey/valkey:9@sha256:8436e10bc65c94886a91d4415b6a6dfa9cb5a306fb3b996e5bb67cd2b4854193
    healthcheck:
      test: redis-cli ping || exit 1

@@ -259,6 +259,17 @@ describe('/search', () => {
          assets: [assetHeic],
        }),
      },
+      {
+        should: "should search city ('')",
+        deferred: () => ({
+          dto: {
+            city: '',
+            visibility: AssetVisibility.Timeline,
+            includeNull: true,
+          },
+          assets: [assetLast],
+        }),
+      },
      {
        should: 'should search city (null)',
        deferred: () => ({
@@ -280,6 +291,18 @@ describe('/search', () => {
          assets: [assetDensity],
        }),
      },
+      {
+        should: "should search state ('')",
+        deferred: () => ({
+          dto: {
+            state: '',
+            visibility: AssetVisibility.Timeline,
+            withExif: true,
+            includeNull: true,
+          },
+          assets: [assetLast, assetNotocactus],
+        }),
+      },
      {
        should: 'should search state (null)',
        deferred: () => ({
@@ -301,6 +324,17 @@ describe('/search', () => {
          assets: [assetFalcon],
        }),
      },
+      {
+        should: "should search country ('')",
+        deferred: () => ({
+          dto: {
+            country: '',
+            visibility: AssetVisibility.Timeline,
+            includeNull: true,
+          },
+          assets: [assetLast],
+        }),
+      },
      {
        should: 'should search country (null)',
        deferred: () => ({
@@ -95,7 +95,6 @@ describe('/server', () => {
        major: expect.any(Number),
        minor: expect.any(Number),
        patch: expect.any(Number),
-        prerelease: null,
      });
    });
  });
@@ -116,7 +115,6 @@ describe('/server', () => {
        oauthAutoLaunch: false,
        ocr: false,
        passwordLogin: true,
-        realtimeTranscoding: false,
        search: true,
        sidecar: true,
        trash: true,
@@ -141,7 +139,6 @@ describe('/server', () => {
        maintenanceMode: false,
        mapDarkStyleUrl: 'https://tiles.immich.cloud/v1/style/dark.json',
        mapLightStyleUrl: 'https://tiles.immich.cloud/v1/style/light.json',
-        minFaces: 3,
      });
    });
  });
@@ -21,18 +21,18 @@ describe('/system-config', () => {
      const response1 = await request(app)
        .put('/system-config')
        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send({ ...config, newVersionCheck: { enabled: false, channel: 'stable' } });
+        .send({ ...config, newVersionCheck: { enabled: false } });

      expect(response1.status).toBe(200);
-      expect(response1.body).toEqual({ ...config, newVersionCheck: { enabled: false, channel: 'stable' } });
+      expect(response1.body).toEqual({ ...config, newVersionCheck: { enabled: false } });

      const response2 = await request(app)
        .put('/system-config')
        .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send({ ...config, newVersionCheck: { enabled: true, channel: 'stable' } });
+        .send({ ...config, newVersionCheck: { enabled: true } });

      expect(response2.status).toBe(200);
-      expect(response2.body).toEqual({ ...config, newVersionCheck: { enabled: true, channel: 'stable' } });
+      expect(response2.body).toEqual({ ...config, newVersionCheck: { enabled: true } });
    });

    it('should reject an invalid config entry', async () => {
@@ -230,21 +230,6 @@ describe('/users', () => {
      const after = await getMyPreferences({ headers: asBearerAuth(admin.accessToken) });
      expect(after).toMatchObject({ download: { includeEmbeddedVideos: true } });
    });
-
-    it('should update minimum face count to display people', async () => {
-      const before = await getMyPreferences({ headers: asBearerAuth(admin.accessToken) });
-      expect(before).toMatchObject({ people: { minimumFaces: 3 } });
-
-      const { status, body } = await request(app)
-        .put('/users/me/preferences')
-        .send({ people: { minimumFaces: 2 } })
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-      expect(status).toBe(200);
-      expect(body).toMatchObject({ people: { minimumFaces: 2 } });
-
-      const after = await getMyPreferences({ headers: asBearerAuth(admin.accessToken) });
-      expect(after).toMatchObject({ people: { minimumFaces: 2 } });
-    });
  });

  describe('GET /users/:id', () => {
@@ -305,8 +305,6 @@
    "refreshing_all_libraries": "Refreshing all libraries",
    "registration": "Admin Registration",
    "registration_description": "Since you are the first user on the system, you will be assigned as the Admin and are responsible for administrative tasks, and additional users will be created by you.",
-    "release_channel_release_candidate": "Release candidate",
-    "release_channel_stable": "Stable",
    "remove_failed_jobs": "Remove failed jobs",
    "require_password_change_on_login": "Require user to change password on first login",
    "reset_settings_to_default": "Reset settings to default",
@@ -401,10 +399,6 @@
    "transcoding_preferred_hardware_device_description": "Applies only to VAAPI and QSV. Sets the dri node used for hardware transcoding.",
    "transcoding_preset_preset": "Preset (-preset)",
    "transcoding_preset_preset_description": "Compression speed. Slower presets produce smaller files, and increase quality when targeting a certain bitrate. VP9 ignores speeds above 'faster'.",
-    "transcoding_realtime": "Real-time Transcoding [EXPERIMENTAL]",
-    "transcoding_realtime_description": "Allows transcoding to be performed in real-time as the video is being streamed. Enables quality switching, but may cause higher playback latency and stuttering depending on server capabilities.",
-    "transcoding_realtime_enabled": "Enable real-time transcoding",
-    "transcoding_realtime_enabled_description": "If disabled, the server will refuse to start new real-time transcoding sessions.",
    "transcoding_reference_frames": "Reference frames",
    "transcoding_reference_frames_description": "The number of frames to reference when compressing a given frame. Higher values improve compression efficiency, but slow down encoding. 0 sets this value automatically.",
    "transcoding_required_description": "Only videos not in an accepted format",
@@ -448,8 +442,6 @@
    "user_settings_description": "Manage user settings",
    "user_successfully_removed": "User {email} has been successfully removed.",
    "users_page_description": "Admin users page",
-    "version_check_channel": "Release channel",
-    "version_check_channel_description": "Pick the release channel you want to get version announcements for",
    "version_check_enabled_description": "Enable version check",
    "version_check_implications": "The version check feature relies on periodic communication with {server}",
    "version_check_settings": "Version Check",
@@ -1592,8 +1584,6 @@
  "merge_people_prompt": "Do you want to merge these people? This action is irreversible.",
  "merge_people_successfully": "Merge people successfully",
  "merged_people_count": "Merged {count, plural, one {# person} other {# people}}",
-  "minFaces": "Minimum faces",
-  "minFaces_description": "The minimum number of recognized faces for a person to be displayed",
  "minimize": "Minimize",
  "minute": "Minute",
  "minutes": "Minutes",
@@ -2462,7 +2452,6 @@
  "video": "Video",
  "video_hover_setting": "Play video thumbnail on hover",
  "video_hover_setting_description": "Play video thumbnail when mouse is hovering over item. Even when disabled, playback can be started by hovering over the play icon.",
-  "video_quality": "Video quality",
  "videos": "Videos",
  "videos_count": "{count, plural, one {# Video} other {# Videos}}",
  "videos_only": "Videos only",
@@ -1,8 +1,8 @@
 ARG DEVICE=cpu

-FROM python:3.11-bookworm@sha256:121d86b6d08752968a7dddbc708849e5f3a839bbff47f32212b46d2a1d842bab AS builder-cpu
+FROM python:3.11-bookworm@sha256:970c99f886b839fc8829289040c1845dadaf2cae46b37acc7710333158ec29b4 AS builder-cpu

-FROM python:3.13-slim-trixie@sha256:b04b5d7233d2ad9c379e22ea8927cd1378cd15c60d4ef876c065b25ea8fb3bf3 AS builder-openvino
+FROM python:3.13-slim-trixie@sha256:d168b8d9eb761f4d3fe305ebd04aeb7e7f2de0297cec5fb2f8f6403244621664 AS builder-openvino

 FROM builder-cpu AS builder-cuda

@@ -39,12 +39,12 @@ RUN --mount=type=cache,target=/root/.cache/uv \
    --mount=type=bind,source=pyproject.toml,target=pyproject.toml \
    uv sync --frozen --extra ${DEVICE} --no-dev --no-editable --no-install-project --compile-bytecode --no-progress --active --link-mode copy

-FROM python:3.11-slim-bookworm@sha256:8dca233de9f3d9bb410665f00a4da6dd06f331083137e0e98ccf227236fcc438 AS prod-cpu
+FROM python:3.11-slim-bookworm@sha256:9c6f90801e6b68e772b7c0ca74260cbf7af9f320acec894e26fccdaccfbe3b47 AS prod-cpu

 ENV LD_PRELOAD=/usr/lib/libmimalloc.so.2 \
    MACHINE_LEARNING_MODEL_ARENA=false

-FROM python:3.13-slim-trixie@sha256:b04b5d7233d2ad9c379e22ea8927cd1378cd15c60d4ef876c065b25ea8fb3bf3 AS prod-openvino
+FROM python:3.13-slim-trixie@sha256:d168b8d9eb761f4d3fe305ebd04aeb7e7f2de0297cec5fb2f8f6403244621664 AS prod-openvino

 RUN apt-get update && \
    apt-get install --no-install-recommends -yqq ocl-icd-libopencl1 wget && \
@@ -49,7 +49,6 @@ try:
            str(settings.http_keepalive_timeout_s),
            "--graceful-timeout",
            "10",
-            "--no-control-socket",
        ],
    ) as cmd:
        cmd.wait()
@@ -12,7 +12,7 @@ from zipfile import BadZipFile

 import orjson
 from fastapi import Depends, FastAPI, File, Form, HTTPException
-from fastapi.responses import PlainTextResponse
+from fastapi.responses import ORJSONResponse, PlainTextResponse
 from onnxruntime.capi.onnxruntime_pybind11_state import InvalidProtobuf, NoSuchFile
 from PIL.Image import Image
 from pydantic import ValidationError
@@ -32,7 +32,6 @@ from .schemas import (
    ModelIdentity,
    ModelTask,
    ModelType,
-    ORJSONResponse,
    PipelineRequest,
    T,
 )
@@ -89,9 +89,7 @@ class OpenClipTextualEncoder(BaseCLIPTextualEncoder):

        tokenizer: Tokenizer = Tokenizer.from_file(self.tokenizer_file_path.as_posix())

-        pad_id = tokenizer.token_to_id(pad_token)
-        if pad_id is None:
-            raise ValueError(f"Pad token '{pad_token}' not found in tokenizer vocab")
+        pad_id: int = tokenizer.token_to_id(pad_token)
        tokenizer.enable_padding(length=context_length, pad_token=pad_token, pad_id=pad_id)
        tokenizer.enable_truncation(max_length=context_length)

@@ -3,16 +3,9 @@ from typing import Any, Literal, Protocol, TypeGuard, TypeVar

 import numpy as np
 import numpy.typing as npt
-import orjson
-from fastapi.responses import JSONResponse
 from typing_extensions import TypedDict


-class ORJSONResponse(JSONResponse):
-    def render(self, content: Any) -> bytes:
-        return orjson.dumps(content, option=orjson.OPT_SERIALIZE_NUMPY)
-
-
 class StrEnum(str, Enum):
    value: str

@@ -816,10 +816,6 @@ class TestFaceRecognition:

    def test_recognition(self, cv_image: cv2.Mat, mocker: MockerFixture) -> None:
        mocker.patch.object(FaceRecognizer, "load")
-        mocker.patch(
-            "immich_ml.models.facial_recognition.recognition.ort.get_available_providers",
-            return_value=["CPUExecutionProvider"],
-        )
        face_recognizer = FaceRecognizer("buffalo_s", min_score=0.0, cache_dir="test_cache")

        num_faces = 2
@@ -864,10 +860,6 @@ class TestFaceRecognition:
        )
        mocker.patch("immich_ml.models.base.InferenceModel.download")
        mocker.patch("immich_ml.models.facial_recognition.recognition.ArcFaceONNX")
-        mocker.patch(
-            "immich_ml.models.facial_recognition.recognition.ort.get_available_providers",
-            return_value=["CPUExecutionProvider"],
-        )
        ort_session.return_value.get_inputs.return_value = [SimpleNamespace(name="input.1", shape=(1, 3, 224, 224))]
        ort_session.return_value.get_outputs.return_value = [SimpleNamespace(name="output.1", shape=(1, 800))]
        path.return_value.__truediv__.return_value.__truediv__.return_value.suffix = ".onnx"
@@ -902,10 +894,6 @@ class TestFaceRecognition:
        )
        mocker.patch("immich_ml.models.base.InferenceModel.download")
        mocker.patch("immich_ml.models.facial_recognition.recognition.ArcFaceONNX")
-        mocker.patch(
-            "immich_ml.models.facial_recognition.recognition.ort.get_available_providers",
-            return_value=["CPUExecutionProvider"],
-        )
        path.return_value.__truediv__.return_value.__truediv__.return_value.suffix = ".onnx"

        inputs = [SimpleNamespace(name="input.1", shape=("batch", 3, 224, 224))]
@@ -1008,10 +996,6 @@ class TestFaceRecognition:

    def test_ignore_other_custom_max_batch_size(self, mocker: MockerFixture) -> None:
        mocker.patch.object(settings, "max_batch_size", MaxBatchSize(ocr=2))
-        mocker.patch(
-            "immich_ml.models.facial_recognition.recognition.ort.get_available_providers",
-            return_value=["CPUExecutionProvider"],
-        )

        recognizer = FaceRecognizer("buffalo_l", cache_dir="test_cache")

@@ -1,5 +1,74 @@
 # @generated - this file is auto-generated by `mise lock` https://mise.en.dev/dev-tools/mise-lock.html

+[[tools."aqua:flutter/flutter"]]
+version = "3.44.0"
+backend = "aqua:flutter/flutter"
+
+[tools."aqua:flutter/flutter"."platforms.linux-arm64"]
+url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.44.0-stable.tar.xz"
+
+[tools."aqua:flutter/flutter"."platforms.linux-arm64-musl"]
+url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.44.0-stable.tar.xz"
+
+[tools."aqua:flutter/flutter"."platforms.linux-x64"]
+url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.44.0-stable.tar.xz"
+
+[tools."aqua:flutter/flutter"."platforms.linux-x64-musl"]
+url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.44.0-stable.tar.xz"
+
+[tools."aqua:flutter/flutter"."platforms.macos-arm64"]
+checksum = "blake3:fb03aa5d9790205c948922ec3f0751c16e4575b09d6ae9dd4fbeb664a69f0e00"
+url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/macos/flutter_macos_arm64_3.44.0-stable.zip"
+
+[tools."aqua:flutter/flutter"."platforms.macos-x64"]
+url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/macos/flutter_macos_3.44.0-stable.zip"
+
+[tools."aqua:flutter/flutter"."platforms.windows-x64"]
+url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/windows/flutter_windows_3.44.0-stable.zip"
+
+[[tools.flutter]]
+version = "3.41.9-stable"
+backend = "asdf:flutter"
+
+[[tools."github:CQLabs/homebrew-dcm"]]
+version = "1.37.0"
+backend = "github:CQLabs/homebrew-dcm"
+
+[tools."github:CQLabs/homebrew-dcm"."platforms.linux-arm64"]
+checksum = "sha256:253da2512b149913dfe345bf9a62a79acb2d730f66e71162ba4a92dfc4224b82"
+url = "https://github.com/CQLabs/homebrew-dcm/releases/download/1.37.0/dcm-linux-arm-release.zip"
+url_api = "https://api.github.com/repos/CQLabs/homebrew-dcm/releases/assets/404543838"
+
+[tools."github:CQLabs/homebrew-dcm"."platforms.linux-arm64-musl"]
+checksum = "sha256:253da2512b149913dfe345bf9a62a79acb2d730f66e71162ba4a92dfc4224b82"
+url = "https://github.com/CQLabs/homebrew-dcm/releases/download/1.37.0/dcm-linux-arm-release.zip"
+url_api = "https://api.github.com/repos/CQLabs/homebrew-dcm/releases/assets/404543838"
+
+[tools."github:CQLabs/homebrew-dcm"."platforms.linux-x64"]
+checksum = "sha256:477e086d4099c12f21e5ccd83b005d5fb945dd4cac4fd127fd9a08d7649af1cf"
+url = "https://github.com/CQLabs/homebrew-dcm/releases/download/1.37.0/dcm-linux-x64-release.zip"
+url_api = "https://api.github.com/repos/CQLabs/homebrew-dcm/releases/assets/404543797"
+
+[tools."github:CQLabs/homebrew-dcm"."platforms.linux-x64-musl"]
+checksum = "sha256:477e086d4099c12f21e5ccd83b005d5fb945dd4cac4fd127fd9a08d7649af1cf"
+url = "https://github.com/CQLabs/homebrew-dcm/releases/download/1.37.0/dcm-linux-x64-release.zip"
+url_api = "https://api.github.com/repos/CQLabs/homebrew-dcm/releases/assets/404543797"
+
+[tools."github:CQLabs/homebrew-dcm"."platforms.macos-arm64"]
+checksum = "sha256:30bede64367d09067093cc57af6ec9496d7717898138ded5cb98a16ac8dd9d93"
+url = "https://github.com/CQLabs/homebrew-dcm/releases/download/1.37.0/dcm-macos-arm-release.zip"
+url_api = "https://api.github.com/repos/CQLabs/homebrew-dcm/releases/assets/404543757"
+
+[tools."github:CQLabs/homebrew-dcm"."platforms.macos-x64"]
+checksum = "sha256:e56cb99872be7445a4de1d37e5438ca70e3bcd83be7a2b9b385e3538881f8068"
+url = "https://github.com/CQLabs/homebrew-dcm/releases/download/1.37.0/dcm-macos-x64-release.zip"
+url_api = "https://api.github.com/repos/CQLabs/homebrew-dcm/releases/assets/404543727"
+
+[tools."github:CQLabs/homebrew-dcm"."platforms.windows-x64"]
+checksum = "sha256:f133470daa3fb0427f039b424392af7e917d7e7db6b556aa2a968ab0e31587da"
+url = "https://github.com/CQLabs/homebrew-dcm/releases/download/1.37.0/dcm-windows-release.zip"
+url_api = "https://api.github.com/repos/CQLabs/homebrew-dcm/releases/assets/404543660"
+
 [[tools."github:extism/cli"]]
 version = "1.6.3"
 backend = "github:extism/cli"
@@ -156,6 +225,30 @@ checksum = "sha256:b5e1d2a1ad3c03229ddc89823848f4a1c11f9c6402a51fa26f0aaa5f1d7a2
 url = "https://github.com/WebAssembly/binaryen/releases/download/version_124/binaryen-version_124-x86_64-windows.tar.gz"
 url_api = "https://api.github.com/repos/WebAssembly/binaryen/releases/assets/288925833"

+[[tools.java]]
+version = "21.0.2"
+backend = "core:java"
+
+[tools.java."platforms.linux-arm64"]
+checksum = "sha256:08db1392a48d4eb5ea5315cf8f18b89dbaf36cda663ba882cf03c704c9257ec2"
+url = "https://download.java.net/java/GA/jdk21.0.2/f2283984656d49d69e91c558476027ac/13/GPL/openjdk-21.0.2_linux-aarch64_bin.tar.gz"
+
+[tools.java."platforms.linux-x64"]
+checksum = "sha256:a2def047a73941e01a73739f92755f86b895811afb1f91243db214cff5bdac3f"
+url = "https://download.java.net/java/GA/jdk21.0.2/f2283984656d49d69e91c558476027ac/13/GPL/openjdk-21.0.2_linux-x64_bin.tar.gz"
+
+[tools.java."platforms.macos-arm64"]
+checksum = "sha256:b3d588e16ec1e0ef9805d8a696591bd518a5cea62567da8f53b5ce32d11d22e4"
+url = "https://download.java.net/java/GA/jdk21.0.2/f2283984656d49d69e91c558476027ac/13/GPL/openjdk-21.0.2_macos-aarch64_bin.tar.gz"
+
+[tools.java."platforms.macos-x64"]
+checksum = "sha256:8fd09e15dc406387a0aba70bf5d99692874e999bf9cd9208b452b5d76ac922d3"
+url = "https://download.java.net/java/GA/jdk21.0.2/f2283984656d49d69e91c558476027ac/13/GPL/openjdk-21.0.2_macos-x64_bin.tar.gz"
+
+[tools.java."platforms.windows-x64"]
+checksum = "sha256:b6c17e747ae78cdd6de4d7532b3164b277daee97c007d3eaa2b39cca99882664"
+url = "https://download.java.net/java/GA/jdk21.0.2/f2283984656d49d69e91c558476027ac/13/GPL/openjdk-21.0.2_windows-x64_bin.zip"
+
 [[tools.node]]
 version = "24.15.0"
 backend = "core:node"
@@ -228,34 +321,6 @@ url = "https://github.com/opentofu/opentofu/releases/download/v1.11.6/tofu_1.11.
 version = "10.33.4"
 backend = "aqua:pnpm/pnpm"

-[tools.pnpm."platforms.linux-arm64"]
-checksum = "sha256:d29649c7380b5cd522f574208fbd35335846686498f45004604d3f5b8658b5cb"
-url = "https://github.com/pnpm/pnpm/releases/download/v10.33.4/pnpm-linux-arm64"
-
-[tools.pnpm."platforms.linux-arm64-musl"]
-checksum = "sha256:d29649c7380b5cd522f574208fbd35335846686498f45004604d3f5b8658b5cb"
-url = "https://github.com/pnpm/pnpm/releases/download/v10.33.4/pnpm-linux-arm64"
-
-[tools.pnpm."platforms.linux-x64"]
-checksum = "sha256:ff1795595535a10d0dfe327303f3dd02377be141190b1f5756de68edde2cf813"
-url = "https://github.com/pnpm/pnpm/releases/download/v10.33.4/pnpm-linux-x64"
-
-[tools.pnpm."platforms.linux-x64-musl"]
-checksum = "sha256:ff1795595535a10d0dfe327303f3dd02377be141190b1f5756de68edde2cf813"
-url = "https://github.com/pnpm/pnpm/releases/download/v10.33.4/pnpm-linux-x64"
-
-[tools.pnpm."platforms.macos-arm64"]
-checksum = "sha256:7aae186a04e1ffaa0047d43cd07d68a98dec303304f28be52234ba955d26c671"
-url = "https://github.com/pnpm/pnpm/releases/download/v10.33.4/pnpm-macos-arm64"
-
-[tools.pnpm."platforms.macos-x64"]
-checksum = "sha256:3b0c97b9f794cdda293949a8ee0e0151ca08f512f4a832408386221c7c73eec6"
-url = "https://github.com/pnpm/pnpm/releases/download/v10.33.4/pnpm-macos-x64"
-
-[tools.pnpm."platforms.windows-x64"]
-checksum = "sha256:3268b2f29defe0dce8a3a26c0ef01488f0d4aa4872923173186ef618ab7d68ef"
-url = "https://github.com/pnpm/pnpm/releases/download/v10.33.4/pnpm-win-x64.exe"
-
 [[tools.terragrunt]]
 version = "1.0.3"
 backend = "aqua:gruntwork-io/terragrunt"
@@ -16,14 +16,28 @@ config_roots = [

 [tools]
 node = "24.15.0"
+"aqua:flutter/flutter" = "3.44.0"
 pnpm = "10.33.4"
 terragrunt = "1.0.3"
 opentofu = "1.11.6"
+java = "21.0.2"
 "npm:oazapfts" = "7.5.0"
 "github:extism/cli" = "1.6.3"
 "github:webassembly/binaryen" = "version_124"
 "github:extism/js-pdk" = "1.6.0"

+[tools."github:CQLabs/homebrew-dcm"]
+version = "1.37.0"
+bin = "dcm"
+postinstall = "chmod +x \"$MISE_TOOL_INSTALL_PATH/dcm\" || true"
+
+[tools."github:CQLabs/homebrew-dcm".platforms]
+linux-x64 = { asset_pattern = "dcm-linux-x64-release.zip" }
+linux-arm64 = { asset_pattern = "dcm-linux-arm-release.zip" }
+macos-x64 = { asset_pattern = "dcm-macos-x64-release.zip" }
+macos-arm64 = { asset_pattern = "dcm-macos-arm-release.zip" }
+windows-x64 = { asset_pattern = "dcm-windows-release.zip" }
+
 [tools."github:jellyfin/jellyfin-ffmpeg"]
 version = "7.1.3-6"

@@ -52,8 +66,11 @@ run = [
 ]

 [tasks.open-api-dart]
-dir = "open-api"
-run = "bash ./bin/generate-dart-sdk.sh"
+dir = "open-api/dart-generator"
+run = [
+  "dart pub get",
+  "dart run bin/generate.dart --spec ../immich-openapi-specs.json --out ../../mobile/openapi",
+]

 [tasks.open-api]
 env = { SHARP_IGNORE_GLOBAL_LIBVIPS = true }
@@ -89,20 +89,6 @@
        <data android:mimeType="video/*" />
      </intent-filter>

-      <!-- Allow Immich to act as an image viewer -->
-      <intent-filter android:label="View in Immich">
-        <action android:name="android.intent.action.VIEW" />
-        <category android:name="android.intent.category.DEFAULT" />
-        <data android:scheme="content" android:mimeType="image/*" />
-      </intent-filter>
-
-      <!-- Allow Immich to act as a video viewer -->
-      <intent-filter android:label="View in Immich">
-        <action android:name="android.intent.action.VIEW" />
-        <category android:name="android.intent.category.DEFAULT" />
-        <data android:scheme="content" android:mimeType="video/*" />
-      </intent-filter>
-
      <!-- immich:// URL scheme handling -->
      <intent-filter>
        <action android:name="android.intent.action.VIEW" />
@@ -1,7 +1,6 @@
 package app.alextran.immich

 import android.content.Context
-import android.content.Intent
 import android.os.Build
 import android.os.ext.SdkExtensions
 import app.alextran.immich.background.BackgroundEngineLock
@@ -23,7 +22,6 @@ import app.alextran.immich.permission.PermissionApiImpl
 import app.alextran.immich.sync.NativeSyncApi
 import app.alextran.immich.sync.NativeSyncApiImpl26
 import app.alextran.immich.sync.NativeSyncApiImpl30
-import app.alextran.immich.viewintent.ViewIntentPlugin
 import io.flutter.embedding.android.FlutterFragmentActivity
 import io.flutter.embedding.engine.FlutterEngine

@@ -33,11 +31,6 @@ class MainActivity : FlutterFragmentActivity() {
    registerPlugins(this, flutterEngine)
  }

-  override fun onNewIntent(intent: Intent) {
-    super.onNewIntent(intent)
-    setIntent(intent)
-  }
-
  companion object {
    fun registerPlugins(ctx: Context, flutterEngine: FlutterEngine) {
      HttpClientManager.initialize(ctx)
@@ -62,7 +55,6 @@ class MainActivity : FlutterFragmentActivity() {
      BackgroundWorkerFgHostApi.setUp(messenger, BackgroundWorkerApiImpl(ctx))
      ConnectivityApi.setUp(messenger, ConnectivityApiImpl(ctx))

-      flutterEngine.plugins.add(ViewIntentPlugin())
      flutterEngine.plugins.add(backgroundEngineLockImpl)
      flutterEngine.plugins.add(nativeSyncApiImpl)
      flutterEngine.plugins.add(permissionApiImpl)
@@ -542,17 +542,16 @@ private open class MessagesPigeonCodec : StandardMessageCodec() {

 /** Generated interface from Pigeon that represents a handler of messages from Flutter. */
 interface NativeSyncApi {
-  fun shouldFullSync(callback: (Result<Boolean>) -> Unit)
-  fun getMediaChanges(callback: (Result<SyncDelta>) -> Unit)
+  fun shouldFullSync(): Boolean
+  fun getMediaChanges(): SyncDelta
  fun checkpointSync()
  fun clearSyncCheckpoint()
-  fun getAssetIdsForAlbum(albumId: String, callback: (Result<List<String>>) -> Unit)
-  fun getAlbums(callback: (Result<List<PlatformAlbum>>) -> Unit)
+  fun getAssetIdsForAlbum(albumId: String): List<String>
+  fun getAlbums(): List<PlatformAlbum>
  fun getAssetsCountSince(albumId: String, timestamp: Long): Long
-  fun getAssetsForAlbum(albumId: String, updatedTimeCond: Long?, callback: (Result<List<PlatformAsset>>) -> Unit)
+  fun getAssetsForAlbum(albumId: String, updatedTimeCond: Long?): List<PlatformAsset>
  fun hashAssets(assetIds: List<String>, allowNetworkAccess: Boolean, callback: (Result<List<HashResult>>) -> Unit)
  fun cancelHashing()
-  fun cancelSync()
  fun getTrashedAssets(): Map<String, List<PlatformAsset>>
  fun restoreFromTrashById(mediaId: String, type: Long, callback: (Result<Boolean>) -> Unit)
  fun getCloudIdForAssetIds(assetIds: List<String>): List<CloudIdResult>
@@ -571,33 +570,27 @@ interface NativeSyncApi {
        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.NativeSyncApi.shouldFullSync$separatedMessageChannelSuffix", codec)
        if (api != null) {
          channel.setMessageHandler { _, reply ->
-            api.shouldFullSync{ result: Result<Boolean> ->
-              val error = result.exceptionOrNull()
-              if (error != null) {
-                reply.reply(MessagesPigeonUtils.wrapError(error))
-              } else {
-                val data = result.getOrNull()
-                reply.reply(MessagesPigeonUtils.wrapResult(data))
-              }
+            val wrapped: List<Any?> = try {
+              listOf(api.shouldFullSync())
+            } catch (exception: Throwable) {
+              MessagesPigeonUtils.wrapError(exception)
            }
+            reply.reply(wrapped)
          }
        } else {
          channel.setMessageHandler(null)
        }
      }
      run {
-        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.NativeSyncApi.getMediaChanges$separatedMessageChannelSuffix", codec)
+        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.NativeSyncApi.getMediaChanges$separatedMessageChannelSuffix", codec, taskQueue)
        if (api != null) {
          channel.setMessageHandler { _, reply ->
-            api.getMediaChanges{ result: Result<SyncDelta> ->
-              val error = result.exceptionOrNull()
-              if (error != null) {
-                reply.reply(MessagesPigeonUtils.wrapError(error))
-              } else {
-                val data = result.getOrNull()
-                reply.reply(MessagesPigeonUtils.wrapResult(data))
-              }
+            val wrapped: List<Any?> = try {
+              listOf(api.getMediaChanges())
+            } catch (exception: Throwable) {
+              MessagesPigeonUtils.wrapError(exception)
            }
+            reply.reply(wrapped)
          }
        } else {
          channel.setMessageHandler(null)
@@ -636,38 +629,32 @@ interface NativeSyncApi {
        }
      }
      run {
-        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.NativeSyncApi.getAssetIdsForAlbum$separatedMessageChannelSuffix", codec)
+        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.NativeSyncApi.getAssetIdsForAlbum$separatedMessageChannelSuffix", codec, taskQueue)
        if (api != null) {
          channel.setMessageHandler { message, reply ->
            val args = message as List<Any?>
            val albumIdArg = args[0] as String
-            api.getAssetIdsForAlbum(albumIdArg) { result: Result<List<String>> ->
-              val error = result.exceptionOrNull()
-              if (error != null) {
-                reply.reply(MessagesPigeonUtils.wrapError(error))
-              } else {
-                val data = result.getOrNull()
-                reply.reply(MessagesPigeonUtils.wrapResult(data))
-              }
+            val wrapped: List<Any?> = try {
+              listOf(api.getAssetIdsForAlbum(albumIdArg))
+            } catch (exception: Throwable) {
+              MessagesPigeonUtils.wrapError(exception)
            }
+            reply.reply(wrapped)
          }
        } else {
          channel.setMessageHandler(null)
        }
      }
      run {
-        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.NativeSyncApi.getAlbums$separatedMessageChannelSuffix", codec)
+        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.NativeSyncApi.getAlbums$separatedMessageChannelSuffix", codec, taskQueue)
        if (api != null) {
          channel.setMessageHandler { _, reply ->
-            api.getAlbums{ result: Result<List<PlatformAlbum>> ->
-              val error = result.exceptionOrNull()
-              if (error != null) {
-                reply.reply(MessagesPigeonUtils.wrapError(error))
-              } else {
-                val data = result.getOrNull()
-                reply.reply(MessagesPigeonUtils.wrapResult(data))
-              }
+            val wrapped: List<Any?> = try {
+              listOf(api.getAlbums())
+            } catch (exception: Throwable) {
+              MessagesPigeonUtils.wrapError(exception)
            }
+            reply.reply(wrapped)
          }
        } else {
          channel.setMessageHandler(null)
@@ -692,21 +679,18 @@ interface NativeSyncApi {
        }
      }
      run {
-        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.NativeSyncApi.getAssetsForAlbum$separatedMessageChannelSuffix", codec)
+        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.NativeSyncApi.getAssetsForAlbum$separatedMessageChannelSuffix", codec, taskQueue)
        if (api != null) {
          channel.setMessageHandler { message, reply ->
            val args = message as List<Any?>
            val albumIdArg = args[0] as String
            val updatedTimeCondArg = args[1] as Long?
-            api.getAssetsForAlbum(albumIdArg, updatedTimeCondArg) { result: Result<List<PlatformAsset>> ->
-              val error = result.exceptionOrNull()
-              if (error != null) {
-                reply.reply(MessagesPigeonUtils.wrapError(error))
-              } else {
-                val data = result.getOrNull()
-                reply.reply(MessagesPigeonUtils.wrapResult(data))
-              }
+            val wrapped: List<Any?> = try {
+              listOf(api.getAssetsForAlbum(albumIdArg, updatedTimeCondArg))
+            } catch (exception: Throwable) {
+              MessagesPigeonUtils.wrapError(exception)
            }
+            reply.reply(wrapped)
          }
        } else {
          channel.setMessageHandler(null)
@@ -749,22 +733,6 @@ interface NativeSyncApi {
          channel.setMessageHandler(null)
        }
      }
-      run {
-        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.NativeSyncApi.cancelSync$separatedMessageChannelSuffix", codec)
-        if (api != null) {
-          channel.setMessageHandler { _, reply ->
-            val wrapped: List<Any?> = try {
-              api.cancelSync()
-              listOf(null)
-            } catch (exception: Throwable) {
-              MessagesPigeonUtils.wrapError(exception)
-            }
-            reply.reply(wrapped)
-          }
-        } else {
-          channel.setMessageHandler(null)
-        }
-      }
      run {
        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.NativeSyncApi.getTrashedAssets$separatedMessageChannelSuffix", codec, taskQueue)
        if (api != null) {
@@ -4,11 +4,7 @@ import android.content.Context


 class NativeSyncApiImpl26(context: Context) : NativeSyncApiImplBase(context), NativeSyncApi {
-  override fun shouldFullSync(callback: (Result<Boolean>) -> Unit) {
-    runSync(callback) { shouldFullSync() }
-  }
-
-  private fun shouldFullSync(): Boolean {
+  override fun shouldFullSync(): Boolean {
    return true
  }

@@ -22,11 +18,7 @@ class NativeSyncApiImpl26(context: Context) : NativeSyncApiImplBase(context), Na
    // No-op for Android 10 and below
  }

-  override fun getMediaChanges(callback: (Result<SyncDelta>) -> Unit) {
-    runSync(callback) { getMediaChanges() }
-  }
-
-  private fun getMediaChanges(): SyncDelta {
+  override fun getMediaChanges(): SyncDelta {
    throw IllegalStateException("Method not supported on this Android version.")
  }

@@ -7,8 +7,6 @@ import android.os.Bundle
 import android.provider.MediaStore
 import androidx.annotation.RequiresApi
 import androidx.annotation.RequiresExtension
-import kotlinx.coroutines.currentCoroutineContext
-import kotlinx.coroutines.ensureActive
 import kotlinx.serialization.json.Json

@RequiresApi(Build.VERSION_CODES.Q)
@@ -37,11 +35,7 @@ class NativeSyncApiImpl30(context: Context) : NativeSyncApiImplBase(context), Na
    }
  }

-  override fun shouldFullSync(callback: (Result<Boolean>) -> Unit) {
-    runSync(callback) { shouldFullSync() }
-  }
-
-  private fun shouldFullSync(): Boolean =
+  override fun shouldFullSync(): Boolean =
    MediaStore.getVersion(ctx) != prefs.getString(SHARED_PREF_MEDIA_STORE_VERSION_KEY, null)

  override fun checkpointSync() {
@@ -55,11 +49,7 @@ class NativeSyncApiImpl30(context: Context) : NativeSyncApiImplBase(context), Na
    }
  }

-  override fun getMediaChanges(callback: (Result<SyncDelta>) -> Unit) {
-    runSync(callback) { getMediaChanges() }
-  }
-
-  private suspend fun getMediaChanges(): SyncDelta {
+  override fun getMediaChanges(): SyncDelta {
    val genMap = getSavedGenerationMap()
    val currentVolumes = MediaStore.getExternalVolumeNames(ctx)
    val changed = mutableListOf<PlatformAsset>()
@@ -68,7 +58,6 @@ class NativeSyncApiImpl30(context: Context) : NativeSyncApiImplBase(context), Na
    var hasChanges = genMap.keys != currentVolumes

    for (volume in currentVolumes) {
-      currentCoroutineContext().ensureActive()
      val currentGen = MediaStore.getGeneration(ctx, volume)
      val storedGen = genMap[volume] ?: 0
      if (currentGen <= storedGen) {
@@ -45,14 +45,12 @@ open class NativeSyncApiImplBase(context: Context) : ImmichPlugin(), ActivityAwa
  private val ctx: Context = context.applicationContext

  private var hashTask: Job? = null
-  private var syncJob: Job? = null
  private val mediaTrashDelegate = MediaTrashDelegate(ctx)

  companion object {
    private const val MAX_CONCURRENT_HASH_OPERATIONS = 16
    private val hashSemaphore = Semaphore(MAX_CONCURRENT_HASH_OPERATIONS)
    private const val HASHING_CANCELLED_CODE = "HASH_CANCELLED"
-    private const val SYNC_CANCELLED_CODE = "SYNC_CANCELLED"

    // MediaStore.Files.FileColumns.SPECIAL_FORMAT — S Extensions 21+
    // https://developer.android.com/reference/android/provider/MediaStore.Files.FileColumns#SPECIAL_FORMAT
@@ -297,11 +295,7 @@ open class NativeSyncApiImplBase(context: Context) : ImmichPlugin(), ActivityAwa
    return PlatformAssetPlaybackStyle.IMAGE
  }

-  fun getAlbums(callback: (Result<List<PlatformAlbum>>) -> Unit) {
-    runSync(callback) { getAlbums() }
-  }
-
-  private suspend fun getAlbums(): List<PlatformAlbum> {
+  fun getAlbums(): List<PlatformAlbum> {
    val albums = mutableListOf<PlatformAlbum>()
    val albumsCount = mutableMapOf<String, Int>()

@@ -328,7 +322,6 @@ open class NativeSyncApiImplBase(context: Context) : ImmichPlugin(), ActivityAwa
        cursor.getColumnIndexOrThrow(MediaStore.Files.FileColumns.DATE_MODIFIED)

      while (cursor.moveToNext()) {
-        currentCoroutineContext().ensureActive()
        val id = cursor.getString(bucketIdColumn)

        val count = albumsCount.getOrDefault(id, 0)
@@ -349,11 +342,7 @@ open class NativeSyncApiImplBase(context: Context) : ImmichPlugin(), ActivityAwa
      .sortedBy { it.id }
  }

-  fun getAssetIdsForAlbum(albumId: String, callback: (Result<List<String>>) -> Unit) {
-    runSync(callback) { getAssetIdsForAlbum(albumId) }
-  }
-
-  private fun getAssetIdsForAlbum(albumId: String): List<String> {
+  fun getAssetIdsForAlbum(albumId: String): List<String> {
    val projection = arrayOf(MediaStore.MediaColumns._ID)

    return getCursor(
@@ -377,11 +366,7 @@ open class NativeSyncApiImplBase(context: Context) : ImmichPlugin(), ActivityAwa
    )?.use { cursor -> cursor.count.toLong() } ?: 0L


-  fun getAssetsForAlbum(albumId: String, updatedTimeCond: Long?, callback: (Result<List<PlatformAsset>>) -> Unit) {
-    runSync(callback) { getAssetsForAlbum(albumId, updatedTimeCond) }
-  }
-
-  private fun getAssetsForAlbum(albumId: String, updatedTimeCond: Long?): List<PlatformAsset> {
+  fun getAssetsForAlbum(albumId: String, updatedTimeCond: Long?): List<PlatformAsset> {
    var selection = "$BUCKET_SELECTION AND $MEDIA_SELECTION"
    val selectionArgs = mutableListOf(albumId, *MEDIA_SELECTION_ARGS)

@@ -466,24 +451,6 @@ open class NativeSyncApiImplBase(context: Context) : ImmichPlugin(), ActivityAwa
    hashTask = null
  }

-  fun cancelSync() {
-    syncJob?.cancel()
-    syncJob = null
-  }
-
-  protected fun <T> runSync(callback: (Result<T>) -> Unit, work: suspend () -> T) {
-    syncJob?.cancel()
-    syncJob = CoroutineScope(Dispatchers.IO).launch {
-      try {
-        completeWhenActive(callback, Result.success(work()))
-      } catch (e: CancellationException) {
-        completeWhenActive(callback, Result.failure(FlutterError(SYNC_CANCELLED_CODE, "Sync cancelled", null)))
-      } catch (e: Exception) {
-        completeWhenActive(callback, Result.failure(e))
-      }
-    }
-  }
-
  fun restoreFromTrashById(mediaId: String, type: Long, callback: (Result<Boolean>) -> Unit) {
    mediaTrashDelegate.restoreFromTrashById(mediaId, type) { completeWhenActive(callback, it) }
  }
@@ -1,292 +0,0 @@
-// Autogenerated from Pigeon (v26.3.4), do not edit directly.
-// See also: https://pub.dev/packages/pigeon
-@file:Suppress("UNCHECKED_CAST", "ArrayInDataClass")
-
-package app.alextran.immich.viewintent
-
-import android.util.Log
-import io.flutter.plugin.common.BasicMessageChannel
-import io.flutter.plugin.common.BinaryMessenger
-import io.flutter.plugin.common.EventChannel
-import io.flutter.plugin.common.MessageCodec
-import io.flutter.plugin.common.StandardMethodCodec
-import io.flutter.plugin.common.StandardMessageCodec
-import java.io.ByteArrayOutputStream
-import java.nio.ByteBuffer
-private object ViewIntentPigeonUtils {
-
-  fun wrapResult(result: Any?): List<Any?> {
-    return listOf(result)
-  }
-
-  fun wrapError(exception: Throwable): List<Any?> {
-    return if (exception is FlutterError) {
-      listOf(
-        exception.code,
-        exception.message,
-        exception.details
-      )
-    } else {
-      listOf(
-        exception.javaClass.simpleName,
-        exception.toString(),
-        "Cause: " + exception.cause + ", Stacktrace: " + Log.getStackTraceString(exception)
-      )
-    }
-  }
-  fun doubleEquals(a: Double, b: Double): Boolean {
-    // Normalize -0.0 to 0.0 and handle NaN equality.
-    return (if (a == 0.0) 0.0 else a) == (if (b == 0.0) 0.0 else b) || (a.isNaN() && b.isNaN())
-  }
-
-  fun floatEquals(a: Float, b: Float): Boolean {
-    // Normalize -0.0 to 0.0 and handle NaN equality.
-    return (if (a == 0.0f) 0.0f else a) == (if (b == 0.0f) 0.0f else b) || (a.isNaN() && b.isNaN())
-  }
-
-  fun doubleHash(d: Double): Int {
-    // Normalize -0.0 to 0.0 and handle NaN to ensure consistent hash codes.
-    val normalized = if (d == 0.0) 0.0 else d
-    val bits = java.lang.Double.doubleToLongBits(normalized)
-    return (bits xor (bits ushr 32)).toInt()
-  }
-
-  fun floatHash(f: Float): Int {
-    // Normalize -0.0 to 0.0 and handle NaN to ensure consistent hash codes.
-    val normalized = if (f == 0.0f) 0.0f else f
-    return java.lang.Float.floatToIntBits(normalized)
-  }
-
-  fun deepEquals(a: Any?, b: Any?): Boolean {
-    if (a === b) {
-      return true
-    }
-    if (a == null || b == null) {
-      return false
-    }
-    if (a is ByteArray && b is ByteArray) {
-      return a.contentEquals(b)
-    }
-    if (a is IntArray && b is IntArray) {
-      return a.contentEquals(b)
-    }
-    if (a is LongArray && b is LongArray) {
-      return a.contentEquals(b)
-    }
-    if (a is DoubleArray && b is DoubleArray) {
-      if (a.size != b.size) return false
-      for (i in a.indices) {
-        if (!doubleEquals(a[i], b[i])) return false
-      }
-      return true
-    }
-    if (a is FloatArray && b is FloatArray) {
-      if (a.size != b.size) return false
-      for (i in a.indices) {
-        if (!floatEquals(a[i], b[i])) return false
-      }
-      return true
-    }
-    if (a is Array<*> && b is Array<*>) {
-      if (a.size != b.size) return false
-      for (i in a.indices) {
-        if (!deepEquals(a[i], b[i])) return false
-      }
-      return true
-    }
-    if (a is List<*> && b is List<*>) {
-      if (a.size != b.size) return false
-      val iterA = a.iterator()
-      val iterB = b.iterator()
-      while (iterA.hasNext() && iterB.hasNext()) {
-        if (!deepEquals(iterA.next(), iterB.next())) return false
-      }
-      return true
-    }
-    if (a is Map<*, *> && b is Map<*, *>) {
-      if (a.size != b.size) return false
-      for (entry in a) {
-        val key = entry.key
-        var found = false
-        for (bEntry in b) {
-          if (deepEquals(key, bEntry.key)) {
-            if (deepEquals(entry.value, bEntry.value)) {
-              found = true
-              break
-            } else {
-              return false
-            }
-          }
-        }
-        if (!found) return false
-      }
-      return true
-    }
-    if (a is Double && b is Double) {
-      return doubleEquals(a, b)
-    }
-    if (a is Float && b is Float) {
-      return floatEquals(a, b)
-    }
-    return a == b
-  }
-
-  fun deepHash(value: Any?): Int {
-    return when (value) {
-      null -> 0
-      is ByteArray -> value.contentHashCode()
-      is IntArray -> value.contentHashCode()
-      is LongArray -> value.contentHashCode()
-      is DoubleArray -> {
-        var result = 1
-        for (item in value) {
-          result = 31 * result + doubleHash(item)
-        }
-        result
-      }
-      is FloatArray -> {
-        var result = 1
-        for (item in value) {
-          result = 31 * result + floatHash(item)
-        }
-        result
-      }
-      is Array<*> -> {
-        var result = 1
-        for (item in value) {
-          result = 31 * result + deepHash(item)
-        }
-        result
-      }
-      is List<*> -> {
-        var result = 1
-        for (item in value) {
-          result = 31 * result + deepHash(item)
-        }
-        result
-      }
-      is Map<*, *> -> {
-        var result = 0
-        for (entry in value) {
-          result += ((deepHash(entry.key) * 31) xor deepHash(entry.value))
-        }
-        result
-      }
-      is Double -> doubleHash(value)
-      is Float -> floatHash(value)
-      else -> value.hashCode()
-    }
-  }
-
-}
-
-/**
- * Error class for passing custom error details to Flutter via a thrown PlatformException.
- * @property code The error code.
- * @property message The error message.
- * @property details The error details. Must be a datatype supported by the api codec.
- */
-class FlutterError (
-  val code: String,
-  override val message: String? = null,
-  val details: Any? = null
-) : RuntimeException()
-
-/** Generated class from Pigeon that represents data sent in messages. */
-data class ViewIntentPayload (
-  val path: String? = null,
-  val mimeType: String,
-  val localAssetId: String? = null
-)
- {
-  companion object {
-    fun fromList(pigeonVar_list: List<Any?>): ViewIntentPayload {
-      val path = pigeonVar_list[0] as String?
-      val mimeType = pigeonVar_list[1] as String
-      val localAssetId = pigeonVar_list[2] as String?
-      return ViewIntentPayload(path, mimeType, localAssetId)
-    }
-  }
-  fun toList(): List<Any?> {
-    return listOf(
-      path,
-      mimeType,
-      localAssetId,
-    )
-  }
-  override fun equals(other: Any?): Boolean {
-    if (other == null || other.javaClass != javaClass) {
-      return false
-    }
-    if (this === other) {
-      return true
-    }
-    val other = other as ViewIntentPayload
-    return ViewIntentPigeonUtils.deepEquals(this.path, other.path) && ViewIntentPigeonUtils.deepEquals(this.mimeType, other.mimeType) && ViewIntentPigeonUtils.deepEquals(this.localAssetId, other.localAssetId)
-  }
-
-  override fun hashCode(): Int {
-    var result = javaClass.hashCode()
-    result = 31 * result + ViewIntentPigeonUtils.deepHash(this.path)
-    result = 31 * result + ViewIntentPigeonUtils.deepHash(this.mimeType)
-    result = 31 * result + ViewIntentPigeonUtils.deepHash(this.localAssetId)
-    return result
-  }
-}
-private open class ViewIntentPigeonCodec : StandardMessageCodec() {
-  override fun readValueOfType(type: Byte, buffer: ByteBuffer): Any? {
-    return when (type) {
-      129.toByte() -> {
-        return (readValue(buffer) as? List<Any?>)?.let {
-          ViewIntentPayload.fromList(it)
-        }
-      }
-      else -> super.readValueOfType(type, buffer)
-    }
-  }
-  override fun writeValue(stream: ByteArrayOutputStream, value: Any?)   {
-    when (value) {
-      is ViewIntentPayload -> {
-        stream.write(129)
-        writeValue(stream, value.toList())
-      }
-      else -> super.writeValue(stream, value)
-    }
-  }
-}
-
-
-/** Generated interface from Pigeon that represents a handler of messages from Flutter. */
-interface ViewIntentHostApi {
-  fun consumeViewIntent(callback: (Result<ViewIntentPayload?>) -> Unit)
-
-  companion object {
-    /** The codec used by ViewIntentHostApi. */
-    val codec: MessageCodec<Any?> by lazy {
-      ViewIntentPigeonCodec()
-    }
-    /** Sets up an instance of `ViewIntentHostApi` to handle messages through the `binaryMessenger`. */
-    @JvmOverloads
-    fun setUp(binaryMessenger: BinaryMessenger, api: ViewIntentHostApi?, messageChannelSuffix: String = "") {
-      val separatedMessageChannelSuffix = if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else ""
-      run {
-        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.ViewIntentHostApi.consumeViewIntent$separatedMessageChannelSuffix", codec)
-        if (api != null) {
-          channel.setMessageHandler { _, reply ->
-            api.consumeViewIntent{ result: Result<ViewIntentPayload?> ->
-              val error = result.exceptionOrNull()
-              if (error != null) {
-                reply.reply(ViewIntentPigeonUtils.wrapError(error))
-              } else {
-                val data = result.getOrNull()
-                reply.reply(ViewIntentPigeonUtils.wrapResult(data))
-              }
-            }
-          }
-        } else {
-          channel.setMessageHandler(null)
-        }
-      }
-    }
-  }
-}
@@ -1,201 +0,0 @@
-package app.alextran.immich.viewintent
-
-import android.app.Activity
-import android.content.Context
-import android.content.Intent
-import android.net.Uri
-import android.provider.DocumentsContract
-import android.provider.MediaStore
-import android.provider.OpenableColumns
-import android.util.Log
-import android.webkit.MimeTypeMap
-import io.flutter.embedding.engine.plugins.FlutterPlugin
-import io.flutter.embedding.engine.plugins.activity.ActivityAware
-import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding
-import io.flutter.plugin.common.PluginRegistry
-import java.io.File
-import java.io.FileOutputStream
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.SupervisorJob
-import kotlinx.coroutines.cancel
-import kotlinx.coroutines.launch
-
-private const val TAG = "ViewIntentPlugin"
-
-class ViewIntentPlugin : FlutterPlugin, ActivityAware, PluginRegistry.NewIntentListener, ViewIntentHostApi {
-  private var context: Context? = null
-  private var activity: Activity? = null
-  private var unconsumedIntent: Intent? = null
-  private val ioScope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
-
-  override fun onAttachedToEngine(binding: FlutterPlugin.FlutterPluginBinding) {
-    context = binding.applicationContext
-    ViewIntentHostApi.setUp(binding.binaryMessenger, this)
-  }
-
-  override fun onDetachedFromEngine(binding: FlutterPlugin.FlutterPluginBinding) {
-    ViewIntentHostApi.setUp(binding.binaryMessenger, null)
-    ioScope.cancel()
-    context = null
-  }
-
-  override fun onAttachedToActivity(binding: ActivityPluginBinding) {
-    activity = binding.activity
-    unconsumedIntent = binding.activity.intent
-    binding.addOnNewIntentListener(this)
-  }
-
-  override fun onDetachedFromActivityForConfigChanges() {
-    activity = null
-  }
-
-  override fun onReattachedToActivityForConfigChanges(binding: ActivityPluginBinding) {
-    onAttachedToActivity(binding)
-  }
-
-  override fun onDetachedFromActivity() {
-    activity = null
-  }
-
-  override fun onNewIntent(intent: Intent): Boolean {
-    unconsumedIntent = intent
-    return false
-  }
-
-  override fun consumeViewIntent(callback: (Result<ViewIntentPayload?>) -> Unit) {
-    val context = context ?: run {
-      callback(Result.success(null))
-      return
-    }
-    val intent = unconsumedIntent ?: activity?.intent
-
-    if (intent?.action != Intent.ACTION_VIEW) {
-      callback(Result.success(null))
-      return
-    }
-
-    val uri = intent.data
-    if (uri == null) {
-      callback(Result.success(null))
-      return
-    }
-
-    ioScope.launch {
-      try {
-        val mimeType = context.contentResolver.getType(uri) ?: intent.type
-        if (mimeType == null || (!mimeType.startsWith("image/") && !mimeType.startsWith("video/"))) {
-          callback(Result.success(null))
-          return@launch
-        }
-
-        val localAssetId = extractLocalAssetId(context, uri, mimeType)
-        val tempFilePath = if (localAssetId == null) {
-          copyUriToTempFile(context, uri, mimeType)?.absolutePath ?: run {
-            callback(Result.success(null))
-            return@launch
-          }
-        } else {
-          null
-        }
-        val payload = ViewIntentPayload(
-          path = tempFilePath,
-          mimeType = mimeType,
-          localAssetId = localAssetId,
-        )
-        consumeViewIntent(intent)
-        callback(Result.success(payload))
-      } catch (e: Exception) {
-        callback(Result.failure(e))
-      }
-    }
-  }
-
-  private fun consumeViewIntent(currentIntent: Intent) {
-    unconsumedIntent = Intent(currentIntent).apply {
-      action = null
-      data = null
-      type = null
-    }
-    activity?.intent = unconsumedIntent
-  }
-
-  private fun extractLocalAssetId(context: Context, uri: Uri, mimeType: String): String? {
-    return tryExtractDocumentLocalAssetId(context, uri)
-      ?: tryParseContentUriId(uri)
-      ?: resolveLocalIdByNameAndSize(context, uri, mimeType)
-  }
-
-  private fun tryExtractDocumentLocalAssetId(context: Context, uri: Uri): String? {
-    return try {
-      if (!DocumentsContract.isDocumentUri(context, uri)) return null
-      val docId = DocumentsContract.getDocumentId(uri)
-      if (docId.isBlank() || docId.startsWith("raw:")) return null
-      docId.substringAfter(':', docId).toLongOrNull()?.toString()
-    } catch (e: Exception) {
-      Log.w(TAG, "Failed to resolve local asset id from document URI: $uri", e)
-      null
-    }
-  }
-
-  private fun tryParseContentUriId(uri: Uri): String? {
-    val id = uri.lastPathSegment?.toLongOrNull() ?: return null
-    return if (id >= 0) id.toString() else null
-  }
-
-  private fun copyUriToTempFile(context: Context, uri: Uri, mimeType: String): File? {
-    return try {
-      val extension = MimeTypeMap.getSingleton().getExtensionFromMimeType(mimeType)?.let { ".$it" }
-      val tempFile = File.createTempFile("view_intent_", extension, context.cacheDir)
-      context.contentResolver.openInputStream(uri)?.use { inputStream ->
-        FileOutputStream(tempFile).use { outputStream ->
-          inputStream.copyTo(outputStream)
-        }
-      } ?: return null
-      tempFile
-    } catch (_: Exception) {
-      null
-    }
-  }
-
-  private fun resolveLocalIdByNameAndSize(context: Context, uri: Uri, mimeType: String): String? {
-    val metaProjection = arrayOf(OpenableColumns.DISPLAY_NAME, OpenableColumns.SIZE)
-    val (displayName, size) =
-      try {
-        context.contentResolver.query(uri, metaProjection, null, null, null)?.use { cursor ->
-          if (!cursor.moveToFirst()) return null
-          val nameIdx = cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME)
-          val sizeIdx = cursor.getColumnIndex(OpenableColumns.SIZE)
-          val name = if (nameIdx >= 0) cursor.getString(nameIdx) else null
-          val bytes = if (sizeIdx >= 0) cursor.getLong(sizeIdx) else -1L
-          if (name.isNullOrBlank() || bytes < 0) return null
-          name to bytes
-        } ?: return null
-      } catch (_: Exception) {
-        return null
-      }
-
-    val tableUri = when {
-      mimeType.startsWith("image/") -> MediaStore.Images.Media.EXTERNAL_CONTENT_URI
-      mimeType.startsWith("video/") -> MediaStore.Video.Media.EXTERNAL_CONTENT_URI
-      else -> return null
-    }
-    return try {
-      context.contentResolver
-        .query(
-          tableUri,
-          arrayOf(MediaStore.MediaColumns._ID),
-          "${MediaStore.MediaColumns.DISPLAY_NAME}=? AND ${MediaStore.MediaColumns.SIZE}=?",
-          arrayOf(displayName, size.toString()),
-          "${MediaStore.MediaColumns.DATE_MODIFIED} DESC",
-        )?.use { cursor ->
-          if (!cursor.moveToFirst()) return null
-          val idIndex = cursor.getColumnIndex(MediaStore.MediaColumns._ID)
-          if (idIndex < 0) return null
-          cursor.getLong(idIndex).toString()
-        }
-    } catch (_: Exception) {
-      null
-    }
-  }
-}
@@ -1,154 +0,0 @@
-import 'dart:async';
-
-import 'package:drift/drift.dart' show Value;
-import 'package:flutter_test/flutter_test.dart';
-import 'package:immich_mobile/domain/models/store.model.dart';
-import 'package:immich_mobile/domain/utils/background_sync.dart';
-import 'package:immich_mobile/entities/store.entity.dart';
-import 'package:immich_mobile/infrastructure/entities/user.entity.drift.dart';
-import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
-import 'package:immich_mobile/main.dart' as app;
-import 'package:immich_mobile/services/api.service.dart';
-import 'package:immich_mobile/utils/bootstrap.dart';
-import 'package:immich_mobile/wm_executor.dart';
-import 'package:integration_test/integration_test.dart';
-import 'package:openapi/api.dart';
-
-import 'test_utils/fake_immich_server.dart';
-
-void main() {
-  final binding = IntegrationTestWidgetsFlutterBinding.ensureInitialized();
-  // These tests do real I/O without pumping a widget tree, so disable the fake async clock
-  binding.framePolicy = LiveTestWidgetsFlutterBindingFramePolicy.fullyLive;
-
-  late Drift drift;
-  late FakeImmichServer server;
-
-  setUpAll(() async {
-    await app.initApp();
-    (drift, _) = await Bootstrap.initDomain();
-  });
-
-  setUp(() async {
-    await workerManagerPatch.init(dynamicSpawning: true);
-    server = await FakeImmichServer.start();
-    await ApiService().resolveAndSetEndpoint(server.endpoint);
-    await drift.delete(drift.userEntity).go();
-    await Store.delete(StoreKey.syncMigrationStatus);
-  });
-
-  tearDown(() async {
-    await workerManagerPatch.dispose();
-    await server.close();
-    await Store.delete(StoreKey.serverEndpoint);
-    await Store.delete(StoreKey.syncMigrationStatus);
-  });
-
-  void sendUser(SyncStream stream, String id, String name) {
-    stream.send(
-      type: SyncEntityType.userV1.value,
-      data: SyncUserV1(
-        id: id,
-        name: name,
-        email: '$id@test.com',
-        hasProfileImage: false,
-        deletedAt: null,
-        profileChangedAt: DateTime.utc(2025),
-      ).toJson(),
-      ack: id,
-    );
-  }
-
-  Future<bool> dbReadable() async {
-    try {
-      await drift.customSelect('SELECT 1').get().timeout(const Duration(seconds: 5));
-      return true;
-    } catch (_) {
-      return false;
-    }
-  }
-
-  Future<int> userCount() async => (await drift.select(drift.userEntity).get()).length;
-
-  // Starts a remote sync and resolves once its /sync/stream request is open.
-  Future<(Future<bool>, SyncStream)> startSync() async {
-    final sync = BackgroundSyncManager().syncRemote();
-    final stream = await server.streamOpened.timeout(
-      const Duration(seconds: 30),
-      onTimeout: () => fail('sync isolate never opened /sync/stream'),
-    );
-    return (sync, stream);
-  }
-
-  testWidgets('a full sync ingests streamed events into the shared DB', (tester) async {
-    expect(await userCount(), 0);
-
-    final (sync, stream) = await startSync();
-
-    sendUser(stream, 'u1', 'Alice');
-    sendUser(stream, 'u2', 'Bob');
-    await stream.close();
-
-    final result = await sync.timeout(
-      const Duration(seconds: 30),
-      onTimeout: () => fail('sync did not complete after the stream ended'),
-    );
-    expect(result, isTrue);
-    expect(await userCount(), 2);
-    expect(server.ackRequests, greaterThan(0));
-  });
-
-  testWidgets('disposing the pool during an in-flight sync drains promptly', (tester) async {
-    final (sync, _) = await startSync();
-
-    final sw = Stopwatch()..start();
-    await workerManagerPatch.dispose().timeout(
-      const Duration(seconds: 15),
-      onTimeout: () => fail('dispose() hung — worker did not drain and exit'),
-    );
-    expect(sw.elapsed, lessThan(const Duration(seconds: 10)), reason: 'abort-driven, not socket-timeout bound');
-
-    expect(await sync.timeout(const Duration(seconds: 5), onTimeout: () => false), isFalse);
-  });
-
-  testWidgets('tearing down a worker blocked mid-write leaves the DB usable', (tester) async {
-    final (sync, stream) = await startSync();
-
-    // Hold an exclusive write transaction so the worker's write is blocked. The lock is taken only
-    // after the stream opens to avoid blocking the worker's own startup DB reads.
-    final releaseTxn = Completer<void>();
-    final txnHeld = Completer<void>();
-    final txn = drift.transaction(() async {
-      await drift.into(drift.userEntity).insert(
-            UserEntityCompanion.insert(
-              id: 'holder',
-              name: 'holder',
-              email: 'holder@test.com',
-              hasProfileImage: const Value(false),
-              profileChangedAt: Value(DateTime.utc(2025)),
-            ),
-          );
-      txnHeld.complete();
-      await releaseTxn.future;
-    });
-    await txnHeld.future;
-
-    sendUser(stream, 'u1', 'Alice');
-    await stream.close();
-
-    // dispose() can only finish once the worker unwinds, which is blocked on the
-    // lock — so start it, release the lock, then await completion.
-    final disposed = workerManagerPatch.dispose();
-    releaseTxn.complete();
-    await txn;
-    await disposed.timeout(
-      const Duration(seconds: 15),
-      onTimeout: () => fail('dispose() hung after releasing the write lock'),
-    );
-    await sync.timeout(const Duration(seconds: 5), onTimeout: () => false);
-
-    expect(await dbReadable(), isTrue);
-    final users = await drift.select(drift.userEntity).get();
-    expect(users.map((u) => u.id), contains('holder'));
-  });
-}
@@ -1,115 +0,0 @@
-import 'dart:async';
-import 'dart:convert';
-import 'dart:io';
-
-/// A dummy localhost server that implements only the endpoints that remote-sync touches.
-class FakeImmichServer {
-  FakeImmichServer._(this._server, this.version);
-
-  final HttpServer _server;
-  final (int, int, int) version;
-
-  final Completer<SyncStream> _streamOpened = Completer<SyncStream>();
-
-  int ackRequests = 0;
-
-  String get endpoint => 'http://${_server.address.host}:${_server.port}/api';
-
-  /// Resolves when the sync isolate opens `POST /sync/stream`.
-  Future<SyncStream> get streamOpened => _streamOpened.future;
-
-  static Future<FakeImmichServer> start({(int, int, int) version = (3, 0, 0)}) async {
-    final server = await HttpServer.bind(InternetAddress.loopbackIPv4, 0);
-    final fake = FakeImmichServer._(server, version);
-    fake._listen();
-    return fake;
-  }
-
-  void _listen() {
-    // A connection torn down mid-write during teardown is expected
-    _server.listen((request) => unawaited(_route(request).catchError((_) {})));
-  }
-
-  Future<void> _route(HttpRequest request) async {
-    final method = request.method;
-    final path = request.uri.path;
-
-    if (method == 'GET' && path == '/api/server/ping') {
-      return _respondJson(request, {'res': 'pong'});
-    }
-    if (method == 'GET' && path == '/api/server/version') {
-      final (major, minor, patch) = version;
-      return _respondJson(request, {'major': major, 'minor': minor, 'patch': patch});
-    }
-    if (path == '/api/sync/ack') {
-      if (method != 'DELETE') {
-        ackRequests++;
-      }
-      return _respondEmpty(request);
-    }
-    if (method == 'POST' && path == '/api/sync/stream') {
-      return _openSyncStream(request);
-    }
-    return _respondEmpty(request, status: HttpStatus.notFound);
-  }
-
-  Future<void> _openSyncStream(HttpRequest request) async {
-    await request.drain<void>();
-    request.response
-      ..statusCode = HttpStatus.ok
-      ..headers.contentType = ContentType('application', 'jsonlines+json')
-      ..contentLength = -1 // chunked: stays open to stream incrementally
-      ..bufferOutput = false;
-    // Flush headers so the client's send() resolves and enters its read loop.
-    await request.response.flush();
-    if (!_streamOpened.isCompleted) {
-      _streamOpened.complete(SyncStream._(request.response));
-    }
-  }
-
-  Future<void> _respondJson(HttpRequest request, Object body) async {
-    await request.drain<void>();
-    request.response
-      ..statusCode = HttpStatus.ok
-      ..headers.contentType = ContentType.json
-      ..write(jsonEncode(body));
-    await request.response.close();
-  }
-
-  Future<void> _respondEmpty(HttpRequest request, {int status = HttpStatus.ok}) async {
-    await request.drain<void>();
-    request.response.statusCode = status;
-    await request.response.close();
-  }
-
-  Future<void> close() async {
-    if (_streamOpened.isCompleted) {
-      await (await _streamOpened.future).close();
-    }
-    await _server.close(force: true);
-  }
-}
-
-/// Handle to the open `/sync/stream` response: push jsonlines events, then end.
-class SyncStream {
-  SyncStream._(this._response);
-
-  final HttpResponse _response;
-  bool _closed = false;
-
-  /// [data] should be a Sync*V1 DTO's `toJson()` so the parser's `fromJson` round-trips it.
-  void send({required String type, required Object data, required String ack}) {
-    if (_closed) {
-      return;
-    }
-    _response.write('${jsonEncode({'type': type, 'data': data, 'ack': ack})}\n');
-  }
-
-  Future<void> close() async {
-    if (_closed) {
-      return;
-    }
-    _closed = true;
-    await _response.close();
-  }
-}
@@ -9,7 +9,7 @@
 /* Begin PBXBuildFile section */
 		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
-		467DA6EAF83F3481F8BD94AB /* Pods_ShareExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8AB817AA297EDEC88B23F3F6 /* Pods_ShareExtension.framework */; };
+		3B6A31FED0FC846D6BD69BBC /* Pods_ShareExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 357FC57E54FD0F51795CF28A /* Pods_ShareExtension.framework */; };
 		74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
 		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
 		97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
@@ -22,7 +22,7 @@
 		B2EE00022E72CA15008B6CA7 /* PermissionApi.g.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2EE00012E72CA15008B6CA7 /* PermissionApi.g.swift */; };
 		B2EE00042E72CA15008B6CA7 /* PermissionApiImpl.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2EE00032E72CA15008B6CA7 /* PermissionApiImpl.swift */; };
 		B2BE315F2E5E5229006EEF88 /* BackgroundWorker.g.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2BE315E2E5E5229006EEF88 /* BackgroundWorker.g.swift */; };
-		D3BED739C0BC29BB32E18EB2 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CC499FBCE6B29B2DAFED7130 /* Pods_Runner.framework */; };
+		D218389C4A4C4693F141F7D1 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 886774DBDDE6B35BF2B4F2CD /* Pods_Runner.framework */; };
 		F02538E92DFBCBDD008C3FA3 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
 		F0B57D3A2DF764BD00DC5BCC /* WidgetKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F0B57D392DF764BD00DC5BCC /* WidgetKit.framework */; };
 		F0B57D3C2DF764BD00DC5BCC /* SwiftUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F0B57D3B2DF764BD00DC5BCC /* SwiftUI.framework */; };
@@ -85,18 +85,16 @@
 /* End PBXCopyFilesBuildPhase section */

 /* Begin PBXFileReference section */
-		10B378D23F917891A0F23E33 /* Pods-ShareExtension.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ShareExtension.release.xcconfig"; path = "Target Support Files/Pods-ShareExtension/Pods-ShareExtension.release.xcconfig"; sourceTree = "<group>"; };
 		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
 		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
+		2E3441B73560D0F6FD25E04F /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
+		357FC57E54FD0F51795CF28A /* Pods_ShareExtension.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ShareExtension.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
-		614A7F5DC5DB09E89E4FCBE8 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
-		681FBA560D5D2ADDE4F0B59E /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
-		6D160F04A389B9FFBC557803 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
+		571EAA93D77181C7C98C2EA6 /* Pods-ShareExtension.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ShareExtension.release.xcconfig"; path = "Target Support Files/Pods-ShareExtension/Pods-ShareExtension.release.xcconfig"; sourceTree = "<group>"; };
 		74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
 		74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
-		8AB817AA297EDEC88B23F3F6 /* Pods_ShareExtension.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ShareExtension.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		937632897A02DE9C249F20A6 /* Pods-ShareExtension.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ShareExtension.debug.xcconfig"; path = "Target Support Files/Pods-ShareExtension/Pods-ShareExtension.debug.xcconfig"; sourceTree = "<group>"; };
+		886774DBDDE6B35BF2B4F2CD /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
 		9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
 		97C146EE1CF9000F007C117D /* Immich-Debug.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Immich-Debug.app"; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -105,6 +103,7 @@
 		97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		A01DD6982F7F43B40049AB63 /* ImageRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageRequest.swift; sourceTree = "<group>"; };
+		B1FBA9EE014DE20271B0FE77 /* Pods-ShareExtension.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ShareExtension.profile.xcconfig"; path = "Target Support Files/Pods-ShareExtension/Pods-ShareExtension.profile.xcconfig"; sourceTree = "<group>"; };
 		B21E34A92E5AFD210031FDB9 /* BackgroundWorkerApiImpl.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BackgroundWorkerApiImpl.swift; sourceTree = "<group>"; };
 		B21E34AB2E5B09100031FDB9 /* BackgroundWorker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BackgroundWorker.swift; sourceTree = "<group>"; };
 		B25D37782E72CA15008B6CA7 /* Connectivity.g.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Connectivity.g.swift; sourceTree = "<group>"; };
@@ -112,11 +111,12 @@
 		B2EE00012E72CA15008B6CA7 /* PermissionApi.g.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PermissionApi.g.swift; sourceTree = "<group>"; };
 		B2EE00032E72CA15008B6CA7 /* PermissionApiImpl.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PermissionApiImpl.swift; sourceTree = "<group>"; };
 		B2BE315E2E5E5229006EEF88 /* BackgroundWorker.g.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BackgroundWorker.g.swift; sourceTree = "<group>"; };
-		C4A6A71F33CE37B3C913115C /* Pods-ShareExtension.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ShareExtension.profile.xcconfig"; path = "Target Support Files/Pods-ShareExtension/Pods-ShareExtension.profile.xcconfig"; sourceTree = "<group>"; };
-		CC499FBCE6B29B2DAFED7130 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		E0E99CDC17B3EB7FA8BA2332 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
 		F0B57D382DF764BD00DC5BCC /* WidgetExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = WidgetExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; };
 		F0B57D392DF764BD00DC5BCC /* WidgetKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WidgetKit.framework; path = System/Library/Frameworks/WidgetKit.framework; sourceTree = SDKROOT; };
 		F0B57D3B2DF764BD00DC5BCC /* SwiftUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SwiftUI.framework; path = System/Library/Frameworks/SwiftUI.framework; sourceTree = SDKROOT; };
+		F7101BB0391A314774615E89 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
+		F8A35EA3C3E01BD66AFDE0E5 /* Pods-ShareExtension.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ShareExtension.debug.xcconfig"; path = "Target Support Files/Pods-ShareExtension/Pods-ShareExtension.debug.xcconfig"; sourceTree = "<group>"; };
 		FA9973382CF6DF4B000EF859 /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = "<group>"; };
 		FAC6F8902D287C890078CB2F /* ShareExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = ShareExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; };
 		FAC6F8B12D287F120078CB2F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -199,7 +199,7 @@
 				FEE084F82EC172460045228E /* SQLiteData in Frameworks */,
 				FEE084FB2EC1725A0045228E /* RawStructuredFieldValues in Frameworks */,
 				FEE084FD2EC1725A0045228E /* StructuredFieldValues in Frameworks */,
-				D3BED739C0BC29BB32E18EB2 /* Pods_Runner.framework in Frameworks */,
+				D218389C4A4C4693F141F7D1 /* Pods_Runner.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -216,7 +216,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				467DA6EAF83F3481F8BD94AB /* Pods_ShareExtension.framework in Frameworks */,
+				3B6A31FED0FC846D6BD69BBC /* Pods_ShareExtension.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -226,12 +226,12 @@
 		0FB772A5B9601143383626CA /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				614A7F5DC5DB09E89E4FCBE8 /* Pods-Runner.debug.xcconfig */,
-				6D160F04A389B9FFBC557803 /* Pods-Runner.release.xcconfig */,
-				681FBA560D5D2ADDE4F0B59E /* Pods-Runner.profile.xcconfig */,
-				937632897A02DE9C249F20A6 /* Pods-ShareExtension.debug.xcconfig */,
-				10B378D23F917891A0F23E33 /* Pods-ShareExtension.release.xcconfig */,
-				C4A6A71F33CE37B3C913115C /* Pods-ShareExtension.profile.xcconfig */,
+				2E3441B73560D0F6FD25E04F /* Pods-Runner.debug.xcconfig */,
+				E0E99CDC17B3EB7FA8BA2332 /* Pods-Runner.release.xcconfig */,
+				F7101BB0391A314774615E89 /* Pods-Runner.profile.xcconfig */,
+				F8A35EA3C3E01BD66AFDE0E5 /* Pods-ShareExtension.debug.xcconfig */,
+				571EAA93D77181C7C98C2EA6 /* Pods-ShareExtension.release.xcconfig */,
+				B1FBA9EE014DE20271B0FE77 /* Pods-ShareExtension.profile.xcconfig */,
 			);
 			path = Pods;
 			sourceTree = "<group>";
@@ -239,10 +239,10 @@
 		1754452DD81DA6620E279E51 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				886774DBDDE6B35BF2B4F2CD /* Pods_Runner.framework */,
+				357FC57E54FD0F51795CF28A /* Pods_ShareExtension.framework */,
 				F0B57D392DF764BD00DC5BCC /* WidgetKit.framework */,
 				F0B57D3B2DF764BD00DC5BCC /* SwiftUI.framework */,
-				CC499FBCE6B29B2DAFED7130 /* Pods_Runner.framework */,
-				8AB817AA297EDEC88B23F3F6 /* Pods_ShareExtension.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -370,7 +370,7 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
 			buildPhases = (
-				BAEA01ACA3F5C9CD3D732370 /* [CP] Check Pods Manifest.lock */,
+				4044AF030EF7D8721844FFBA /* [CP] Check Pods Manifest.lock */,
 				9740EEB61CF901F6004384FC /* Run Script */,
 				97C146EA1CF9000F007C117D /* Sources */,
 				97C146EB1CF9000F007C117D /* Frameworks */,
@@ -378,8 +378,8 @@
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				FAC6F89A2D287C890078CB2F /* Embed Foundation Extensions */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
-				513DA7292DED6106813332F4 /* [CP] Embed Pods Frameworks */,
-				2FA39DEC809D6D7C4A01EFCB /* [CP] Copy Pods Resources */,
+				D218A34AEE62BC1EF119F5B0 /* [CP] Embed Pods Frameworks */,
+				6724EEB7D74949FA08581154 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -393,9 +393,6 @@
 				FEE084F22EC172080045228E /* Schemas */,
 			);
 			name = Runner;
-			packageProductDependencies = (
-				78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */,
-			);
 			productName = Runner;
 			productReference = 97C146EE1CF9000F007C117D /* Immich-Debug.app */;
 			productType = "com.apple.product-type.application";
@@ -424,7 +421,7 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = FAC6F8A02D287C890078CB2F /* Build configuration list for PBXNativeTarget "ShareExtension" */;
 			buildPhases = (
-				8EC9CF3E20AF32BF24D4F3E1 /* [CP] Check Pods Manifest.lock */,
+				3BEF3D71D97E337D921C0EB5 /* [CP] Check Pods Manifest.lock */,
 				FAC6F88C2D287C890078CB2F /* Sources */,
 				FAC6F88D2D287C890078CB2F /* Frameworks */,
 				FAC6F88E2D287C890078CB2F /* Resources */,
@@ -473,7 +470,7 @@
 			);
 			mainGroup = 97C146E51CF9000F007C117D;
 			packageReferences = (
-				781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */,
+				781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */,
 				FEE084F62EC172460045228E /* XCRemoteSwiftPackageReference "sqlite-data" */,
 				FEE084F92EC1725A0045228E /* XCRemoteSwiftPackageReference "swift-http-structured-headers" */,
 			);
@@ -520,23 +517,6 @@
 /* End PBXResourcesBuildPhase section */

 /* Begin PBXShellScriptBuildPhase section */
-		2FA39DEC809D6D7C4A01EFCB /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
-			);
-			name = "[CP] Copy Pods Resources";
-			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
 			isa = PBXShellScriptBuildPhase;
 			alwaysOutOfDate = 1;
@@ -553,24 +533,7 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
 		};
-		513DA7292DED6106813332F4 /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		8EC9CF3E20AF32BF24D4F3E1 /* [CP] Check Pods Manifest.lock */ = {
+		3BEF3D71D97E337D921C0EB5 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -592,22 +555,7 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		9740EEB61CF901F6004384FC /* Run Script */ = {
-			isa = PBXShellScriptBuildPhase;
-			alwaysOutOfDate = 1;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "Run Script";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build\n";
-		};
-		BAEA01ACA3F5C9CD3D732370 /* [CP] Check Pods Manifest.lock */ = {
+		4044AF030EF7D8721844FFBA /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -629,6 +577,55 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
+		6724EEB7D74949FA08581154 /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
+			);
+			name = "[CP] Copy Pods Resources";
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		9740EEB61CF901F6004384FC /* Run Script */ = {
+			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Run Script";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build\n";
+		};
+		D218A34AEE62BC1EF119F5B0 /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 /* End PBXShellScriptBuildPhase section */

 /* Begin PBXSourcesBuildPhase section */
@@ -1095,7 +1092,7 @@
 		};
 		FAC6F89C2D287C890078CB2F /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 937632897A02DE9C249F20A6 /* Pods-ShareExtension.debug.xcconfig */;
+			baseConfigurationReference = F8A35EA3C3E01BD66AFDE0E5 /* Pods-ShareExtension.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@@ -1138,7 +1135,7 @@
 		};
 		FAC6F89D2D287C890078CB2F /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 10B378D23F917891A0F23E33 /* Pods-ShareExtension.release.xcconfig */;
+			baseConfigurationReference = 571EAA93D77181C7C98C2EA6 /* Pods-ShareExtension.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@@ -1178,7 +1175,7 @@
 		};
 		FAC6F89E2D287C890078CB2F /* Profile */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = C4A6A71F33CE37B3C913115C /* Pods-ShareExtension.profile.xcconfig */;
+			baseConfigurationReference = B1FBA9EE014DE20271B0FE77 /* Pods-ShareExtension.profile.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@@ -1261,13 +1258,6 @@
 		};
 /* End XCConfigurationList section */

-/* Begin XCLocalSwiftPackageReference section */
-		781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */ = {
-			isa = XCLocalSwiftPackageReference;
-			relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage;
-		};
-/* End XCLocalSwiftPackageReference section */
-
 /* Begin XCRemoteSwiftPackageReference section */
 		FEE084F62EC172460045228E /* XCRemoteSwiftPackageReference "sqlite-data" */ = {
 			isa = XCRemoteSwiftPackageReference;
@@ -1288,10 +1278,6 @@
 /* End XCRemoteSwiftPackageReference section */

 /* Begin XCSwiftPackageProductDependency section */
-		78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */ = {
-			isa = XCSwiftPackageProductDependency;
-			productName = FlutterGeneratedPluginSwiftPackage;
-		};
 		FEE084F72EC172460045228E /* SQLiteData */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = FEE084F62EC172460045228E /* XCRemoteSwiftPackageReference "sqlite-data" */;
@@ -5,8 +5,8 @@
      "kind" : "remoteSourceControl",
      "location" : "https://github.com/pointfreeco/combine-schedulers",
      "state" : {
-        "revision" : "fd16d76fd8b9a976d88bfb6cacc05ca8d19c91b6",
-        "version" : "1.1.0"
+        "revision" : "5928286acce13def418ec36d05a001a9641086f2",
+        "version" : "1.0.3"
      }
    },
    {
@@ -121,8 +121,8 @@ class BackgroundWorker: BackgroundWorkerBgHostApi {
  
  /**
   * Cancels the currently running background task, either due to timeout or external request.
-   * Only tears down the engine after Dart confirms it's drained. If Dart overruns iOS's grace window,
-   * the expiration handler still calls setTaskCompleted and iOS suspends us.
+   * Sends a cancel signal to the Flutter side and sets up a fallback timer to ensure
+   * the completion handler is eventually called even if Flutter doesn't respond.
   */
  func close() {
    if isComplete {
@@ -132,6 +132,12 @@ class BackgroundWorker: BackgroundWorkerBgHostApi {
    flutterApi?.cancel { result in
      self.complete(success: false)
    }
+
+    // Fallback safety mechanism: ensure completion is called within 2 seconds
+    // This prevents the background task from hanging indefinitely if Flutter doesn't respond
+    Timer.scheduledTimer(withTimeInterval: 2, repeats: false) { _ in
+      self.complete(success: false)
+    }
  }

  
@@ -526,17 +526,16 @@ class MessagesPigeonCodec: FlutterStandardMessageCodec, @unchecked Sendable {

 /// Generated protocol from Pigeon that represents a handler of messages from Flutter.
 protocol NativeSyncApi {
-  func shouldFullSync(completion: @escaping (Result<Bool, Error>) -> Void)
-  func getMediaChanges(completion: @escaping (Result<SyncDelta, Error>) -> Void)
+  func shouldFullSync() throws -> Bool
+  func getMediaChanges() throws -> SyncDelta
  func checkpointSync() throws
  func clearSyncCheckpoint() throws
-  func getAssetIdsForAlbum(albumId: String, completion: @escaping (Result<[String], Error>) -> Void)
-  func getAlbums(completion: @escaping (Result<[PlatformAlbum], Error>) -> Void)
+  func getAssetIdsForAlbum(albumId: String) throws -> [String]
+  func getAlbums() throws -> [PlatformAlbum]
  func getAssetsCountSince(albumId: String, timestamp: Int64) throws -> Int64
-  func getAssetsForAlbum(albumId: String, updatedTimeCond: Int64?, completion: @escaping (Result<[PlatformAsset], Error>) -> Void)
+  func getAssetsForAlbum(albumId: String, updatedTimeCond: Int64?) throws -> [PlatformAsset]
  func hashAssets(assetIds: [String], allowNetworkAccess: Bool, completion: @escaping (Result<[HashResult], Error>) -> Void)
  func cancelHashing() throws
-  func cancelSync() throws
  func getTrashedAssets() throws -> [String: [PlatformAsset]]
  func restoreFromTrashById(mediaId: String, type: Int64, completion: @escaping (Result<Bool, Error>) -> Void)
  func getCloudIdForAssetIds(assetIds: [String]) throws -> [CloudIdResult]
@@ -556,28 +555,26 @@ class NativeSyncApiSetup {
    let shouldFullSyncChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.NativeSyncApi.shouldFullSync\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
    if let api = api {
      shouldFullSyncChannel.setMessageHandler { _, reply in
-        api.shouldFullSync { result in
-          switch result {
-          case .success(let res):
-            reply(wrapResult(res))
-          case .failure(let error):
-            reply(wrapError(error))
-          }
+        do {
+          let result = try api.shouldFullSync()
+          reply(wrapResult(result))
+        } catch {
+          reply(wrapError(error))
        }
      }
    } else {
      shouldFullSyncChannel.setMessageHandler(nil)
    }
-    let getMediaChangesChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.NativeSyncApi.getMediaChanges\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
+    let getMediaChangesChannel = taskQueue == nil
+      ? FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.NativeSyncApi.getMediaChanges\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
+      : FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.NativeSyncApi.getMediaChanges\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec, taskQueue: taskQueue)
    if let api = api {
      getMediaChangesChannel.setMessageHandler { _, reply in
-        api.getMediaChanges { result in
-          switch result {
-          case .success(let res):
-            reply(wrapResult(res))
-          case .failure(let error):
-            reply(wrapError(error))
-          }
+        do {
+          let result = try api.getMediaChanges()
+          reply(wrapResult(result))
+        } catch {
+          reply(wrapError(error))
        }
      }
    } else {
@@ -609,33 +606,33 @@ class NativeSyncApiSetup {
    } else {
      clearSyncCheckpointChannel.setMessageHandler(nil)
    }
-    let getAssetIdsForAlbumChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.NativeSyncApi.getAssetIdsForAlbum\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
+    let getAssetIdsForAlbumChannel = taskQueue == nil
+      ? FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.NativeSyncApi.getAssetIdsForAlbum\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
+      : FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.NativeSyncApi.getAssetIdsForAlbum\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec, taskQueue: taskQueue)
    if let api = api {
      getAssetIdsForAlbumChannel.setMessageHandler { message, reply in
        let args = message as! [Any?]
        let albumIdArg = args[0] as! String
-        api.getAssetIdsForAlbum(albumId: albumIdArg) { result in
-          switch result {
-          case .success(let res):
-            reply(wrapResult(res))
-          case .failure(let error):
-            reply(wrapError(error))
-          }
+        do {
+          let result = try api.getAssetIdsForAlbum(albumId: albumIdArg)
+          reply(wrapResult(result))
+        } catch {
+          reply(wrapError(error))
        }
      }
    } else {
      getAssetIdsForAlbumChannel.setMessageHandler(nil)
    }
-    let getAlbumsChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.NativeSyncApi.getAlbums\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
+    let getAlbumsChannel = taskQueue == nil
+      ? FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.NativeSyncApi.getAlbums\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
+      : FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.NativeSyncApi.getAlbums\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec, taskQueue: taskQueue)
    if let api = api {
      getAlbumsChannel.setMessageHandler { _, reply in
-        api.getAlbums { result in
-          switch result {
-          case .success(let res):
-            reply(wrapResult(res))
-          case .failure(let error):
-            reply(wrapError(error))
-          }
+        do {
+          let result = try api.getAlbums()
+          reply(wrapResult(result))
+        } catch {
+          reply(wrapError(error))
        }
      }
    } else {
@@ -659,19 +656,19 @@ class NativeSyncApiSetup {
    } else {
      getAssetsCountSinceChannel.setMessageHandler(nil)
    }
-    let getAssetsForAlbumChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.NativeSyncApi.getAssetsForAlbum\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
+    let getAssetsForAlbumChannel = taskQueue == nil
+      ? FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.NativeSyncApi.getAssetsForAlbum\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
+      : FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.NativeSyncApi.getAssetsForAlbum\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec, taskQueue: taskQueue)
    if let api = api {
      getAssetsForAlbumChannel.setMessageHandler { message, reply in
        let args = message as! [Any?]
        let albumIdArg = args[0] as! String
        let updatedTimeCondArg: Int64? = nilOrValue(args[1])
-        api.getAssetsForAlbum(albumId: albumIdArg, updatedTimeCond: updatedTimeCondArg) { result in
-          switch result {
-          case .success(let res):
-            reply(wrapResult(res))
-          case .failure(let error):
-            reply(wrapError(error))
-          }
+        do {
+          let result = try api.getAssetsForAlbum(albumId: albumIdArg, updatedTimeCond: updatedTimeCondArg)
+          reply(wrapResult(result))
+        } catch {
+          reply(wrapError(error))
        }
      }
    } else {
@@ -710,19 +707,6 @@ class NativeSyncApiSetup {
    } else {
      cancelHashingChannel.setMessageHandler(nil)
    }
-    let cancelSyncChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.NativeSyncApi.cancelSync\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
-    if let api = api {
-      cancelSyncChannel.setMessageHandler { _, reply in
-        do {
-          try api.cancelSync()
-          reply(wrapResult(nil))
-        } catch {
-          reply(wrapError(error))
-        }
-      }
-    } else {
-      cancelSyncChannel.setMessageHandler(nil)
-    }
    let getTrashedAssetsChannel = taskQueue == nil
      ? FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.NativeSyncApi.getTrashedAssets\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
      : FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.NativeSyncApi.getTrashedAssets\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec, taskQueue: taskQueue)
@@ -39,9 +39,6 @@ class NativeSyncApiImpl: ImmichPlugin, NativeSyncApi, FlutterPlugin {
  private static let hashCancelledCode = "HASH_CANCELLED"
  private static let hashCancelled = Result<[HashResult], Error>.failure(PigeonError(code: hashCancelledCode, message: "Hashing cancelled", details: nil))
  
-  private var syncTask: Task<Void?, Error>?
-  private static let syncCancelledCode = "SYNC_CANCELLED"
-  private static let syncCancelled = PigeonError(code: syncCancelledCode, message: "Sync cancelled", details: nil)
  
  init(with defaults: UserDefaults = .standard) {
    self.defaults = defaults
@@ -74,11 +71,7 @@ class NativeSyncApiImpl: ImmichPlugin, NativeSyncApi, FlutterPlugin {
    saveChangeToken(token: PHPhotoLibrary.shared().currentChangeToken)
  }
  
-  func shouldFullSync(completion: @escaping (Result<Bool, Error>) -> Void) {
-    runSync(completion) { $0.shouldFullSync() }
-  }
-  
-  private func shouldFullSync() -> Bool {
+  func shouldFullSync() -> Bool {
    guard #available(iOS 16, *),
          PHPhotoLibrary.authorizationStatus(for: .readWrite) == .authorized,
          let storedToken = getChangeToken() else {
@@ -94,17 +87,12 @@ class NativeSyncApiImpl: ImmichPlugin, NativeSyncApi, FlutterPlugin {
    return false
  }
  
-  func getAlbums(completion: @escaping (Result<[PlatformAlbum], Error>) -> Void) {
-    runSync(completion) { try $0.getAlbums() }
-  }
-  
-  private func getAlbums() throws -> [PlatformAlbum] {
+  func getAlbums() throws -> [PlatformAlbum] {
    var albums: [PlatformAlbum] = []
    
-    for type in albumTypes {
+    albumTypes.forEach { type in
      let collections = PHAssetCollection.fetchAssetCollections(with: type, subtype: .any, options: nil)
      for i in 0..<collections.count {
-        try Task.checkCancellation()
        let album = collections.object(at: i)
        
        // Ignore recovered album
@@ -138,11 +126,7 @@ class NativeSyncApiImpl: ImmichPlugin, NativeSyncApi, FlutterPlugin {
    return albums.sorted { $0.id < $1.id }
  }
  
-  func getMediaChanges(completion: @escaping (Result<SyncDelta, Error>) -> Void) {
-    runSync(completion) { try $0.getMediaChanges() }
-  }
-  
-  private func getMediaChanges() throws -> SyncDelta {
+  func getMediaChanges() throws -> SyncDelta {
    guard #available(iOS 16, *) else {
      throw PigeonError(code: "UNSUPPORTED_OS", message: "This feature requires iOS 16 or later.", details: nil)
    }
@@ -162,49 +146,51 @@ class NativeSyncApiImpl: ImmichPlugin, NativeSyncApi, FlutterPlugin {
      return SyncDelta(hasChanges: false, updates: [], deletes: [], assetAlbums: [:])
    }
    
-    let changes = try PHPhotoLibrary.shared().fetchPersistentChanges(since: storedToken)
-    
-    var updatedAssets: Set<AssetWrapper> = []
-    var deletedAssets: Set<String> = []
-    
-    for change in changes {
-      try Task.checkCancellation()
-      guard let details = try? change.changeDetails(for: PHObjectType.asset) else { continue }
+    do {
+      let changes = try PHPhotoLibrary.shared().fetchPersistentChanges(since: storedToken)
      
-      let updated = details.updatedLocalIdentifiers.union(details.insertedLocalIdentifiers)
-      deletedAssets.formUnion(details.deletedLocalIdentifiers)
+      var updatedAssets: Set<AssetWrapper> = []
+      var deletedAssets: Set<String> = []
      
-      if (updated.isEmpty) { continue }
-      
-      let options = PHFetchOptions()
-      options.includeHiddenAssets = false
-      let result = PHAsset.fetchAssets(withLocalIdentifiers: Array(updated), options: options)
-      for i in 0..<result.count {
-        let asset = result.object(at: i)
+      for change in changes {
+        guard let details = try? change.changeDetails(for: PHObjectType.asset) else { continue }
        
-        // Asset wrapper only uses the id for comparison. Multiple change can contain the same asset, skip duplicate changes
-        let predicate = PlatformAsset(
-          id: asset.localIdentifier,
-          name: "",
-          type: 0,
-          durationMs: 0,
-          orientation: 0,
-          isFavorite: false,
-          playbackStyle: .unknown
-        )
-        if (updatedAssets.contains(AssetWrapper(with: predicate))) {
-          continue
+        let updated = details.updatedLocalIdentifiers.union(details.insertedLocalIdentifiers)
+        deletedAssets.formUnion(details.deletedLocalIdentifiers)
+        
+        if (updated.isEmpty) { continue }
+        
+        let options = PHFetchOptions()
+        options.includeHiddenAssets = false
+        let result = PHAsset.fetchAssets(withLocalIdentifiers: Array(updated), options: options)
+        for i in 0..<result.count {
+          let asset = result.object(at: i)
+          
+          // Asset wrapper only uses the id for comparison. Multiple change can contain the same asset, skip duplicate changes
+          let predicate = PlatformAsset(
+            id: asset.localIdentifier,
+            name: "",
+            type: 0,
+            durationMs: 0,
+            orientation: 0,
+            isFavorite: false,
+            playbackStyle: .unknown
+          )
+          if (updatedAssets.contains(AssetWrapper(with: predicate))) {
+            continue
+          }
+          
+          let domainAsset = AssetWrapper(with: asset.toPlatformAsset())
+          updatedAssets.insert(domainAsset)
        }
-        
-        let domainAsset = AssetWrapper(with: asset.toPlatformAsset())
-        updatedAssets.insert(domainAsset)
      }
+      
+      let updates = Array(updatedAssets.map { $0.asset })
+      return SyncDelta(hasChanges: true, updates: updates, deletes: Array(deletedAssets), assetAlbums: buildAssetAlbumsMap(assets: updates))
    }
-    
-    let updates = Array(updatedAssets.map { $0.asset })
-    return SyncDelta(hasChanges: true, updates: updates, deletes: Array(deletedAssets), assetAlbums: buildAssetAlbumsMap(assets: updates))
  }
  
+  
  private func buildAssetAlbumsMap(assets: Array<PlatformAsset>) -> [String: [String]] {
    guard !assets.isEmpty else {
      return [:]
@@ -227,11 +213,7 @@ class NativeSyncApiImpl: ImmichPlugin, NativeSyncApi, FlutterPlugin {
    return albumAssets
  }
  
-  func getAssetIdsForAlbum(albumId: String, completion: @escaping (Result<[String], Error>) -> Void) {
-    runSync(completion) { try $0.getAssetIdsForAlbum(albumId: albumId) }
-  }
-  
-  private func getAssetIdsForAlbum(albumId: String) throws -> [String] {
+  func getAssetIdsForAlbum(albumId: String) throws -> [String] {
    let collections = PHAssetCollection.fetchAssetCollections(withLocalIdentifiers: [albumId], options: nil)
    guard let album = collections.firstObject else {
      return []
@@ -241,14 +223,9 @@ class NativeSyncApiImpl: ImmichPlugin, NativeSyncApi, FlutterPlugin {
    let options = PHFetchOptions()
    options.includeHiddenAssets = false
    let assets = getAssetsFromAlbum(in: album, options: options)
-    assets.enumerateObjects { (asset, _, stop) in
-      if Task.isCancelled {
-        stop.pointee = true
-        return 
-      }
+    assets.enumerateObjects { (asset, _, _) in
      ids.append(asset.localIdentifier)
    }
-    try Task.checkCancellation()
    return ids
  }
  
@@ -266,11 +243,7 @@ class NativeSyncApiImpl: ImmichPlugin, NativeSyncApi, FlutterPlugin {
    return Int64(assets.count)
  }
  
-  func getAssetsForAlbum(albumId: String, updatedTimeCond: Int64?, completion: @escaping (Result<[PlatformAsset], Error>) -> Void) {
-    runSync(completion) { try $0.getAssetsForAlbum(albumId: albumId, updatedTimeCond: updatedTimeCond) }
-  }
-  
-  private func getAssetsForAlbum(albumId: String, updatedTimeCond: Int64?) throws -> [PlatformAsset] {
+  func getAssetsForAlbum(albumId: String, updatedTimeCond: Int64?) throws -> [PlatformAsset] {
    let collections = PHAssetCollection.fetchAssetCollections(withLocalIdentifiers: [albumId], options: nil)
    guard let album = collections.firstObject else {
      return []
@@ -289,14 +262,9 @@ class NativeSyncApiImpl: ImmichPlugin, NativeSyncApi, FlutterPlugin {
    }
    
    var assets: [PlatformAsset] = []
-    result.enumerateObjects { (asset, _, stop) in
-      if Task.isCancelled {
-        stop.pointee = true
-        return 
-      }
+    result.enumerateObjects { (asset, _, _) in
      assets.append(asset.toPlatformAsset())
    }
-    try Task.checkCancellation()
    return assets
  }
  
@@ -356,31 +324,6 @@ class NativeSyncApiImpl: ImmichPlugin, NativeSyncApi, FlutterPlugin {
    hashTask = nil
  }
  
-  func cancelSync() {
-    syncTask?.cancel()
-    syncTask = nil
-  }
-  
-  private func runSync<T>(
-    _ completion: @escaping (Result<T, Error>) -> Void,
-    _ work: @escaping (NativeSyncApiImpl) throws -> T
-  ) {
-    syncTask?.cancel()
-    syncTask = Task { [weak self] in
-      guard let self else { return nil }
-      let result: Result<T, Error>
-      do {
-        result = .success(try work(self))
-      } catch is CancellationError {
-        result = .failure(Self.syncCancelled)
-      } catch {
-        result = .failure(error)
-      }
-      self.completeWhenActive(for: completion, with: result)
-      return nil
-    }
-  }
-  
  private func hashAsset(_ asset: PHAsset, allowNetworkAccess: Bool) async -> HashResult? {
    class RequestRef {
      var id: PHAssetResourceDataRequestID?
@@ -49,7 +49,7 @@ def get_version_from_pubspec
  pubspec = YAML.load_file(pubspec_path)
  
  version_string = pubspec['version']
-  version_string ? version_string.split('+').first.split('-').first : nil
+  version_string ? version_string.split('+').first : nil
 end
  
  # Helper method to configure code signing for all targets
@@ -12,7 +12,7 @@ import 'package:immich_mobile/domain/models/config/theme_config.dart';
 import 'package:immich_mobile/domain/models/config/timeline_config.dart';
 import 'package:immich_mobile/domain/models/config/viewer_config.dart';
 import 'package:immich_mobile/domain/models/log.model.dart';
-import 'package:immich_mobile/domain/models/settings_key.dart';
+import 'package:immich_mobile/domain/models/metadata_key.dart';
 import 'package:immich_mobile/domain/models/timeline.model.dart';
 import 'package:immich_mobile/providers/album/album_sort_by_options.provider.dart';

@@ -95,7 +95,7 @@ class AppConfig {
  String toString() =>
      'AppConfig(logLevel: $logLevel, theme: $theme, cleanup: $cleanup, map: $map, timeline: $timeline, image: $image, viewer: $viewer, slideshow: $slideshow, album: $album, backup: $backup, network: $network)';

-  T read<T extends Object>(SettingsKey<T> key) =>
+  T read<T extends Object>(MetadataKey<T> key) =>
      (switch (key) {
            .logLevel => logLevel,
            .themePrimaryColor => theme.primaryColor,
@@ -143,10 +143,10 @@ class AppConfig {
          })
          as T;

-  factory AppConfig.fromEntries(Map<SettingsKey<Object>, Object> overrides) =>
+  factory AppConfig.fromEntries(Map<MetadataKey<Object>, Object> overrides) =>
      overrides.entries.fold(const AppConfig(), (config, entry) => config.write(entry.key, entry.value));

-  AppConfig write<T extends Object>(SettingsKey<T> key, T value) {
+  AppConfig write<T extends Object>(MetadataKey<T> key, T value) {
    return switch (key) {
      .logLevel => copyWith(logLevel: value as LogLevel),
      .themePrimaryColor => copyWith(theme: theme.copyWith(primaryColor: value as ImmichColorPreset)),
@@ -7,7 +7,7 @@ import 'package:immich_mobile/domain/models/log.model.dart';
 import 'package:immich_mobile/domain/models/timeline.model.dart';
 import 'package:immich_mobile/providers/album/album_sort_by_options.provider.dart';

-enum SettingsKey<T extends Object> {
+enum MetadataKey<T extends Object> {
  // Theme
  themePrimaryColor<ImmichColorPreset>(codec: _EnumCodec(ImmichColorPreset.values)),
  themeMode<ThemeMode>(codec: _EnumCodec(ThemeMode.values)),
@@ -73,24 +73,24 @@ enum SettingsKey<T extends Object> {
  slideshowLook<SlideshowLook>(codec: _EnumCodec(SlideshowLook.values)),
  slideshowDirection<SlideshowDirection>(codec: _EnumCodec(SlideshowDirection.values));

-  final _SettingsCodec<T>? _codecOverride;
+  final _MetadataCodec<T>? _codecOverride;

-  const SettingsKey({_SettingsCodec<T>? codec}) : _codecOverride = codec;
+  const MetadataKey({_MetadataCodec<T>? codec}) : _codecOverride = codec;

-  _SettingsCodec<T> get _codec => _codecOverride ?? _SettingsCodec.forType(T);
+  _MetadataCodec<T> get _codec => _codecOverride ?? _MetadataCodec.forType(T);

  String encode(T value) => _codec.encode(value);

  T decode(String raw) => _codec.decode(raw);
 }

-sealed class _SettingsCodec<T extends Object> {
-  const _SettingsCodec();
+sealed class _MetadataCodec<T extends Object> {
+  const _MetadataCodec();

  String encode(T value);
  T decode(String raw);

-  static const Map<Type, _SettingsCodec<Object>> _primitives = {
+  static const Map<Type, _MetadataCodec<Object>> _primitives = {
    int: _PrimitiveCodec.integer,
    double: _PrimitiveCodec.real,
    bool: _PrimitiveCodec.boolean,
@@ -98,16 +98,16 @@ sealed class _SettingsCodec<T extends Object> {
    DateTime: _DateTimeCodec(),
  };

-  static _SettingsCodec<T> forType<T extends Object>(Type runtimeType) {
+  static _MetadataCodec<T> forType<T extends Object>(Type runtimeType) {
    final codec = _primitives[runtimeType];
    if (codec == null) {
-      throw StateError('No primitive codec for $runtimeType. Provide an explicit codec when defining the SettingsKey.');
+      throw StateError('No primitive codec for $runtimeType. Provide an explicit codec when defining the MetadataKey.');
    }
-    return codec as _SettingsCodec<T>;
+    return codec as _MetadataCodec<T>;
  }
 }

-final class _EnumCodec<T extends Enum> extends _SettingsCodec<T> {
+final class _EnumCodec<T extends Enum> extends _MetadataCodec<T> {
  final List<T> values;

  const _EnumCodec(this.values);
@@ -119,7 +119,7 @@ final class _EnumCodec<T extends Enum> extends _SettingsCodec<T> {
  T decode(String raw) => values.firstWhere((v) => v.name == raw);
 }

-final class _DateTimeCodec extends _SettingsCodec<DateTime> {
+final class _DateTimeCodec extends _MetadataCodec<DateTime> {
  const _DateTimeCodec();

  @override
@@ -129,9 +129,9 @@ final class _DateTimeCodec extends _SettingsCodec<DateTime> {
  DateTime decode(String raw) => DateTime.parse(raw);
 }

-final class _MapCodec<K extends Object, V extends Object> extends _SettingsCodec<Map<K, V>> {
-  final _SettingsCodec<K> _keyCodec;
-  final _SettingsCodec<V> _valueCodec;
+final class _MapCodec<K extends Object, V extends Object> extends _MetadataCodec<Map<K, V>> {
+  final _MetadataCodec<K> _keyCodec;
+  final _MetadataCodec<V> _valueCodec;

  const _MapCodec(this._keyCodec, this._valueCodec);

@@ -167,8 +167,8 @@ final class _MapCodec<K extends Object, V extends Object> extends _SettingsCodec
  }
 }

-final class _ListCodec<T extends Object> extends _SettingsCodec<List<T>> {
-  final _SettingsCodec<T> _elementCodec;
+final class _ListCodec<T extends Object> extends _MetadataCodec<List<T>> {
+  final _MetadataCodec<T> _elementCodec;

  const _ListCodec(this._elementCodec);

@@ -197,7 +197,7 @@ final class _ListCodec<T extends Object> extends _SettingsCodec<List<T>> {
  }
 }

-final class _PrimitiveCodec<T extends Object> extends _SettingsCodec<T> {
+final class _PrimitiveCodec<T extends Object> extends _MetadataCodec<T> {
  final T Function(String) _parse;

  const _PrimitiveCodec._(this._parse);
@@ -11,7 +11,7 @@ import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/logger_db.repository.dart';
-import 'package:immich_mobile/infrastructure/repositories/settings.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/metadata.repository.dart';
 import 'package:immich_mobile/platform/background_worker_api.g.dart';
 import 'package:immich_mobile/platform/background_worker_lock_api.g.dart';
 import 'package:immich_mobile/providers/background_sync.provider.dart';
@@ -39,7 +39,7 @@ class BackgroundWorkerFgService {
      _foregroundHostApi.saveNotificationMessage(title, body);

  Future<void> configure({int? minimumDelaySeconds, bool? requireCharging}) {
-    final backup = SettingsRepository.instance.appConfig.backup;
+    final backup = MetadataRepository.instance.appConfig.backup;
    return _foregroundHostApi.configure(
      BackgroundWorkerSettings(
        minimumDelaySeconds: minimumDelaySeconds ?? backup.triggerDelay,
@@ -67,7 +67,7 @@ class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {
    BackgroundWorkerFlutterApi.setUp(this);
  }

-  bool get _isBackupEnabled => SettingsRepository.instance.appConfig.backup.enabled;
+  bool get _isBackupEnabled => MetadataRepository.instance.appConfig.backup.enabled;

  Future<void> init() async {
    try {
@@ -113,35 +113,9 @@ class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {

  @override
  Future<void> onIosUpload(bool isRefresh, int? maxSeconds) async {
-    _logger.info('iOS background upload started with maxSeconds: ${maxSeconds}s');
-    final sw = Stopwatch()..start();
-    try {
-      final budget = maxSeconds != null ? Duration(seconds: maxSeconds - 1) : null;
-
-      final sync = _ref?.read(backgroundSyncProvider);
-      if (sync == null) {
-        return;
-      }
-
-      // Run sync local, sync remote, hash and backup concurrently so the bg
-      // refresh task (20s budget) can make progress on all four instead of
-      // racing them sequentially. Phases are independent at the data layer:
-      // hash and handle_backup read drift state and tolerate stale reads
-      // (server-side dedup catches the rare race). The single budget caps the
-      // whole batch; no phase needs its own timeout.
-      final all = Future.wait<dynamic>([sync.syncLocal(), sync.syncRemote(), sync.hashAssets(), _handleBackup()]);
-      if (budget != null) {
-        await all.timeout(budget, onTimeout: () => <dynamic>[]);
-      } else {
-        await all;
-      }
-    } catch (error, stack) {
-      _logger.severe("Failed to complete iOS background upload", error, stack);
-    } finally {
-      sw.stop();
-      _logger.info("iOS background upload completed in ${sw.elapsed.inSeconds}s");
-      await _cleanup();
-    }
+    final hashTimeout = isRefresh ? const Duration(seconds: 5) : Duration(minutes: _isBackupEnabled ? 3 : 6);
+    final backupTimeout = maxSeconds != null ? Duration(seconds: maxSeconds - 1) : null;
+    return _backgroundLoop(hashTimeout: hashTimeout, backupTimeout: backupTimeout, debugLabel: 'iOS background upload');
  }

  Future<void> _backgroundLoop({
@@ -214,14 +188,20 @@ class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {
      if (!_cancellationToken.isCompleted) {
        _cancellationToken.complete();
      }
+      final cleanupFutures = [
+        nativeSyncApi?.cancelHashing(),
+        workerManagerPatch.dispose().catchError((_) async {
+          // Discard any errors on the dispose call
+          return;
+        }),
+        LogService.I.dispose(),
+        Store.dispose(),

-      // Workers share one sqlite connection, so DB teardown must wait until every worker has stopped using it.
-      await Future.wait([
-        if (backgroundSyncManager != null) backgroundSyncManager.cancel(),
-        if (nativeSyncApi != null) nativeSyncApi.cancelHashing(),
-      ]);
-      await workerManagerPatch.dispose().catchError((_) async {});
-      await Future.wait([LogService.I.dispose(), Store.dispose(), _drift.optimize(allTables: true)]);
+        backgroundSyncManager?.cancel(),
+        _drift.optimize(allTables: true),
+      ];
+
+      await Future.wait(cleanupFutures.nonNulls);
      await _drift.close();
      await _driftLogger.close();

@@ -1,5 +1,3 @@
-import 'dart:async';
-
 import 'package:flutter/services.dart';
 import 'package:immich_mobile/constants/constants.dart';
 import 'package:immich_mobile/domain/models/album/local_album.model.dart';
@@ -19,7 +17,7 @@ class HashService {
  final DriftLocalAssetRepository _localAssetRepository;
  final DriftTrashedLocalAssetRepository _trashedLocalAssetRepository;
  final NativeSyncApi _nativeSyncApi;
-  final Completer<void>? _cancellation;
+  final bool Function()? _cancelChecker;
  final _log = Logger('HashService');

  HashService({
@@ -27,15 +25,11 @@ class HashService {
    required this._localAssetRepository,
    required this._trashedLocalAssetRepository,
    required this._nativeSyncApi,
-    this._cancellation,
+    this._cancelChecker,
    int? batchSize,
-  }) : _batchSize = batchSize ?? kBatchHashFileLimit {
-    // Stop the in-flight native hash call promptly on cancellation; the loops
-    // below also observe [isCancelled] to bail between batches.
-    _cancellation?.future.then((_) => _nativeSyncApi.cancelHashing().onError(_log.warning));
-  }
+  }) : _batchSize = batchSize ?? kBatchHashFileLimit;

-  bool get isCancelled => _cancellation?.isCompleted ?? false;
+  bool get isCancelled => _cancelChecker?.call() ?? false;

  Future<void> hashAssets() async {
    _log.info("Starting hashing of assets");
@@ -2,7 +2,6 @@ import 'dart:async';

 import 'package:collection/collection.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter/services.dart';
 import 'package:immich_mobile/domain/models/album/local_album.model.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
@@ -18,8 +17,6 @@ import 'package:immich_mobile/utils/datetime_helpers.dart';
 import 'package:immich_mobile/utils/diff.dart';
 import 'package:logging/logging.dart';

-const String _kSyncCancelledCode = "SYNC_CANCELLED";
-
 class LocalSyncService {
  final DriftLocalAlbumRepository _localAlbumRepository;
  // ignore: unused_field
@@ -28,7 +25,6 @@ class LocalSyncService {
  final DriftTrashedLocalAssetRepository _trashedLocalAssetRepository;
  final AssetMediaRepository _assetMediaRepository;
  final IPermissionRepository _permissionRepository;
-  final Completer<void>? _cancellation;
  final Logger _log = Logger("DeviceSyncService");

  LocalSyncService({
@@ -38,12 +34,7 @@ class LocalSyncService {
    required this._trashedLocalAssetRepository,
    required this._assetMediaRepository,
    required this._permissionRepository,
-    this._cancellation,
-  }) {
-    _cancellation?.future.then((_) => _nativeSyncApi.cancelSync().onError(_log.warning));
-  }
-
-  bool get _isCancelled => _cancellation?.isCompleted ?? false;
+  });

  Future<void> sync({bool full = false}) async {
    final Stopwatch stopwatch = Stopwatch()..start();
@@ -90,10 +81,6 @@ class LocalSyncService {
      // detect album deletions from the native side
      if (CurrentPlatform.isAndroid) {
        for (final album in dbAlbums) {
-          if (_isCancelled) {
-            _log.warning("Local sync cancelled. Stopped processing albums.");
-            return;
-          }
          final deviceIds = await _nativeSyncApi.getAssetIdsForAlbum(album.id);
          await _localAlbumRepository.syncDeletes(album.id, deviceIds);
        }
@@ -104,10 +91,6 @@ class LocalSyncService {
        // does not include changes for cloud albums.
        final cloudAlbums = deviceAlbums.where((a) => a.isCloud).toLocalAlbums();
        for (final album in cloudAlbums) {
-          if (_isCancelled) {
-            _log.warning("Local sync cancelled. Stopped processing cloud albums.");
-            return;
-          }
          final dbAlbum = dbAlbums.firstWhereOrNull((a) => a.id == album.id);
          if (dbAlbum == null) {
            _log.warning("Cloud album ${album.name} not found in local database. Skipping sync.");
@@ -119,12 +102,6 @@ class LocalSyncService {
        await _mapIosCloudIds(newAssets);
      }
      await _nativeSyncApi.checkpointSync();
-    } on PlatformException catch (e, s) {
-      if (e.code == _kSyncCancelledCode) {
-        _log.warning("Local sync cancelled");
-      } else {
-        _log.severe("Error performing device sync", e, s);
-      }
    } catch (e, s) {
      _log.severe("Error performing device sync", e, s);
    } finally {
@@ -152,21 +129,12 @@ class LocalSyncService {
      await _nativeSyncApi.checkpointSync();
      stopwatch.stop();
      _log.info("Full device sync took - ${stopwatch.elapsedMilliseconds}ms");
-    } on PlatformException catch (e, s) {
-      if (e.code == _kSyncCancelledCode) {
-        _log.warning("Full device sync cancelled");
-      } else {
-        _log.severe("Error performing full device sync", e, s);
-      }
    } catch (e, s) {
      _log.severe("Error performing full device sync", e, s);
    }
  }

  Future<void> addAlbum(LocalAlbum album) async {
-    if (_isCancelled) {
-      return;
-    }
    try {
      _log.fine("Adding device album ${album.name}");

@@ -194,9 +162,6 @@ class LocalSyncService {

  // The deviceAlbum is ignored since we are going to refresh it anyways
  FutureOr<bool> updateAlbum(LocalAlbum dbAlbum, LocalAlbum deviceAlbum) async {
-    if (_isCancelled) {
-      return false;
-    }
    try {
      _log.fine("Syncing device album ${dbAlbum.name}");

@@ -2,9 +2,9 @@ import 'dart:async';

 import 'package:immich_mobile/constants/constants.dart';
 import 'package:immich_mobile/domain/models/log.model.dart';
-import 'package:immich_mobile/domain/models/settings_key.dart';
+import 'package:immich_mobile/domain/models/metadata_key.dart';
 import 'package:immich_mobile/infrastructure/repositories/log.repository.dart';
-import 'package:immich_mobile/infrastructure/repositories/settings.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/metadata.repository.dart';
 import 'package:immich_mobile/utils/debug_print.dart';
 import 'package:logging/logging.dart';

@@ -12,10 +12,10 @@ import 'package:logging/logging.dart';
 ///
 /// It listens to Dart's [Logger.root], buffers logs in memory (optionally),
 /// writes them to a persistent [LogRepository], and manages log levels via
-/// [SettingsRepository].
+/// [MetadataRepository].
 class LogService {
  final LogRepository _logRepository;
-  final SettingsRepository _settingsRepository;
+  final MetadataRepository _metadataRepository;

  final List<LogMessage> _msgBuffer = [];

@@ -38,12 +38,12 @@ class LogService {

  static Future<LogService> init({
    required LogRepository logRepository,
-    required SettingsRepository settingsRepository,
+    required MetadataRepository metadataRepository,
    bool shouldBuffer = true,
  }) async {
    _instance ??= await create(
      logRepository: logRepository,
-      settingsRepository: settingsRepository,
+      metadataRepository: metadataRepository,
      shouldBuffer: shouldBuffer,
    );
    return _instance!;
@@ -51,17 +51,17 @@ class LogService {

  static Future<LogService> create({
    required LogRepository logRepository,
-    required SettingsRepository settingsRepository,
+    required MetadataRepository metadataRepository,
    bool shouldBuffer = true,
  }) async {
-    final instance = LogService._(logRepository, settingsRepository, shouldBuffer);
+    final instance = LogService._(logRepository, metadataRepository, shouldBuffer);
    await logRepository.truncate(limit: kLogTruncateLimit);
-    final level = instance._settingsRepository.appConfig.logLevel;
+    final level = instance._metadataRepository.appConfig.logLevel;
    Logger.root.level = Level.LEVELS.elementAtOrNull(level.index) ?? Level.INFO;
    return instance;
  }

-  LogService._(this._logRepository, this._settingsRepository, this._shouldBuffer) {
+  LogService._(this._logRepository, this._metadataRepository, this._shouldBuffer) {
    _logSubscription = Logger.root.onRecord.listen(_handleLogRecord);
  }

@@ -91,7 +91,7 @@ class LogService {
  }

  Future<void> setLogLevel(LogLevel level) async {
-    await _settingsRepository.write(SettingsKey.logLevel, level);
+    await _metadataRepository.write(MetadataKey.logLevel, level);
    Logger.root.level = level.toLevel();
  }

@@ -112,16 +112,10 @@ class LogService {
    return _flushBuffer();
  }

-  Future<void> dispose() async {
+  Future<void> dispose() {
    _flushTimer?.cancel();
-    _flushTimer = null;
-    await _logSubscription.cancel();
-    await _flushBuffer();
-    // Allow a subsequent init() (e.g. when a worker isolate is reused) to
-    // create a fresh instance instead of returning this disposed one.
-    if (identical(_instance, this)) {
-      _instance = null;
-    }
+    _logSubscription.cancel();
+    return _flushBuffer();
  }

  Future<void> _flushBuffer() async {
@@ -8,7 +8,6 @@ import 'package:immich_mobile/domain/models/user.model.dart';
 import 'package:immich_mobile/infrastructure/repositories/remote_album.repository.dart';
 import 'package:immich_mobile/models/albums/album_search.model.dart';
 import 'package:immich_mobile/providers/album/album_sort_by_options.provider.dart';
-import 'package:openapi/api.dart' show Optional;
 import 'package:immich_mobile/repositories/drift_album_api_repository.dart';
 import 'package:immich_mobile/services/foreground_upload.service.dart';
 import 'package:logging/logging.dart';
@@ -138,7 +137,7 @@ class RemoteAlbumService {
  Future<RemoteAlbum> updateAlbum(
    String albumId, {
    String? name,
-    Optional<String?> description = const Optional.absent(),
+    String? description,
    String? thumbnailAssetId,
    bool? isActivityEnabled,
    AlbumAssetOrder? order,
@@ -193,30 +192,43 @@ class RemoteAlbumService {
    required UserDto uploader,
    required AlbumAssetCandidates candidates,
    UploadCallbacks uploadCallbacks = const UploadCallbacks(),
-    Completer<void>? cancelToken,
  }) async {
    int addedCount = 0;
    if (candidates.remoteAssetIds.isNotEmpty) {
      addedCount += await addAssets(albumId: albumId, assetIds: candidates.remoteAssetIds);
    }
    if (candidates.localAssetsToUpload.isNotEmpty) {
-      addedCount += await _uploadAndAddLocals(
-        albumId,
-        uploader,
-        candidates.localAssetsToUpload,
-        uploadCallbacks,
-        cancelToken,
-      );
+      addedCount += await _uploadAndAddLocals(albumId, uploader, candidates.localAssetsToUpload, uploadCallbacks);
    }
    return addedCount;
  }

+  /// Creates an album, seeding it with already-remote asset IDs, then uploads
+  /// local-only assets and links each one as it finishes.
+  Future<RemoteAlbum> createAlbumWithAssets({
+    required String title,
+    required UserDto owner,
+    String? description,
+    AlbumAssetCandidates candidates = const AlbumAssetCandidates(remoteAssetIds: [], localAssetsToUpload: []),
+    UploadCallbacks uploadCallbacks = const UploadCallbacks(),
+  }) async {
+    final album = await createAlbum(
+      title: title,
+      owner: owner,
+      description: description,
+      assetIds: candidates.remoteAssetIds,
+    );
+    if (candidates.localAssetsToUpload.isNotEmpty) {
+      await _uploadAndAddLocals(album.id, owner, candidates.localAssetsToUpload, uploadCallbacks);
+    }
+    return album;
+  }
+
  Future<int> _uploadAndAddLocals(
    String albumId,
    UserDto uploader,
    List<LocalAsset> localAssets,
    UploadCallbacks userCallbacks,
-    Completer<void>? cancelToken,
  ) async {
    int addedCount = 0;
    final pendingAdds = <Future<void>>[];
@@ -246,7 +258,7 @@ class RemoteAlbumService {
          return;
        }
        pendingAdds.add(
-          linkUploadedAssetToAlbum(albumId, remoteId, uploader, source)
+          _linkUploadedAssetToAlbum(albumId, remoteId, uploader, source)
              .then<void>((added) {
                addedCount += added;
              })
@@ -257,7 +269,7 @@ class RemoteAlbumService {
      },
    );

-    await _uploadService.uploadManual(localAssets, callbacks: wrappedCallbacks, cancelToken: cancelToken);
+    await _uploadService.uploadManual(localAssets, callbacks: wrappedCallbacks);
    await Future.wait(pendingAdds);
    return addedCount;
  }
@@ -276,7 +288,7 @@ class RemoteAlbumService {
  /// `remote_asset_entity` row from the local source so the FK-protected
  /// junction insert succeeds. Sync overwrites the placeholder later with
  /// the authoritative server data.
-  Future<int> linkUploadedAssetToAlbum(String albumId, String remoteId, UserDto uploader, LocalAsset source) async {
+  Future<int> _linkUploadedAssetToAlbum(String albumId, String remoteId, UserDto uploader, LocalAsset source) async {
    final result = await _albumApiRepository.addAssets(albumId, [remoteId]);
    if (result.added.isEmpty) {
      return 0;
@@ -54,13 +54,7 @@ class StoreService {
  /// Disposes the store and cancels the subscription. To reuse the store call init() again
  Future<void> dispose() async {
    await _storeUpdateSubscription?.cancel();
-    _storeUpdateSubscription = null;
    _cache.clear();
-    // Allow a subsequent init() (e.g. when a worker isolate is reused) to
-    // create a fresh instance instead of returning this disposed one.
-    if (identical(_instance, this)) {
-      _instance = null;
-    }
  }

  /// Returns the cached value for [key], or `null`
@@ -1,5 +1,3 @@
-import 'dart:async';
-
 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';
@@ -7,7 +5,6 @@ import 'package:immich_mobile/domain/services/store.service.dart';
 import 'package:immich_mobile/infrastructure/repositories/local_album.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/remote_album.repository.dart';
 import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/cancel.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/store.provider.dart';
 import 'package:immich_mobile/repositories/drift_album_api_repository.dart';
 import 'package:immich_mobile/utils/debug_print.dart';
@@ -19,7 +16,6 @@ final syncLinkedAlbumServiceProvider = Provider(
    ref.watch(remoteAlbumRepository),
    ref.watch(driftAlbumApiRepositoryProvider),
    ref.watch(storeServiceProvider),
-    cancellation: ref.watch(cancellationProvider),
  ),
 );

@@ -28,15 +24,13 @@ class SyncLinkedAlbumService {
  final DriftRemoteAlbumRepository _remoteAlbumRepository;
  final DriftAlbumApiRepository _albumApiRepository;
  final StoreService _storeService;
-  final Completer<void>? _cancellation;

  SyncLinkedAlbumService(
    this._localAlbumRepository,
    this._remoteAlbumRepository,
    this._albumApiRepository,
-    this._storeService, {
-    this._cancellation,
-  });
+    this._storeService,
+  );

  final _log = Logger("SyncLinkedAlbumService");

@@ -61,11 +55,7 @@ class SyncLinkedAlbumService {
        final assetIds = await _remoteAlbumRepository.getLinkedAssetIds(userId, localAlbum.id, linkedRemoteAlbumId);
        _log.fine("Syncing ${assetIds.length} assets to remote album: ${remoteAlbum.name}");
        if (assetIds.isNotEmpty) {
-          final album = await _albumApiRepository.addAssets(
-            remoteAlbum.id,
-            assetIds,
-            abortTrigger: _cancellation?.future,
-          );
+          final album = await _albumApiRepository.addAssets(remoteAlbum.id, assetIds);
          await _remoteAlbumRepository.addAssets(remoteAlbum.id, album.added);
        }
      }),
@@ -38,7 +38,7 @@ class SyncStreamService {
  final IPermissionRepository _permissionRepository;
  final SyncMigrationRepository _syncMigrationRepository;
  final ApiService _api;
-  final Completer<void>? _cancellation;
+  final bool Function()? _cancelChecker;

  SyncStreamService({
    required this._syncApiRepository,
@@ -49,20 +49,16 @@ class SyncStreamService {
    required this._permissionRepository,
    required this._syncMigrationRepository,
    required this._api,
-    this._cancellation,
+    this._cancelChecker,
  });

-  bool get isCancelled => _cancellation?.isCompleted ?? false;
+  bool get isCancelled => _cancelChecker?.call() ?? false;

  Future<bool> sync() async {
    _logger.info("Remote sync request for user");
    final serverVersion = await _api.serverInfoApi.getServerVersion();
-    if (serverVersion == null) {
-      _logger.severe("Cannot perform sync: unable to determine server version");
-      return false;
-    }

-    final serverSemVer = SemVer(major: serverVersion.major, minor: serverVersion.minor, patch: serverVersion.patch_);
+    final serverSemVer = SemVer(major: serverVersion.major, minor: serverVersion.minor, patch: serverVersion.patch);

    final value = Store.get(StoreKey.syncMigrationStatus, "[]");
    final migrations = (jsonDecode(value) as List).cast<String>();
@@ -80,15 +76,10 @@ class SyncStreamService {
      _handleEvents,
      serverVersion: serverSemVer,
      onReset: () => shouldReset = true,
-      abortSignal: _cancellation?.future,
    );
    if (shouldReset) {
      _logger.info("Resetting sync state as requested by server");
-      await _syncApiRepository.streamChanges(
-        _handleEvents,
-        serverVersion: serverSemVer,
-        abortSignal: _cancellation?.future,
-      );
+      await _syncApiRepository.streamChanges(_handleEvents, serverVersion: serverSemVer);
    }

    previousLength = migrations.length;
@@ -323,7 +314,7 @@ class SyncStreamService {
  }

  Future<void> handleWsAssetUploadReadyV1Batch(List<dynamic> batchData) async {
-    if (batchData.isEmpty || isCancelled) {
+    if (batchData.isEmpty) {
      return;
    }

@@ -366,7 +357,7 @@ class SyncStreamService {
  }

  Future<void> handleWsAssetUploadReadyV2Batch(List<dynamic> batchData) async {
-    if (batchData.isEmpty || isCancelled) {
+    if (batchData.isEmpty) {
      return;
    }

@@ -409,9 +400,6 @@ class SyncStreamService {
  }

  Future<void> handleWsAssetEditReadyV1(dynamic data) async {
-    if (isCancelled) {
-      return;
-    }
    _logger.info('Processing AssetEditReadyV1 event');

    try {
@@ -452,9 +440,6 @@ class SyncStreamService {
  }

  Future<void> handleWsAssetEditReadyV2(dynamic data) async {
-    if (isCancelled) {
-      return;
-    }
    _logger.info('Processing AssetEditReadyV2 event');

    try {
@@ -7,7 +7,7 @@ import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/events.model.dart';
 import 'package:immich_mobile/domain/models/timeline.model.dart';
 import 'package:immich_mobile/domain/utils/event_stream.dart';
-import 'package:immich_mobile/infrastructure/repositories/settings.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/metadata.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/timeline.repository.dart';
 import 'package:immich_mobile/utils/async_mutex.dart';

@@ -39,12 +39,12 @@ enum TimelineOrigin {

 class TimelineFactory {
  final DriftTimelineRepository _timelineRepository;
-  final SettingsRepository _settingsRepository;
+  final MetadataRepository _metadataRepository;

-  const TimelineFactory({required this._timelineRepository, required this._settingsRepository});
+  const TimelineFactory({required this._timelineRepository, required this._metadataRepository});

  GroupAssetsBy get groupBy {
-    final group = _settingsRepository.appConfig.timeline.groupAssetsBy;
+    final group = _metadataRepository.appConfig.timeline.groupAssetsBy;
    // We do not support auto grouping in the new timeline yet, fallback to day grouping
    return group == GroupAssetsBy.auto ? GroupAssetsBy.day : group;
  }
@@ -50,28 +50,54 @@ class BackgroundSyncManager {
  });

  Future<void> cancel() async {
-    final tasks = [
-      _syncTask,
-      _syncWebsocketTask,
-      _cloudIdSyncTask,
-      _linkedAlbumSyncTask,
-      _deviceAlbumSyncTask,
-      _hashTask,
-    ];
-    final futures = [
-      for (final task in tasks)
-        if (task != null) task.future,
-    ];
-    for (final task in tasks) {
-      task?.cancel();
+    final futures = <Future>[];
+
+    if (_syncTask != null) {
+      futures.add(_syncTask!.future);
    }
+    _syncTask?.cancel();
    _syncTask = null;
+
+    if (_syncWebsocketTask != null) {
+      futures.add(_syncWebsocketTask!.future);
+    }
+    _syncWebsocketTask?.cancel();
    _syncWebsocketTask = null;
+
+    if (_cloudIdSyncTask != null) {
+      futures.add(_cloudIdSyncTask!.future);
+    }
+    _cloudIdSyncTask?.cancel();
    _cloudIdSyncTask = null;
+
+    if (_linkedAlbumSyncTask != null) {
+      futures.add(_linkedAlbumSyncTask!.future);
+    }
+    _linkedAlbumSyncTask?.cancel();
    _linkedAlbumSyncTask = null;
-    _deviceAlbumSyncTask = null;
+
+    try {
+      await Future.wait(futures);
+    } on CanceledError {
+      // Ignore cancellation errors
+    }
+  }
+
+  Future<void> cancelLocal() async {
+    final futures = <Future>[];
+
+    if (_hashTask != null) {
+      futures.add(_hashTask!.future);
+    }
+    _hashTask?.cancel();
    _hashTask = null;

+    if (_deviceAlbumSyncTask != null) {
+      futures.add(_deviceAlbumSyncTask!.future);
+    }
+    _deviceAlbumSyncTask?.cancel();
+    _deviceAlbumSyncTask = null;
+
    try {
      await Future.wait(futures);
    } on CanceledError {
@@ -1,5 +1,3 @@
-import 'dart:async';
-
 import 'package:drift/drift.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/constants.dart';
@@ -11,7 +9,6 @@ import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/local_album.repository.dart';
 import 'package:immich_mobile/platform/native_sync_api.g.dart';
 import 'package:immich_mobile/providers/api.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/sync.provider.dart';
 import 'package:immich_mobile/providers/server_info.provider.dart';
@@ -54,10 +51,9 @@ Future<void> syncCloudIds(ProviderContainer ref) async {
  }

  final assetApi = ref.read(apiServiceProvider).assetsApi;
-  final cancellation = ref.read(cancellationProvider);

  // Process cloud IDs in paginated batches
-  await _processCloudIdMappingsInBatches(db, currentUser.id, assetApi, canBulkUpdateMetadata, logger, cancellation);
+  await _processCloudIdMappingsInBatches(db, currentUser.id, assetApi, canBulkUpdateMetadata, logger);
 }

 Future<void> _processCloudIdMappingsInBatches(
@@ -66,17 +62,12 @@ Future<void> _processCloudIdMappingsInBatches(
  AssetsApi assetsApi,
  bool canBulkUpdate,
  Logger logger,
-  Completer<void> cancellation,
 ) async {
  const pageSize = 20000;
  String? lastLocalId;
  final seenRemoteAssetIds = <String>{};

  while (true) {
-    if (cancellation.isCompleted) {
-      logger.warning('Cloud ID migration cancelled. Stopping batch processing.');
-      break;
-    }
    final mappings = await _fetchCloudIdMappings(drift, userId, pageSize, lastLocalId);
    if (mappings.isEmpty) {
      break;
@@ -107,9 +98,9 @@ Future<void> _processCloudIdMappingsInBatches(

    if (items.isNotEmpty) {
      if (canBulkUpdate) {
-        await _bulkUpdateCloudIds(assetsApi, items, cancellation.future);
+        await _bulkUpdateCloudIds(assetsApi, items);
      } else {
-        await _sequentialUpdateCloudIds(assetsApi, items, cancellation);
+        await _sequentialUpdateCloudIds(assetsApi, items);
      }
    }

@@ -120,35 +111,20 @@ Future<void> _processCloudIdMappingsInBatches(
  }
 }

-Future<void> _sequentialUpdateCloudIds(
-  AssetsApi assetsApi,
-  List<AssetMetadataBulkUpsertItemDto> items,
-  Completer<void> cancellation,
-) async {
+Future<void> _sequentialUpdateCloudIds(AssetsApi assetsApi, List<AssetMetadataBulkUpsertItemDto> items) async {
  for (final item in items) {
-    if (cancellation.isCompleted) {
-      break;
-    }
    final upsertItem = AssetMetadataUpsertItemDto(key: item.key, value: item.value);
    try {
-      await assetsApi.updateAssetMetadata(
-        item.assetId,
-        AssetMetadataUpsertDto(items: [upsertItem]),
-        abortTrigger: cancellation.future,
-      );
+      await assetsApi.updateAssetMetadata(item.assetId, AssetMetadataUpsertDto(items: [upsertItem]));
    } catch (error, stack) {
      Logger('migrateCloudIds').warning('Failed to update metadata for asset ${item.assetId}', error, stack);
    }
  }
 }

-Future<void> _bulkUpdateCloudIds(
-  AssetsApi assetsApi,
-  List<AssetMetadataBulkUpsertItemDto> items,
-  Future<void> abortTrigger,
-) async {
+Future<void> _bulkUpdateCloudIds(AssetsApi assetsApi, List<AssetMetadataBulkUpsertItemDto> items) async {
  try {
-    await assetsApi.updateBulkAssetMetadata(AssetMetadataBulkUpsertDto(items: items), abortTrigger: abortTrigger);
+    await assetsApi.updateBulkAssetMetadata(AssetMetadataBulkUpsertDto(items: items));
  } catch (error, stack) {
    Logger('migrateCloudIds').warning('Failed to bulk update metadata', error, stack);
  }
@@ -18,11 +18,11 @@ extension DTOToAsset on api.AssetResponseDto {
      height: height?.toInt(),
      width: width?.toInt(),
      isFavorite: isFavorite,
-      livePhotoVideoId: livePhotoVideoId.orElse(null),
+      livePhotoVideoId: livePhotoVideoId,
      thumbHash: thumbhash,
      localId: null,
      type: type.toAssetType(),
-      stackId: stack.orElse(null)?.id,
+      stackId: stack?.id,
      isEdited: isEdited,
    );
  }
@@ -41,13 +41,13 @@ extension DTOToAsset on api.AssetResponseDto {
      height: height?.toInt(),
      width: width?.toInt(),
      isFavorite: isFavorite,
-      livePhotoVideoId: livePhotoVideoId.orElse(null),
+      livePhotoVideoId: livePhotoVideoId,
      thumbHash: thumbhash,
      localId: null,
      type: type.toAssetType(),
-      stackId: stack.orElse(null)?.id,
+      stackId: stack?.id,
      isEdited: isEdited,
-      exifInfo: exifInfo.orElse(null) != null ? ExifDtoConverter.fromDto(exifInfo.orElse(null)!) : const ExifInfo(),
+      exifInfo: exifInfo != null ? ExifDtoConverter.fromDto(exifInfo!) : const ExifInfo(),
    );
  }
 }
@@ -64,10 +64,10 @@ extension on api.AssetVisibility {

 extension on api.AssetTypeEnum {
  AssetType toAssetType() => switch (this) {
-    api.AssetTypeEnum.IMAGE => AssetType.image,
-    api.AssetTypeEnum.VIDEO => AssetType.video,
-    api.AssetTypeEnum.AUDIO => AssetType.audio,
-    api.AssetTypeEnum.OTHER => AssetType.other,
+    api.AssetTypeEnum.image => AssetType.image,
+    api.AssetTypeEnum.video => AssetType.video,
+    api.AssetTypeEnum.audio => AssetType.audio,
+    api.AssetTypeEnum.other => AssetType.other,
    _ => throw Exception('Unknown AssetType value: $this'),
  };
 }
@@ -6,7 +6,6 @@ import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';

@TableIndex.sql('CREATE INDEX IF NOT EXISTS idx_local_asset_checksum ON local_asset_entity (checksum)')
@TableIndex.sql('CREATE INDEX IF NOT EXISTS idx_local_asset_cloud_id ON local_asset_entity (i_cloud_id)')
-@TableIndex.sql('CREATE INDEX IF NOT EXISTS idx_local_asset_created_at ON local_asset_entity (created_at)')
 class LocalAssetEntity extends Table with DriftDefaultsMixin, AssetEntityMixin {
  const LocalAssetEntity();

@@ -1348,7 +1348,3 @@ i0.Index get idxLocalAssetCloudId => i0.Index(
  'idx_local_asset_cloud_id',
  'CREATE INDEX IF NOT EXISTS idx_local_asset_cloud_id ON local_asset_entity (i_cloud_id)',
 );
-i0.Index get idxLocalAssetCreatedAt => i0.Index(
-  'idx_local_asset_created_at',
-  'CREATE INDEX IF NOT EXISTS idx_local_asset_created_at ON local_asset_entity (created_at)',
-);
@@ -1,8 +1,8 @@
 import 'package:drift/drift.dart';
 import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';

-class SettingsEntity extends Table with DriftDefaultsMixin {
-  const SettingsEntity();
+class MetadataEntity extends Table with DriftDefaultsMixin {
+  const MetadataEntity();

  TextColumn get key => text()();

@@ -14,5 +14,5 @@ class SettingsEntity extends Table with DriftDefaultsMixin {
  Set<Column> get primaryKey => {key};

  @override
-  String get tableName => "settings";
+  String get tableName => "metadata";
 }
@@ -1,28 +1,28 @@
 // dart format width=80
 // ignore_for_file: type=lint
 import 'package:drift/drift.dart' as i0;
-import 'package:immich_mobile/infrastructure/entities/settings.entity.drift.dart'
+import 'package:immich_mobile/infrastructure/entities/metadata.entity.drift.dart'
    as i1;
-import 'package:immich_mobile/infrastructure/entities/settings.entity.dart'
+import 'package:immich_mobile/infrastructure/entities/metadata.entity.dart'
    as i2;
 import 'package:drift/src/runtime/query_builder/query_builder.dart' as i3;

-typedef $$SettingsEntityTableCreateCompanionBuilder =
-    i1.SettingsEntityCompanion Function({
+typedef $$MetadataEntityTableCreateCompanionBuilder =
+    i1.MetadataEntityCompanion Function({
      required String key,
      required String value,
      i0.Value<DateTime> updatedAt,
    });
-typedef $$SettingsEntityTableUpdateCompanionBuilder =
-    i1.SettingsEntityCompanion Function({
+typedef $$MetadataEntityTableUpdateCompanionBuilder =
+    i1.MetadataEntityCompanion Function({
      i0.Value<String> key,
      i0.Value<String> value,
      i0.Value<DateTime> updatedAt,
    });

-class $$SettingsEntityTableFilterComposer
-    extends i0.Composer<i0.GeneratedDatabase, i1.$SettingsEntityTable> {
-  $$SettingsEntityTableFilterComposer({
+class $$MetadataEntityTableFilterComposer
+    extends i0.Composer<i0.GeneratedDatabase, i1.$MetadataEntityTable> {
+  $$MetadataEntityTableFilterComposer({
    required super.$db,
    required super.$table,
    super.joinBuilder,
@@ -45,9 +45,9 @@ class $$SettingsEntityTableFilterComposer
  );
 }

-class $$SettingsEntityTableOrderingComposer
-    extends i0.Composer<i0.GeneratedDatabase, i1.$SettingsEntityTable> {
-  $$SettingsEntityTableOrderingComposer({
+class $$MetadataEntityTableOrderingComposer
+    extends i0.Composer<i0.GeneratedDatabase, i1.$MetadataEntityTable> {
+  $$MetadataEntityTableOrderingComposer({
    required super.$db,
    required super.$table,
    super.joinBuilder,
@@ -70,9 +70,9 @@ class $$SettingsEntityTableOrderingComposer
  );
 }

-class $$SettingsEntityTableAnnotationComposer
-    extends i0.Composer<i0.GeneratedDatabase, i1.$SettingsEntityTable> {
-  $$SettingsEntityTableAnnotationComposer({
+class $$MetadataEntityTableAnnotationComposer
+    extends i0.Composer<i0.GeneratedDatabase, i1.$MetadataEntityTable> {
+  $$MetadataEntityTableAnnotationComposer({
    required super.$db,
    required super.$table,
    super.joinBuilder,
@@ -89,47 +89,47 @@ class $$SettingsEntityTableAnnotationComposer
      $composableBuilder(column: $table.updatedAt, builder: (column) => column);
 }

-class $$SettingsEntityTableTableManager
+class $$MetadataEntityTableTableManager
    extends
        i0.RootTableManager<
          i0.GeneratedDatabase,
-          i1.$SettingsEntityTable,
-          i1.SettingsEntityData,
-          i1.$$SettingsEntityTableFilterComposer,
-          i1.$$SettingsEntityTableOrderingComposer,
-          i1.$$SettingsEntityTableAnnotationComposer,
-          $$SettingsEntityTableCreateCompanionBuilder,
-          $$SettingsEntityTableUpdateCompanionBuilder,
+          i1.$MetadataEntityTable,
+          i1.MetadataEntityData,
+          i1.$$MetadataEntityTableFilterComposer,
+          i1.$$MetadataEntityTableOrderingComposer,
+          i1.$$MetadataEntityTableAnnotationComposer,
+          $$MetadataEntityTableCreateCompanionBuilder,
+          $$MetadataEntityTableUpdateCompanionBuilder,
          (
-            i1.SettingsEntityData,
+            i1.MetadataEntityData,
            i0.BaseReferences<
              i0.GeneratedDatabase,
-              i1.$SettingsEntityTable,
-              i1.SettingsEntityData
+              i1.$MetadataEntityTable,
+              i1.MetadataEntityData
            >,
          ),
-          i1.SettingsEntityData,
+          i1.MetadataEntityData,
          i0.PrefetchHooks Function()
        > {
-  $$SettingsEntityTableTableManager(
+  $$MetadataEntityTableTableManager(
    i0.GeneratedDatabase db,
-    i1.$SettingsEntityTable table,
+    i1.$MetadataEntityTable table,
  ) : super(
        i0.TableManagerState(
          db: db,
          table: table,
          createFilteringComposer: () =>
-              i1.$$SettingsEntityTableFilterComposer($db: db, $table: table),
+              i1.$$MetadataEntityTableFilterComposer($db: db, $table: table),
          createOrderingComposer: () =>
-              i1.$$SettingsEntityTableOrderingComposer($db: db, $table: table),
+              i1.$$MetadataEntityTableOrderingComposer($db: db, $table: table),
          createComputedFieldComposer: () => i1
-              .$$SettingsEntityTableAnnotationComposer($db: db, $table: table),
+              .$$MetadataEntityTableAnnotationComposer($db: db, $table: table),
          updateCompanionCallback:
              ({
                i0.Value<String> key = const i0.Value.absent(),
                i0.Value<String> value = const i0.Value.absent(),
                i0.Value<DateTime> updatedAt = const i0.Value.absent(),
-              }) => i1.SettingsEntityCompanion(
+              }) => i1.MetadataEntityCompanion(
                key: key,
                value: value,
                updatedAt: updatedAt,
@@ -139,7 +139,7 @@ class $$SettingsEntityTableTableManager
                required String key,
                required String value,
                i0.Value<DateTime> updatedAt = const i0.Value.absent(),
-              }) => i1.SettingsEntityCompanion.insert(
+              }) => i1.MetadataEntityCompanion.insert(
                key: key,
                value: value,
                updatedAt: updatedAt,
@@ -152,34 +152,34 @@ class $$SettingsEntityTableTableManager
      );
 }

-typedef $$SettingsEntityTableProcessedTableManager =
+typedef $$MetadataEntityTableProcessedTableManager =
    i0.ProcessedTableManager<
      i0.GeneratedDatabase,
-      i1.$SettingsEntityTable,
-      i1.SettingsEntityData,
-      i1.$$SettingsEntityTableFilterComposer,
-      i1.$$SettingsEntityTableOrderingComposer,
-      i1.$$SettingsEntityTableAnnotationComposer,
-      $$SettingsEntityTableCreateCompanionBuilder,
-      $$SettingsEntityTableUpdateCompanionBuilder,
+      i1.$MetadataEntityTable,
+      i1.MetadataEntityData,
+      i1.$$MetadataEntityTableFilterComposer,
+      i1.$$MetadataEntityTableOrderingComposer,
+      i1.$$MetadataEntityTableAnnotationComposer,
+      $$MetadataEntityTableCreateCompanionBuilder,
+      $$MetadataEntityTableUpdateCompanionBuilder,
      (
-        i1.SettingsEntityData,
+        i1.MetadataEntityData,
        i0.BaseReferences<
          i0.GeneratedDatabase,
-          i1.$SettingsEntityTable,
-          i1.SettingsEntityData
+          i1.$MetadataEntityTable,
+          i1.MetadataEntityData
        >,
      ),
-      i1.SettingsEntityData,
+      i1.MetadataEntityData,
      i0.PrefetchHooks Function()
    >;

-class $SettingsEntityTable extends i2.SettingsEntity
-    with i0.TableInfo<$SettingsEntityTable, i1.SettingsEntityData> {
+class $MetadataEntityTable extends i2.MetadataEntity
+    with i0.TableInfo<$MetadataEntityTable, i1.MetadataEntityData> {
  @override
  final i0.GeneratedDatabase attachedDatabase;
  final String? _alias;
-  $SettingsEntityTable(this.attachedDatabase, [this._alias]);
+  $MetadataEntityTable(this.attachedDatabase, [this._alias]);
  static const i0.VerificationMeta _keyMeta = const i0.VerificationMeta('key');
  @override
  late final i0.GeneratedColumn<String> key = i0.GeneratedColumn<String>(
@@ -219,10 +219,10 @@ class $SettingsEntityTable extends i2.SettingsEntity
  String get aliasedName => _alias ?? actualTableName;
  @override
  String get actualTableName => $name;
-  static const String $name = 'settings';
+  static const String $name = 'metadata';
  @override
  i0.VerificationContext validateIntegrity(
-    i0.Insertable<i1.SettingsEntityData> instance, {
+    i0.Insertable<i1.MetadataEntityData> instance, {
    bool isInserting = false,
  }) {
    final context = i0.VerificationContext();
@@ -255,9 +255,9 @@ class $SettingsEntityTable extends i2.SettingsEntity
  @override
  Set<i0.GeneratedColumn> get $primaryKey => {key};
  @override
-  i1.SettingsEntityData map(Map<String, dynamic> data, {String? tablePrefix}) {
+  i1.MetadataEntityData map(Map<String, dynamic> data, {String? tablePrefix}) {
    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
-    return i1.SettingsEntityData(
+    return i1.MetadataEntityData(
      key: attachedDatabase.typeMapping.read(
        i0.DriftSqlType.string,
        data['${effectivePrefix}key'],
@@ -274,8 +274,8 @@ class $SettingsEntityTable extends i2.SettingsEntity
  }

  @override
-  $SettingsEntityTable createAlias(String alias) {
-    return $SettingsEntityTable(attachedDatabase, alias);
+  $MetadataEntityTable createAlias(String alias) {
+    return $MetadataEntityTable(attachedDatabase, alias);
  }

  @override
@@ -284,12 +284,12 @@ class $SettingsEntityTable extends i2.SettingsEntity
  bool get isStrict => true;
 }

-class SettingsEntityData extends i0.DataClass
-    implements i0.Insertable<i1.SettingsEntityData> {
+class MetadataEntityData extends i0.DataClass
+    implements i0.Insertable<i1.MetadataEntityData> {
  final String key;
  final String value;
  final DateTime updatedAt;
-  const SettingsEntityData({
+  const MetadataEntityData({
    required this.key,
    required this.value,
    required this.updatedAt,
@@ -303,12 +303,12 @@ class SettingsEntityData extends i0.DataClass
    return map;
  }

-  factory SettingsEntityData.fromJson(
+  factory MetadataEntityData.fromJson(
    Map<String, dynamic> json, {
    i0.ValueSerializer? serializer,
  }) {
    serializer ??= i0.driftRuntimeOptions.defaultSerializer;
-    return SettingsEntityData(
+    return MetadataEntityData(
      key: serializer.fromJson<String>(json['key']),
      value: serializer.fromJson<String>(json['value']),
      updatedAt: serializer.fromJson<DateTime>(json['updatedAt']),
@@ -324,17 +324,17 @@ class SettingsEntityData extends i0.DataClass
    };
  }

-  i1.SettingsEntityData copyWith({
+  i1.MetadataEntityData copyWith({
    String? key,
    String? value,
    DateTime? updatedAt,
-  }) => i1.SettingsEntityData(
+  }) => i1.MetadataEntityData(
    key: key ?? this.key,
    value: value ?? this.value,
    updatedAt: updatedAt ?? this.updatedAt,
  );
-  SettingsEntityData copyWithCompanion(i1.SettingsEntityCompanion data) {
-    return SettingsEntityData(
+  MetadataEntityData copyWithCompanion(i1.MetadataEntityCompanion data) {
+    return MetadataEntityData(
      key: data.key.present ? data.key.value : this.key,
      value: data.value.present ? data.value.value : this.value,
      updatedAt: data.updatedAt.present ? data.updatedAt.value : this.updatedAt,
@@ -343,7 +343,7 @@ class SettingsEntityData extends i0.DataClass

  @override
  String toString() {
-    return (StringBuffer('SettingsEntityData(')
+    return (StringBuffer('MetadataEntityData(')
          ..write('key: $key, ')
          ..write('value: $value, ')
          ..write('updatedAt: $updatedAt')
@@ -356,29 +356,29 @@ class SettingsEntityData extends i0.DataClass
  @override
  bool operator ==(Object other) =>
      identical(this, other) ||
-      (other is i1.SettingsEntityData &&
+      (other is i1.MetadataEntityData &&
          other.key == this.key &&
          other.value == this.value &&
          other.updatedAt == this.updatedAt);
 }

-class SettingsEntityCompanion
-    extends i0.UpdateCompanion<i1.SettingsEntityData> {
+class MetadataEntityCompanion
+    extends i0.UpdateCompanion<i1.MetadataEntityData> {
  final i0.Value<String> key;
  final i0.Value<String> value;
  final i0.Value<DateTime> updatedAt;
-  const SettingsEntityCompanion({
+  const MetadataEntityCompanion({
    this.key = const i0.Value.absent(),
    this.value = const i0.Value.absent(),
    this.updatedAt = const i0.Value.absent(),
  });
-  SettingsEntityCompanion.insert({
+  MetadataEntityCompanion.insert({
    required String key,
    required String value,
    this.updatedAt = const i0.Value.absent(),
  }) : key = i0.Value(key),
       value = i0.Value(value);
-  static i0.Insertable<i1.SettingsEntityData> custom({
+  static i0.Insertable<i1.MetadataEntityData> custom({
    i0.Expression<String>? key,
    i0.Expression<String>? value,
    i0.Expression<DateTime>? updatedAt,
@@ -390,12 +390,12 @@ class SettingsEntityCompanion
    });
  }

-  i1.SettingsEntityCompanion copyWith({
+  i1.MetadataEntityCompanion copyWith({
    i0.Value<String>? key,
    i0.Value<String>? value,
    i0.Value<DateTime>? updatedAt,
  }) {
-    return i1.SettingsEntityCompanion(
+    return i1.MetadataEntityCompanion(
      key: key ?? this.key,
      value: value ?? this.value,
      updatedAt: updatedAt ?? this.updatedAt,
@@ -419,7 +419,7 @@ class SettingsEntityCompanion

  @override
  String toString() {
-    return (StringBuffer('SettingsEntityCompanion(')
+    return (StringBuffer('MetadataEntityCompanion(')
          ..write('key: $key, ')
          ..write('value: $value, ')
          ..write('updatedAt: $updatedAt')
@@ -13,7 +13,7 @@ import 'package:immich_mobile/infrastructure/entities/local_asset.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/local_asset.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/memory.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/memory_asset.entity.dart';
-import 'package:immich_mobile/infrastructure/entities/settings.entity.dart';
+import 'package:immich_mobile/infrastructure/entities/metadata.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/partner.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/person.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_album.entity.dart';
@@ -55,7 +55,7 @@ import 'package:logging/logging.dart';
    StoreEntity,
    TrashedLocalAssetEntity,
    AssetEditEntity,
-    SettingsEntity,
+    MetadataEntity,
  ],
  include: {'package:immich_mobile/infrastructure/entities/merged_asset.drift'},
 )
@@ -98,7 +98,7 @@ class Drift extends $Drift {
  }

  @override
-  int get schemaVersion => 28;
+  int get schemaVersion => 26;

  @override
  MigrationStrategy get migration => MigrationStrategy(
@@ -276,12 +276,6 @@ class Drift extends $Drift {
          from25To26: (m, v26) async {
            await m.addColumn(v26.remoteAssetEntity, v26.remoteAssetEntity.uploadedAt);
          },
-          from26To27: (m, v27) async {
-            await customStatement('ALTER TABLE metadata RENAME TO settings');
-          },
-          from27To28: (m, v28) async {
-            await m.createIndex(v28.idxLocalAssetCreatedAt);
-          },
        ),
      );

@@ -43,7 +43,7 @@ import 'package:immich_mobile/infrastructure/entities/trashed_local_asset.entity
    as i20;
 import 'package:immich_mobile/infrastructure/entities/asset_edit.entity.drift.dart'
    as i21;
-import 'package:immich_mobile/infrastructure/entities/settings.entity.drift.dart'
+import 'package:immich_mobile/infrastructure/entities/metadata.entity.drift.dart'
    as i22;
 import 'package:immich_mobile/infrastructure/entities/merged_asset.drift.dart'
    as i23;
@@ -91,7 +91,7 @@ abstract class $Drift extends i0.GeneratedDatabase {
      .$TrashedLocalAssetEntityTable(this);
  late final i21.$AssetEditEntityTable assetEditEntity = i21
      .$AssetEditEntityTable(this);
-  late final i22.$SettingsEntityTable settingsEntity = i22.$SettingsEntityTable(
+  late final i22.$MetadataEntityTable metadataEntity = i22.$MetadataEntityTable(
    this,
  );
  i23.MergedAssetDrift get mergedAssetDrift => i24.ReadDatabaseContainer(
@@ -112,7 +112,6 @@ abstract class $Drift extends i0.GeneratedDatabase {
    i7.idxLocalAlbumAssetAlbumAsset,
    i4.idxLocalAssetChecksum,
    i4.idxLocalAssetCloudId,
-    i4.idxLocalAssetCreatedAt,
    i3.idxStackPrimaryAssetId,
    i2.uQRemoteAssetsOwnerChecksum,
    i2.uQRemoteAssetsOwnerLibraryChecksum,
@@ -133,7 +132,7 @@ abstract class $Drift extends i0.GeneratedDatabase {
    storeEntity,
    trashedLocalAssetEntity,
    assetEditEntity,
-    settingsEntity,
+    metadataEntity,
    i10.idxPartnerSharedWithId,
    i11.idxLatLng,
    i11.idxRemoteExifCity,
@@ -396,6 +395,6 @@ class $DriftManager {
      );
  i21.$$AssetEditEntityTableTableManager get assetEditEntity =>
      i21.$$AssetEditEntityTableTableManager(_db, _db.assetEditEntity);
-  i22.$$SettingsEntityTableTableManager get settingsEntity =>
-      i22.$$SettingsEntityTableTableManager(_db, _db.settingsEntity);
+  i22.$$MetadataEntityTableTableManager get metadataEntity =>
+      i22.$$MetadataEntityTableTableManager(_db, _db.metadataEntity);
 }
@@ -241,7 +241,7 @@ class DriftLocalAlbumRepository extends DriftDatabaseRepository {
            innerJoin(_db.localAssetEntity, _db.localAlbumAssetEntity.assetId.equalsExp(_db.localAssetEntity.id)),
          ])
          ..where(_db.localAlbumAssetEntity.albumId.equals(albumId) & _db.localAssetEntity.checksum.isNull())
-          ..orderBy([OrderingTerm.desc(_db.localAssetEntity.createdAt)]);
+          ..orderBy([OrderingTerm.asc(_db.localAssetEntity.id)]);

    return query.map((row) => row.readTable(_db.localAssetEntity).toDto()).get();
  }
@@ -1,21 +1,21 @@
 import 'package:collection/collection.dart';
 import 'package:drift/drift.dart';
 import 'package:immich_mobile/domain/models/config/app_config.dart';
-import 'package:immich_mobile/domain/models/settings_key.dart';
-import 'package:immich_mobile/infrastructure/entities/settings.entity.drift.dart';
+import 'package:immich_mobile/domain/models/metadata_key.dart';
+import 'package:immich_mobile/infrastructure/entities/metadata.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';

-class SettingsRepository extends DriftDatabaseRepository {
+class MetadataRepository extends DriftDatabaseRepository {
  final Drift _db;

-  SettingsRepository._(this._db) : super(_db);
+  MetadataRepository._(this._db) : super(_db);

-  static SettingsRepository? _instance;
+  static MetadataRepository? _instance;

-  static SettingsRepository get instance {
+  static MetadataRepository get instance {
    final instance = _instance;
    if (instance == null) {
-      throw StateError('SettingsRepository not initialized. Call ensureInitialized() first');
+      throw StateError('MetadataRepository not initialized. Call ensureInitialized() first');
    }
    return instance;
  }
@@ -23,31 +23,31 @@ class SettingsRepository extends DriftDatabaseRepository {
  AppConfig _appConfig = const .new();
  AppConfig get appConfig => _appConfig;

-  static Future<SettingsRepository> ensureInitialized(Drift db) async {
+  static Future<MetadataRepository> ensureInitialized(Drift db) async {
    if (_instance == null) {
-      final instance = SettingsRepository._(db);
+      final instance = MetadataRepository._(db);
      await instance.refresh();
      _instance = instance;
    }
    return _instance!;
  }

-  Future<void> refresh() async => _applyOverrides(await _db.select(_db.settingsEntity).get());
+  Future<void> refresh() async => _applyOverrides(await _db.select(_db.metadataEntity).get());

-  Future<void> clear(Iterable<SettingsKey> keys) async {
+  Future<void> clear(Iterable<MetadataKey> keys) async {
    if (keys.isEmpty) {
      return;
    }

    final names = keys.map((key) => key.name).toList();
-    await (_db.delete(_db.settingsEntity)..where((row) => row.key.isIn(names))).go();
+    await (_db.delete(_db.metadataEntity)..where((row) => row.key.isIn(names))).go();

    for (final key in keys) {
      _appConfig = _appConfig.write(key, defaultConfig.read(key));
    }
  }

-  Future<void> write<T extends Object, U extends T>(SettingsKey<T> key, U value) async {
+  Future<void> write<T extends Object, U extends T>(MetadataKey<T> key, U value) async {
    if (value == _appConfig.read(key)) {
      return;
    }
@@ -57,22 +57,22 @@ class SettingsRepository extends DriftDatabaseRepository {
    }

    await _db
-        .into(_db.settingsEntity)
+        .into(_db.metadataEntity)
        .insertOnConflictUpdate(
-          SettingsEntityCompanion.insert(key: key.name, value: key.encode(value), updatedAt: Value(DateTime.now())),
+          MetadataEntityCompanion.insert(key: key.name, value: key.encode(value), updatedAt: Value(DateTime.now())),
        );
    _appConfig = _appConfig.write(key, value);
  }

-  Stream<AppConfig> watchConfig() => _db.select(_db.settingsEntity).watch().map((rows) {
+  Stream<AppConfig> watchConfig() => _db.select(_db.metadataEntity).watch().map((rows) {
    _applyOverrides(rows);
    return _appConfig;
  });

-  void _applyOverrides(List<SettingsEntityData> rows) {
+  void _applyOverrides(List<MetadataEntityData> rows) {
    _appConfig = AppConfig.fromEntries(
      rows.fold({}, (overrides, row) {
-        final metadataKey = SettingsKey.values.firstWhereOrNull((key) => key.name == row.key);
+        final metadataKey = MetadataKey.values.firstWhereOrNull((key) => key.name == row.key);
        if (metadataKey == null) {
          return overrides;
        }
@@ -11,73 +11,60 @@ class SearchApiRepository extends ApiRepository {
  Future<SearchResponseDto?> search(SearchFilter filter, int page) {
    AssetTypeEnum? type;
    if (filter.mediaType.index == AssetType.image.index) {
-      type = AssetTypeEnum.IMAGE;
+      type = AssetTypeEnum.image;
    } else if (filter.mediaType.index == AssetType.video.index) {
-      type = AssetTypeEnum.VIDEO;
+      type = AssetTypeEnum.video;
    }

    if ((filter.context != null && filter.context!.isNotEmpty) ||
        (filter.assetId != null && filter.assetId!.isNotEmpty)) {
      return _api.searchSmart(
        SmartSearchDto(
-          query: filter.context == null ? const Optional.absent() : Optional.present(filter.context!),
-          queryAssetId: filter.assetId == null ? const Optional.absent() : Optional.present(filter.assetId!),
-          language: filter.language == null ? const Optional.absent() : Optional.present(filter.language!),
-          country: filter.location.country == null
-              ? const Optional.absent()
-              : Optional.present(filter.location.country!),
-          state: filter.location.state == null ? const Optional.absent() : Optional.present(filter.location.state!),
-          city: filter.location.city == null ? const Optional.absent() : Optional.present(filter.location.city!),
-          make: filter.camera.make == null ? const Optional.absent() : Optional.present(filter.camera.make!),
-          model: filter.camera.model == null ? const Optional.absent() : Optional.present(filter.camera.model!),
-          takenAfter: filter.date.takenAfter == null
-              ? const Optional.absent()
-              : Optional.present(filter.date.takenAfter!),
-          takenBefore: filter.date.takenBefore == null
-              ? const Optional.absent()
-              : Optional.present(filter.date.takenBefore!),
-          visibility: Optional.present(filter.display.isArchive ? AssetVisibility.archive : AssetVisibility.timeline),
-          rating: filter.rating.rating == null ? const Optional.absent() : Optional.present(filter.rating.rating!),
-          isFavorite: filter.display.isFavorite ? const Optional.present(true) : const Optional.absent(),
-          isNotInAlbum: filter.display.isNotInAlbum ? const Optional.present(true) : const Optional.absent(),
-          personIds: Optional.present(filter.people.map((e) => e.id).toList()),
-          tagIds: filter.tagIds == null ? const Optional.absent() : Optional.present(filter.tagIds!),
-          type: type == null ? const Optional.absent() : Optional.present(type),
-          page: Optional.present(page),
-          size: const Optional.present(100),
+          query: filter.context.toOptional(),
+          queryAssetId: filter.assetId.toOptional(),
+          language: filter.language.toOptional(),
+          country: filter.location.country.toOptional(),
+          state: filter.location.state.toOptional(),
+          city: filter.location.city.toOptional(),
+          make: filter.camera.make.toOptional(),
+          model: filter.camera.model.toOptional(),
+          takenAfter: filter.date.takenAfter.toOptional(),
+          takenBefore: filter.date.takenBefore.toOptional(),
+          visibility: (filter.display.isArchive ? AssetVisibility.archive : AssetVisibility.timeline).toOptional(),
+          rating: filter.rating.rating.toOptional(),
+          isFavorite: (filter.display.isFavorite ? true : null).toOptional(),
+          isNotInAlbum: (filter.display.isNotInAlbum ? true : null).toOptional(),
+          personIds: filter.people.map((e) => e.id).toList().toOptional(),
+          tagIds: filter.tagIds.toOptional(),
+          type: type.toOptional(),
+          page: page.toOptional(),
+          size: 100.toOptional(),
        ),
      );
    }

    return _api.searchAssets(
      MetadataSearchDto(
-        originalFileName: filter.filename != null && filter.filename!.isNotEmpty
-            ? Optional.present(filter.filename!)
-            : const Optional.absent(),
-        country: filter.location.country == null ? const Optional.absent() : Optional.present(filter.location.country!),
-        description: filter.description != null && filter.description!.isNotEmpty
-            ? Optional.present(filter.description!)
-            : const Optional.absent(),
-        ocr: filter.ocr != null && filter.ocr!.isNotEmpty ? Optional.present(filter.ocr!) : const Optional.absent(),
-        state: filter.location.state == null ? const Optional.absent() : Optional.present(filter.location.state!),
-        city: filter.location.city == null ? const Optional.absent() : Optional.present(filter.location.city!),
-        make: filter.camera.make == null ? const Optional.absent() : Optional.present(filter.camera.make!),
-        model: filter.camera.model == null ? const Optional.absent() : Optional.present(filter.camera.model!),
-        takenAfter: filter.date.takenAfter == null
-            ? const Optional.absent()
-            : Optional.present(filter.date.takenAfter!),
-        takenBefore: filter.date.takenBefore == null
-            ? const Optional.absent()
-            : Optional.present(filter.date.takenBefore!),
-        visibility: Optional.present(filter.display.isArchive ? AssetVisibility.archive : AssetVisibility.timeline),
-        rating: filter.rating.rating == null ? const Optional.absent() : Optional.present(filter.rating.rating!),
-        isFavorite: filter.display.isFavorite ? const Optional.present(true) : const Optional.absent(),
-        isNotInAlbum: filter.display.isNotInAlbum ? const Optional.present(true) : const Optional.absent(),
-        personIds: Optional.present(filter.people.map((e) => e.id).toList()),
-        tagIds: filter.tagIds == null ? const Optional.absent() : Optional.present(filter.tagIds!),
-        type: type == null ? const Optional.absent() : Optional.present(type),
-        page: Optional.present(page),
-        size: const Optional.present(1000),
+        originalFileName: (filter.filename != null && filter.filename!.isNotEmpty ? filter.filename : null).toOptional(),
+        country: filter.location.country.toOptional(),
+        description: (filter.description != null && filter.description!.isNotEmpty ? filter.description : null)
+            .toOptional(),
+        ocr: (filter.ocr != null && filter.ocr!.isNotEmpty ? filter.ocr : null).toOptional(),
+        state: filter.location.state.toOptional(),
+        city: filter.location.city.toOptional(),
+        make: filter.camera.make.toOptional(),
+        model: filter.camera.model.toOptional(),
+        takenAfter: filter.date.takenAfter.toOptional(),
+        takenBefore: filter.date.takenBefore.toOptional(),
+        visibility: (filter.display.isArchive ? AssetVisibility.archive : AssetVisibility.timeline).toOptional(),
+        rating: filter.rating.rating.toOptional(),
+        isFavorite: (filter.display.isFavorite ? true : null).toOptional(),
+        isNotInAlbum: (filter.display.isNotInAlbum ? true : null).toOptional(),
+        personIds: filter.people.map((e) => e.id).toList().toOptional(),
+        tagIds: filter.tagIds.toOptional(),
+        type: type.toOptional(),
+        page: page.toOptional(),
+        size: 1000.toOptional(),
      ),
    );
  }
@@ -88,5 +75,5 @@ class SearchApiRepository extends ApiRepository {
    String? state,
    String? make,
    String? model,
-  }) => _api.getSearchSuggestions(type, country: country, state: state, make: make, model: model);
+  }) => _api.getSearchSuggestions(type: type, country: country, state: state, make: make, model: model);
 }
@@ -20,7 +20,7 @@ class SyncApiRepository {
  }

  Future<void> deleteSyncAck(List<SyncEntityType> types) {
-    return _api.syncApi.deleteSyncAck(SyncAckDeleteDto(types: Optional.present(types)));
+    return _api.syncApi.deleteSyncAck(SyncAckDeleteDto(types: types.toOptional()));
  }

  Future<void> streamChanges(
@@ -29,7 +29,6 @@ class SyncApiRepository {
    Function()? onReset,
    int batchSize = kSyncEventBatchSize,
    http.Client? httpClient,
-    Future<void>? abortSignal,
  }) async {
    final stopwatch = Stopwatch()..start();
    final client = httpClient ?? NetworkRepository.client;
@@ -37,7 +36,7 @@ class SyncApiRepository {

    final headers = {'Content-Type': 'application/json', 'Accept': 'application/jsonlines+json'};

-    final request = http.AbortableRequest('POST', Uri.parse(endpoint), abortTrigger: abortSignal);
+    final request = http.Request('POST', Uri.parse(endpoint));
    request.headers.addAll(headers);
    request.body = jsonEncode(
      SyncStreamDto(
@@ -91,7 +91,7 @@ class SyncStreamRepository extends DriftDatabaseRepository {
            email: Value(user.email),
            hasProfileImage: Value(user.hasProfileImage),
            profileChangedAt: Value(user.profileChangedAt),
-            avatarColor: Value(user.avatarColor.orElse(null)?.toAvatarColor() ?? AvatarColor.primary),
+            avatarColor: Value(user.avatarColor?.toAvatarColor() ?? AvatarColor.primary),
            isAdmin: Value(user.isAdmin),
            pinCode: Value(user.pinCode),
            quotaSizeInBytes: Value(user.quotaSizeInBytes ?? 0),
@@ -133,7 +133,7 @@ class SyncStreamRepository extends DriftDatabaseRepository {
            email: Value(user.email),
            hasProfileImage: Value(user.hasProfileImage),
            profileChangedAt: Value(user.profileChangedAt),
-            avatarColor: Value(user.avatarColor.orElse(null)?.toAvatarColor() ?? AvatarColor.primary),
+            avatarColor: Value(user.avatarColor?.toAvatarColor() ?? AvatarColor.primary),
          );

          batch.insert(_db.userEntity, companion.copyWith(id: Value(user.id)), onConflict: DoUpdate((_) => companion));
@@ -885,10 +885,10 @@ class SyncStreamRepository extends DriftDatabaseRepository {

 extension on AssetTypeEnum {
  AssetType toAssetType() => switch (this) {
-    AssetTypeEnum.IMAGE => AssetType.image,
-    AssetTypeEnum.VIDEO => AssetType.video,
-    AssetTypeEnum.AUDIO => AssetType.audio,
-    AssetTypeEnum.OTHER => AssetType.other,
+    AssetTypeEnum.image => AssetType.image,
+    AssetTypeEnum.video => AssetType.video,
+    AssetTypeEnum.audio => AssetType.audio,
+    AssetTypeEnum.other => AssetType.other,
    _ => throw Exception('Unknown AssetType value: $this'),
  };
 }
@@ -17,7 +17,7 @@ class TagsApiRepository extends ApiRepository {

  Future<int> bulkTagAssets(List<String> assetIds, List<String> tagIds) async {
    final response = await _api.bulkTagAssets(TagBulkAssetsDto(assetIds: assetIds, tagIds: tagIds));
-    return response?.count ?? 0;
+    return response.count;
  }

  Future<List<TagResponseDto>?> upsertTags(List<String> tags) async {
@@ -12,9 +12,6 @@ class UserApiRepository extends ApiRepository {

  Future<UserDto?> getMyUser() async {
    final (adminDto, preferenceDto) = await (_api.getMyUser(), _api.getMyPreferences()).wait;
-    if (adminDto == null) {
-      return null;
-    }

    return UserConverter.fromAdminDto(adminDto, preferenceDto);
  }
@@ -5,24 +5,24 @@ import 'package:openapi/api.dart';
 abstract final class ExifDtoConverter {
  static ExifInfo fromDto(ExifResponseDto dto) {
    return ExifInfo(
-      fileSize: dto.fileSizeInByte.orElse(null),
-      description: dto.description.orElse(null),
-      orientation: dto.orientation.orElse(null),
-      timeZone: dto.timeZone.orElse(null),
-      dateTimeOriginal: dto.dateTimeOriginal.orElse(null),
-      isFlipped: isOrientationFlipped(dto.orientation.orElse(null)),
-      latitude: dto.latitude.orElse(null)?.toDouble(),
-      longitude: dto.longitude.orElse(null)?.toDouble(),
-      city: dto.city.orElse(null),
-      state: dto.state.orElse(null),
-      country: dto.country.orElse(null),
-      make: dto.make.orElse(null),
-      model: dto.model.orElse(null),
-      lens: dto.lensModel.orElse(null),
-      f: dto.fNumber.orElse(null)?.toDouble(),
-      mm: dto.focalLength.orElse(null)?.toDouble(),
-      iso: dto.iso.orElse(null)?.toInt(),
-      exposureSeconds: exposureTimeToSeconds(dto.exposureTime.orElse(null)),
+      fileSize: dto.fileSizeInByte,
+      description: dto.description,
+      orientation: dto.orientation,
+      timeZone: dto.timeZone,
+      dateTimeOriginal: dto.dateTimeOriginal,
+      isFlipped: isOrientationFlipped(dto.orientation),
+      latitude: dto.latitude?.toDouble(),
+      longitude: dto.longitude?.toDouble(),
+      city: dto.city,
+      state: dto.state,
+      country: dto.country,
+      make: dto.make,
+      model: dto.model,
+      lens: dto.lensModel,
+      f: dto.fNumber?.toDouble(),
+      mm: dto.focalLength?.toDouble(),
+      iso: dto.iso?.toInt(),
+      exposureSeconds: exposureTimeToSeconds(dto.exposureTime),
    );
  }

@@ -40,7 +40,7 @@ abstract final class UserConverter {
    updatedAt: DateTime.now(),
    avatarColor: dto.avatarColor.toAvatarColor(),
    memoryEnabled: false,
-    inTimeline: dto.inTimeline.orElse(null) ?? false,
+    inTimeline: dto.inTimeline ?? false,
    isPartnerSharedBy: false,
    isPartnerSharedWith: false,
    profileChangedAt: dto.profileChangedAt,
@@ -24,9 +24,8 @@ import 'package:immich_mobile/pages/common/splash_screen.page.dart';
 import 'package:immich_mobile/platform/background_worker_lock_api.g.dart';
 import 'package:immich_mobile/providers/app_life_cycle.provider.dart';
 import 'package:immich_mobile/providers/asset_viewer/share_intent_upload.provider.dart';
-import 'package:immich_mobile/providers/view_intent/view_intent_handler.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
 import 'package:immich_mobile/providers/locale_provider.dart';
 import 'package:immich_mobile/providers/routes.provider.dart';
@@ -41,6 +40,7 @@ import 'package:immich_mobile/utils/cache/widgets_binding.dart';
 import 'package:immich_mobile/utils/debug_print.dart';
 import 'package:immich_mobile/utils/licenses.dart';
 import 'package:immich_mobile/utils/migration.dart';
+import 'package:immich_mobile/utils/openapi_compat.dart';
 import 'package:immich_mobile/wm_executor.dart';
 import 'package:immich_ui/immich_ui.dart';
 import 'package:intl/date_symbol_data_local.dart';
@@ -50,6 +50,8 @@ import 'package:timezone/data/latest.dart';
 void main() async {
  try {
    ImmichWidgetsBinding();
+    // Register backward-compat back-fills before any API response is parsed.
+    configureOpenApiCompat();
    unawaited(BackgroundWorkerLockService(BackgroundWorkerLockApi()).lock());
    await EasyLocalization.ensureInitialized();
    final (drift, _) = await Bootstrap.initDomain();
@@ -129,7 +131,6 @@ class ImmichAppState extends ConsumerState<ImmichApp> with WidgetsBindingObserve
      case AppLifecycleState.resumed:
        dPrint(() => "[APP STATE] resumed");
        ref.read(appStateProvider.notifier).handleAppResume();
-        unawaited(ref.read(viewIntentHandlerProvider).onAppResumed());
        break;
      case AppLifecycleState.inactive:
        dPrint(() => "[APP STATE] inactive");
@@ -235,7 +236,6 @@ class ImmichAppState extends ConsumerState<ImmichApp> with WidgetsBindingObserve
      }
    });

-    ref.read(viewIntentHandlerProvider).init();
    ref.read(shareIntentUploadProvider.notifier).init();
  }

@@ -2,12 +2,16 @@ import 'package:immich_mobile/utils/semver.dart';
 import 'package:openapi/api.dart';

 class ServerVersion extends SemVer {
-  const ServerVersion({required super.major, required super.minor, required super.patch, super.prerelease});
+  const ServerVersion({required super.major, required super.minor, required super.patch});

-  ServerVersion.fromDto(ServerVersionResponseDto dto)
-    : super(major: dto.major, minor: dto.minor, patch: dto.patch_, prerelease: dto.prerelease);
+  @override
+  String toString() {
+    return 'ServerVersion(major: $major, minor: $minor, patch: $patch)';
+  }

-  bool isAtLeast({int major = 0, int minor = 0, int patch = 0, int? prerelease}) {
-    return this >= SemVer(major: major, minor: minor, patch: patch, prerelease: prerelease);
+  ServerVersion.fromDto(ServerVersionResponseDto dto) : super(major: dto.major, minor: dto.minor, patch: dto.patch);
+
+  bool isAtLeast({int major = 0, int minor = 0, int patch = 0}) {
+    return this >= SemVer(major: major, minor: minor, patch: patch);
  }
 }
@@ -71,12 +71,12 @@ class SharedLink {
      key = dto.key,
      showMetadata = dto.showMetadata,
      slug = dto.slug,
-      type = dto.type == SharedLinkType.ALBUM ? SharedLinkSource.album : SharedLinkSource.individual,
-      title = dto.type == SharedLinkType.ALBUM
-          ? dto.album.orElse(null)?.albumName.toUpperCase() ?? "UNKNOWN SHARE"
+      type = dto.type == SharedLinkType.album ? SharedLinkSource.album : SharedLinkSource.individual,
+      title = dto.type == SharedLinkType.album
+          ? dto.album?.albumName.toUpperCase() ?? "UNKNOWN SHARE"
          : "INDIVIDUAL SHARE",
-      thumbAssetId = dto.type == SharedLinkType.ALBUM
-          ? dto.album.orElse(null)?.albumThumbnailAssetId
+      thumbAssetId = dto.type == SharedLinkType.album
+          ? dto.album?.albumThumbnailAssetId
          : dto.assets.isNotEmpty
          ? dto.assets[0].id
          : null;
@@ -1,35 +0,0 @@
-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/platform/view_intent_api.g.dart';
-import 'package:path/path.dart';
-
-extension ViewIntentPayloadX on ViewIntentPayload {
-  String get fileName {
-    final resolvedPath = path;
-    if (resolvedPath != null && resolvedPath.isNotEmpty) {
-      return basename(resolvedPath);
-    }
-    return localAssetId ?? 'view_intent_asset';
-  }
-
-  bool get isImage => mimeType.toLowerCase().startsWith('image/');
-
-  bool get isVideo => mimeType.toLowerCase().startsWith('video/');
-
-  AssetPlaybackStyle get playbackStyle {
-    if (isVideo) {
-      return AssetPlaybackStyle.video;
-    }
-
-    final normalizedMimeType = mimeType.toLowerCase();
-    if (normalizedMimeType == 'image/gif' || normalizedMimeType == 'image/webp') {
-      return AssetPlaybackStyle.imageAnimated;
-    }
-
-    final normalizedPath = path?.toLowerCase();
-    if (normalizedPath != null && (normalizedPath.endsWith('.gif') || normalizedPath.endsWith('.webp'))) {
-      return AssetPlaybackStyle.imageAnimated;
-    }
-
-    return AssetPlaybackStyle.image;
-  }
-}
@@ -8,11 +8,11 @@ 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/infrastructure/repositories/settings.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/metadata.repository.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/backup/drift_backup.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/widgets/backup/drift_album_info_list_tile.dart';
@@ -103,7 +103,7 @@ class _DriftBackupAlbumSelectionPageState extends ConsumerState<DriftBackupAlbum
            return;
          }

-          final isBackupEnabled = SettingsRepository.instance.appConfig.backup.enabled;
+          final isBackupEnabled = MetadataRepository.instance.appConfig.backup.enabled;
          await ref.read(driftBackupProvider.notifier).getBackupStatus(user.id);
          final currentTotalAssetCount = ref.read(driftBackupProvider.select((p) => p.totalCount));
          final totalChanged = currentTotalAssetCount != _initialTotalAssetCount;
@@ -4,10 +4,10 @@ import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
-import 'package:immich_mobile/infrastructure/repositories/settings.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/metadata.repository.dart';
 import 'package:immich_mobile/providers/background_sync.provider.dart';
 import 'package:immich_mobile/providers/backup/drift_backup.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/widgets/settings/backup_settings/drift_backup_settings.dart';
 import 'package:logging/logging.dart';
@@ -27,7 +27,7 @@ class DriftBackupOptionsPage extends ConsumerWidget {
        // There is an issue with Flutter where the pop event
        // can be triggered multiple times, so we guard it with _hasPopped

-        final currentBackup = ref.read(appConfigProvider).backup;
+        final currentBackup = ref.read(metadataProvider).appConfig.backup;
        final currentCellularForVideos = currentBackup.useCellularForVideos;
        final currentCellularForPhotos = currentBackup.useCellularForPhotos;

@@ -45,7 +45,7 @@ class DriftBackupOptionsPage extends ConsumerWidget {
          }

          await ref.read(driftBackupProvider.notifier).getBackupStatus(currentUser.id);
-          final isBackupEnabled = SettingsRepository.instance.appConfig.backup.enabled;
+          final isBackupEnabled = MetadataRepository.instance.appConfig.backup.enabled;
          if (!isBackupEnabled) {
            return;
          }
@@ -3,9 +3,10 @@ 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';
+import 'package:immich_mobile/domain/models/metadata_key.dart';
 import 'package:immich_mobile/generated/translations.g.dart';
 import 'package:immich_mobile/providers/api.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';

 class SettingsHeader {
  String key = "";
@@ -21,7 +22,7 @@ class HeaderSettingsPage extends HookConsumerWidget {
    final headers = useState<List<SettingsHeader>>([]);
    final setInitialHeaders = useState(false);

-    final storedHeaders = ref.read(appConfigProvider).network.customHeaders;
+    final storedHeaders = ref.read(metadataProvider).appConfig.network.customHeaders;
    if (!setInitialHeaders.value) {
      storedHeaders.forEach((k, v) {
        final header = SettingsHeader();
@@ -93,7 +94,7 @@ class HeaderSettingsPage extends HookConsumerWidget {
      headersMap[key] = value;
    }

-    await ref.read(settingsProvider).write(.networkCustomHeaders, headersMap);
+    await ref.read(metadataProvider).write(MetadataKey.networkCustomHeaders, headersMap);
    await ref.read(apiServiceProvider).updateHeaders();
  }
 }
@@ -12,12 +12,11 @@ import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/generated/codegen_loader.g.dart';
 import 'package:immich_mobile/generated/translations.g.dart';
-import 'package:immich_mobile/infrastructure/repositories/settings.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/metadata.repository.dart';
 import 'package:immich_mobile/providers/auth.provider.dart';
 import 'package:immich_mobile/providers/background_sync.provider.dart';
 import 'package:immich_mobile/providers/backup/drift_backup.provider.dart';
 import 'package:immich_mobile/providers/server_info.provider.dart';
-import 'package:immich_mobile/providers/view_intent/view_intent_handler.provider.dart';
 import 'package:immich_mobile/providers/websocket.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/theme/color_scheme.dart';
@@ -315,7 +314,6 @@ class SplashScreenPageState extends ConsumerState<SplashScreenPage> {
      final wsProvider = ref.read(websocketProvider.notifier);
      final backgroundManager = ref.read(backgroundSyncProvider);
      final backupProvider = ref.read(driftBackupProvider.notifier);
-      final viewIntentHandler = ref.read(viewIntentHandlerProvider);

      unawaited(
        ref.read(authProvider.notifier).saveAuthInfo(accessToken: accessToken).then(
@@ -330,8 +328,6 @@ class SplashScreenPageState extends ConsumerState<SplashScreenPage> {
                backgroundManager.syncRemote().then((success) => syncSuccess = success),
              ]);

-              await viewIntentHandler.flushDeferredViewIntent();
-
              if (syncSuccess) {
                await Future.wait([
                  backgroundManager.hashAssets().then((_) {
@@ -345,7 +341,7 @@ class SplashScreenPageState extends ConsumerState<SplashScreenPage> {
                await backgroundManager.hashAssets();
              }

-              if (SettingsRepository.instance.appConfig.backup.syncAlbums) {
+              if (MetadataRepository.instance.appConfig.backup.syncAlbums) {
                await backgroundManager.syncLinkedAlbum();
              }
            } catch (e) {
@@ -374,7 +370,7 @@ class SplashScreenPageState extends ConsumerState<SplashScreenPage> {
  }

  Future<void> _resumeBackup(DriftBackupNotifier notifier) async {
-    final isEnableBackup = SettingsRepository.instance.appConfig.backup.enabled;
+    final isEnableBackup = MetadataRepository.instance.appConfig.backup.enabled;

    if (isEnableBackup) {
      final currentUser = Store.tryGet(StoreKey.currentUser);
@@ -11,7 +11,6 @@ import 'package:immich_mobile/models/shared_link/shared_link.model.dart';
 import 'package:immich_mobile/providers/server_info.provider.dart';
 import 'package:immich_mobile/providers/shared_link.provider.dart';
 import 'package:immich_mobile/services/shared_link.service.dart';
-import 'package:openapi/api.dart';
 import 'package:immich_mobile/utils/url_helper.dart';
 import 'package:immich_mobile/widgets/common/confirm_dialog.dart';
 import 'package:immich_mobile/widgets/common/immich_toast.dart';
@@ -366,10 +365,11 @@ class SharedLinkEditPage extends HookConsumerWidget {
      bool? download;
      bool? upload;
      bool? meta;
-      var password = const Optional<String?>.absent();
-      var description = const Optional<String?>.absent();
+      String? desc;
+      String? password;
      String? slug;
-      var expiry = const Optional<DateTime?>.absent();
+      DateTime? expiry;
+      bool? changeExpiry;

      if (allowDownload.value != existingLink!.allowDownload) {
        download = allowDownload.value;
@@ -383,16 +383,12 @@ class SharedLinkEditPage extends HookConsumerWidget {
        meta = showMetadata.value;
      }

-      if (descriptionController.text != (existingLink!.description ?? '')) {
-        description = descriptionController.text.isEmpty
-            ? const Optional.present(null)
-            : Optional.present(descriptionController.text);
+      if (descriptionController.text != existingLink!.description) {
+        desc = descriptionController.text;
      }

-      if (passwordController.text != (existingLink!.password ?? '')) {
-        password = passwordController.text.isEmpty
-            ? const Optional.present(null)
-            : Optional.present(passwordController.text);
+      if (passwordController.text != existingLink!.password) {
+        password = passwordController.text;
      }

      if (slugController.text != (existingLink!.slug ?? "")) {
@@ -403,7 +399,8 @@ class SharedLinkEditPage extends HookConsumerWidget {

      final newExpiry = expiryAfter.value;
      if (newExpiry?.toUtc() != existingLink!.expiresAt?.toUtc()) {
-        expiry = newExpiry == null ? const Optional.present(null) : Optional.present(newExpiry.toUtc());
+        expiry = newExpiry;
+        changeExpiry = true;
      }

      await ref
@@ -413,10 +410,11 @@ class SharedLinkEditPage extends HookConsumerWidget {
            showMeta: meta,
            allowDownload: download,
            allowUpload: upload,
-            description: description,
+            description: desc,
            password: password,
            slug: slug,
-            expiresAt: expiry,
+            expiresAt: expiry?.toUtc(),
+            changeExpiry: changeExpiry,
          );
      if (!context.mounted) {
        return;
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`custom: ['https://buy.immich.app', 'https://immich.store']`