fix(web): preserve stacked asset selection when tagging faces

Change-Id: Iec1507560f99f2e9433bd5cf6b460b176a6a6964
2026-06-13 03:21:45 -07:00 · 2026-06-03 02:43:48 +00:00
458 changed files with 5628 additions and 42959 deletions
@@ -94,7 +94,6 @@ jobs:
        uses: immich-app/devtools/actions/use-mise@7b8610a904d57da241e4ddba17fa62b62b15aed4 # use-mise-action-v2.0.2
        with:
          github_token: ${{ steps.token.outputs.token }}
-          working_directory: ./mobile

      - name: Create the Keystore
        if: ${{ !github.event.pull_request.head.repo.fork }}
@@ -220,7 +219,6 @@ jobs:
        uses: immich-app/devtools/actions/use-mise@7b8610a904d57da241e4ddba17fa62b62b15aed4 # use-mise-action-v2.0.2
        with:
          github_token: ${{ steps.token.outputs.token }}
-          working_directory: ./mobile

      - name: Install Flutter dependencies
        working-directory: ./mobile
@@ -4,7 +4,6 @@ on:
  pull_request:
    paths:
      - 'open-api/**'
-      - 'mobile/lib/utils/openapi_patching.dart'
      - '.github/workflows/check-openapi.yml'

 concurrency:
@@ -30,36 +29,3 @@ jobs:
          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 }}
-          working_directory: ./mobile
-
-      - 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
@@ -14,11 +14,7 @@ jobs:
      should_run: ${{ steps.should_run.outputs.run }}
    steps:
      - id: should_run
-        run: |
-          echo "run=${{
-            (github.event_name == 'issues' || github.event.discussion.category.name == 'Feature Request')
-            && !contains(fromJSON('["OWNER", "MEMBER", "COLLABORATOR"]'), github.event.issue.author_association || github.event.discussion.author_association)
-          }}" >> "$GITHUB_OUTPUT"
+        run: echo "run=${{ github.event_name == 'issues' || github.event.discussion.category.name == 'Feature Request' }}" >> $GITHUB_OUTPUT

  get_body:
    runs-on: ubuntu-latest
@@ -45,7 +45,7 @@ jobs:
        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
        if: always()
        with:
-          github-token: ${{ steps.token.outputs.token }}
+          github-token: ${{ steps.generate-token.outputs.token }}
          script: |
            github.rest.issues.removeLabel({
              issue_number: context.payload.pull_request.number,
@@ -64,7 +64,6 @@ jobs:
        uses: immich-app/devtools/actions/use-mise@7b8610a904d57da241e4ddba17fa62b62b15aed4 # use-mise-action-v2.0.2
        with:
          github_token: ${{ steps.token.outputs.token }}
-          working_directory: ./mobile

      - name: Install dependencies
        run: flutter pub get
@@ -90,8 +89,6 @@ jobs:
            mobile/**/*.g.dart
            mobile/**/*.gr.dart
            mobile/**/*.drift.dart
-            mobile/**/*.g.swift
-            mobile/**/*.g.kt

      - name: Verify files have not changed
        if: steps.verify-changed-files.outputs.files_changed == 'true'
@@ -560,7 +560,6 @@ jobs:
        uses: immich-app/devtools/actions/use-mise@7b8610a904d57da241e4ddba17fa62b62b15aed4 # use-mise-action-v2.0.2
        with:
          github_token: ${{ steps.token.outputs.token }}
-          working_directory: ./mobile

      - name: Install dependencies
        run: flutter pub get
@@ -4,4 +4,4 @@
 /web/ @danieldietzler
 /machine-learning/ @mertalev
 /e2e/ @danieldietzler
-/mobile/ @shenlong-tanwen @santoshakil
+/mobile/ @shenlong-tanwen
@@ -97,7 +97,7 @@ services:
    command: ['./run.sh', '-disable-reporting']
    ports:
      - 3000:3000
-    image: grafana/grafana:12.4.4-ubuntu@sha256:df2e7ef5f32f771794cf76bad5f2bceac227036460a2cc269a9045e5662abc58
+    image: grafana/grafana:12.4.3-ubuntu@sha256:ca3f764fdc48cebdf22dd206f33ecb0795a9a7210eacd1b5c02204aebd78b223
    volumes:
      - grafana-data:/var/lib/grafana

@@ -112,7 +112,7 @@ services:
      traefik.enable: true
      # increase readingTimeouts for the entrypoint used here
      traefik.http.routers.immich.entrypoints: websecure
-      traefik.http.routers.immich.rule: Host(`immich.example.com`)
+      traefik.http.routers.immich.rule: Host(`immich.your-domain.com`)
      traefik.http.services.immich.loadbalancer.server.port: 2283
 ```

@@ -90,7 +90,7 @@ immich-admin list-users
 [
  {
    id: 'e65e6f88-2a30-4dbe-8dd9-1885f4889b53',
-    email: 'immich@example.com',
+    email: 'immich@example.com.com',
    name: 'Immich Admin',
    storageLabel: 'admin',
    externalPath: null,
@@ -7,7 +7,7 @@ Immich uses the [OpenAPI](https://swagger.io/specification/) standard to generat
 OpenAPI is used to generate the client (Typescript, Dart) SDK. `openapi-generator-cli` can be installed [here](https://openapi-generator.tech/docs/installation/). The generated SDK is based on the `immich-openapi-specs.json` file, which is autogenerated by the server **when running in development mode**. The `immich-openapi-specs.json` file can be modified with `@nestjs/swagger` decorators used or referenced by controller endpoints. See the [NestJS OpenAPI docs](https://docs.nestjs.com/openapi/types-and-parameters) for more info. When you add a new endpoint or modify an existing one, you must run the server in development mode and run the command below to update the client SDK.

 ```bash
-mise open-api
+make open-api
 ```

 You can find the generated client SDK in the `packages/sdk/client` for Typescript SDK and `mobile/openapi` for Dart SDK.
@@ -218,7 +218,7 @@ When the Dev Container starts, it automatically:
   - Debug ports: 9230 (workers), 9231 (API)

 :::info
-The Dev Container setup replaces the `mise dev` command from the traditional setup. All services start automatically when you open the container.
+The Dev Container setup replaces the `make dev` command from the traditional setup. All services start automatically when you open the container.
 :::

 ### Accessing Services
@@ -2,7 +2,7 @@

 A minimal devcontainer is supplied with this repository. All commands can be executed directly inside this container to avoid tedious installation of the environment.
 :::warning
-The provided devcontainer isn't complete at the moment. At least all dockerized steps in the Makefile won't work (`mise dev`, ....). Feel free to contribute!
+The provided devcontainer isn't complete at the moment. At least all dockerized steps in the Makefile won't work (`make dev`, ....). Feel free to contribute!
 :::
 When contributing code through a pull request, please check the following:

@@ -45,7 +45,7 @@ All the services are packaged to run as with single Docker Compose command.
 5. From the root directory, run:

 ```bash title="Start development server"
-mise dev
+make dev # required Makefile installed on the system.
 ```

 5. Access the dev instance in your browser at http://localhost:3000, or connect via the mobile app.
@@ -88,7 +88,7 @@ To see local changes to `@immich/ui` in Immich, do the following:
 3. Uncomment the corresponding volume in web service of the `docker/docker-compose.dev.yml` file (`../../ui:/usr/src/ui`)
 4. Uncomment the corresponding alias in the `web/vite.config.ts` file (`'@immich/ui': path.resolve(\_\_dirname, '../../ui/packages/ui')`)
 5. Uncomment the import statement in `web/src/app.css` file `@import '../../../ui/packages/ui/dist/theme/default.css';` and comment out `@import '@immich/ui/theme/default.css';`
-6. Start up the stack via `mise dev`
+6. Start up the stack via `make dev`
 7. After making changes in `@immich/ui`, rebuild it (`pnpm run build`)

 ### Mobile app
@@ -12,7 +12,7 @@ You need to run `mise //server:install` before _once_.
 The e2e tests can be run by first starting up a test production environment via:

 ```bash
-mise e2e
+make e2e
 ```

 Before you can run the tests, you need to run the following commands _once_:
@@ -17,7 +17,7 @@ services:
    ports:
      - "8888:80"
    environment:
-      PGADMIN_DEFAULT_EMAIL: admin@example.com
+      PGADMIN_DEFAULT_EMAIL: user-name@domain-name.com
      PGADMIN_DEFAULT_PASSWORD: strong-password
    volumes:
      - pgadmin-data:/var/lib/pgadmin
@@ -4,8 +4,7 @@ services:
  e2e-auth-server:
    container_name: immich-e2e-auth-server
    build:
-      context: ../
-      dockerfile: packages/e2e-auth-server/Dockerfile
+      context: ../packages/e2e-auth-server
    ports:
      - 2286:2286

@@ -504,14 +504,13 @@ describe('/albums', () => {
      });
    });

-    it('should deduplicate owner from albumUsers on create', async () => {
+    it('should not be able to share album with owner', async () => {
      const { status, body } = await request(app)
        .post('/albums')
        .send({ albumName: 'New album', albumUsers: [{ role: AlbumUserRole.Editor, userId: user1.userId }] })
        .set('Authorization', `Bearer ${user1.accessToken}`);
-      expect(status).toBe(201);
-      expect(body.albumUsers).toHaveLength(1);
-      expect(body.albumUsers[0]).toMatchObject({ role: AlbumUserRole.Owner, user: { id: user1.userId } });
+      expect(status).toBe(400);
+      expect(body).toEqual(errorDto.badRequest('Cannot share album with owner'));
    });
  });

@@ -492,6 +492,20 @@ describe('/asset', () => {
      expect(status).toEqual(200);
    });

+    it('should set the negative rating', async () => {
+      const { status, body } = await request(app)
+        .put(`/assets/${user1Assets[0].id}`)
+        .set('Authorization', `Bearer ${user1.accessToken}`)
+        .send({ rating: -1 });
+      expect(body).toMatchObject({
+        id: user1Assets[0].id,
+        exifInfo: expect.objectContaining({
+          rating: -1,
+        }),
+      });
+      expect(status).toEqual(200);
+    });
+
    it('should return tagged people', async () => {
      const { status, body } = await request(app)
        .put(`/assets/${user1Assets[0].id}`)
@@ -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: () => ({
@@ -1 +0,0 @@
-{}
@@ -570,7 +570,6 @@
  "asset_added_to_album": "Added to album",
  "asset_adding_to_album": "Adding to album…",
  "asset_created": "Asset created",
-  "asset_day_count": "{date}: {count, plural, one {# asset} other {# assets}}",
  "asset_description_updated": "Asset description has been updated",
  "asset_filename_is_offline": "Asset {filename} is offline",
  "asset_has_unassigned_faces": "Asset has unassigned faces",
@@ -700,7 +699,6 @@
  "backup_settings_subtitle": "Manage upload settings",
  "backup_upload_details_page_more_details": "Tap for more details",
  "backward": "Backward",
-  "battery_optimization_backup_reliability": "Disabling battery optimizations can improve the reliability of background backup",
  "biometric_auth_enabled": "Biometric authentication enabled",
  "biometric_locked_out": "You are locked out of biometric authentication",
  "biometric_no_options": "No biometric options available",
@@ -1401,7 +1399,6 @@
  "leave": "Leave",
  "leave_album": "Leave album",
  "lens_model": "Lens model",
-  "less": "Less",
  "let_others_respond": "Let others respond",
  "level": "Level",
  "library": "Library",
@@ -1692,7 +1689,6 @@
  "not_selected": "Not selected",
  "notes": "Notes",
  "nothing_here_yet": "Nothing here yet",
-  "notification_backup_reliability": "Enable notifications to improve background backup reliability",
  "notification_permission_dialog_content": "To enable notifications, go to Settings and select allow.",
  "notification_permission_list_tile_content": "Grant permission to enable notifications.",
  "notification_permission_list_tile_enable_button": "Enable Notifications",
@@ -2414,7 +2410,6 @@
  "updated_password": "Updated password",
  "upload": "Upload",
  "upload_concurrency": "Upload concurrency",
-  "upload_day_count": "{date}: {count, plural, one {# upload} other {# uploads}}",
  "upload_details": "Upload Details",
  "upload_dialog_info": "Do you want to backup the selected Asset(s) to the server?",
  "upload_dialog_title": "Upload Asset",
@@ -2430,8 +2425,6 @@
  "upload_to_immich": "Upload to Immich ({count})",
  "uploading": "Uploading",
  "uploading_media": "Uploading media",
-  "uploads": "Uploads",
-  "uploads_count": "{count, plural, one {# upload} other {# uploads}}",
  "url": "URL",
  "usage": "Usage",
  "use_biometric": "Use biometric",
@@ -1 +0,0 @@
-{}
@@ -1 +0,0 @@
-{}
@@ -1 +0,0 @@
-{}
@@ -1 +0,0 @@
-{}
@@ -1 +0,0 @@
-{}
@@ -1 +0,0 @@
-{}
@@ -1 +0,0 @@
-{}
@@ -1 +0,0 @@
-{}
@@ -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"
@@ -82,8 +151,40 @@ url_api = "https://api.github.com/repos/extism/js-pdk/releases/assets/353224133"
 version = "7.1.3-6"
 backend = "github:jellyfin/jellyfin-ffmpeg"

-[tools."github:jellyfin/jellyfin-ffmpeg".options]
-asset_pattern = "jellyfin-ffmpeg_*_portable_linuxarm64-gpl.tar.xz"
+[tools."github:jellyfin/jellyfin-ffmpeg"."platforms.linux-arm64"]
+checksum = "sha256:bea03c670e8cc5bfe9edc0c5d624d4735421610cef5e808db93e7d8596952886"
+url = "https://github.com/jellyfin/jellyfin-ffmpeg/releases/download/v7.1.3-6/jellyfin-ffmpeg_7.1.3-6_portable_linuxarm64-gpl.tar.xz"
+url_api = "https://api.github.com/repos/jellyfin/jellyfin-ffmpeg/releases/assets/409048876"
+
+[tools."github:jellyfin/jellyfin-ffmpeg"."platforms.linux-arm64-musl"]
+checksum = "sha256:bea03c670e8cc5bfe9edc0c5d624d4735421610cef5e808db93e7d8596952886"
+url = "https://github.com/jellyfin/jellyfin-ffmpeg/releases/download/v7.1.3-6/jellyfin-ffmpeg_7.1.3-6_portable_linuxarm64-gpl.tar.xz"
+url_api = "https://api.github.com/repos/jellyfin/jellyfin-ffmpeg/releases/assets/409048876"
+
+[tools."github:jellyfin/jellyfin-ffmpeg"."platforms.linux-x64"]
+checksum = "sha256:39e99a7927468a6abec5f65d00f55010e8ff2ae3c2605294f179c94f6ae21af2"
+url = "https://github.com/jellyfin/jellyfin-ffmpeg/releases/download/v7.1.3-6/jellyfin-ffmpeg_7.1.3-6_portable_linux64-gpl.tar.xz"
+url_api = "https://api.github.com/repos/jellyfin/jellyfin-ffmpeg/releases/assets/409048879"
+
+[tools."github:jellyfin/jellyfin-ffmpeg"."platforms.linux-x64-musl"]
+checksum = "sha256:39e99a7927468a6abec5f65d00f55010e8ff2ae3c2605294f179c94f6ae21af2"
+url = "https://github.com/jellyfin/jellyfin-ffmpeg/releases/download/v7.1.3-6/jellyfin-ffmpeg_7.1.3-6_portable_linux64-gpl.tar.xz"
+url_api = "https://api.github.com/repos/jellyfin/jellyfin-ffmpeg/releases/assets/409048879"
+
+[tools."github:jellyfin/jellyfin-ffmpeg"."platforms.macos-arm64"]
+checksum = "sha256:e024d5e78d5414e75f0181036cd21373fafb9270c72894dfd7dbda2572439820"
+url = "https://github.com/jellyfin/jellyfin-ffmpeg/releases/download/v7.1.3-6/jellyfin-ffmpeg_7.1.3-6_portable_macarm64-gpl.tar.xz"
+url_api = "https://api.github.com/repos/jellyfin/jellyfin-ffmpeg/releases/assets/408995838"
+
+[tools."github:jellyfin/jellyfin-ffmpeg"."platforms.macos-x64"]
+checksum = "sha256:066ede9774aaae97a18098aaeea8b7e0d286653eb8618f640476e99c59a536c2"
+url = "https://github.com/jellyfin/jellyfin-ffmpeg/releases/download/v7.1.3-6/jellyfin-ffmpeg_7.1.3-6_portable_mac64-gpl.tar.xz"
+url_api = "https://api.github.com/repos/jellyfin/jellyfin-ffmpeg/releases/assets/408995889"
+
+[tools."github:jellyfin/jellyfin-ffmpeg"."platforms.windows-x64"]
+checksum = "sha256:7b7168149689610296f3a187c717056ce0786cc125a31caf28056737e9ba1cc1"
+url = "https://github.com/jellyfin/jellyfin-ffmpeg/releases/download/v7.1.3-6/jellyfin-ffmpeg_7.1.3-6_portable_win64-clang-gpl.zip"
+url_api = "https://api.github.com/repos/jellyfin/jellyfin-ffmpeg/releases/assets/409036094"

 [[tools."github:webassembly/binaryen"]]
 version = "version_124"
@@ -217,39 +318,9 @@ checksum = "sha256:27323f70c875b8251bfd7e61a4cffc3ebff4e56ed1e611b955016f0c70773
 url = "https://github.com/opentofu/opentofu/releases/download/v1.11.6/tofu_1.11.6_windows_amd64.tar.gz"

 [[tools.pnpm]]
-version = "11.4.0"
+version = "10.33.4"
 backend = "aqua:pnpm/pnpm"

-[tools.pnpm."platforms.linux-arm64"]
-checksum = "sha256:cc38ebd5b2610a5744f84576b963c49e6609a8df5aed714ae3de749998d4478c"
-url = "https://github.com/pnpm/pnpm/releases/download/v11.4.0/pnpm-linux-arm64.tar.gz"
-provenance = "github-attestations"
-
-[tools.pnpm."platforms.linux-arm64-musl"]
-checksum = "sha256:a1e2ec9123c709fd04b704227cfcf3b50cd2bbbc1bd39d2df414530b5697eb75"
-url = "https://github.com/pnpm/pnpm/releases/download/v11.4.0/pnpm-linux-arm64-musl.tar.gz"
-provenance = "github-attestations"
-
-[tools.pnpm."platforms.linux-x64"]
-checksum = "sha256:f3f8d1217eef013bbc71a24d52efb1f1041e4aff55edd80e0b08e25f409305a4"
-url = "https://github.com/pnpm/pnpm/releases/download/v11.4.0/pnpm-linux-x64.tar.gz"
-provenance = "github-attestations"
-
-[tools.pnpm."platforms.linux-x64-musl"]
-checksum = "sha256:60010ad00a96b71e20d1618acaca7a71395e710cbd5e88946c030a1d07c56916"
-url = "https://github.com/pnpm/pnpm/releases/download/v11.4.0/pnpm-linux-x64-musl.tar.gz"
-provenance = "github-attestations"
-
-[tools.pnpm."platforms.macos-arm64"]
-checksum = "sha256:ba59014c2c1ce8b76af9f559385206a2623de4ff2b694b5c91598a8f44abb4e2"
-url = "https://github.com/pnpm/pnpm/releases/download/v11.4.0/pnpm-darwin-arm64.tar.gz"
-provenance = "github-attestations"
-
-[tools.pnpm."platforms.windows-x64"]
-checksum = "sha256:84ce90e38bc0b1164173eb853a0fbffc7edcb050cb0d5c8ce4ca609f5c808e0a"
-url = "https://github.com/pnpm/pnpm/releases/download/v11.4.0/pnpm-win32-x64.zip"
-provenance = "github-attestations"
-
 [[tools.terragrunt]]
 version = "1.0.3"
 backend = "aqua:gruntwork-io/terragrunt"
@@ -16,14 +16,27 @@ config_roots = [

 [tools]
 node = "24.15.0"
-pnpm = "11.4.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"
-java = "21.0.2"
+
+[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"
@@ -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)
@@ -47,44 +47,18 @@ class FlutterError (
  override val message: String? = null,
  val details: Any? = null
 ) : RuntimeException()
-
-enum class PermissionStatus(val raw: Int) {
-  GRANTED(0),
-  DENIED(1),
-  PERMANENTLY_DENIED(2);
-
-  companion object {
-    fun ofRaw(raw: Int): PermissionStatus? {
-      return values().firstOrNull { it.raw == raw }
-    }
-  }
-}
 private open class PermissionApiPigeonCodec : StandardMessageCodec() {
  override fun readValueOfType(type: Byte, buffer: ByteBuffer): Any? {
-    return when (type) {
-      129.toByte() -> {
-        return (readValue(buffer) as Long?)?.let {
-          PermissionStatus.ofRaw(it.toInt())
-        }
-      }
-      else -> super.readValueOfType(type, buffer)
-    }
+    return     super.readValueOfType(type, buffer)
  }
  override fun writeValue(stream: ByteArrayOutputStream, value: Any?)   {
-    when (value) {
-      is PermissionStatus -> {
-        stream.write(129)
-        writeValue(stream, value.raw.toLong())
-      }
-      else -> super.writeValue(stream, value)
-    }
+    super.writeValue(stream, value)
  }
 }


 /** Generated interface from Pigeon that represents a handler of messages from Flutter. */
 interface PermissionApi {
-  fun isIgnoringBatteryOptimizations(): PermissionStatus
  fun hasManageMediaPermission(): Boolean
  fun requestManageMediaPermission(callback: (Result<Boolean>) -> Unit)
  fun manageMediaPermission(callback: (Result<Boolean>) -> Unit)
@@ -98,21 +72,6 @@ interface PermissionApi {
    @JvmOverloads
    fun setUp(binaryMessenger: BinaryMessenger, api: PermissionApi?, messageChannelSuffix: String = "") {
      val separatedMessageChannelSuffix = if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else ""
-      run {
-        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.PermissionApi.isIgnoringBatteryOptimizations$separatedMessageChannelSuffix", codec)
-        if (api != null) {
-          channel.setMessageHandler { _, reply ->
-            val wrapped: List<Any?> = try {
-              listOf(api.isIgnoringBatteryOptimizations())
-            } catch (exception: Throwable) {
-              PermissionApiPigeonUtils.wrapError(exception)
-            }
-            reply.reply(wrapped)
-          }
-        } else {
-          channel.setMessageHandler(null)
-        }
-      }
      run {
        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.PermissionApi.hasManageMediaPermission$separatedMessageChannelSuffix", codec)
        if (api != null) {
@@ -1,26 +1,13 @@
 package app.alextran.immich.permission

 import android.content.Context
-import android.os.PowerManager
 import app.alextran.immich.core.ImmichPlugin
 import io.flutter.embedding.engine.plugins.activity.ActivityAware
 import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding

 class PermissionApiImpl(context: Context) : ImmichPlugin(), PermissionApi, ActivityAware {
-  private val ctx: Context = context.applicationContext
  private val manageMediaPermissionDelegate = ManageMediaPermissionDelegate(context)

-  private val powerManager =
-    ctx.getSystemService(Context.POWER_SERVICE) as PowerManager
-
-
-  override fun isIgnoringBatteryOptimizations(): PermissionStatus {
-    if (powerManager.isIgnoringBatteryOptimizations(ctx.packageName)) {
-      return PermissionStatus.GRANTED
-    }
-    return PermissionStatus.DENIED
-  }
-
  override fun hasManageMediaPermission(): Boolean =
    manageMediaPermissionDelegate.hasManageMediaPermission()

@@ -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();
-  }
-}
@@ -2,5 +2,4 @@ source "https://rubygems.org"

 gem "fastlane"
 gem "cocoapods"
-gem "abbrev" # Required for Ruby 3.4+
-gem "multi_json"
+gem "abbrev" # Required for Ruby 3.4+
@@ -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)
+    }
  }

  
@@ -46,57 +46,8 @@ private func nilOrValue<T>(_ value: Any?) -> T? {
  return value as! T?
 }

-
-enum PermissionStatus: Int {
-  case granted = 0
-  case denied = 1
-  case permanentlyDenied = 2
-}
-
-private class PermissionApiPigeonCodecReader: FlutterStandardReader {
-  override func readValue(ofType type: UInt8) -> Any? {
-    switch type {
-    case 129:
-      let enumResultAsInt: Int? = nilOrValue(self.readValue() as! Int?)
-      if let enumResultAsInt = enumResultAsInt {
-        return PermissionStatus(rawValue: enumResultAsInt)
-      }
-      return nil
-    default:
-      return super.readValue(ofType: type)
-    }
-  }
-}
-
-private class PermissionApiPigeonCodecWriter: FlutterStandardWriter {
-  override func writeValue(_ value: Any) {
-    if let value = value as? PermissionStatus {
-      super.writeByte(129)
-      super.writeValue(value.rawValue)
-    } else {
-      super.writeValue(value)
-    }
-  }
-}
-
-private class PermissionApiPigeonCodecReaderWriter: FlutterStandardReaderWriter {
-  override func reader(with data: Data) -> FlutterStandardReader {
-    return PermissionApiPigeonCodecReader(data: data)
-  }
-
-  override func writer(with data: NSMutableData) -> FlutterStandardWriter {
-    return PermissionApiPigeonCodecWriter(data: data)
-  }
-}
-
-class PermissionApiPigeonCodec: FlutterStandardMessageCodec, @unchecked Sendable {
-  static let shared = PermissionApiPigeonCodec(readerWriter: PermissionApiPigeonCodecReaderWriter())
-}
-
-
 /// Generated protocol from Pigeon that represents a handler of messages from Flutter.
 protocol PermissionApi {
-  func isIgnoringBatteryOptimizations() throws -> PermissionStatus
  func hasManageMediaPermission() throws -> Bool
  func requestManageMediaPermission(completion: @escaping (Result<Bool, Error>) -> Void)
  func manageMediaPermission(completion: @escaping (Result<Bool, Error>) -> Void)
@@ -104,23 +55,10 @@ protocol PermissionApi {

 /// Generated setup class from Pigeon to handle messages through the `binaryMessenger`.
 class PermissionApiSetup {
-  static var codec: FlutterStandardMessageCodec { PermissionApiPigeonCodec.shared }
+  static var codec: FlutterStandardMessageCodec { FlutterStandardMessageCodec.sharedInstance() }
  /// Sets up an instance of `PermissionApi` to handle messages through the `binaryMessenger`.
  static func setUp(binaryMessenger: FlutterBinaryMessenger, api: PermissionApi?, messageChannelSuffix: String = "") {
    let channelSuffix = messageChannelSuffix.count > 0 ? ".\(messageChannelSuffix)" : ""
-    let isIgnoringBatteryOptimizationsChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.PermissionApi.isIgnoringBatteryOptimizations\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
-    if let api = api {
-      isIgnoringBatteryOptimizationsChannel.setMessageHandler { _, reply in
-        do {
-          let result = try api.isIgnoringBatteryOptimizations()
-          reply(wrapResult(result))
-        } catch {
-          reply(wrapError(error))
-        }
-      }
-    } else {
-      isIgnoringBatteryOptimizationsChannel.setMessageHandler(nil)
-    }
    let hasManageMediaPermissionChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.PermissionApi.hasManageMediaPermission\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
    if let api = api {
      hasManageMediaPermissionChannel.setMessageHandler { _, reply in
@@ -1,10 +1,6 @@
 import Foundation

 class PermissionApiImpl: PermissionApi {
-  func isIgnoringBatteryOptimizations() throws -> PermissionStatus {
-    return PermissionStatus.granted;
-  }
-  
  func hasManageMediaPermission() throws -> Bool {
    return 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?
@@ -22,5 +22,3 @@ enum AssetDateAggregation { start, end }
 enum SlideshowLook { contain, cover, blurredBackground }

 enum SlideshowDirection { forward, backward, shuffle }
-
-enum PartnerDirection { sharedBy, sharedWith }
@@ -5,8 +5,6 @@ const Map<String, Locale> locales = {
  'English (en)': Locale('en'),
  // Additional locales
  'Arabic (ar)': Locale('ar'),
-  'Bosnian (bl)': Locale('bn'),
-  'Brazilian Portuguese (pt_BR)': Locale('pt', 'BR'),
  'Bulgarian (bg)': Locale('bg'),
  'Catalan (ca)': Locale('ca'),
  'Chinese Simplified (zh_CN)': Locale.fromSubtags(languageCode: 'zh', scriptCode: 'Hans'),
@@ -16,7 +14,6 @@ const Map<String, Locale> locales = {
  'Danish (da)': Locale('da'),
  'Dutch (nl)': Locale('nl'),
  'Estonian (et)': Locale('et'),
-  'Filipino (tl)': Locale('tl'),
  'Finnish (fi)': Locale('fi'),
  'French (fr)': Locale('fr'),
  'Galician (gl)': Locale('gl'),
@@ -28,17 +25,13 @@ const Map<String, Locale> locales = {
  'Indonesian (id)': Locale('id'),
  'Italian (it)': Locale('it'),
  'Japanese (ja)': Locale('ja'),
-  'Kabyle (kab)': Locale('kab'),
-  'Khmer (Northern) (kxm)': Locale('kxm'),
  'Korean (ko)': Locale('ko'),
  'Latvian (lv)': Locale('lv'),
  'Lithuanian (lt)': Locale('lt'),
-  'Lombard (lmo)': Locale('lmo'),
  'Mongolian (mn)': Locale('mn'),
-  'Māori (mi)': Locale('mi'),
-  'Nepali (ne)': Locale('ne'),
  'Norwegian Bokmål (nb_NO)': Locale('nb', 'NO'),
  'Polish (pl)': Locale('pl'),
+  'Brazilian Portuguese (pt_BR)': Locale('pt', 'BR'),
  'Portuguese (pt)': Locale('pt'),
  'Romanian (ro)': Locale('ro'),
  'Russian (ru)': Locale('ru'),
@@ -47,8 +40,6 @@ const Map<String, Locale> locales = {
  'Slovak (sk)': Locale('sk'),
  'Slovenian (sl)': Locale('sl'),
  'Spanish (es)': Locale('es'),
-  'Swabian (swg)': Locale('swg'),
-  'Swahili (sw)': Locale('sw'),
  'Swedish (sv)': Locale('sv'),
  'Tamil (ta)': Locale('ta'),
  'Telugu (te)': Locale('te'),
@@ -1,128 +0,0 @@
-class Ocr {
-  final String id;
-  final String assetId;
-  final double x1;
-  final double y1;
-  final double x2;
-  final double y2;
-  final double x3;
-  final double y3;
-  final double x4;
-  final double y4;
-  final double boxScore;
-  final double textScore;
-  final String text;
-  final bool isVisible;
-
-  const Ocr({
-    required this.id,
-    required this.assetId,
-    required this.x1,
-    required this.y1,
-    required this.x2,
-    required this.y2,
-    required this.x3,
-    required this.y3,
-    required this.x4,
-    required this.y4,
-    required this.boxScore,
-    required this.textScore,
-    required this.text,
-    required this.isVisible,
-  });
-
-  Ocr copyWith({
-    String? id,
-    String? assetId,
-    double? x1,
-    double? y1,
-    double? x2,
-    double? y2,
-    double? x3,
-    double? y3,
-    double? x4,
-    double? y4,
-    double? boxScore,
-    double? textScore,
-    String? text,
-    bool? isVisible,
-  }) {
-    return Ocr(
-      id: id ?? this.id,
-      assetId: assetId ?? this.assetId,
-      x1: x1 ?? this.x1,
-      y1: y1 ?? this.y1,
-      x2: x2 ?? this.x2,
-      y2: y2 ?? this.y2,
-      x3: x3 ?? this.x3,
-      y3: y3 ?? this.y3,
-      x4: x4 ?? this.x4,
-      y4: y4 ?? this.y4,
-      boxScore: boxScore ?? this.boxScore,
-      textScore: textScore ?? this.textScore,
-      text: text ?? this.text,
-      isVisible: isVisible ?? this.isVisible,
-    );
-  }
-
-  @override
-  String toString() {
-    return '''Ocr {
-    id: $id,
-    assetId: $assetId,
-    x1: $x1,
-    y1: $y1,
-    x2: $x2,
-    y2: $y2,
-    x3: $x3,
-    y3: $y3,
-    x4: $x4,
-    y4: $y4,
-    boxScore: $boxScore,
-    textScore: $textScore,
-    text: $text,
-    isVisible: $isVisible
-  }''';
-  }
-
-  @override
-  bool operator ==(Object other) {
-    if (identical(this, other)) {
-      return true;
-    }
-
-    return other is Ocr &&
-        other.id == id &&
-        other.assetId == assetId &&
-        other.x1 == x1 &&
-        other.y1 == y1 &&
-        other.x2 == x2 &&
-        other.y2 == y2 &&
-        other.x3 == x3 &&
-        other.y3 == y3 &&
-        other.x4 == x4 &&
-        other.y4 == y4 &&
-        other.boxScore == boxScore &&
-        other.textScore == textScore &&
-        other.text == text &&
-        other.isVisible == isVisible;
-  }
-
-  @override
-  int get hashCode {
-    return id.hashCode ^
-        assetId.hashCode ^
-        x1.hashCode ^
-        y1.hashCode ^
-        x2.hashCode ^
-        y2.hashCode ^
-        x3.hashCode ^
-        y3.hashCode ^
-        x4.hashCode ^
-        y4.hashCode ^
-        boxScore.hashCode ^
-        textScore.hashCode ^
-        text.hashCode ^
-        isVisible.hashCode;
-  }
-}
@@ -237,125 +237,3 @@ class PartnerUserDto {
    return id.hashCode ^ email.hashCode ^ name.hashCode ^ inTimeline.hashCode ^ profileImagePath.hashCode;
  }
 }
-
-class User {
-  final String id;
-  final String name;
-  final String email;
-  final DateTime profileChangedAt;
-  final bool hasProfileImage;
-  final AvatarColor? avatarColor;
-
-  const User({
-    required this.id,
-    required this.name,
-    required this.email,
-    required this.profileChangedAt,
-    required this.hasProfileImage,
-    this.avatarColor = AvatarColor.primary,
-  });
-
-  @override
-  String toString() {
-    return 'User(id: $id, name: $name, email: $email, profileChangedAt: $profileChangedAt, hasProfileImage: $hasProfileImage, avatarColor: $avatarColor)';
-  }
-
-  @override
-  bool operator ==(covariant User other) {
-    if (identical(this, other)) {
-      return true;
-    }
-
-    return other.id == id &&
-        other.name == name &&
-        other.email == email &&
-        other.profileChangedAt == profileChangedAt &&
-        other.hasProfileImage == hasProfileImage &&
-        other.avatarColor == avatarColor;
-  }
-
-  @override
-  int get hashCode => Object.hash(id, name, email, profileChangedAt, hasProfileImage, avatarColor);
-}
-
-class AuthUser extends User {
-  final bool isAdmin;
-  final String? pinCode;
-  final int? quotaSizeInBytes;
-  final int quotaUsageInBytes;
-
-  const AuthUser({
-    required super.id,
-    required super.name,
-    required super.email,
-    required super.profileChangedAt,
-    required super.hasProfileImage,
-    super.avatarColor,
-    this.isAdmin = false,
-    this.pinCode,
-    this.quotaSizeInBytes = 0,
-    this.quotaUsageInBytes = 0,
-  });
-
-  @override
-  String toString() {
-    return 'AuthUser(user: ${super.toString()}, isAdmin: $isAdmin, pinCode: $pinCode, quotaSizeInBytes: $quotaSizeInBytes, quotaUsageInBytes: $quotaUsageInBytes)';
-  }
-
-  @override
-  bool operator ==(covariant AuthUser other) {
-    if (identical(this, other)) {
-      return true;
-    }
-
-    return super == other &&
-        other.isAdmin == isAdmin &&
-        other.pinCode == pinCode &&
-        other.quotaSizeInBytes == quotaSizeInBytes &&
-        other.quotaUsageInBytes == quotaUsageInBytes;
-  }
-
-  @override
-  int get hashCode => Object.hash(super.hashCode, isAdmin, pinCode, quotaSizeInBytes, quotaUsageInBytes);
-}
-
-class Partner extends User {
-  final bool inTimeline;
-
-  const Partner({
-    required super.id,
-    required super.name,
-    required super.email,
-    required super.profileChangedAt,
-    required super.hasProfileImage,
-    super.avatarColor,
-    this.inTimeline = false,
-  });
-
-  Partner.fromUser(User user, {this.inTimeline = false})
-    : super(
-        id: user.id,
-        name: user.name,
-        email: user.email,
-        profileChangedAt: user.profileChangedAt,
-        hasProfileImage: user.hasProfileImage,
-        avatarColor: user.avatarColor,
-      );
-
-  @override
-  String toString() {
-    return 'Partner(user: ${super.toString()}, inTimeline: $inTimeline)';
-  }
-
-  @override
-  bool operator ==(covariant Partner other) {
-    if (identical(this, other)) {
-      return true;
-    }
-
-    return super == other && other.inTimeline == inTimeline;
-  }
-
-  @override
-  int get hashCode => Object.hash(super.hashCode, inTimeline);
-}
@@ -55,7 +55,6 @@ class Preferences {
  final bool tagsEnabled;
  final AvatarColor userAvatarColor;
  final bool showSupportBadge;
-  final int minimumFaces;

  const Preferences({
    this.foldersEnabled = false,
@@ -66,7 +65,6 @@ class Preferences {
    this.tagsEnabled = false,
    this.userAvatarColor = AvatarColor.primary,
    this.showSupportBadge = true,
-    this.minimumFaces = 3,
  });

  Preferences copyWith({
@@ -78,7 +76,6 @@ class Preferences {
    bool? tagsEnabled,
    AvatarColor? userAvatarColor,
    bool? showSupportBadge,
-    int? minimumFaces,
  }) {
    return Preferences(
      foldersEnabled: foldersEnabled ?? this.foldersEnabled,
@@ -89,7 +86,6 @@ class Preferences {
      tagsEnabled: tagsEnabled ?? this.tagsEnabled,
      userAvatarColor: userAvatarColor ?? this.userAvatarColor,
      showSupportBadge: showSupportBadge ?? this.showSupportBadge,
-      minimumFaces: minimumFaces ?? this.minimumFaces,
    );
  }

@@ -103,7 +99,6 @@ class Preferences {
    preferences["tags-Enabled"] = tagsEnabled;
    preferences["avatar-Color"] = userAvatarColor.value;
    preferences["purchase-ShowSupportBadge"] = showSupportBadge;
-    preferences["minimumFaces"] = minimumFaces;
    return preferences;
  }

@@ -120,7 +115,6 @@ class Preferences {
        orElse: () => AvatarColor.primary,
      ),
      showSupportBadge: (map["purchase"] as Map<String, Object?>?)?["showSupportBadge"] as bool? ?? true,
-      minimumFaces: (map["people"] as Map<String, Object?>?)?["minimumFaces"] as int? ?? 3,
    );
  }

@@ -135,7 +129,6 @@ sharedLinksEnabled: $sharedLinksEnabled,
 tagsEnabled: $tagsEnabled,
 userAvatarColor: $userAvatarColor,
 showSupportBadge: $showSupportBadge,
-minimumFaces: $minimumFaces,
 }''';
  }

@@ -152,8 +145,7 @@ minimumFaces: $minimumFaces,
        other.sharedLinksEnabled == sharedLinksEnabled &&
        other.tagsEnabled == tagsEnabled &&
        other.userAvatarColor == userAvatarColor &&
-        other.showSupportBadge == showSupportBadge &&
-        other.minimumFaces == minimumFaces;
+        other.showSupportBadge == showSupportBadge;
  }

  @override
@@ -165,8 +157,7 @@ minimumFaces: $minimumFaces,
        sharedLinksEnabled.hashCode ^
        tagsEnabled.hashCode ^
        userAvatarColor.hashCode ^
-        showSupportBadge.hashCode ^
-        minimumFaces.hashCode;
+        showSupportBadge.hashCode;
  }
 }

@@ -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}");

@@ -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 {
@@ -1,12 +0,0 @@
-import 'package:immich_mobile/domain/models/ocr.model.dart';
-import 'package:immich_mobile/infrastructure/repositories/ocr.repository.dart';
-
-class OcrService {
-  final OcrRepository _repository;
-
-  const OcrService(this._repository);
-
-  Future<List<Ocr>?> get(String assetId) {
-    return _repository.get(assetId);
-  }
-}
@@ -1,42 +1,51 @@
-import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/user.model.dart';
 import 'package:immich_mobile/infrastructure/repositories/partner.repository.dart';
-import 'package:immich_mobile/infrastructure/repositories/user.repository.dart';
 import 'package:immich_mobile/repositories/partner_api.repository.dart';
-import 'package:stream_transform/stream_transform.dart';
+import 'package:immich_mobile/utils/debug_print.dart';

-class PartnerService {
-  final UserRepository _userRepository;
-  final PartnerRepository _partnerRepository;
+class DriftPartnerService {
+  final DriftPartnerRepository _driftPartnerRepository;
  final PartnerApiRepository _partnerApiRepository;

-  const PartnerService(this._userRepository, this._partnerRepository, this._partnerApiRepository);
+  const DriftPartnerService(this._driftPartnerRepository, this._partnerApiRepository);

-  Stream<Iterable<User>> getCandidates(String userId) {
-    final userStream = _userRepository.getAll();
-    final partnerStream = _partnerRepository.search(userId, .sharedBy);
-
-    return userStream.combineLatest(partnerStream, (users, partners) {
-      final partnersSet = partners.map((partner) => partner.id).toSet();
-      return users.where((user) => user.id != userId && !partnersSet.contains(user.id));
-    });
+  Future<List<PartnerUserDto>> getSharedWith(String userId) {
+    return _driftPartnerRepository.getSharedWith(userId);
  }

-  Stream<Iterable<Partner>> search(String userId, PartnerDirection direction) =>
-      _partnerRepository.search(userId, direction);
-
-  Future<void> update({required String sharedById, required String sharedWithId, required bool inTimeline}) async {
-    await _partnerApiRepository.update(sharedById, inTimeline: inTimeline);
-    await _partnerRepository.update(sharedById: sharedById, sharedWithId: sharedWithId, inTimeline: inTimeline);
+  Future<List<PartnerUserDto>> getSharedBy(String userId) {
+    return _driftPartnerRepository.getSharedBy(userId);
  }

-  Future<void> create({required String sharedById, required String sharedWithId, bool inTimeline = false}) async {
-    await _partnerApiRepository.create(sharedWithId);
-    await _partnerRepository.create(sharedById: sharedById, sharedWithId: sharedWithId, inTimeline: inTimeline);
+  Future<List<PartnerUserDto>> getAvailablePartners(String currentUserId) async {
+    final otherUsers = await _driftPartnerRepository.getAvailablePartners(currentUserId);
+    final currentPartners = await _driftPartnerRepository.getSharedBy(currentUserId);
+    final available = otherUsers.where((user) {
+      return !currentPartners.any((partner) => partner.id == user.id);
+    }).toList();
+
+    return available;
  }

-  Future<void> delete({required String sharedById, required String sharedWithId}) async {
-    await _partnerApiRepository.delete(sharedWithId);
-    await _partnerRepository.delete(sharedById: sharedById, sharedWithId: sharedWithId);
+  Future<void> toggleShowInTimeline(String partnerId, String userId) async {
+    final partner = await _driftPartnerRepository.getPartner(partnerId, userId);
+    if (partner == null) {
+      dPrint(() => "Partner not found: $partnerId for user: $userId");
+      return;
+    }
+
+    await _partnerApiRepository.update(partnerId, inTimeline: !partner.inTimeline);
+
+    await _driftPartnerRepository.toggleShowInTimeline(partner, userId);
+  }
+
+  Future<void> addPartner(String partnerId, String userId) async {
+    await _partnerApiRepository.create(partnerId);
+    await _driftPartnerRepository.create(partnerId, userId);
+  }
+
+  Future<void> removePartner(String partnerId, String userId) async {
+    await _partnerApiRepository.delete(partnerId);
+    await _driftPartnerRepository.delete(partnerId, userId);
  }
 }
@@ -18,8 +18,8 @@ class DriftPeopleService {
    return _repository.getAssetPeople(assetId);
  }

-  Future<List<DriftPerson>> getAllPeople({int minFaces = 3}) {
-    return _repository.getAllPeople(minFaces: minFaces);
+  Future<List<DriftPerson>> getAllPeople() {
+    return _repository.getAllPeople();
  }

  Future<int> updateName(String personId, String name) 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:immich_mobile/utils/option.dart';
 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,
-    Option<String?> description = const Option.none(),
+    String? description,
    String? thumbnailAssetId,
    bool? isActivityEnabled,
    AlbumAssetOrder? order,
@@ -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,10 +49,10 @@ 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");
@@ -80,15 +80,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;
@@ -317,17 +312,13 @@ class SyncStreamService {
        return _syncStreamRepository.updateAssetFacesV2(data.cast());
      case SyncEntityType.assetFaceDeleteV1:
        return _syncStreamRepository.deleteAssetFacesV1(data.cast());
-      case SyncEntityType.assetOcrV1:
-        return _syncStreamRepository.updateAssetOcrV1(data.cast());
-      case SyncEntityType.assetOcrDeleteV1:
-        return _syncStreamRepository.deleteAssetOcrV1(data.cast());
      default:
        _logger.warning("Unknown sync data type: $type");
    }
  }

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

@@ -370,7 +361,7 @@ class SyncStreamService {
  }

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

@@ -413,9 +404,6 @@ class SyncStreamService {
  }

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

    try {
@@ -456,9 +444,6 @@ class SyncStreamService {
  }

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

    try {
@@ -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(),
    );
  }
 }
@@ -1,34 +0,0 @@
-import 'package:drift/drift.dart';
-import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.dart';
-import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';
-
-@TableIndex.sql('CREATE INDEX IF NOT EXISTS idx_asset_ocr_asset_id ON asset_ocr_entity (asset_id)')
-class AssetOcrEntity extends Table with DriftDefaultsMixin {
-  const AssetOcrEntity();
-
-  TextColumn get id => text()();
-
-  TextColumn get assetId => text().references(RemoteAssetEntity, #id, onDelete: KeyAction.cascade)();
-
-  RealColumn get x1 => real()();
-  RealColumn get y1 => real()();
-
-  RealColumn get x2 => real()();
-  RealColumn get y2 => real()();
-
-  RealColumn get x3 => real()();
-  RealColumn get y3 => real()();
-
-  RealColumn get x4 => real()();
-  RealColumn get y4 => real()();
-
-  RealColumn get boxScore => real()();
-  RealColumn get textScore => real()();
-
-  TextColumn get recognizedText => text()();
-
-  BoolColumn get isVisible => boolean().withDefault(const Constant(true))();
-
-  @override
-  Set<Column> get primaryKey => {id};
-}
@@ -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,15 +0,0 @@
-import 'package:immich_mobile/domain/models/user.model.dart';
-import 'package:immich_mobile/infrastructure/entities/partner.entity.drift.dart';
-import 'package:immich_mobile/infrastructure/entities/user.entity.drift.dart';
-
-User mapToUser(UserEntityData data) => User(
-  id: data.id,
-  name: data.name,
-  email: data.email,
-  hasProfileImage: data.hasProfileImage,
-  profileChangedAt: data.profileChangedAt,
-  avatarColor: data.avatarColor,
-);
-
-Partner mapToPartner(UserEntityData user, PartnerEntityData partner) =>
-    Partner.fromUser(mapToUser(user), inTimeline: partner.inTimeline);
@@ -1,14 +1,10 @@
 import 'dart:async';
-import 'dart:io';

 import 'package:drift/drift.dart';
-// ignore: implementation_imports, invalid_use_of_internal_member
-import 'package:drift/src/runtime/executor/stream_queries.dart' show StreamQueryStore;
-import 'package:drift_sqlite_async/drift_sqlite_async.dart';
+import 'package:drift_flutter/drift_flutter.dart';
 import 'package:flutter/foundation.dart';
 import 'package:immich_mobile/infrastructure/entities/asset_edit.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/asset_face.entity.dart';
-import 'package:immich_mobile/infrastructure/entities/asset_ocr.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/auth_user.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/exif.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/local_album.entity.dart';
@@ -17,6 +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/partner.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/person.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_album.entity.dart';
@@ -25,7 +22,6 @@ import 'package:immich_mobile/infrastructure/entities/remote_album_user.entity.d
 import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_asset_cloud_id.entity.dart';
-import 'package:immich_mobile/infrastructure/entities/settings.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/stack.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/store.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/trashed_local_asset.entity.dart';
@@ -35,12 +31,6 @@ import 'package:immich_mobile/infrastructure/entities/user_metadata.entity.dart'
 import 'package:immich_mobile/infrastructure/repositories/db.repository.drift.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.steps.dart';
 import 'package:logging/logging.dart';
-import 'package:path/path.dart' as p;
-import 'package:path_provider/path_provider.dart';
-import 'package:sqlite3/sqlite3.dart';
-import 'package:sqlite3_connection_pool/sqlite3_connection_pool.dart';
-import 'package:sqlite_async/native.dart';
-import 'package:sqlite_async/sqlite_async.dart';

@DriftDatabase(
  tables: [
@@ -66,24 +56,12 @@ import 'package:sqlite_async/sqlite_async.dart';
    TrashedLocalAssetEntity,
    AssetEditEntity,
    SettingsEntity,
-    AssetOcrEntity,
  ],
  include: {'package:immich_mobile/infrastructure/entities/merged_asset.drift'},
 )
 class Drift extends $Drift {
-  final SqliteConnectionPool? _updatePool;
-
-  Drift(super.executor) : _updatePool = null;
-
-  Drift.sqlite(SqliteConnection db, SqliteConnectionPool updatePool)
-    : _updatePool = updatePool,
-      super(DatabaseConnection(SqliteAsyncQueryExecutor(db), streamQueries: _DriftPoolStreamQueries(updatePool)));
-
-  @override
-  Future<void> close() async {
-    await super.close();
-    _updatePool?.close();
-  }
+  Drift([QueryExecutor? executor])
+    : super(executor ?? driftDatabase(name: 'immich', native: const DriftNativeOptions(shareAcrossIsolates: true)));

  Future<void> reset() async {
    // https://github.com/simolus3/drift/commit/bd80a46264b6dd833ef4fd87fffc03f5a832ab41#diff-3f879e03b4a35779344ef16170b9353608dd9c42385f5402ec6035aac4dd8a04R76-R94
@@ -120,7 +98,7 @@ class Drift extends $Drift {
  }

  @override
-  int get schemaVersion => 29;
+  int get schemaVersion => 27;

  @override
  MigrationStrategy get migration => MigrationStrategy(
@@ -301,13 +279,6 @@ class Drift extends $Drift {
          from26To27: (m, v27) async {
            await customStatement('ALTER TABLE metadata RENAME TO settings');
          },
-          from27To28: (m, v28) async {
-            await m.createIndex(v28.idxLocalAssetCreatedAt);
-          },
-          from28To29: (m, v29) async {
-            await m.createTable(v29.assetOcrEntity);
-            await m.createIndex(v29.idxAssetOcrAssetId);
-          },
        ),
      );

@@ -337,82 +308,3 @@ class DriftDatabaseRepository {

  Future<T> transaction<T>(Future<T> Function() callback) => _db.transaction(callback);
 }
-
-// ignore: invalid_use_of_internal_member
-final class _DriftPoolStreamQueries extends StreamQueryStore {
-  _DriftPoolStreamQueries(this._pool);
-
-  final SqliteConnectionPool _pool;
-
-  @override
-  void handleTableUpdates(Set<TableUpdate> updates) {
-    if (updates.isEmpty) {
-      return;
-    }
-    _pool.dispatchUpdateNotification([for (final update in updates) update.table]);
-  }
-
-  @override
-  Stream<Set<TableUpdate>> updatesForSync(TableUpdateQuery query) {
-    return _pool.updatedTables
-        .map((tables) => {for (final table in tables) TableUpdate(table)})
-        .where((updates) => updates.any(query.matches));
-  }
-}
-
-Future<SqliteConnection> openSqliteConnection({required String name}) async {
-  return _openImmichDatabase(await _databaseFile(name));
-}
-
-Future<(SqliteConnection, SqliteConnectionPool)> openSqliteConnectionWithUpdatePool({required String name}) async {
-  final file = await _databaseFile(name);
-  final db = _openImmichDatabase(file);
-  await db.initialize();
-  final updatePool = SqliteConnectionPool.open(
-    name: file.path,
-    openConnections: () => throw StateError('Pool for "$name" should already be open via sqlite_async'),
-  );
-  return (db, updatePool);
-}
-
-Future<File> _databaseFile(String name) async {
-  final dbFolder = await getApplicationDocumentsDirectory();
-  return File(p.join(dbFolder.path, '$name.sqlite'));
-}
-
-SqliteDatabase _openImmichDatabase(File file) {
-  return SqliteDatabase.withFactory(
-    ImmichSqliteOpenFactory(
-      path: file.path,
-      sqliteOptions: const SqliteOptions(
-        journalMode: SqliteJournalMode.wal, // PRAGMA journal_mode (writer only)
-        synchronous: SqliteSynchronous.normal, // PRAGMA synchronous
-        lockTimeout: Duration(seconds: 30), // -> PRAGMA busy_timeout = 30000
-      ),
-    ),
-  );
-}
-
-@visibleForTesting
-final class ImmichSqliteOpenFactory extends NativeSqliteOpenFactory {
-  ImmichSqliteOpenFactory({required super.path, super.sqliteOptions});
-
-  @override
-  List<String> pragmaStatements(SqliteOpenOptions options) {
-    return [
-      ...super.pragmaStatements(options),
-      'PRAGMA cache_size = -32000', // 32MB
-      'PRAGMA temp_store = MEMORY',
-      'PRAGMA foreign_keys = ON',
-    ];
-  }
-}
-
-Future<void> configureSqliteCache() async {
-  // Make sqlite3 pick a more suitable location for temporary files - the
-  // one from the system may be inaccessible due to sand-boxing.
-  final cacheBase = (await getTemporaryDirectory()).path;
-  // We can't access /tmp on Android, which sqlite3 would try by default.
-  // Explicitly tell it about the correct temporary directory.
-  sqlite3.tempDirectory = cacheBase;
-}
@@ -45,11 +45,9 @@ import 'package:immich_mobile/infrastructure/entities/asset_edit.entity.drift.da
    as i21;
 import 'package:immich_mobile/infrastructure/entities/settings.entity.drift.dart'
    as i22;
-import 'package:immich_mobile/infrastructure/entities/asset_ocr.entity.drift.dart'
-    as i23;
 import 'package:immich_mobile/infrastructure/entities/merged_asset.drift.dart'
-    as i24;
-import 'package:drift/internal/modular.dart' as i25;
+    as i23;
+import 'package:drift/internal/modular.dart' as i24;

 abstract class $Drift extends i0.GeneratedDatabase {
  $Drift(i0.QueryExecutor e) : super(e);
@@ -96,12 +94,9 @@ abstract class $Drift extends i0.GeneratedDatabase {
  late final i22.$SettingsEntityTable settingsEntity = i22.$SettingsEntityTable(
    this,
  );
-  late final i23.$AssetOcrEntityTable assetOcrEntity = i23.$AssetOcrEntityTable(
+  i23.MergedAssetDrift get mergedAssetDrift => i24.ReadDatabaseContainer(
    this,
-  );
-  i24.MergedAssetDrift get mergedAssetDrift => i25.ReadDatabaseContainer(
-    this,
-  ).accessor<i24.MergedAssetDrift>(i24.MergedAssetDrift.new);
+  ).accessor<i23.MergedAssetDrift>(i23.MergedAssetDrift.new);
  @override
  Iterable<i0.TableInfo<i0.Table, Object?>> get allTables =>
      allSchemaEntities.whereType<i0.TableInfo<i0.Table, Object?>>();
@@ -117,7 +112,6 @@ abstract class $Drift extends i0.GeneratedDatabase {
    i7.idxLocalAlbumAssetAlbumAsset,
    i4.idxLocalAssetChecksum,
    i4.idxLocalAssetCloudId,
-    i4.idxLocalAssetCreatedAt,
    i3.idxStackPrimaryAssetId,
    i2.uQRemoteAssetsOwnerChecksum,
    i2.uQRemoteAssetsOwnerLibraryChecksum,
@@ -139,7 +133,6 @@ abstract class $Drift extends i0.GeneratedDatabase {
    trashedLocalAssetEntity,
    assetEditEntity,
    settingsEntity,
-    assetOcrEntity,
    i10.idxPartnerSharedWithId,
    i11.idxLatLng,
    i11.idxRemoteExifCity,
@@ -152,7 +145,6 @@ abstract class $Drift extends i0.GeneratedDatabase {
    i20.idxTrashedLocalAssetChecksum,
    i20.idxTrashedLocalAssetAlbum,
    i21.idxAssetEditAssetId,
-    i23.idxAssetOcrAssetId,
  ];
  @override
  i0.StreamQueryUpdateRules
@@ -342,13 +334,6 @@ abstract class $Drift extends i0.GeneratedDatabase {
      ),
      result: [i0.TableUpdate('asset_edit_entity', kind: i0.UpdateKind.delete)],
    ),
-    i0.WritePropagation(
-      on: i0.TableUpdateQuery.onTableName(
-        'remote_asset_entity',
-        limitUpdateKind: i0.UpdateKind.delete,
-      ),
-      result: [i0.TableUpdate('asset_ocr_entity', kind: i0.UpdateKind.delete)],
-    ),
  ]);
  @override
  i0.DriftDatabaseOptions get options =>
@@ -412,6 +397,4 @@ class $DriftManager {
      i21.$$AssetEditEntityTableTableManager(_db, _db.assetEditEntity);
  i22.$$SettingsEntityTableTableManager get settingsEntity =>
      i22.$$SettingsEntityTableTableManager(_db, _db.settingsEntity);
-  i23.$$AssetOcrEntityTableTableManager get assetOcrEntity =>
-      i23.$$AssetOcrEntityTableTableManager(_db, _db.assetOcrEntity);
 }
@@ -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,14 +1,14 @@
 import 'package:drift/drift.dart';
-import 'package:drift_sqlite_async/drift_sqlite_async.dart';
+import 'package:drift_flutter/drift_flutter.dart';
 import 'package:immich_mobile/infrastructure/entities/log.entity.dart';
 import 'package:immich_mobile/infrastructure/repositories/logger_db.repository.drift.dart';
-import 'package:sqlite_async/sqlite_async.dart';

@DriftDatabase(tables: [LogMessageEntity])
 class DriftLogger extends $DriftLogger {
-  DriftLogger.fromExecutor(super.executor);
-
-  DriftLogger.sqlite(SqliteConnection db) : super(SqliteAsyncDriftConnection(db));
+  DriftLogger([QueryExecutor? executor])
+    : super(
+        executor ?? driftDatabase(name: 'immich_logs', native: const DriftNativeOptions(shareAcrossIsolates: true)),
+      );

  @override
  int get schemaVersion => 1;
@@ -19,8 +19,7 @@ class DriftLogger extends $DriftLogger {
      await customStatement('PRAGMA foreign_keys = ON');
      await customStatement('PRAGMA synchronous = NORMAL');
      await customStatement('PRAGMA journal_mode = WAL');
-      await customStatement('PRAGMA busy_timeout = 30000'); // 30s
-      await customStatement('PRAGMA cache_size = -32000'); // 32MB
+      await customStatement('PRAGMA busy_timeout = 500');
      await customStatement('PRAGMA temp_store = MEMORY');
    },
  );
@@ -1,38 +0,0 @@
-import 'package:immich_mobile/domain/models/ocr.model.dart';
-import 'package:immich_mobile/infrastructure/entities/asset_ocr.entity.drift.dart';
-import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
-import 'package:drift/drift.dart';
-
-class OcrRepository extends DriftDatabaseRepository {
-  final Drift _db;
-  const OcrRepository(this._db) : super(_db);
-
-  Future<List<Ocr>> get(String assetId) async {
-    final query = _db.select(_db.assetOcrEntity)
-      ..where((row) => row.assetId.equals(assetId) & row.isVisible.equals(true));
-
-    final result = await query.get();
-    return result.map((e) => e.toDto()).toList();
-  }
-}
-
-extension on AssetOcrEntityData {
-  Ocr toDto() {
-    return Ocr(
-      id: id,
-      assetId: assetId,
-      x1: x1,
-      y1: y1,
-      x2: x2,
-      y2: y2,
-      x3: x3,
-      y3: y3,
-      x4: x4,
-      y4: y4,
-      boxScore: boxScore,
-      textScore: textScore,
-      text: recognizedText,
-      isVisible: isVisible,
-    );
-  }
-}
@@ -1,62 +1,106 @@
 import 'package:drift/drift.dart';
-import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/user.model.dart';
 import 'package:immich_mobile/infrastructure/entities/partner.entity.drift.dart';
-import 'package:immich_mobile/infrastructure/mapper.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';

-class PartnerRepository {
+class DriftPartnerRepository extends DriftDatabaseRepository {
  final Drift _db;
-  const PartnerRepository(this._db);
+  const DriftPartnerRepository(this._db) : super(_db);

-  Future<Partner> get({required String sharedById, required String sharedWithId}) =>
-      (_db.select(_db.partnerEntity).join([
-            innerJoin(_db.userEntity, _db.userEntity.id.equalsExp(_db.partnerEntity.sharedById)),
-          ])..where(
-            _db.partnerEntity.sharedById.equals(sharedById) & _db.partnerEntity.sharedWithId.equals(sharedWithId),
-          ))
-          .map(_resultToPartner)
-          .getSingle();
+  Future<List<PartnerUserDto>> getPartners(String userId) {
+    final query = _db.select(_db.partnerEntity).join([
+      innerJoin(_db.userEntity, _db.userEntity.id.equalsExp(_db.partnerEntity.sharedById)),
+    ])..where(_db.partnerEntity.sharedWithId.equals(userId));

-  Stream<Iterable<Partner>> search(String userId, PartnerDirection direction) =>
-      (_db.select(_db.partnerEntity).join([
-            innerJoin(
-              _db.userEntity,
-              _db.userEntity.id.equalsExp(switch (direction) {
-                .sharedBy => _db.partnerEntity.sharedWithId,
-                .sharedWith => _db.partnerEntity.sharedById,
-              }),
-            ),
-          ])..where(
-            switch (direction) {
-                  .sharedBy => _db.partnerEntity.sharedById,
-                  .sharedWith => _db.partnerEntity.sharedWithId,
-                }.equals(userId) &
-                _db.userEntity.id.equals(userId).not(),
-          ))
-          .map(_resultToPartner)
-          .watch();
+    return query.map((row) {
+      final user = row.readTable(_db.userEntity);
+      final partner = row.readTable(_db.partnerEntity);
+      return PartnerUserDto(id: user.id, email: user.email, name: user.name, inTimeline: partner.inTimeline);
+    }).get();
+  }

-  Future<void> create({required String sharedById, required String sharedWithId, bool inTimeline = false}) =>
-      _db.partnerEntity.insertOnConflictUpdate(
-        PartnerEntityCompanion(
-          sharedById: Value(sharedById),
-          sharedWithId: Value(sharedWithId),
-          inTimeline: Value(inTimeline),
-        ),
-      );
+  // Get users who we can share our library with
+  Future<List<PartnerUserDto>> getAvailablePartners(String currentUserId) {
+    final query = _db.select(_db.userEntity)..where((row) => row.id.equals(currentUserId).not());

-  Future<void> update({required String sharedById, required String sharedWithId, required bool inTimeline}) =>
-      (_db.partnerEntity.update()..where((t) => t.sharedById.equals(sharedById) & t.sharedWithId.equals(sharedWithId)))
-          .write(PartnerEntityCompanion(inTimeline: Value(inTimeline)));
+    return query.map((user) {
+      return PartnerUserDto(id: user.id, email: user.email, name: user.name, inTimeline: false);
+    }).get();
+  }

-  Future<void> delete({required String sharedById, required String sharedWithId}) =>
-      (_db.partnerEntity.delete()..where((t) => t.sharedById.equals(sharedById) & t.sharedWithId.equals(sharedWithId)))
-          .go();
+  // Get users who are sharing their photos WITH the current user
+  Future<List<PartnerUserDto>> getSharedWith(String partnerId) {
+    final query = _db.select(_db.partnerEntity).join([
+      innerJoin(_db.userEntity, _db.userEntity.id.equalsExp(_db.partnerEntity.sharedById)),
+    ])..where(_db.partnerEntity.sharedWithId.equals(partnerId));

-  Partner _resultToPartner(TypedResult result) {
-    final user = result.readTable(_db.userEntity);
-    final partner = result.readTable(_db.partnerEntity);
-    return mapToPartner(user, partner);
+    return query.map((row) {
+      final user = row.readTable(_db.userEntity);
+      final partner = row.readTable(_db.partnerEntity);
+      return PartnerUserDto(id: user.id, email: user.email, name: user.name, inTimeline: partner.inTimeline);
+    }).get();
+  }
+
+  // Get users who the current user is sharing their photos TO
+  Future<List<PartnerUserDto>> getSharedBy(String userId) {
+    final query = _db.select(_db.partnerEntity).join([
+      innerJoin(_db.userEntity, _db.userEntity.id.equalsExp(_db.partnerEntity.sharedWithId)),
+    ])..where(_db.partnerEntity.sharedById.equals(userId));
+
+    return query.map((row) {
+      final user = row.readTable(_db.userEntity);
+      final partner = row.readTable(_db.partnerEntity);
+      return PartnerUserDto(id: user.id, email: user.email, name: user.name, inTimeline: partner.inTimeline);
+    }).get();
+  }
+
+  Future<List<String>> getAllPartnerIds(String userId) async {
+    // Get users who are sharing with me (sharedWithId = userId)
+    final sharingWithMeQuery = _db.select(_db.partnerEntity)..where((tbl) => tbl.sharedWithId.equals(userId));
+    final sharingWithMe = await sharingWithMeQuery.map((row) => row.sharedById).get();
+
+    // Get users who I am sharing with (sharedById = userId)
+    final sharingWithThemQuery = _db.select(_db.partnerEntity)..where((tbl) => tbl.sharedById.equals(userId));
+    final sharingWithThem = await sharingWithThemQuery.map((row) => row.sharedWithId).get();
+
+    // Combine both lists and remove duplicates
+    final allPartnerIds = <String>{...sharingWithMe, ...sharingWithThem}.toList();
+    return allPartnerIds;
+  }
+
+  Future<PartnerUserDto?> getPartner(String partnerId, String userId) {
+    final query = _db.select(_db.partnerEntity).join([
+      innerJoin(_db.userEntity, _db.userEntity.id.equalsExp(_db.partnerEntity.sharedById)),
+    ])..where(_db.partnerEntity.sharedById.equals(partnerId) & _db.partnerEntity.sharedWithId.equals(userId));
+
+    return query.map((row) {
+      final user = row.readTable(_db.userEntity);
+      final partner = row.readTable(_db.partnerEntity);
+      return PartnerUserDto(id: user.id, email: user.email, name: user.name, inTimeline: partner.inTimeline);
+    }).getSingleOrNull();
+  }
+
+  Future<bool> toggleShowInTimeline(PartnerUserDto partner, String userId) {
+    return _db.partnerEntity.update().replace(
+      PartnerEntityCompanion(
+        sharedById: Value(partner.id),
+        sharedWithId: Value(userId),
+        inTimeline: Value(!partner.inTimeline),
+      ),
+    );
+  }
+
+  Future<int> create(String partnerId, String userId) {
+    final entity = PartnerEntityCompanion(
+      sharedById: Value(userId),
+      sharedWithId: Value(partnerId),
+      inTimeline: const Value(false),
+    );
+
+    return _db.partnerEntity.insertOne(entity);
+  }
+
+  Future<void> delete(String partnerId, String userId) {
+    return _db.partnerEntity.deleteWhere((t) => t.sharedById.equals(userId) & t.sharedWithId.equals(partnerId));
  }
 }
@@ -32,7 +32,7 @@ class DriftPeopleRepository extends DriftDatabaseRepository {
    }).get();
  }

-  Future<List<DriftPerson>> getAllPeople({int minFaces = 3}) async {
+  Future<List<DriftPerson>> getAllPeople() async {
    final people = _db.personEntity;
    final faces = _db.assetFaceEntity;
    final assets = _db.remoteAssetEntity;
@@ -49,7 +49,7 @@ class DriftPeopleRepository extends DriftDatabaseRepository {
                faces.isVisible.equals(true) &
                faces.deletedAt.isNull(),
          )
-          ..groupBy([people.id], having: faces.id.count().isBiggerOrEqualValue(minFaces) | people.name.equals('').not())
+          ..groupBy([people.id], having: faces.id.count().isBiggerOrEqualValue(3) | people.name.equals('').not())
          ..orderBy([
            OrderingTerm(expression: people.name.equals('').not(), mode: OrderingMode.desc),
            OrderingTerm(expression: faces.id.count(), mode: OrderingMode.desc),
@@ -267,7 +267,7 @@ class RemoteAssetRepository extends DriftDatabaseRepository {
    );
  }

-  Future<void> updateRating(String assetId, int? rating) async {
+  Future<void> updateRating(String assetId, int rating) async {
    await (_db.remoteExifEntity.update()..where((row) => row.assetId.equals(assetId))).write(
      RemoteExifEntityCompanion(rating: Value(rating)),
    );
@@ -1,7 +1,6 @@
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart' hide AssetVisibility;
 import 'package:immich_mobile/infrastructure/repositories/api.repository.dart';
 import 'package:immich_mobile/models/search/search_filter.model.dart';
-import 'package:immich_mobile/utils/option.dart';
 import 'package:openapi/api.dart';

 class SearchApiRepository extends ApiRepository {
@@ -21,64 +20,50 @@ class SearchApiRepository extends ApiRepository {
        (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.toOptional(),
-          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,
+          queryAssetId: filter.assetId,
+          language: filter.language,
+          country: filter.location.country,
+          state: filter.location.state,
+          city: filter.location.city,
+          make: filter.camera.make,
+          model: filter.camera.model,
+          takenAfter: filter.date.takenAfter,
+          takenBefore: filter.date.takenBefore,
+          visibility: filter.display.isArchive ? AssetVisibility.archive : AssetVisibility.timeline,
+          rating: filter.rating.rating,
+          isFavorite: filter.display.isFavorite ? true : null,
+          isNotInAlbum: filter.display.isNotInAlbum ? true : null,
+          personIds: filter.people.map((e) => e.id).toList(),
+          tagIds: filter.tagIds,
+          type: type,
+          page: page,
+          size: 100,
        ),
      );
    }

    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.toOptional(),
-        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,
+        country: filter.location.country,
+        description: filter.description != null && filter.description!.isNotEmpty ? filter.description : null,
+        ocr: filter.ocr != null && filter.ocr!.isNotEmpty ? filter.ocr : null,
+        state: filter.location.state,
+        city: filter.location.city,
+        make: filter.camera.make,
+        model: filter.camera.model,
+        takenAfter: filter.date.takenAfter,
+        takenBefore: filter.date.takenBefore,
+        visibility: filter.display.isArchive ? AssetVisibility.archive : AssetVisibility.timeline,
+        rating: filter.rating.rating,
+        isFavorite: filter.display.isFavorite ? true : null,
+        isNotInAlbum: filter.display.isNotInAlbum ? true : null,
+        personIds: filter.people.map((e) => e.id).toList(),
+        tagIds: filter.tagIds,
+        type: type,
+        page: page,
+        size: 1000,
      ),
    );
  }
@@ -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));
  }

  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(
@@ -74,7 +73,6 @@ class SyncApiRepository {
          serverVersion >= const SemVer(major: 2, minor: 6, patch: 0)
              ? SyncRequestType.assetFacesV2
              : SyncRequestType.assetFacesV1,
-          if (serverVersion >= const SemVer(major: 3, minor: 0, patch: 0)) SyncRequestType.assetOcrV1,
        ],
      ).toJson(),
    );
@@ -205,8 +203,6 @@ const _kResponseMap = <SyncEntityType, Function(Object)>{
  SyncEntityType.assetFaceV1: SyncAssetFaceV1.fromJson,
  SyncEntityType.assetFaceV2: SyncAssetFaceV2.fromJson,
  SyncEntityType.assetFaceDeleteV1: SyncAssetFaceDeleteV1.fromJson,
-  SyncEntityType.assetOcrV1: SyncAssetOcrV1.fromJson,
-  SyncEntityType.assetOcrDeleteV1: SyncAssetOcrDeleteV1.fromJson,
  SyncEntityType.syncCompleteV1: _SyncEmptyDto.fromJson,
 };

@@ -12,7 +12,6 @@ import 'package:immich_mobile/domain/models/user_metadata.model.dart';
 import 'package:immich_mobile/extensions/string_extensions.dart';
 import 'package:immich_mobile/infrastructure/entities/asset_edit.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/asset_face.entity.drift.dart';
-import 'package:immich_mobile/infrastructure/entities/asset_ocr.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/auth_user.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/exif.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/local_album.entity.drift.dart';
@@ -70,7 +69,6 @@ class SyncStreamRepository extends DriftDatabaseRepository {
            await _db.userMetadataEntity.deleteAll();
            await _db.remoteAssetCloudIdEntity.deleteAll();
            await _db.assetEditEntity.deleteAll();
-            await _db.assetOcrEntity.deleteAll();
          });
        } finally {
          // re-enable FK even if the transaction throws, otherwise the connection
@@ -93,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),
@@ -135,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));
@@ -850,52 +848,6 @@ class SyncStreamRepository extends DriftDatabaseRepository {
    }
  }

-  Future<void> updateAssetOcrV1(Iterable<SyncAssetOcrV1> data) async {
-    try {
-      await _db.batch((batch) {
-        for (final assetOcr in data) {
-          final companion = AssetOcrEntityCompanion(
-            assetId: Value(assetOcr.assetId),
-            recognizedText: Value(assetOcr.text),
-            x1: Value(assetOcr.x1),
-            y1: Value(assetOcr.y1),
-            x2: Value(assetOcr.x2),
-            y2: Value(assetOcr.y2),
-            x3: Value(assetOcr.x3),
-            y3: Value(assetOcr.y3),
-            x4: Value(assetOcr.x4),
-            y4: Value(assetOcr.y4),
-            boxScore: Value(assetOcr.boxScore),
-            textScore: Value(assetOcr.textScore),
-            isVisible: Value(assetOcr.isVisible),
-          );
-
-          batch.insert(
-            _db.assetOcrEntity,
-            companion.copyWith(id: Value(assetOcr.id)),
-            onConflict: DoUpdate((_) => companion),
-          );
-        }
-      });
-    } catch (error, stack) {
-      _logger.severe('Error: updateAssetOcrV1', error, stack);
-      rethrow;
-    }
-  }
-
-  Future<void> deleteAssetOcrV1(Iterable<SyncAssetOcrDeleteV1> data) async {
-    try {
-      await _db.batch((batch) {
-        for (final assetOcr in data) {
-          batch.deleteWhere(_db.assetOcrEntity, (row) => row.id.equals(assetOcr.id));
-        }
-      });
-    } catch (error, stack) {
-      _logger.severe('Error: deleteAssetOcrV1', error, stack);
-      rethrow;
-    }
-  }
-
  Future<void> pruneAssets() async {
    try {
      await _db.transaction(() async {
@@ -2,17 +2,9 @@ import 'package:drift/drift.dart';
 import 'package:immich_mobile/domain/models/user.model.dart';
 import 'package:immich_mobile/domain/models/user_metadata.model.dart';
 import 'package:immich_mobile/infrastructure/entities/auth_user.entity.drift.dart';
-import 'package:immich_mobile/infrastructure/mapper.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/user_metadata.repository.dart';

-class UserRepository {
-  final Drift _db;
-  const UserRepository(this._db);
-
-  Stream<Iterable<User>> getAll() => _db.select(_db.userEntity).map(mapToUser).watch();
-}
-
 class DriftAuthUserRepository extends DriftDatabaseRepository {
  final Drift _db;
  const DriftAuthUserRepository(super.db) : _db = db;
@@ -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,7 +24,6 @@ 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/platform.provider.dart';
@@ -129,7 +128,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 +233,6 @@ class ImmichAppState extends ConsumerState<ImmichApp> with WidgetsBindingObserve
      }
    });

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

@@ -3,7 +3,6 @@ import 'dart:convert';

 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/person.model.dart';
-import 'package:immich_mobile/utils/option.dart';

 class SearchLocationFilter {
  String? country;
@@ -134,26 +133,19 @@ class SearchDateFilter {
 }

 class SearchRatingFilter {
-  /// none = no filter; some(null) = filter for unrated; some(1-5) = filter for that rating
-  Option<int?> rating;
-  SearchRatingFilter({this.rating = const Option.none()});
+  int? rating;
+  SearchRatingFilter({this.rating});

-  SearchRatingFilter copyWith({Option<int?>? rating}) {
+  SearchRatingFilter copyWith({int? rating}) {
    return SearchRatingFilter(rating: rating ?? this.rating);
  }

  Map<String, dynamic> toMap() {
-    if (rating.isNone) {
-      return <String, dynamic>{'active': false};
-    }
-    return <String, dynamic>{'active': true, 'value': rating.unwrapOrNull};
+    return <String, dynamic>{'rating': rating};
  }

  factory SearchRatingFilter.fromMap(Map<String, dynamic> map) {
-    if (!(map['active'] as bool? ?? false)) {
-      return SearchRatingFilter();
-    }
-    return SearchRatingFilter(rating: Option.some(map['value'] as int?));
+    return SearchRatingFilter(rating: map['rating'] != null ? map['rating'] as int : null);
  }

  String toJson() => json.encode(toMap());
@@ -278,7 +270,7 @@ class SearchFilter {
        display.isNotInAlbum == false &&
        display.isArchive == false &&
        display.isFavorite == false &&
-        rating.rating.isNone &&
+        rating.rating == null &&
        mediaType == AssetType.other;
  }

@@ -73,10 +73,10 @@ class SharedLink {
      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"
+          ? dto.album?.albumName.toUpperCase() ?? "UNKNOWN SHARE"
          : "INDIVIDUAL SHARE",
      thumbAssetId = dto.type == SharedLinkType.ALBUM
-          ? dto.album.orElse(null)?.albumThumbnailAssetId
+          ? 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,7 +8,6 @@ import 'package:immich_mobile/domain/models/album/local_album.model.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:immich_mobile/extensions/theme_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/generated/translations.g.dart';
@@ -16,16 +15,11 @@ import 'package:immich_mobile/presentation/widgets/backup/backup_toggle_button.w
 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/permission.provider.dart';
 import 'package:immich_mobile/providers/sync_status.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/widgets/backup/backup_info_card.dart';
-import 'package:immich_ui/immich_ui.dart';
 import 'package:logging/logging.dart';
-import 'package:permission_handler/permission_handler.dart';
-import 'package:url_launcher/url_launcher.dart';
 import 'package:wakelock_plus/wakelock_plus.dart';

@RoutePage()
@@ -168,7 +162,11 @@ class _DriftBackupPageState extends ConsumerState<DriftBackupPage> {
                      ),
                    ),
                  },
-                  const _BackupFooter(),
+                  TextButton.icon(
+                    icon: const Icon(Icons.info_outline_rounded),
+                    onPressed: () => context.pushRoute(const DriftUploadDetailRoute()),
+                    label: Text("view_details".t(context: context)),
+                  ),
                ],
              ],
            ),
@@ -179,137 +177,6 @@ class _DriftBackupPageState extends ConsumerState<DriftBackupPage> {
  }
 }

-class _BackupFooter extends ConsumerStatefulWidget {
-  const _BackupFooter();
-
-  @override
-  ConsumerState<_BackupFooter> createState() => _BackupFooterState();
-}
-
-class _BackupFooterState extends ConsumerState<_BackupFooter> with WidgetsBindingObserver {
-  @override
-  void initState() {
-    super.initState();
-    WidgetsBinding.instance.addObserver(this);
-  }
-
-  @override
-  void dispose() {
-    WidgetsBinding.instance.removeObserver(this);
-    super.dispose();
-  }
-
-  @override
-  void didChangeAppLifecycleState(AppLifecycleState state) {
-    if (CurrentPlatform.isAndroid && state == AppLifecycleState.resumed && mounted) {
-      unawaited(ref.read(notificationPermissionProvider.notifier).getNotificationPermission());
-      unawaited(ref.read(batteryOptimizationProvider.notifier).getBatteryOptimizationPermission());
-    }
-  }
-
-  void showPermissionsDialog() {
-    showDialog(
-      context: context,
-      builder: (ctx) => AlertDialog(
-        content: Text(context.t.notification_permission_dialog_content),
-        actions: [
-          ImmichTextButton(
-            labelText: context.t.cancel,
-            variant: .ghost,
-            expanded: false,
-            onPressed: () => ContextHelper(ctx).pop(),
-          ),
-          ImmichTextButton(
-            labelText: context.t.settings,
-            variant: .ghost,
-            expanded: false,
-            onPressed: () {
-              ContextHelper(context).pop();
-              openAppSettings();
-            },
-          ),
-        ],
-      ),
-    );
-  }
-
-  void showBatteryOptimizationInfo() {
-    showDialog<void>(
-      context: context,
-      barrierDismissible: false,
-      builder: (BuildContext ctx) {
-        return AlertDialog(
-          title: Text(context.t.backup_controller_page_background_battery_info_title),
-          content: SingleChildScrollView(child: Text(context.t.backup_controller_page_background_battery_info_message)),
-          actions: [
-            ImmichTextButton(
-              labelText: context.t.backup_controller_page_background_battery_info_link,
-              variant: .ghost,
-              expanded: false,
-              onPressed: () => launchUrl(Uri.parse('https://dontkillmyapp.com'), mode: LaunchMode.externalApplication),
-            ),
-            ImmichTextButton(
-              labelText: context.t.backup_controller_page_background_battery_info_ok,
-              variant: .ghost,
-              expanded: false,
-              onPressed: () => ContextHelper(ctx).pop(),
-            ),
-          ],
-        );
-      },
-    );
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final isBackupEnabled = ref.watch(appConfigProvider.select((config) => config.backup.enabled));
-    final notificationStatus = ref.watch(notificationPermissionProvider);
-    final batteryOptimizationStatus = ref.watch(batteryOptimizationProvider).valueOrNull;
-
-    return Column(
-      children: [
-        if (CurrentPlatform.isAndroid && isBackupEnabled) ...[
-          if (notificationStatus != PermissionStatus.granted)
-            TextButton.icon(
-              iconAlignment: .end,
-              icon: Icon(Icons.open_in_new_outlined, color: context.colorScheme.onSurfaceSecondary),
-              label: Text(
-                context.t.notification_backup_reliability,
-                textAlign: TextAlign.left,
-                style: context.textTheme.bodySmall?.copyWith(color: context.colorScheme.onSurfaceSecondary),
-              ),
-              onPressed: () {
-                ref.read(notificationPermissionProvider.notifier).requestNotificationPermission().then((p) {
-                  if (p == PermissionStatus.permanentlyDenied) {
-                    showPermissionsDialog();
-                  }
-                });
-              },
-            ),
-          if (notificationStatus != PermissionStatus.granted && batteryOptimizationStatus != PermissionStatus.granted)
-            const Divider(indent: 32, endIndent: 32),
-          if (batteryOptimizationStatus != PermissionStatus.granted)
-            TextButton.icon(
-              iconAlignment: .end,
-              icon: Icon(Icons.open_in_new_outlined, color: context.colorScheme.onSurfaceSecondary),
-              label: Text(
-                context.t.battery_optimization_backup_reliability,
-                textAlign: TextAlign.left,
-                style: context.textTheme.bodySmall?.copyWith(color: context.colorScheme.onSurfaceSecondary),
-              ),
-              onPressed: showBatteryOptimizationInfo,
-            ),
-        ],
-        TextButton.icon(
-          icon: const Icon(Icons.info_outline_rounded),
-          onPressed: () => context.pushRoute(const DriftUploadDetailRoute()),
-          label: Text(context.t.view_details),
-        ),
-      ],
-    );
-  }
-}
-
 class _BackupAlbumSelectionCard extends ConsumerWidget {
  const _BackupAlbumSelectionCard();

@@ -17,7 +17,6 @@ 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((_) {
@@ -0,0 +1,139 @@
+import 'package:auto_route/auto_route.dart';
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/user.model.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/presentation/widgets/people/partner_user_avatar.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/partner.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/user.provider.dart';
+import 'package:immich_mobile/widgets/common/confirm_dialog.dart';
+import 'package:immich_mobile/widgets/common/immich_toast.dart';
+
+@RoutePage()
+class DriftPartnerPage extends HookConsumerWidget {
+  const DriftPartnerPage({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final potentialPartnersAsync = ref.watch(driftAvailablePartnerProvider);
+
+    addNewUsersHandler() async {
+      final potentialPartners = potentialPartnersAsync.value;
+      if (potentialPartners == null || potentialPartners.isEmpty) {
+        ImmichToast.show(context: context, msg: "partner_page_no_more_users".tr());
+        return;
+      }
+
+      final selectedUser = await showDialog<PartnerUserDto>(
+        context: context,
+        builder: (context) {
+          return SimpleDialog(
+            title: const Text("partner_page_select_partner").tr(),
+            children: [
+              for (PartnerUserDto partner in potentialPartners)
+                SimpleDialogOption(
+                  onPressed: () => context.pop(partner),
+                  child: Row(
+                    children: [
+                      Padding(
+                        padding: const EdgeInsets.only(right: 8),
+                        child: PartnerUserAvatar(partner: partner),
+                      ),
+                      Text(partner.name),
+                    ],
+                  ),
+                ),
+            ],
+          );
+        },
+      );
+      if (selectedUser != null) {
+        await ref.read(partnerUsersProvider.notifier).addPartner(selectedUser);
+      }
+    }
+
+    onDeleteUser(PartnerUserDto partner) {
+      return showDialog(
+        context: context,
+        builder: (BuildContext context) {
+          return ConfirmDialog(
+            title: "stop_photo_sharing",
+            content: "partner_page_stop_sharing_content".tr(namedArgs: {'partner': partner.name}),
+            onOk: () => ref.read(partnerUsersProvider.notifier).removePartner(partner),
+          );
+        },
+      );
+    }
+
+    return Scaffold(
+      appBar: AppBar(
+        title: const Text("partners").t(context: context),
+        elevation: 0,
+        centerTitle: false,
+        actions: [
+          IconButton(
+            onPressed: potentialPartnersAsync.whenOrNull(data: (data) => addNewUsersHandler),
+            icon: const Icon(Icons.person_add),
+            tooltip: "add_partner".tr(),
+          ),
+        ],
+      ),
+      body: _SharedToPartnerList(onAddPartner: addNewUsersHandler, onDeletePartner: onDeleteUser),
+    );
+  }
+}
+
+class _SharedToPartnerList extends ConsumerWidget {
+  final VoidCallback onAddPartner;
+  final Function(PartnerUserDto partner) onDeletePartner;
+
+  const _SharedToPartnerList({required this.onAddPartner, required this.onDeletePartner});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final partnerAsync = ref.watch(driftSharedByPartnerProvider);
+
+    return partnerAsync.when(
+      data: (partners) {
+        if (partners.isEmpty) {
+          return Padding(
+            padding: const EdgeInsets.symmetric(horizontal: 16.0),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Padding(
+                  padding: const EdgeInsets.symmetric(vertical: 8),
+                  child: const Text("partner_page_empty_message", style: TextStyle(fontSize: 14)).tr(),
+                ),
+                Align(
+                  alignment: Alignment.center,
+                  child: ElevatedButton.icon(
+                    onPressed: onAddPartner,
+                    icon: const Icon(Icons.person_add),
+                    label: const Text("add_partner").tr(),
+                  ),
+                ),
+              ],
+            ),
+          );
+        }
+
+        return ListView.builder(
+          itemCount: partners.length,
+          itemBuilder: (context, index) {
+            final partner = partners[index];
+            return ListTile(
+              leading: PartnerUserAvatar(partner: partner),
+              title: Text(partner.name),
+              subtitle: Text(partner.email),
+              trailing: IconButton(icon: const Icon(Icons.person_remove), onPressed: () => onDeletePartner(partner)),
+            );
+          },
+        );
+      },
+      loading: () => const Center(child: CircularProgressIndicator()),
+      error: (error, stack) => Center(child: Text('error_loading_partners'.tr(args: [error.toString()]))),
+    );
+  }
+}
@@ -1,200 +0,0 @@
-import 'package:auto_route/auto_route.dart';
-import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/material.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/domain/models/user.model.dart';
-import 'package:immich_mobile/generated/translations.g.dart';
-import 'package:immich_mobile/presentation/widgets/people/partner_user_avatar.widget.dart';
-import 'package:immich_mobile/providers/infrastructure/user.provider.dart';
-import 'package:immich_mobile/providers/user.provider.dart';
-import 'package:immich_mobile/widgets/common/confirm_dialog.dart';
-
-@visibleForTesting
-final candidatesStateProvider = StreamProvider.autoDispose<Iterable<User>>((ref) {
-  final currentUser = ref.watch(currentUserProvider);
-  // TODO: Refactor with a route guard to avoid this check in every provider
-  if (currentUser == null) {
-    return const Stream.empty();
-  }
-  return ref.watch(partnerServiceProvider).getCandidates(currentUser.id);
-});
-
-@visibleForTesting
-final partnersStateProvider = StreamProvider.autoDispose<Iterable<Partner>>((ref) {
-  final currentUser = ref.watch(currentUserProvider);
-  // TODO: Refactor with a route guard to avoid this check in every provider
-  if (currentUser == null) {
-    return const Stream.empty();
-  }
-
-  return ref.watch(partnerServiceProvider).search(currentUser.id, .sharedBy);
-});
-
-Future<void> _addPartner(BuildContext context, WidgetRef ref) async {
-  final selected = await showDialog<User>(context: context, builder: (_) => const PartnerSelectionDialog());
-  final currentUser = ref.read(currentUserProvider);
-  if (selected != null && currentUser != null) {
-    await ref.read(partnerServiceProvider).create(sharedById: currentUser.id, sharedWithId: selected.id);
-  }
-}
-
-Future<void> _removePartner(BuildContext context, WidgetRef ref, Partner partner) => showDialog(
-  context: context,
-  builder: (_) => ConfirmDialog(
-    title: "stop_photo_sharing",
-    content: context.t.partner_page_stop_sharing_content(partner: partner.name),
-    onOk: () {
-      final currentUser = ref.read(currentUserProvider);
-      if (currentUser != null) {
-        ref.read(partnerServiceProvider).delete(sharedById: currentUser.id, sharedWithId: partner.id);
-      }
-    },
-  ),
-);
-
-@RoutePage()
-class PartnerPage extends ConsumerWidget {
-  const PartnerPage({super.key});
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final sharedByAsync = ref.watch(partnersStateProvider);
-
-    return Scaffold(
-      appBar: AppBar(
-        title: Text(context.t.partners),
-        elevation: 0,
-        centerTitle: false,
-        actions: [
-          IconButton(
-            onPressed: () => _addPartner(context, ref),
-            icon: const Icon(Icons.person_add),
-            tooltip: context.t.add_partner,
-          ),
-        ],
-      ),
-      body: sharedByAsync.when(
-        data: (partners) => PartnerSharedByList(
-          partners: partners.toList(growable: false),
-          onAdd: () => _addPartner(context, ref),
-          onRemove: (partner) => _removePartner(context, ref, partner),
-        ),
-        loading: () => const Center(child: CircularProgressIndicator()),
-        error: (error, _) => Center(child: Text(context.t.error_loading_partners(error: error))),
-      ),
-    );
-  }
-}
-
-class _EmptyPartners extends StatelessWidget {
-  const _EmptyPartners({required this.onAdd});
-
-  final VoidCallback onAdd;
-
-  @override
-  Widget build(BuildContext context) {
-    return Padding(
-      padding: const .symmetric(horizontal: 16.0),
-      child: Column(
-        crossAxisAlignment: .start,
-        children: [
-          Padding(
-            padding: const .symmetric(vertical: 8),
-            child: Text(context.t.partner_page_empty_message, style: const TextStyle(fontSize: 14)),
-          ),
-          Align(
-            alignment: .center,
-            child: ElevatedButton.icon(
-              onPressed: onAdd,
-              icon: const Icon(Icons.person_add),
-              label: Text(context.t.add_partner),
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-}
-
-@visibleForTesting
-class PartnerSharedByList extends StatelessWidget {
-  const PartnerSharedByList({super.key, required this.partners, required this.onAdd, required this.onRemove});
-
-  final List<Partner> partners;
-  final VoidCallback onAdd;
-  final ValueChanged<Partner> onRemove;
-
-  @override
-  Widget build(BuildContext context) {
-    if (partners.isEmpty) {
-      return _EmptyPartners(onAdd: onAdd);
-    }
-
-    return ListView.builder(
-      itemCount: partners.length,
-      itemBuilder: (_, index) {
-        final partner = partners[index];
-        return ListTile(
-          leading: PartnerUserAvatar(userId: partner.id, name: partner.name),
-          title: Text(partner.name),
-          subtitle: Text(partner.email),
-          trailing: IconButton(icon: const Icon(Icons.person_remove), onPressed: () => onRemove(partner)),
-        );
-      },
-    );
-  }
-}
-
-@visibleForTesting
-class PartnerSelectionDialog extends ConsumerWidget {
-  const PartnerSelectionDialog({super.key});
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final candidatesAsync = ref.watch(candidatesStateProvider);
-
-    return SimpleDialog(
-      title: const Text("partner_page_select_partner").tr(),
-      children: candidatesAsync.when(
-        data: (candidates) {
-          final users = candidates.toList();
-          if (users.isEmpty) {
-            return [
-              Padding(
-                padding: const .symmetric(horizontal: 24, vertical: 8),
-                child: const Text("partner_page_no_more_users").tr(),
-              ),
-            ];
-          }
-          return [
-            for (final candidate in users)
-              SimpleDialogOption(
-                onPressed: () => Navigator.of(context).pop(candidate),
-                child: Row(
-                  children: [
-                    Padding(
-                      padding: const .only(right: 8),
-                      child: PartnerUserAvatar(userId: candidate.id, name: candidate.name),
-                    ),
-                    Text(candidate.name),
-                  ],
-                ),
-              ),
-          ];
-        },
-        loading: () => const [
-          Padding(
-            padding: .all(24),
-            child: Center(child: CircularProgressIndicator()),
-          ),
-        ],
-        error: (error, _) => [
-          Padding(
-            padding: const .symmetric(horizontal: 24, vertical: 8),
-            child: Text(context.t.error_loading_partners(error: error)),
-          ),
-        ],
-      ),
-    );
-  }
-}
--- a/Show More
+++ b/Show More