refactor: use widget previews for ui showcase

.devcontainer/server/container-start-frontend.sh

@@ -8,8 +8,6 @@ log "Preparing Immich Web Frontend"
 log ""
 run_cmd pnpm --filter @immich/sdk install
 run_cmd pnpm --filter @immich/sdk build
-run_cmd pnpm --filter @immich/plugin-sdk install
-run_cmd pnpm --filter @immich/plugin-sdk build
 run_cmd pnpm --filter immich-web install
 
 log "Starting Immich Web Frontend"

.github/workflows/build-mobile.yml

@@ -230,12 +230,8 @@ jobs:
       - name: Generate platform APIs
         run: mise //mobile:codegen:pigeon
 
-      - name: Resolve iOS Swift Packages
-        working-directory: ./mobile
-        run: flutter build ios --config-only --no-codesign
-
       - name: Setup Ruby
-        uses: ruby/setup-ruby@afeafc3d1ab54a631816aba4c914a0081c12ff2f # v1.310.0
+        uses: ruby/setup-ruby@6aaa311d81eba98ae12eaffbcb63296ace0efcde # v1.307.0
         with:
           ruby-version: '3.3'
           bundler-cache: true
@@ -292,6 +288,7 @@ jobs:
           APP_STORE_CONNECT_API_KEY_ID: ${{ secrets.APP_STORE_CONNECT_API_KEY_ID }}
           APP_STORE_CONNECT_API_KEY_ISSUER_ID: ${{ secrets.APP_STORE_CONNECT_API_KEY_ISSUER_ID }}
           ENVIRONMENT: ${{ inputs.environment || 'development' }}
+          BUNDLE_ID_SUFFIX: ${{ inputs.environment == 'production' && '' || 'development' }}
           GITHUB_REF: ${{ github.ref }}
           FASTLANE_XCODEBUILD_SETTINGS_TIMEOUT: 120
           FASTLANE_XCODEBUILD_SETTINGS_RETRIES: 6

.github/workflows/codeql-analysis.yml

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

.github/workflows/static_analysis.yml

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

docker/docker-compose.dev.yml

@@ -21,7 +21,7 @@ services:
     volumes:
       - ..:/usr/src/app
       # - ../../ui:/usr/src/ui
-      - build_cache:/buildcache
+      - pnpm_cache:/buildcache/pnpm_cache
       - server_node_modules:/usr/src/app/server/node_modules
       - web_node_modules:/usr/src/app/web/node_modules
       - github_node_modules:/usr/src/app/.github/node_modules
@@ -45,11 +45,11 @@ services:
       target: dev
     command:
       - |
-        mise install
+        pnpm install
         touch /tmp/init-complete
         exec tail -f /dev/null
     volumes:
-      - build_cache:/buildcache
+      - pnpm_store_server:/buildcache/pnpm-store
     restart: 'no'
     healthcheck:
       test: ['CMD', 'test', '-f', '/tmp/init-complete']
@@ -73,6 +73,7 @@ services:
     volumes:
       - ${UPLOAD_LOCATION}/photos:/data
       - /etc/localtime:/etc/localtime:ro
+      - pnpm_store_server:/buildcache/pnpm-store
       - ../packages/plugin-core:/build/plugins/immich-plugin-core
     env_file:
       - .env
@@ -121,6 +122,8 @@ services:
     ports:
       - 3000:3000
       - 24678:24678
+    volumes:
+      - pnpm_store_web:/buildcache/pnpm-store
     restart: unless-stopped
     depends_on:
       immich-init:
@@ -200,7 +203,9 @@ volumes:
   model_cache:
   prometheus_data:
   grafana_data:
-  build_cache:
+  pnpm_cache:
+  pnpm_store_server:
+  pnpm_store_web:
   server_node_modules:
   web_node_modules:
   github_node_modules:

docs/docs/FAQ.mdx

@@ -26,8 +26,6 @@ For organizations seeking to resell Immich, we have established the following gu
 
 When in doubt or if you have an edge case scenario, we encourage you to contact us directly via email to discuss the use of our trademark. We can provide clear guidance on what is acceptable and what is not. You can reach out at: questions@immich.app
 
----
-
 ## User
 
 ### How can I reset the admin password?
@@ -38,10 +36,6 @@ The admin password can be reset by running the [reset-admin-password](/administr
 
 You can see the list of all users by running [list-users](/administration/server-commands.md) Command on the Immich-server.
 
-### How can I change my profile picture?
-
-View a single photo, press the three dots in the top-right to show context menu, and select "Set as profile picture". In the pop-up, use your mouse scroll wheel to zoom in the picture until it completely fills the circle. Click and drag the picture to align it to your liking. Press "Save" to save your changes.
-
 ---
 
 ## Mobile App

docs/docs/developer/database-migrations.md

@@ -5,7 +5,7 @@ After making any changes in the `server/src/schema`, a database migration need t
 1. Run the command
 
 ```bash
-mise //server:migrations generate <migration-name>
+pnpm run migrations:generate <migration-name>
 ```
 
 2. Check if the migration file makes sense.
@@ -18,7 +18,7 @@ The server will automatically detect `*.ts` file changes and restart. Part of th
 If you need to undo the most recently applied migration—for example, when developing or testing on schema changes—run:
 
 ```bash
-mise //server:migrations revert
+pnpm run migrations:revert
 ```
 
 This command rolls back the latest migration and brings the database schema back to its previous state.

docs/docs/developer/devcontainers.md

@@ -252,33 +252,44 @@ To connect the mobile app to your Dev Container:
 
 The Dev Container supports multiple ways to run tests:
 
+#### Using Mise Commands (Recommended)
+
 ```bash
-# Server
-mise //server:test          # unit tests
-mise //server:test-medium   # medium / integration tests
-
-# Web
-mise //web:test             # unit tests
-
-# E2E
-mise //e2e:test             # API tests
-mise //e2e:test-web         # web UI tests (Playwright)
-
-# Run all checks for a component
-mise //server:checklist
-mise //web:checklist
+# Run tests for specific components
+mise run checklist      # in `server/`, `web/`, `packages/cli`
 ```
 
-### Additional Commands
+#### Using PNPM Directly
+
+```bash
+# Server tests
+cd /workspaces/immich/server
+pnpm test               # Run all tests
+pnpm run test:medium    # Medium tests (integration tests)
+pnpm run test:watch     # Watch mode
+pnpm run test:cov       # Coverage report
+
+# Web tests
+cd /workspaces/immich/web
+pnpm test               # Run all tests
+pnpm run test:watch     # Watch mode
+
+# E2E tests
+cd /workspaces/immich/e2e
+pnpm run test           # Run API tests
+pnpm run test:web       # Run web UI tests
+```
+
+### Additional Make Commands
 
 ```bash
 # API generation
-mise //:open-api             # Generate OpenAPI specs
-mise //:open-api-typescript  # Generate TypeScript SDK
-mise //:open-api-dart        # Generate Dart SDK
+make open-api           # Generate OpenAPI specs
+make open-api-typescript # Generate TypeScript SDK
+make open-api-dart      # Generate Dart SDK
 
 # Database
-mise //server:sql            # Sync database schema
+mise sql                # Sync database schema
 ```
 
 ### Debugging

docs/docs/developer/pr-checklist.md

@@ -8,42 +8,34 @@ When contributing code through a pull request, please check the following:
 
 ## Web Checks
 
-- [ ] `mise //web:lint` (linting via ESLint)
-- [ ] `mise //web:format` (formatting via Prettier)
-- [ ] `mise //web:check-svelte` (type checking via SvelteKit)
-- [ ] `mise //web:check-typescript` (type checking via `tsc`)
-- [ ] `mise //web:test` (unit tests)
+- [ ] `pnpm run lint` (linting via ESLint)
+- [ ] `pnpm run format` (formatting via Prettier)
+- [ ] `pnpm run check:svelte` (Type checking via SvelteKit)
+- [ ] `pnpm run check:typescript` (check typescript)
+- [ ] `pnpm test` (unit tests)
 
 :::tip AIO
-Run all web checks with `mise //web:checklist`
-:::
-
-:::tip Auto Fix
-Use `mise //web:lint-fix` and `mise //web:format-fix` to automatically correct some issues.
+Run all web checks with `pnpm run check:all`
 :::
 
 ## Documentation
 
-- [ ] `mise //docs:format` (formatting via Prettier)
+- [ ] `pnpm run format` (formatting via Prettier)
 - [ ] Update the `_redirects` file if you have renamed a page or removed it from the documentation.
 
-:::tip Auto Fix
-Use `mise //docs:format-fix` to automatically fix formatting.
-:::
-
 ## Server Checks
 
-- [ ] `mise //server:lint` (linting via ESLint)
-- [ ] `mise //server:format` (formatting via Prettier)
-- [ ] `mise //server:check` (type checking via `tsc`)
-- [ ] `mise //server:test` (unit tests)
+- [ ] `pnpm run lint` (linting via ESLint)
+- [ ] `pnpm run format` (formatting via Prettier)
+- [ ] `pnpm run check` (Type checking via `tsc`)
+- [ ] `pnpm test` (unit tests)
 
 :::tip AIO
-Run all server checks with `mise //server:checklist`
+Run all server checks with `pnpm run check:all`
 :::
 
 :::tip Auto Fix
-Use `mise //server:lint-fix` and `mise //server:format-fix` to automatically correct some issues.
+You can use `pnpm run __:fix` to potentially correct some issues automatically for `pnpm run format` and `lint`.
 :::
 
 ## Mobile Checklist
@@ -61,17 +53,6 @@ Run all these commands at once with `mise //mobile:checklist`
 You can use `mise //mobile:lint-fix` to potentially correct some issues automatically for `mise //mobile:lint`.
 :::
 
-## Machine Learning Checklist
-
-- [ ] `mise //machine-learning:lint` (linting via ruff)
-- [ ] `mise //machine-learning:format` (formatting via ruff)
-- [ ] `mise //machine-learning:check` (type checking via mypy)
-- [ ] `mise //machine-learning:test` (unit tests via pytest)
-
-:::tip AIO
-Run all machine learning checks with `mise //machine-learning:checklist`
-:::
-
 ## OpenAPI
 
 The OpenAPI client libraries need to be regenerated whenever there are changes to the `immich-openapi-specs.json` file. Note that you should not modify this file directly as it is auto-generated. See [OpenAPI](/api.md) for more details.

docs/docs/developer/setup.md

@@ -32,10 +32,6 @@ This environment includes the services below. Additional details are available i
 
 All the services are packaged to run as with single Docker Compose command.
 
-:::tip mise
-[mise](https://mise.jdx.dev) is used throughout the project to manage tool versions and run tasks. [Install mise](https://mise.jdx.dev/installing-mise.html), then from the repo root run `mise trust` and `mise install` to get all required tools. Tasks for each service can be run from the repo root using `mise //namespace:task` (e.g. `mise //server:lint`). To list all available tasks, run `mise tasks ls --all`.
-:::
-
 ### Server and web apps
 
 1. Clone the project repo.
@@ -60,23 +56,22 @@ You can access the web from `http://your-machine-ip:3000` or `http://localhost:3
 
 #### Connect web to a remote backend
 
-If you only want to do web development connected to an existing, remote backend, run from the repo root:
+If you only want to do web development connected to an existing, remote backend, follow these steps:
+
+1. Build the Immich SDK - `pnpm --filter @immich/sdk install && pnpm --filter @immich/sdk build`
+2. Enter the web directory - `cd web/`
+3. Install web dependencies - `pnpm i`
+4. Start the web development server
 
 ```bash
-IMMICH_SERVER_URL=https://demo.immich.app/ mise //web:start
-```
-
-This will install all dependencies (including the SDK) and start the dev server in one step. To connect to the hosted demo server specifically, use the shorthand:
-
-```bash
-mise //web:start-demo
+IMMICH_SERVER_URL=https://demo.immich.app/ pnpm run dev
 ```
 
 If you're using PowerShell on Windows you may need to set the env var separately like so:
 
 ```powershell
 $env:IMMICH_SERVER_URL = "https://demo.immich.app/"
-mise //web:start
+pnpm run dev
 ```
 
 #### `@immich/ui`
@@ -95,20 +90,42 @@ To see local changes to `@immich/ui` in Immich, do the following:
 
 #### Setup
 
-1. Run `mise //mobile:install` to install Flutter dependencies.
-2. Run `mise //mobile:translation` to generate the translation file.
-3. Change to the `mobile/` directory and run `flutter run` to start the app.
+1. [Install mise](https://mise.jdx.dev/installing-mise.html).
+2. Change to the immich (root) directory and trust the mise config with `mise trust`.
+3. Install tools with mise: `mise install`.
+4. Change to the `mobile/` directory.
+5. Run `flutter pub get` to install the dependencies.
+6. Run `make translation` to generate the translation file.
+7. Run `flutter run` to start the app.
 
 #### Translation
 
-To add a new translation text, enter the key-value pair in the `i18n/en.json` in the root of the immich project. Then run:
+To add a new translation text, enter the key-value pair in the `i18n/en.json` in the root of the immich project. Then, from the `mobile/` directory, run
 
 ```bash
-mise //mobile:translation
+make translation
 ```
 
 The mobile app asks you what backend to connect to. You can utilize the demo backend (https://demo.immich.app/) if you don't need to change server code or upload photos. Alternatively, you can run the server yourself per the instructions above.
 
+#### UI components and widget previews
+
+Shared design-system widgets (buttons, inputs, forms) live in the
+[`immich_ui` package](https://github.com/immich-app/immich/tree/main/mobile/packages/ui/)
+under `mobile/packages/ui/`. Components are defined in `lib/src/components/`
+and have matching previews in `lib/src/previews/`.
+
+To inspect a component in isolation with a light/dark toggle and hot reload,
+launch [Flutter's Widget Previewer](https://docs.flutter.dev/tools/widget-previewer):
+
+```bash
+cd mobile/packages/ui
+flutter widget-preview start
+```
+
+In VS Code or Android Studio with the Flutter plugin, the previewer
+auto-starts when you open the **Flutter Widget Preview** tab in the sidebar.
+
 ## IDE setup
 
 ### Lint / format extensions

docs/docs/developer/testing.md

@@ -4,8 +4,8 @@
 
 ### Unit tests
 
-Unit tests are run with `mise //server:test`.
-You need to run `mise //server:install` before _once_.
+Unit are run by calling `pnpm run test` from the `server/` directory.
+You need to run `pnpm install` (in `server/`) before _once_.
 
 ### End to end tests
 
@@ -17,7 +17,8 @@ make e2e
 
 Before you can run the tests, you need to run the following commands _once_:
 
-- `mise //e2e:ci-setup` (installs e2e, SDK, and CLI dependencies)
+- `pnpm install`
+- `pnpm --filter @immich/sdk --filter @immich/cli build`
 - `mise //:open-api`
 
 Once the test environment is running, the e2e tests can be run via:

docs/docs/install/environment-variables.md

@@ -154,33 +154,33 @@ Redis (Sentinel) URL example JSON before encoding:
 
 ## Machine Learning
 
-| Variable                                                    | Description                                                                                                                                                  |           Default            | Containers       |
-| :---------------------------------------------------------- | :----------------------------------------------------------------------------------------------------------------------------------------------------------- | :--------------------------: | :--------------- |
-| `MACHINE_LEARNING_MODEL_TTL`                                | Inactivity time (s) before a model is unloaded (disabled if \<= 0)                                                                                           |            `300`             | machine learning |
-| `MACHINE_LEARNING_MODEL_TTL_POLL_S`                         | Interval (s) between checks for the model TTL (disabled if \<= 0)                                                                                            |             `10`             | machine learning |
-| `MACHINE_LEARNING_CACHE_FOLDER`                             | Directory where models are downloaded                                                                                                                        |           `/cache`           | machine learning |
-| `MACHINE_LEARNING_REQUEST_THREADS`<sup>\*1</sup>            | Thread count of the request thread pool (disabled if \<= 0)                                                                                                  |     number of CPU cores      | machine learning |
-| `MACHINE_LEARNING_MODEL_INTER_OP_THREADS`                   | Number of parallel model operations                                                                                                                          |             `1`              | machine learning |
-| `MACHINE_LEARNING_MODEL_INTRA_OP_THREADS`                   | Number of threads for each model operation                                                                                                                   |             `2`              | machine learning |
-| `MACHINE_LEARNING_WORKERS`<sup>\*2</sup>                    | Number of worker processes to spawn                                                                                                                          |             `1`              | machine learning |
-| `MACHINE_LEARNING_HTTP_KEEPALIVE_TIMEOUT_S`<sup>\*3</sup>   | HTTP Keep-alive time in seconds                                                                                                                              |             `2`              | machine learning |
-| `MACHINE_LEARNING_WORKER_TIMEOUT`                           | Maximum time (s) of unresponsiveness before a worker is killed                                                                                               | `300` (`900` if using ROCm)  | machine learning |
-| `MACHINE_LEARNING_PRELOAD__CLIP__TEXTUAL`                   | Comma-separated list of (textual) CLIP model(s) to preload and cache                                                                                         |                              | machine learning |
-| `MACHINE_LEARNING_PRELOAD__CLIP__VISUAL`                    | Comma-separated list of (visual) CLIP model(s) to preload and cache                                                                                          |                              | machine learning |
-| `MACHINE_LEARNING_PRELOAD__FACIAL_RECOGNITION__RECOGNITION` | Comma-separated list of (recognition) facial recognition model(s) to preload and cache                                                                       |                              | machine learning |
-| `MACHINE_LEARNING_PRELOAD__FACIAL_RECOGNITION__DETECTION`   | Comma-separated list of (detection) facial recognition model(s) to preload and cache                                                                         |                              | machine learning |
-| `MACHINE_LEARNING_PRELOAD__OCR__RECOGNITION`                | Comma-separated list of (recognition) OCR model(s) to preload and cache                                                                                      |                              | machine learning |
-| `MACHINE_LEARNING_PRELOAD__OCR__DETECTION`                  | Comma-separated list of (detection) OCR model(s) to preload and cache                                                                                        |                              | machine learning |
-| `MACHINE_LEARNING_ANN`                                      | Enable ARM-NN hardware acceleration if supported                                                                                                             |            `True`            | machine learning |
-| `MACHINE_LEARNING_ANN_FP16_TURBO`                           | Execute operations in FP16 precision: increasing speed, reducing precision (applies only to ARM-NN)                                                          |           `False`            | machine learning |
-| `MACHINE_LEARNING_ANN_TUNING_LEVEL`                         | ARM-NN GPU tuning level (1: rapid, 2: normal, 3: exhaustive)                                                                                                 |             `2`              | machine learning |
-| `MACHINE_LEARNING_DEVICE_IDS`<sup>\*4</sup>                 | Device IDs to use in multi-GPU environments                                                                                                                  |             `0`              | machine learning |
-| `MACHINE_LEARNING_MAX_BATCH_SIZE__FACIAL_RECOGNITION`       | Set the maximum number of faces that will be processed at once by the facial recognition model                                                               | None (`1` if using OpenVINO) | machine learning |
-| `MACHINE_LEARNING_MAX_BATCH_SIZE__OCR`                      | Set the maximum number of boxes that will be processed at once by the OCR model                                                                              |             `6`              | machine learning |
-| `MACHINE_LEARNING_RKNN`                                     | Enable RKNN hardware acceleration if supported                                                                                                               |            `True`            | machine learning |
-| `MACHINE_LEARNING_RKNN_THREADS`                             | How many threads of RKNN runtime should be spun up while inferencing.                                                                                        |             `1`              | machine learning |
-| `MACHINE_LEARNING_MODEL_ARENA`                              | Pre-allocates CPU memory to avoid memory fragmentation                                                                                                       |             true             | machine learning |
-| `MACHINE_LEARNING_OPENVINO_PRECISION`                       | If set to FP16, uses half-precision floating-point operations for faster inference with reduced accuracy (one of [`FP16`, `FP32`], applies only to OpenVINO) |            `FP32`            | machine learning |
+| Variable                                                    | Description                                                                                                                                                  |             Default             | Containers       |
+| :---------------------------------------------------------- | :----------------------------------------------------------------------------------------------------------------------------------------------------------- | :-----------------------------: | :--------------- |
+| `MACHINE_LEARNING_MODEL_TTL`                                | Inactivity time (s) before a model is unloaded (disabled if \<= 0)                                                                                           |              `300`              | machine learning |
+| `MACHINE_LEARNING_MODEL_TTL_POLL_S`                         | Interval (s) between checks for the model TTL (disabled if \<= 0)                                                                                            |              `10`               | machine learning |
+| `MACHINE_LEARNING_CACHE_FOLDER`                             | Directory where models are downloaded                                                                                                                        |            `/cache`             | machine learning |
+| `MACHINE_LEARNING_REQUEST_THREADS`<sup>\*1</sup>            | Thread count of the request thread pool (disabled if \<= 0)                                                                                                  |       number of CPU cores       | machine learning |
+| `MACHINE_LEARNING_MODEL_INTER_OP_THREADS`                   | Number of parallel model operations                                                                                                                          |               `1`               | machine learning |
+| `MACHINE_LEARNING_MODEL_INTRA_OP_THREADS`                   | Number of threads for each model operation                                                                                                                   |               `2`               | machine learning |
+| `MACHINE_LEARNING_WORKERS`<sup>\*2</sup>                    | Number of worker processes to spawn                                                                                                                          |               `1`               | machine learning |
+| `MACHINE_LEARNING_HTTP_KEEPALIVE_TIMEOUT_S`<sup>\*3</sup>   | HTTP Keep-alive time in seconds                                                                                                                              |               `2`               | machine learning |
+| `MACHINE_LEARNING_WORKER_TIMEOUT`                           | Maximum time (s) of unresponsiveness before a worker is killed                                                                                               | `120` (`300` if using OpenVINO) | machine learning |
+| `MACHINE_LEARNING_PRELOAD__CLIP__TEXTUAL`                   | Comma-separated list of (textual) CLIP model(s) to preload and cache                                                                                         |                                 | machine learning |
+| `MACHINE_LEARNING_PRELOAD__CLIP__VISUAL`                    | Comma-separated list of (visual) CLIP model(s) to preload and cache                                                                                          |                                 | machine learning |
+| `MACHINE_LEARNING_PRELOAD__FACIAL_RECOGNITION__RECOGNITION` | Comma-separated list of (recognition) facial recognition model(s) to preload and cache                                                                       |                                 | machine learning |
+| `MACHINE_LEARNING_PRELOAD__FACIAL_RECOGNITION__DETECTION`   | Comma-separated list of (detection) facial recognition model(s) to preload and cache                                                                         |                                 | machine learning |
+| `MACHINE_LEARNING_PRELOAD__OCR__RECOGNITION`                | Comma-separated list of (recognition) OCR model(s) to preload and cache                                                                                      |                                 | machine learning |
+| `MACHINE_LEARNING_PRELOAD__OCR__DETECTION`                  | Comma-separated list of (detection) OCR model(s) to preload and cache                                                                                        |                                 | machine learning |
+| `MACHINE_LEARNING_ANN`                                      | Enable ARM-NN hardware acceleration if supported                                                                                                             |             `True`              | machine learning |
+| `MACHINE_LEARNING_ANN_FP16_TURBO`                           | Execute operations in FP16 precision: increasing speed, reducing precision (applies only to ARM-NN)                                                          |             `False`             | machine learning |
+| `MACHINE_LEARNING_ANN_TUNING_LEVEL`                         | ARM-NN GPU tuning level (1: rapid, 2: normal, 3: exhaustive)                                                                                                 |               `2`               | machine learning |
+| `MACHINE_LEARNING_DEVICE_IDS`<sup>\*4</sup>                 | Device IDs to use in multi-GPU environments                                                                                                                  |               `0`               | machine learning |
+| `MACHINE_LEARNING_MAX_BATCH_SIZE__FACIAL_RECOGNITION`       | Set the maximum number of faces that will be processed at once by the facial recognition model                                                               |  None (`1` if using OpenVINO)   | machine learning |
+| `MACHINE_LEARNING_MAX_BATCH_SIZE__OCR`                      | Set the maximum number of boxes that will be processed at once by the OCR model                                                                              |               `6`               | machine learning |
+| `MACHINE_LEARNING_RKNN`                                     | Enable RKNN hardware acceleration if supported                                                                                                               |             `True`              | machine learning |
+| `MACHINE_LEARNING_RKNN_THREADS`                             | How many threads of RKNN runtime should be spun up while inferencing.                                                                                        |               `1`               | machine learning |
+| `MACHINE_LEARNING_MODEL_ARENA`                              | Pre-allocates CPU memory to avoid memory fragmentation                                                                                                       |              true               | machine learning |
+| `MACHINE_LEARNING_OPENVINO_PRECISION`                       | If set to FP16, uses half-precision floating-point operations for faster inference with reduced accuracy (one of [`FP16`, `FP32`], applies only to OpenVINO) |             `FP32`              | machine learning |
 
 \*1: It is recommended to begin with this parameter when changing the concurrency levels of the machine learning service and then tune the other ones.
 

docs/mise.toml

@@ -3,7 +3,7 @@ run = "pnpm install --filter documentation --frozen-lockfile"
 
 [tasks.start]
 env._.path = "./node_modules/.bin"
-run = "docusaurus start --port 3005"
+run = "docusaurus --port 3005"
 
 [tasks.build]
 env._.path = "./node_modules/.bin"

e2e/docker-compose.dev.yml

@@ -83,7 +83,9 @@ volumes:
   model_cache:
   prometheus_data:
   grafana_data:
-  build_cache:
+  pnpm_cache:
+  pnpm_store_server:
+  pnpm_store_web:
   server_node_modules:
   web_node_modules:
   github_node_modules:

e2e/src/ui/specs/timeline/timeline.e2e-spec.ts

@@ -536,7 +536,7 @@ test.describe('Timeline', () => {
         force: false,
         ids: [assetToTrash.id],
       });
-      await page.locator('#control-bar').getByLabel('Close').click();
+      await page.locator('#asset-selection-app-bar').getByLabel('Close').click();
       await page.getByText('Trash', { exact: true }).click();
       await timelineUtils.waitForTimelineLoad(page);
       await thumbnailUtils.expectInViewport(page, assetToTrash.id);
@@ -676,7 +676,7 @@ test.describe('Timeline', () => {
         ids: [assetToArchive.id],
       });
       await thumbnailUtils.expectThumbnailIsArchive(page, assetToArchive.id);
-      await page.locator('#control-bar').getByLabel('Close').click();
+      await page.locator('#asset-selection-app-bar').getByLabel('Close').click();
       await page.getByRole('link').getByText('Archive').click();
       await timelineUtils.waitForTimelineLoad(page);
       await thumbnailUtils.expectInViewport(page, assetToArchive.id);
@@ -823,7 +823,7 @@ test.describe('Timeline', () => {
       });
       // ensure thumbnail still exists and has favorite icon
       await thumbnailUtils.expectThumbnailIsFavorite(page, assetToFavorite.id);
-      await page.locator('#control-bar').getByLabel('Close').click();
+      await page.locator('#asset-selection-app-bar').getByLabel('Close').click();
       await page.getByRole('link').getByText('Favorites').click();
       await timelineUtils.waitForTimelineLoad(page);
       await pageUtils.goToAsset(page, assetToFavorite.fileCreatedAt);

i18n/en.json

@@ -698,7 +698,6 @@
   "birthdate_saved": "Date of birth saved successfully",
   "birthdate_set_description": "Date of birth is used to calculate the age of this person at the time of a photo.",
   "blurred_background": "Blurred background",
-  "browse_templates": "Browse templates",
   "bugs_and_feature_requests": "Bugs & Feature Requests",
   "build": "Build",
   "build_image": "Build Image",
@@ -840,7 +839,6 @@
   "copy_error": "Copy error",
   "copy_file_path": "Copy file path",
   "copy_image": "Copy Image",
-  "copy_json": "Copy JSON",
   "copy_link": "Copy link",
   "copy_link_to_clipboard": "Copy link to clipboard",
   "copy_password": "Copy password",
@@ -978,10 +976,7 @@
   "downloading_asset_filename": "Downloading asset {filename}",
   "downloading_from_icloud": "Downloading from iCloud",
   "downloading_media": "Downloading media",
-  "drag_to_reorder": "Drag to reorder",
   "drop_files_to_upload": "Drop files anywhere to upload",
-  "duplicate": "Duplicate",
-  "duplicate_workflow": "Duplicate workflow",
   "duplicates": "Duplicates",
   "duplicates_description": "Resolve each group by indicating which, if any, are duplicates.",
   "duration": "Duration",
@@ -2259,7 +2254,6 @@
   "step_delete_confirm": "Are you sure you want to delete this step?",
   "step_details": "Step details",
   "steps": "Steps",
-  "steps_count": "{count, plural, one {# step} other {# steps}}",
   "stop_casting": "Stop casting",
   "stop_motion_photo": "Stop Motion Photo",
   "stop_photo_sharing": "Stop sharing your photos?",
@@ -2421,7 +2415,6 @@
   "use_browser_locale_description": "Format dates, times, and numbers based on your browser locale",
   "use_current_connection": "Use current connection",
   "use_custom_date_range": "Use custom date range instead",
-  "use_template": "Use template",
   "user": "User",
   "user_has_been_deleted": "This user has been deleted.",
   "user_id": "User ID",
@@ -2483,7 +2476,6 @@
   "week": "Week",
   "welcome": "Welcome",
   "welcome_to_immich": "Welcome to Immich",
-  "when": "When",
   "width": "Width",
   "wifi_name": "Wi-Fi Name",
   "workflow": "Workflow",
@@ -2496,7 +2488,6 @@
   "workflow_name": "Workflow name",
   "workflow_navigation_prompt": "Are you sure you want to leave without saving your changes?",
   "workflow_summary": "Workflow summary",
-  "workflow_templates": "Workflow templates",
   "workflow_update_success": "Workflow updated successfully",
   "workflow_updated": "Workflow updated",
   "workflows": "Workflows",

machine-learning/immich_ml/config.py

@@ -6,7 +6,7 @@ from pathlib import Path
 from socket import socket
 
 from gunicorn.arbiter import Arbiter
-from pydantic import BaseModel, Field
+from pydantic import BaseModel
 from pydantic_settings import BaseSettings, SettingsConfigDict
 from rich.console import Console
 from rich.logging import RichHandler
@@ -42,10 +42,6 @@ class MaxBatchSize(BaseModel):
     ocr: int | None = None
 
 
-def default_worker_timeout() -> int:
-    return 900 if os.environ.get("DEVICE") == "rocm" else 300
-
-
 class Settings(BaseSettings):
     model_config = SettingsConfigDict(
         env_prefix="MACHINE_LEARNING_",
@@ -58,7 +54,7 @@ class Settings(BaseSettings):
     model_ttl: int = 300
     model_ttl_poll_s: int = 10
     workers: int = 1
-    worker_timeout: int = Field(default_factory=default_worker_timeout)
+    worker_timeout: int = 300
     http_keepalive_timeout_s: int = 2
     test_full: bool = False
     request_threads: int = os.cpu_count() or 4

machine-learning/immich_ml/models/facial_recognition/recognition.py

@@ -89,10 +89,4 @@ class FaceRecognizer(InferenceModel):
     @property
     def _batch_size_default(self) -> int | None:
         providers = ort.get_available_providers()
-        if (
-            self.model_format == ModelFormat.ONNX
-            and "MIGraphXExecutionProvider" not in providers
-            and "OpenVINOExecutionProvider" not in providers
-        ):
-            return None
-        return 1
+        return None if self.model_format == ModelFormat.ONNX and "OpenVINOExecutionProvider" not in providers else 1

machine-learning/immich_ml/sessions/ort.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 from pathlib import Path
-from threading import Lock
 from typing import Any
 
 import numpy as np
@@ -13,37 +12,6 @@ from immich_ml.schemas import ModelPrecision, SessionNode
 
 from ..config import log, settings
 
-MigraphxInputSignature = tuple[tuple[str, str, tuple[int, ...]], ...]
-
-_migraphx_registry_lock = Lock()
-_migraphx_model_locks: dict[str, Lock] = {}
-_migraphx_compiled_inputs: set[tuple[str, MigraphxInputSignature]] = set()
-
-
-def _migraphx_get_model_lock(model_key: str) -> Lock:
-    with _migraphx_registry_lock:
-        lock = _migraphx_model_locks.get(model_key)
-        if lock is None:
-            lock = Lock()
-            _migraphx_model_locks[model_key] = lock
-        return lock
-
-
-def _migraphx_has_compiled_input(key: tuple[str, MigraphxInputSignature]) -> bool:
-    with _migraphx_registry_lock:
-        return key in _migraphx_compiled_inputs
-
-
-def _migraphx_mark_compiled_input(key: tuple[str, MigraphxInputSignature]) -> None:
-    with _migraphx_registry_lock:
-        _migraphx_compiled_inputs.add(key)
-
-
-def _migraphx_input_signature(
-    input_feed: dict[str, NDArray[np.float32]] | dict[str, NDArray[np.int32]],
-) -> MigraphxInputSignature:
-    return tuple((name, str(value.dtype), tuple(value.shape)) for name, value in sorted(input_feed.items()))
-
 
 class OrtSession:
     session: ort.InferenceSession
@@ -80,21 +48,7 @@ class OrtSession:
         input_feed: dict[str, NDArray[np.float32]] | dict[str, NDArray[np.int32]],
         run_options: Any = None,
     ) -> list[NDArray[np.float32]]:
-        if "MIGraphXExecutionProvider" in self.providers:
-            model_key = self.model_path.resolve().as_posix()
-            input_key = (model_key, _migraphx_input_signature(input_feed))
-            if not _migraphx_has_compiled_input(input_key):
-                model_lock = _migraphx_get_model_lock(model_key)
-                with model_lock:
-                    if not _migraphx_has_compiled_input(input_key):
-                        outputs: list[NDArray[np.float32]] = self.session.run(output_names, input_feed, run_options)
-                        _migraphx_mark_compiled_input(input_key)
-                        return outputs
-
-            outputs = self.session.run(output_names, input_feed, run_options)
-            return outputs
-
-        outputs = self.session.run(output_names, input_feed, run_options)
+        outputs: list[NDArray[np.float32]] = self.session.run(output_names, input_feed, run_options)
         return outputs
 
     @property

machine-learning/pyproject.toml

@@ -10,7 +10,7 @@ dependencies = [
     "fastapi>=0.95.2,<1.0",
     "gunicorn>=21.1.0",
     "huggingface-hub>=1.0,<2.0",
-    "insightface>=0.7.3,<2.0",
+    "insightface>=0.7.3,<1.0",
     "numpy>=2.4.0,<3.0",
     "opencv-python-headless>=4.7.0.72,<5.0",
     "orjson>=3.9.5",

machine-learning/test_main.py

@@ -35,37 +35,7 @@ from immich_ml.sessions.ort import OrtSession
 from immich_ml.sessions.rknn import RknnSession, run_inference
 
 
-class FakeLock:
-    def __init__(self) -> None:
-        self.enter = mock.Mock()
-        self.exit = mock.Mock()
-
-    def __enter__(self) -> None:
-        self.enter()
-
-    def __exit__(self, *args: object) -> None:
-        self.exit(*args)
-
-
 class TestBase:
-    def test_sets_default_worker_timeout(self, monkeypatch: MonkeyPatch) -> None:
-        monkeypatch.delenv("DEVICE", raising=False)
-        monkeypatch.delenv("MACHINE_LEARNING_WORKER_TIMEOUT", raising=False)
-
-        assert Settings().worker_timeout == 300
-
-    def test_sets_rocm_default_worker_timeout(self, monkeypatch: MonkeyPatch) -> None:
-        monkeypatch.setenv("DEVICE", "rocm")
-        monkeypatch.delenv("MACHINE_LEARNING_WORKER_TIMEOUT", raising=False)
-
-        assert Settings().worker_timeout == 900
-
-    def test_worker_timeout_env_override(self, monkeypatch: MonkeyPatch) -> None:
-        monkeypatch.setenv("DEVICE", "rocm")
-        monkeypatch.setenv("MACHINE_LEARNING_WORKER_TIMEOUT", "1200")
-
-        assert Settings().worker_timeout == 1200
-
     def test_sets_default_cache_dir(self) -> None:
         encoder = OpenClipTextualEncoder("ViT-B-32__openai")
 
@@ -443,52 +413,6 @@ class TestOrtSession:
 
         assert sess_options is session.sess_options
 
-    def test_serializes_rocm_first_run_for_new_input_signature(self, mocker: MockerFixture) -> None:
-        lock = FakeLock()
-        get_model_lock = mocker.patch("immich_ml.sessions.ort._migraphx_get_model_lock", return_value=lock)
-        mocker.patch("immich_ml.sessions.ort._migraphx_compiled_inputs", set())
-        mocker.patch("immich_ml.sessions.ort.Path.mkdir")
-        session = OrtSession("/cache/ViT-B-32__openai/model.onnx", providers=["MIGraphXExecutionProvider"])
-        input_feed = {"input": np.random.rand(1, 3, 224, 224).astype(np.float32)}
-
-        session.run(None, input_feed)
-        session.run(None, input_feed)
-
-        lock.enter.assert_called_once()
-        lock.exit.assert_called_once()
-        get_model_lock.assert_called_once()
-        session.session.run.assert_has_calls([mock.call(None, input_feed, None), mock.call(None, input_feed, None)])
-
-    def test_serializes_rocm_run_for_each_new_input_signature(self, mocker: MockerFixture) -> None:
-        lock = FakeLock()
-        mocker.patch("immich_ml.sessions.ort._migraphx_get_model_lock", return_value=lock)
-        mocker.patch("immich_ml.sessions.ort._migraphx_compiled_inputs", set())
-        mocker.patch("immich_ml.sessions.ort.Path.mkdir")
-        session = OrtSession("/cache/ViT-B-32__openai/model.onnx", providers=["MIGraphXExecutionProvider"])
-        input_feed = {"input": np.random.rand(1, 3, 224, 224).astype(np.float32)}
-        new_shape_input_feed = {"input": np.random.rand(2, 3, 224, 224).astype(np.float32)}
-
-        session.run(None, input_feed)
-        session.run(None, new_shape_input_feed)
-
-        assert lock.enter.call_count == 2
-        assert lock.exit.call_count == 2
-        session.session.run.assert_has_calls(
-            [mock.call(None, input_feed, None), mock.call(None, new_shape_input_feed, None)]
-        )
-
-    def test_does_not_serialize_non_rocm_run(self, mocker: MockerFixture) -> None:
-        lock = FakeLock()
-        get_model_lock = mocker.patch("immich_ml.sessions.ort._migraphx_get_model_lock", return_value=lock)
-        session = OrtSession("/cache/ViT-B-32__openai/model.onnx", providers=["CPUExecutionProvider"])
-        input_feed = {"input": np.random.rand(1, 3, 224, 224).astype(np.float32)}
-
-        session.run(None, input_feed)
-
-        get_model_lock.assert_not_called()
-        lock.enter.assert_not_called()
-        session.session.run.assert_called_once_with(None, input_feed, None)
-
 
 class TestAnnSession:
     def test_creates_ann_session(self, ann_session: mock.Mock, info: mock.Mock) -> None:
@@ -959,34 +883,6 @@ class TestFaceRecognition:
         onnx.load.assert_not_called()
         onnx.save.assert_not_called()
 
-    def test_recognition_does_not_add_batch_axis_for_migraphx(
-        self, ort_session: mock.Mock, path: mock.Mock, mocker: MockerFixture
-    ) -> None:
-        onnx = mocker.patch("immich_ml.models.facial_recognition.recognition.onnx", autospec=True)
-        update_dims = mocker.patch(
-            "immich_ml.models.facial_recognition.recognition.update_inputs_outputs_dims", autospec=True
-        )
-        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=["MIGraphXExecutionProvider", "CPUExecutionProvider"],
-        )
-        path.return_value.__truediv__.return_value.__truediv__.return_value.suffix = ".onnx"
-
-        inputs = [SimpleNamespace(name="input.1", shape=(1, 3, 224, 224))]
-        outputs = [SimpleNamespace(name="output.1", shape=(1, 800))]
-        ort_session.return_value.get_inputs.return_value = inputs
-        ort_session.return_value.get_outputs.return_value = outputs
-
-        face_recognizer = FaceRecognizer("buffalo_s", cache_dir=path)
-        face_recognizer.load()
-
-        assert face_recognizer.batch_size == 1
-        update_dims.assert_not_called()
-        onnx.load.assert_not_called()
-        onnx.save.assert_not_called()
-
     def test_set_custom_max_batch_size(self, mocker: MockerFixture) -> None:
         mocker.patch.object(settings, "max_batch_size", MaxBatchSize(facial_recognition=2))
 

machine-learning/uv.lock

@@ -1004,7 +1004,7 @@ requires-dist = [
     { name = "fastapi", specifier = ">=0.95.2,<1.0" },
     { name = "gunicorn", specifier = ">=21.1.0" },
     { name = "huggingface-hub", specifier = ">=1.0,<2.0" },
-    { name = "insightface", specifier = ">=0.7.3,<2.0" },
+    { name = "insightface", specifier = ">=0.7.3,<1.0" },
     { name = "numpy", specifier = ">=2.4.0,<3.0" },
     { name = "onnxruntime", marker = "extra == 'armnn'", specifier = ">=1.23.2,<2" },
     { name = "onnxruntime", marker = "extra == 'cpu'", specifier = ">=1.23.2,<2" },

mise.lock

@@ -38,36 +38,43 @@ backend = "github:CQLabs/homebrew-dcm"
 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"
+github_attestations = "unavailable"
 
 [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"
+github_attestations = "unavailable"
 
 [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"
+github_attestations = "unavailable"
 
 [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"
+github_attestations = "unavailable"
 
 [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"
+github_attestations = "unavailable"
 
 [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"
+github_attestations = "unavailable"
 
 [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"
+github_attestations = "unavailable"
 
 [[tools."github:extism/cli"]]
 version = "1.6.3"
@@ -77,36 +84,43 @@ backend = "github:extism/cli"
 checksum = "sha256:d92f830c9be39637569feacb04e9750c28848df6d9a219db94152a9b4eb9452b"
 url = "https://github.com/extism/cli/releases/download/v1.6.3/extism-v1.6.3-linux-arm64.tar.gz"
 url_api = "https://api.github.com/repos/extism/cli/releases/assets/275694030"
+github_attestations = "unavailable"
 
 [tools."github:extism/cli"."platforms.linux-arm64-musl"]
 checksum = "sha256:d92f830c9be39637569feacb04e9750c28848df6d9a219db94152a9b4eb9452b"
 url = "https://github.com/extism/cli/releases/download/v1.6.3/extism-v1.6.3-linux-arm64.tar.gz"
 url_api = "https://api.github.com/repos/extism/cli/releases/assets/275694030"
+github_attestations = "unavailable"
 
 [tools."github:extism/cli"."platforms.linux-x64"]
 checksum = "sha256:34e7ae9bfded6e2c32dee83f70a4e50d34f9d3e80d1762b09625fe82e214d02d"
 url = "https://github.com/extism/cli/releases/download/v1.6.3/extism-v1.6.3-linux-amd64.tar.gz"
 url_api = "https://api.github.com/repos/extism/cli/releases/assets/275694025"
+github_attestations = "unavailable"
 
 [tools."github:extism/cli"."platforms.linux-x64-musl"]
 checksum = "sha256:34e7ae9bfded6e2c32dee83f70a4e50d34f9d3e80d1762b09625fe82e214d02d"
 url = "https://github.com/extism/cli/releases/download/v1.6.3/extism-v1.6.3-linux-amd64.tar.gz"
 url_api = "https://api.github.com/repos/extism/cli/releases/assets/275694025"
+github_attestations = "unavailable"
 
 [tools."github:extism/cli"."platforms.macos-arm64"]
 checksum = "sha256:b4ddbc575b5ac000115247f781723f9b9f284ed87b29c600539d72161b5b29fc"
 url = "https://github.com/extism/cli/releases/download/v1.6.3/extism-v1.6.3-darwin-arm64.tar.gz"
 url_api = "https://api.github.com/repos/extism/cli/releases/assets/275694029"
+github_attestations = "unavailable"
 
 [tools."github:extism/cli"."platforms.macos-x64"]
 checksum = "sha256:9a2f71b6e6009685a622cc3084e52d2a1a8e23c98d29ffa72e666e9dc699855f"
 url = "https://github.com/extism/cli/releases/download/v1.6.3/extism-v1.6.3-darwin-amd64.tar.gz"
 url_api = "https://api.github.com/repos/extism/cli/releases/assets/275694026"
+github_attestations = "unavailable"
 
 [tools."github:extism/cli"."platforms.windows-x64"]
 checksum = "sha256:47e4ed2782445b2b08a4d1ac127211588f8b4d1fc25fd6481d4cb65151b5213c"
 url = "https://github.com/extism/cli/releases/download/v1.6.3/extism-v1.6.3-windows-amd64.zip"
 url_api = "https://api.github.com/repos/extism/cli/releases/assets/275694035"
+github_attestations = "unavailable"
 
 [[tools."github:extism/js-pdk"]]
 version = "1.6.0"
@@ -116,36 +130,43 @@ backend = "github:extism/js-pdk"
 checksum = "sha256:15a186250e68d6bff4ec839fff275d45a90e383a69209dcc1239eb9e3aee6e1b"
 url = "https://github.com/extism/js-pdk/releases/download/v1.6.0/extism-js-aarch64-linux-v1.6.0.gz"
 url_api = "https://api.github.com/repos/extism/js-pdk/releases/assets/353223214"
+github_attestations = "unavailable"
 
 [tools."github:extism/js-pdk"."platforms.linux-arm64-musl"]
 checksum = "sha256:15a186250e68d6bff4ec839fff275d45a90e383a69209dcc1239eb9e3aee6e1b"
 url = "https://github.com/extism/js-pdk/releases/download/v1.6.0/extism-js-aarch64-linux-v1.6.0.gz"
 url_api = "https://api.github.com/repos/extism/js-pdk/releases/assets/353223214"
+github_attestations = "unavailable"
 
 [tools."github:extism/js-pdk"."platforms.linux-x64"]
 checksum = "sha256:4ded271ccf465031ccd0dc35e7a140e134d7f30721671cc4a8e1ff805d4aad68"
 url = "https://github.com/extism/js-pdk/releases/download/v1.6.0/extism-js-x86_64-linux-v1.6.0.gz"
 url_api = "https://api.github.com/repos/extism/js-pdk/releases/assets/353223119"
+github_attestations = "unavailable"
 
 [tools."github:extism/js-pdk"."platforms.linux-x64-musl"]
 checksum = "sha256:4ded271ccf465031ccd0dc35e7a140e134d7f30721671cc4a8e1ff805d4aad68"
 url = "https://github.com/extism/js-pdk/releases/download/v1.6.0/extism-js-x86_64-linux-v1.6.0.gz"
 url_api = "https://api.github.com/repos/extism/js-pdk/releases/assets/353223119"
+github_attestations = "unavailable"
 
 [tools."github:extism/js-pdk"."platforms.macos-arm64"]
 checksum = "sha256:548e25bda3971a07c32d78a249135cf8cb7b3eede101e878e06e53e01ac2e0ce"
 url = "https://github.com/extism/js-pdk/releases/download/v1.6.0/extism-js-aarch64-macos-v1.6.0.gz"
 url_api = "https://api.github.com/repos/extism/js-pdk/releases/assets/353223215"
+github_attestations = "unavailable"
 
 [tools."github:extism/js-pdk"."platforms.macos-x64"]
 checksum = "sha256:d85a875c2a071f0c29fe572764c52c3a499f157ab7f9efac8939a4364390e29b"
 url = "https://github.com/extism/js-pdk/releases/download/v1.6.0/extism-js-x86_64-macos-v1.6.0.gz"
 url_api = "https://api.github.com/repos/extism/js-pdk/releases/assets/353223239"
+github_attestations = "unavailable"
 
 [tools."github:extism/js-pdk"."platforms.windows-x64"]
 checksum = "sha256:97b7b746141e4777e1ca2b76febdeb16dc9d314ff6a4257df05a476b67228acc"
 url = "https://github.com/extism/js-pdk/releases/download/v1.6.0/extism-js-x86_64-windows-v1.6.0.gz"
 url_api = "https://api.github.com/repos/extism/js-pdk/releases/assets/353224133"
+github_attestations = "unavailable"
 
 [[tools."github:jellyfin/jellyfin-ffmpeg"]]
 version = "7.1.3-6"
@@ -155,36 +176,43 @@ backend = "github:jellyfin/jellyfin-ffmpeg"
 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"
+github_attestations = "unavailable"
 
 [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"
+github_attestations = "unavailable"
 
 [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"
+github_attestations = "unavailable"
 
 [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"
+github_attestations = "unavailable"
 
 [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"
+github_attestations = "unavailable"
 
 [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"
+github_attestations = "unavailable"
 
 [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"
+github_attestations = "unavailable"
 
 [[tools."github:webassembly/binaryen"]]
 version = "version_124"
@@ -194,36 +222,43 @@ backend = "github:webassembly/binaryen"
 checksum = "sha256:6291bd9a57d8e046f3bc099a4db386c147433a87f71c783a901c5b1792e38de3"
 url = "https://github.com/WebAssembly/binaryen/releases/download/version_124/binaryen-version_124-aarch64-linux.tar.gz"
 url_api = "https://api.github.com/repos/WebAssembly/binaryen/releases/assets/288927659"
+github_attestations = "unavailable"
 
 [tools."github:webassembly/binaryen"."platforms.linux-arm64-musl"]
 checksum = "sha256:6291bd9a57d8e046f3bc099a4db386c147433a87f71c783a901c5b1792e38de3"
 url = "https://github.com/WebAssembly/binaryen/releases/download/version_124/binaryen-version_124-aarch64-linux.tar.gz"
 url_api = "https://api.github.com/repos/WebAssembly/binaryen/releases/assets/288927659"
+github_attestations = "unavailable"
 
 [tools."github:webassembly/binaryen"."platforms.linux-x64"]
 checksum = "sha256:0290c3779fedf592b8da0ded3032ff55c41a2b7bfa2d6bf7b7bac6f0e6e28963"
 url = "https://github.com/WebAssembly/binaryen/releases/download/version_124/binaryen-version_124-x86_64-linux.tar.gz"
 url_api = "https://api.github.com/repos/WebAssembly/binaryen/releases/assets/288926769"
+github_attestations = "unavailable"
 
 [tools."github:webassembly/binaryen"."platforms.linux-x64-musl"]
 checksum = "sha256:0290c3779fedf592b8da0ded3032ff55c41a2b7bfa2d6bf7b7bac6f0e6e28963"
 url = "https://github.com/WebAssembly/binaryen/releases/download/version_124/binaryen-version_124-x86_64-linux.tar.gz"
 url_api = "https://api.github.com/repos/WebAssembly/binaryen/releases/assets/288926769"
+github_attestations = "unavailable"
 
 [tools."github:webassembly/binaryen"."platforms.macos-arm64"]
 checksum = "sha256:86a2c960ff62c6d2ea6009d1f89745c22c70100d394a095eab45eb941bdaa24c"
 url = "https://github.com/WebAssembly/binaryen/releases/download/version_124/binaryen-version_124-arm64-macos.tar.gz"
 url_api = "https://api.github.com/repos/WebAssembly/binaryen/releases/assets/288926134"
+github_attestations = "unavailable"
 
 [tools."github:webassembly/binaryen"."platforms.macos-x64"]
 checksum = "sha256:b389bb0731758d86c3cb266d01d28a12725c23bd3cabc3df34faa162af0887e9"
 url = "https://github.com/WebAssembly/binaryen/releases/download/version_124/binaryen-version_124-x86_64-macos.tar.gz"
 url_api = "https://api.github.com/repos/WebAssembly/binaryen/releases/assets/288926135"
+github_attestations = "unavailable"
 
 [tools."github:webassembly/binaryen"."platforms.windows-x64"]
 checksum = "sha256:b5e1d2a1ad3c03229ddc89823848f4a1c11f9c6402a51fa26f0aaa5f1d7a2203"
 url = "https://github.com/WebAssembly/binaryen/releases/download/version_124/binaryen-version_124-x86_64-windows.tar.gz"
 url_api = "https://api.github.com/repos/WebAssembly/binaryen/releases/assets/288925833"
+github_attestations = "unavailable"
 
 [[tools.java]]
 version = "21.0.2"
@@ -318,9 +353,37 @@ 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 = "10.33.4"
+version = "10.33.1"
 backend = "aqua:pnpm/pnpm"
 
+[tools.pnpm."platforms.linux-arm64"]
+checksum = "sha256:ed8aa7901cf325f4cf5019405bdd6bf988426e4b23d08fe9b12ea4df7046f23e"
+url = "https://github.com/pnpm/pnpm/releases/download/v10.33.1/pnpm-linux-arm64"
+
+[tools.pnpm."platforms.linux-arm64-musl"]
+checksum = "sha256:ed8aa7901cf325f4cf5019405bdd6bf988426e4b23d08fe9b12ea4df7046f23e"
+url = "https://github.com/pnpm/pnpm/releases/download/v10.33.1/pnpm-linux-arm64"
+
+[tools.pnpm."platforms.linux-x64"]
+checksum = "sha256:fba950842532edd365e949b74643b64e6311089a45532dbe1e8f909a247fe3e9"
+url = "https://github.com/pnpm/pnpm/releases/download/v10.33.1/pnpm-linux-x64"
+
+[tools.pnpm."platforms.linux-x64-musl"]
+checksum = "sha256:fba950842532edd365e949b74643b64e6311089a45532dbe1e8f909a247fe3e9"
+url = "https://github.com/pnpm/pnpm/releases/download/v10.33.1/pnpm-linux-x64"
+
+[tools.pnpm."platforms.macos-arm64"]
+checksum = "sha256:909ced0038b00881d4d620ba2018c5d9691de373deea8e3c84b722b44324e47c"
+url = "https://github.com/pnpm/pnpm/releases/download/v10.33.1/pnpm-macos-arm64"
+
+[tools.pnpm."platforms.macos-x64"]
+checksum = "sha256:afdad60b83f4f482f4c95cc79325f29aef776d0922a324f023a312f40e0cc7d3"
+url = "https://github.com/pnpm/pnpm/releases/download/v10.33.1/pnpm-macos-x64"
+
+[tools.pnpm."platforms.windows-x64"]
+checksum = "sha256:67b23fd8c6800566b1cc04c446b170ff6e7977250084e4d8df9bfdbd8e6f4d02"
+url = "https://github.com/pnpm/pnpm/releases/download/v10.33.1/pnpm-win-x64.exe"
+
 [[tools.terragrunt]]
 version = "1.0.3"
 backend = "aqua:gruntwork-io/terragrunt"

mise.toml

@@ -73,6 +73,7 @@ run = "bash ./bin/generate-dart-sdk.sh"
 env = { SHARP_IGNORE_GLOBAL_LIBVIPS = true }
 run = [
   { task = "//:plugins" },
+  { task = "//server:build" },
   { task = "//server:install" },
   { task = "//server:build" },
   { task = "//server:sync-open-api" },

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

@@ -17,8 +17,6 @@ import app.alextran.immich.images.LocalImageApi
 import app.alextran.immich.images.LocalImagesImpl
 import app.alextran.immich.images.RemoteImageApi
 import app.alextran.immich.images.RemoteImagesImpl
-import app.alextran.immich.permission.PermissionApi
-import app.alextran.immich.permission.PermissionApiImpl
 import app.alextran.immich.sync.NativeSyncApi
 import app.alextran.immich.sync.NativeSyncApiImpl26
 import app.alextran.immich.sync.NativeSyncApiImpl30
@@ -46,9 +44,7 @@ class MainActivity : FlutterFragmentActivity() {
         } else {
           NativeSyncApiImpl30(ctx)
         }
-      val permissionApiImpl = PermissionApiImpl(ctx)
       NativeSyncApi.setUp(messenger, nativeSyncApiImpl)
-      PermissionApi.setUp(messenger, permissionApiImpl)
       LocalImageApi.setUp(messenger, LocalImagesImpl(ctx))
       RemoteImageApi.setUp(messenger, RemoteImagesImpl(ctx))
 
@@ -57,7 +53,6 @@ class MainActivity : FlutterFragmentActivity() {
 
       flutterEngine.plugins.add(backgroundEngineLockImpl)
       flutterEngine.plugins.add(nativeSyncApiImpl)
-      flutterEngine.plugins.add(permissionApiImpl)
     }
 
     fun cancelPlugins(flutterEngine: FlutterEngine) {
@@ -65,8 +60,6 @@ class MainActivity : FlutterFragmentActivity() {
         flutterEngine.plugins.get(NativeSyncApiImpl26::class.java) as ImmichPlugin?
           ?: flutterEngine.plugins.get(NativeSyncApiImpl30::class.java) as ImmichPlugin?
       nativeApi?.detachFromEngine()
-      val permissionApi = flutterEngine.plugins.get(PermissionApiImpl::class.java) as ImmichPlugin?
-      permissionApi?.detachFromEngine()
     }
   }
 }

mobile/android/app/src/main/kotlin/app/alextran/immich/core/Network.g.kt

@@ -315,7 +315,6 @@ interface NetworkApi {
   fun hasCertificate(): Boolean
   fun getClientPointer(): Long
   fun setRequestHeaders(headers: Map<String, String>, serverUrls: List<String>, token: String?)
-  fun getAppGroupId(): String
 
   companion object {
     /** The codec used by NetworkApi. */
@@ -431,21 +430,6 @@ interface NetworkApi {
           channel.setMessageHandler(null)
         }
       }
-      run {
-        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.NetworkApi.getAppGroupId$separatedMessageChannelSuffix", codec)
-        if (api != null) {
-          channel.setMessageHandler { _, reply ->
-            val wrapped: List<Any?> = try {
-              listOf(api.getAppGroupId())
-            } catch (exception: Throwable) {
-              NetworkPigeonUtils.wrapError(exception)
-            }
-            reply.reply(wrapped)
-          }
-        } else {
-          channel.setMessageHandler(null)
-        }
-      }
     }
   }
 }

mobile/android/app/src/main/kotlin/app/alextran/immich/core/NetworkApiPlugin.kt

@@ -13,7 +13,7 @@ class NetworkApiPlugin : FlutterPlugin, ActivityAware {
   private var networkApi: NetworkApiImpl? = null
 
   override fun onAttachedToEngine(binding: FlutterPlugin.FlutterPluginBinding) {
-    networkApi = NetworkApiImpl(binding.applicationContext)
+    networkApi = NetworkApiImpl()
     NetworkApi.setUp(binding.binaryMessenger, networkApi)
   }
 
@@ -39,11 +39,9 @@ class NetworkApiPlugin : FlutterPlugin, ActivityAware {
   }
 }
 
-private class NetworkApiImpl(private val context: Context) : NetworkApi {
+private class NetworkApiImpl : NetworkApi {
   var activity: Activity? = null
 
-  override fun getAppGroupId(): String = context.packageName
-
   override fun addCertificate(clientData: ClientCertData, callback: (Result<Unit>) -> Unit) {
     try {
       HttpClientManager.setKeyEntry(clientData.data, clientData.password.toCharArray())

mobile/android/app/src/main/kotlin/app/alextran/immich/permission/ManageMediaPermissionDelegate.kt

@@ -1,96 +0,0 @@
-package app.alextran.immich.permission
-
-import android.content.Context
-import android.content.Intent
-import android.os.Build
-import android.provider.MediaStore
-import android.provider.Settings
-import androidx.core.net.toUri
-import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding
-import io.flutter.plugin.common.PluginRegistry
-
-class ManageMediaPermissionDelegate(
-  context: Context,
-  private val requestCode: Int = 1003,
-) : PluginRegistry.ActivityResultListener {
-  private val ctx = context.applicationContext
-  private var activityBinding: ActivityPluginBinding? = null
-  private var pendingResult: ((Result<Boolean>) -> Unit)? = null
-
-  fun hasManageMediaPermission(): Boolean {
-    return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-      MediaStore.canManageMedia(ctx)
-    } else {
-      false
-    }
-  }
-
-  fun requestManageMediaPermission(callback: (Result<Boolean>) -> Unit) {
-    if (hasManageMediaPermission()) {
-      callback(Result.success(true))
-      return
-    }
-
-    openManageMediaPermissionSettings(callback)
-  }
-
-  fun manageMediaPermission(callback: (Result<Boolean>) -> Unit) {
-    openManageMediaPermissionSettings(callback)
-  }
-
-  private fun openManageMediaPermissionSettings(callback: (Result<Boolean>) -> Unit) {
-    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) {
-      callback(Result.success(false))
-      return
-    }
-
-    val activity = activityBinding?.activity
-    if (activity == null) {
-      callback(Result.failure(FlutterError("NO_ACTIVITY", "Activity not available", null)))
-      return
-    }
-
-    pendingResult = callback
-    val intent = Intent(Settings.ACTION_REQUEST_MANAGE_MEDIA).apply {
-      data = "package:${activity.packageName}".toUri()
-    }
-    try {
-      activity.startActivityForResult(intent, requestCode)
-    } catch (e: Exception) {
-      pendingResult = null
-      callback(
-        Result.failure(
-          FlutterError("ACTIVITY_LAUNCH_FAILED", "Failed to launch MANAGE_MEDIA settings", e.toString())
-        )
-      )
-    }
-  }
-
-  fun onAttachedToActivity(binding: ActivityPluginBinding) {
-    activityBinding = binding
-    binding.addActivityResultListener(this)
-  }
-
-  fun onDetachedFromActivity() {
-    failPending("ACTIVITY_DETACHED", "Activity detached before MANAGE_MEDIA result")
-    activityBinding?.removeActivityResultListener(this)
-    activityBinding = null
-  }
-
-  override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?): Boolean {
-    if (requestCode == this.requestCode) {
-      val callback = pendingResult
-      pendingResult = null
-      callback?.invoke(Result.success(hasManageMediaPermission()))
-      return true
-    }
-
-    return false
-  }
-
-  private fun failPending(code: String, message: String) {
-    val callback = pendingResult ?: return
-    pendingResult = null
-    callback(Result.failure(FlutterError(code, message, null)))
-  }
-}

mobile/android/app/src/main/kotlin/app/alextran/immich/permission/PermissionApi.g.kt

@@ -1,128 +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.permission
-
-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 PermissionApiPigeonUtils {
-
-  fun wrapResult(result: Any?): List<Any?> {
-    return listOf(result)
-  }
-
-  fun wrapError(exception: Throwable): List<Any?> {
-    return if (exception is FlutterError) {
-      listOf(
-        exception.code,
-        exception.message,
-        exception.details
-      )
-    } else {
-      listOf(
-        exception.javaClass.simpleName,
-        exception.toString(),
-        "Cause: " + exception.cause + ", Stacktrace: " + Log.getStackTraceString(exception)
-      )
-    }
-  }
-}
-
-/**
- * Error class for passing custom error details to Flutter via a thrown PlatformException.
- * @property code The error code.
- * @property message The error message.
- * @property details The error details. Must be a datatype supported by the api codec.
- */
-class FlutterError (
-  val code: String,
-  override val message: String? = null,
-  val details: Any? = null
-) : RuntimeException()
-private open class PermissionApiPigeonCodec : StandardMessageCodec() {
-  override fun readValueOfType(type: Byte, buffer: ByteBuffer): Any? {
-    return     super.readValueOfType(type, buffer)
-  }
-  override fun writeValue(stream: ByteArrayOutputStream, value: Any?)   {
-    super.writeValue(stream, value)
-  }
-}
-
-
-/** Generated interface from Pigeon that represents a handler of messages from Flutter. */
-interface PermissionApi {
-  fun hasManageMediaPermission(): Boolean
-  fun requestManageMediaPermission(callback: (Result<Boolean>) -> Unit)
-  fun manageMediaPermission(callback: (Result<Boolean>) -> Unit)
-
-  companion object {
-    /** The codec used by PermissionApi. */
-    val codec: MessageCodec<Any?> by lazy {
-      PermissionApiPigeonCodec()
-    }
-    /** Sets up an instance of `PermissionApi` to handle messages through the `binaryMessenger`. */
-    @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.hasManageMediaPermission$separatedMessageChannelSuffix", codec)
-        if (api != null) {
-          channel.setMessageHandler { _, reply ->
-            val wrapped: List<Any?> = try {
-              listOf(api.hasManageMediaPermission())
-            } 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.requestManageMediaPermission$separatedMessageChannelSuffix", codec)
-        if (api != null) {
-          channel.setMessageHandler { _, reply ->
-            api.requestManageMediaPermission{ result: Result<Boolean> ->
-              val error = result.exceptionOrNull()
-              if (error != null) {
-                reply.reply(PermissionApiPigeonUtils.wrapError(error))
-              } else {
-                val data = result.getOrNull()
-                reply.reply(PermissionApiPigeonUtils.wrapResult(data))
-              }
-            }
-          }
-        } else {
-          channel.setMessageHandler(null)
-        }
-      }
-      run {
-        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.PermissionApi.manageMediaPermission$separatedMessageChannelSuffix", codec)
-        if (api != null) {
-          channel.setMessageHandler { _, reply ->
-            api.manageMediaPermission{ result: Result<Boolean> ->
-              val error = result.exceptionOrNull()
-              if (error != null) {
-                reply.reply(PermissionApiPigeonUtils.wrapError(error))
-              } else {
-                val data = result.getOrNull()
-                reply.reply(PermissionApiPigeonUtils.wrapResult(data))
-              }
-            }
-          }
-        } else {
-          channel.setMessageHandler(null)
-        }
-      }
-    }
-  }
-}

mobile/android/app/src/main/kotlin/app/alextran/immich/permission/PermissionApiImpl.kt

@@ -1,37 +0,0 @@
-package app.alextran.immich.permission
-
-import android.content.Context
-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 manageMediaPermissionDelegate = ManageMediaPermissionDelegate(context)
-
-  override fun hasManageMediaPermission(): Boolean =
-    manageMediaPermissionDelegate.hasManageMediaPermission()
-
-  override fun requestManageMediaPermission(callback: (Result<Boolean>) -> Unit) {
-    manageMediaPermissionDelegate.requestManageMediaPermission { completeWhenActive(callback, it) }
-  }
-
-  override fun manageMediaPermission(callback: (Result<Boolean>) -> Unit) {
-    manageMediaPermissionDelegate.manageMediaPermission { completeWhenActive(callback, it) }
-  }
-
-  override fun onAttachedToActivity(binding: ActivityPluginBinding) {
-    manageMediaPermissionDelegate.onAttachedToActivity(binding)
-  }
-
-  override fun onDetachedFromActivityForConfigChanges() {
-    manageMediaPermissionDelegate.onDetachedFromActivity()
-  }
-
-  override fun onReattachedToActivityForConfigChanges(binding: ActivityPluginBinding) {
-    manageMediaPermissionDelegate.onAttachedToActivity(binding)
-  }
-
-  override fun onDetachedFromActivity() {
-    manageMediaPermissionDelegate.onDetachedFromActivity()
-  }
-}

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

@@ -1,133 +0,0 @@
-package app.alextran.immich.sync
-
-import android.app.Activity
-import android.content.ContentResolver
-import android.content.ContentUris
-import android.content.Context
-import android.content.Intent
-import android.net.Uri
-import android.os.Build
-import android.os.Bundle
-import android.provider.MediaStore
-import androidx.annotation.RequiresApi
-import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding
-import io.flutter.plugin.common.PluginRegistry
-
-class MediaTrashDelegate(
-  context: Context,
-  private val trashRequestCode: Int = 1002,
-) : PluginRegistry.ActivityResultListener {
-  private val ctx = context.applicationContext
-  private var activityBinding: ActivityPluginBinding? = null
-  private var pendingResult: ((Result<Boolean>) -> Unit)? = null
-
-  private fun hasManageMediaPermission(): Boolean {
-    return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-      MediaStore.canManageMedia(ctx)
-    } else {
-      false
-    }
-  }
-
-  fun restoreFromTrashById(mediaId: String, type: Long, callback: (Result<Boolean>) -> Unit) {
-    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R || !hasManageMediaPermission()) {
-      callback(Result.failure(FlutterError("PERMISSION_DENIED", "Media permission required", null)))
-      return
-    }
-
-    val id = mediaId.toLongOrNull()
-    if (id == null) {
-      callback(Result.failure(FlutterError("INVALID_ID", "The file id is not a valid number: $mediaId", null)))
-      return
-    }
-
-    if (!isInTrash(id)) {
-      callback(Result.failure(FlutterError("TRASH_NOT_FOUND", "Item with id=$id not found in trash", null)))
-      return
-    }
-
-    restoreUri(ContentUris.withAppendedId(contentUriForType(type.toInt()), id), callback)
-  }
-
-  @RequiresApi(Build.VERSION_CODES.R)
-  private fun restoreUri(
-    contentUri: Uri,
-    callback: (Result<Boolean>) -> Unit,
-  ) {
-    val activity = activityBinding?.activity
-    if (activity == null) {
-      callback(Result.failure(FlutterError("NO_ACTIVITY", "Activity not available", null)))
-      return
-    }
-
-    try {
-      val pendingIntent = MediaStore.createTrashRequest(ctx.contentResolver, listOf(contentUri), false)
-      pendingResult = callback
-      activity.startIntentSenderForResult(
-        pendingIntent.intentSender,
-        trashRequestCode,
-        null,
-        0,
-        0,
-        0,
-      )
-    } catch (e: Exception) {
-      pendingResult = null
-      callback(
-        Result.failure(
-          FlutterError("TRASH_ERROR", "Error creating or starting trash request", e.toString())
-        )
-      )
-    }
-  }
-
-  @RequiresApi(Build.VERSION_CODES.R)
-  private fun isInTrash(id: Long): Boolean {
-    val filesUri = MediaStore.Files.getContentUri(MediaStore.VOLUME_EXTERNAL)
-    val args = Bundle().apply {
-      putString(ContentResolver.QUERY_ARG_SQL_SELECTION, "${MediaStore.Files.FileColumns._ID}=?")
-      putStringArray(ContentResolver.QUERY_ARG_SQL_SELECTION_ARGS, arrayOf(id.toString()))
-      putInt(MediaStore.QUERY_ARG_MATCH_TRASHED, MediaStore.MATCH_ONLY)
-      putInt(ContentResolver.QUERY_ARG_LIMIT, 1)
-    }
-    return ctx.contentResolver.query(filesUri, arrayOf(MediaStore.Files.FileColumns._ID), args, null)
-      ?.use { it.moveToFirst() } == true
-  }
-
-  private fun contentUriForType(type: Int): Uri =
-    when (type) {
-      // Same order as AssetType from Dart.
-      1 -> MediaStore.Images.Media.EXTERNAL_CONTENT_URI
-      2 -> MediaStore.Video.Media.EXTERNAL_CONTENT_URI
-      3 -> MediaStore.Audio.Media.EXTERNAL_CONTENT_URI
-      else -> MediaStore.Files.getContentUri(MediaStore.VOLUME_EXTERNAL)
-    }
-
-  fun onAttachedToActivity(binding: ActivityPluginBinding) {
-    activityBinding = binding
-    binding.addActivityResultListener(this)
-  }
-
-  fun onDetachedFromActivity() {
-    failPending("ACTIVITY_DETACHED", "Activity detached before trash result")
-    activityBinding?.removeActivityResultListener(this)
-    activityBinding = null
-  }
-
-  override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?): Boolean {
-    if (requestCode == trashRequestCode) {
-      val callback = pendingResult
-      pendingResult = null
-      callback?.invoke(Result.success(resultCode == Activity.RESULT_OK))
-      return true
-    }
-
-    return false
-  }
-
-  private fun failPending(code: String, message: String) {
-    val callback = pendingResult ?: return
-    pendingResult = null
-    callback(Result.failure(FlutterError(code, message, null)))
-  }
-}

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

@@ -553,7 +553,6 @@ interface NativeSyncApi {
   fun hashAssets(assetIds: List<String>, allowNetworkAccess: Boolean, callback: (Result<List<HashResult>>) -> Unit)
   fun cancelHashing()
   fun getTrashedAssets(): Map<String, List<PlatformAsset>>
-  fun restoreFromTrashById(mediaId: String, type: Long, callback: (Result<Boolean>) -> Unit)
   fun getCloudIdForAssetIds(assetIds: List<String>): List<CloudIdResult>
 
   companion object {
@@ -748,27 +747,6 @@ interface NativeSyncApi {
           channel.setMessageHandler(null)
         }
       }
-      run {
-        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.NativeSyncApi.restoreFromTrashById$separatedMessageChannelSuffix", codec)
-        if (api != null) {
-          channel.setMessageHandler { message, reply ->
-            val args = message as List<Any?>
-            val mediaIdArg = args[0] as String
-            val typeArg = args[1] as Long
-            api.restoreFromTrashById(mediaIdArg, typeArg) { result: Result<Boolean> ->
-              val error = result.exceptionOrNull()
-              if (error != null) {
-                reply.reply(MessagesPigeonUtils.wrapError(error))
-              } else {
-                val data = result.getOrNull()
-                reply.reply(MessagesPigeonUtils.wrapResult(data))
-              }
-            }
-          }
-        } else {
-          channel.setMessageHandler(null)
-        }
-      }
       run {
         val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.NativeSyncApi.getCloudIdForAssetIds$separatedMessageChannelSuffix", codec, taskQueue)
         if (api != null) {

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

@@ -17,8 +17,6 @@ import com.bumptech.glide.Glide
 import com.bumptech.glide.load.ImageHeaderParser
 import com.bumptech.glide.load.ImageHeaderParserUtils
 import com.bumptech.glide.load.resource.bitmap.DefaultImageHeaderParser
-import io.flutter.embedding.engine.plugins.activity.ActivityAware
-import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -41,11 +39,10 @@ sealed class AssetResult {
 private const val TAG = "NativeSyncApiImplBase"
 
 @SuppressLint("InlinedApi")
-open class NativeSyncApiImplBase(context: Context) : ImmichPlugin(), ActivityAware {
+open class NativeSyncApiImplBase(context: Context) : ImmichPlugin() {
   private val ctx: Context = context.applicationContext
 
   private var hashTask: Job? = null
-  private val mediaTrashDelegate = MediaTrashDelegate(ctx)
 
   companion object {
     private const val MAX_CONCURRENT_HASH_OPERATIONS = 16
@@ -451,26 +448,6 @@ open class NativeSyncApiImplBase(context: Context) : ImmichPlugin(), ActivityAwa
     hashTask = null
   }
 
-  fun restoreFromTrashById(mediaId: String, type: Long, callback: (Result<Boolean>) -> Unit) {
-    mediaTrashDelegate.restoreFromTrashById(mediaId, type) { completeWhenActive(callback, it) }
-  }
-
-  override fun onAttachedToActivity(binding: ActivityPluginBinding) {
-    mediaTrashDelegate.onAttachedToActivity(binding)
-  }
-
-  override fun onDetachedFromActivityForConfigChanges() {
-    mediaTrashDelegate.onDetachedFromActivity()
-  }
-
-  override fun onReattachedToActivityForConfigChanges(binding: ActivityPluginBinding) {
-    mediaTrashDelegate.onAttachedToActivity(binding)
-  }
-
-  override fun onDetachedFromActivity() {
-    mediaTrashDelegate.onDetachedFromActivity()
-  }
-
   // This method is only implemented on iOS; on Android, we do not have a concept of cloud IDs
   @Suppress("unused", "UNUSED_PARAMETER")
   fun getCloudIdForAssetIds(assetIds: List<String>): List<CloudIdResult> {

mobile/ios/Runner.xcodeproj/project.pbxproj

@@ -19,8 +19,6 @@
 		B21E34AC2E5B09190031FDB9 /* BackgroundWorker.swift in Sources */ = {isa = PBXBuildFile; fileRef = B21E34AB2E5B09100031FDB9 /* BackgroundWorker.swift */; };
 		B25D377A2E72CA15008B6CA7 /* Connectivity.g.swift in Sources */ = {isa = PBXBuildFile; fileRef = B25D37782E72CA15008B6CA7 /* Connectivity.g.swift */; };
 		B25D377C2E72CA26008B6CA7 /* ConnectivityApiImpl.swift in Sources */ = {isa = PBXBuildFile; fileRef = B25D377B2E72CA20008B6CA7 /* ConnectivityApiImpl.swift */; };
-		B2EE00022E72CA15008B6CA7 /* PermissionApi.g.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2EE00012E72CA15008B6CA7 /* PermissionApi.g.swift */; };
-		B2EE00042E72CA15008B6CA7 /* PermissionApiImpl.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2EE00032E72CA15008B6CA7 /* PermissionApiImpl.swift */; };
 		B2BE315F2E5E5229006EEF88 /* BackgroundWorker.g.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2BE315E2E5E5229006EEF88 /* BackgroundWorker.g.swift */; };
 		D218389C4A4C4693F141F7D1 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 886774DBDDE6B35BF2B4F2CD /* Pods_Runner.framework */; };
 		F02538E92DFBCBDD008C3FA3 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
@@ -108,8 +106,6 @@
 		B21E34AB2E5B09100031FDB9 /* BackgroundWorker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BackgroundWorker.swift; sourceTree = "<group>"; };
 		B25D37782E72CA15008B6CA7 /* Connectivity.g.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Connectivity.g.swift; sourceTree = "<group>"; };
 		B25D377B2E72CA20008B6CA7 /* ConnectivityApiImpl.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConnectivityApiImpl.swift; sourceTree = "<group>"; };
-		B2EE00012E72CA15008B6CA7 /* PermissionApi.g.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PermissionApi.g.swift; sourceTree = "<group>"; };
-		B2EE00032E72CA15008B6CA7 /* PermissionApiImpl.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PermissionApiImpl.swift; sourceTree = "<group>"; };
 		B2BE315E2E5E5229006EEF88 /* BackgroundWorker.g.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BackgroundWorker.g.swift; sourceTree = "<group>"; };
 		E0E99CDC17B3EB7FA8BA2332 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
 		F0B57D382DF764BD00DC5BCC /* WidgetExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = WidgetExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -291,7 +287,6 @@
 				B25D37792E72CA15008B6CA7 /* Connectivity */,
 				B21E34A62E5AF9760031FDB9 /* Background */,
 				B2CF7F8C2DDE4EBB00744BF6 /* Sync */,
-				B2EE00052E72CA15008B6CA7 /* Permission */,
 				FA9973382CF6DF4B000EF859 /* Runner.entitlements */,
 				FAC7416727DB9F5500C668D8 /* RunnerProfile.entitlements */,
 				97C146FA1CF9000F007C117D /* Main.storyboard */,
@@ -326,15 +321,6 @@
 			path = Connectivity;
 			sourceTree = "<group>";
 		};
-		B2EE00052E72CA15008B6CA7 /* Permission */ = {
-			isa = PBXGroup;
-			children = (
-				B2EE00032E72CA15008B6CA7 /* PermissionApiImpl.swift */,
-				B2EE00012E72CA15008B6CA7 /* PermissionApi.g.swift */,
-			);
-			path = Permission;
-			sourceTree = "<group>";
-		};
 		FAC6F8B62D287F120078CB2F /* ShareExtension */ = {
 			isa = PBXGroup;
 			children = (
@@ -641,8 +627,6 @@
 				FE5499F42F1197D8006016CB /* RemoteImages.g.swift in Sources */,
 				FE5FE4AE2F30FBC000A71243 /* ImageProcessing.swift in Sources */,
 				B25D377A2E72CA15008B6CA7 /* Connectivity.g.swift in Sources */,
-				B2EE00022E72CA15008B6CA7 /* PermissionApi.g.swift in Sources */,
-				B2EE00042E72CA15008B6CA7 /* PermissionApiImpl.swift in Sources */,
 				FE5499F82F1198E2006016CB /* RemoteImagesImpl.swift in Sources */,
 				FEAFA8732E4D42F4001E47FE /* Thumbhash.swift in Sources */,
 				B25D377C2E72CA26008B6CA7 /* ConnectivityApiImpl.swift in Sources */,
@@ -742,7 +726,6 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CUSTOM_GROUP_ID = group.app.immich.share.profile;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -775,6 +758,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 240;
+				CUSTOM_GROUP_ID = group.app.immich.share;
 				DEVELOPMENT_TEAM = 2W7AC6T8T5;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -825,7 +809,6 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CUSTOM_GROUP_ID = group.app.immich.share.debug;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -885,7 +868,6 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CUSTOM_GROUP_ID = group.app.immich.share;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -920,6 +902,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 240;
+				CUSTOM_GROUP_ID = group.app.immich.share;
 				DEVELOPMENT_TEAM = 2W7AC6T8T5;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -949,6 +932,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 240;
+				CUSTOM_GROUP_ID = group.app.immich.share;
 				DEVELOPMENT_TEAM = 2W7AC6T8T5;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -1104,6 +1088,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 240;
+				CUSTOM_GROUP_ID = group.app.immich.share;
 				DEVELOPMENT_TEAM = 2W7AC6T8T5;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
@@ -1147,6 +1132,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 240;
+				CUSTOM_GROUP_ID = group.app.immich.share;
 				DEVELOPMENT_TEAM = 2W7AC6T8T5;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
@@ -1187,6 +1173,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 240;
+				CUSTOM_GROUP_ID = group.app.immich.share;
 				DEVELOPMENT_TEAM = 2W7AC6T8T5;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu17;

mobile/ios/Runner/AppDelegate.swift

@@ -26,7 +26,6 @@ import native_video_player
 
   public static func registerPlugins(with registry: FlutterPluginRegistry, messenger: FlutterBinaryMessenger) {
     NativeSyncApiImpl.register(with: registry.registrar(forPlugin: NativeSyncApiImpl.name)!)
-    PermissionApiSetup.setUp(binaryMessenger: messenger, api: PermissionApiImpl())
     LocalImageApiSetup.setUp(binaryMessenger: messenger, api: LocalImageApiImpl())
     RemoteImageApiSetup.setUp(binaryMessenger: messenger, api: RemoteImageApiImpl())
     BackgroundWorkerFgHostApiSetup.setUp(binaryMessenger: messenger, api: BackgroundWorkerApiImpl())

mobile/ios/Runner/Core/Network.g.swift

@@ -288,7 +288,6 @@ protocol NetworkApi {
   func hasCertificate() throws -> Bool
   func getClientPointer() throws -> Int64
   func setRequestHeaders(headers: [String: String], serverUrls: [String], token: String?) throws
-  func getAppGroupId() throws -> String
 }
 
 /// Generated setup class from Pigeon to handle messages through the `binaryMessenger`.
@@ -389,18 +388,5 @@ class NetworkApiSetup {
     } else {
       setRequestHeadersChannel.setMessageHandler(nil)
     }
-    let getAppGroupIdChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.NetworkApi.getAppGroupId\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
-    if let api = api {
-      getAppGroupIdChannel.setMessageHandler { _, reply in
-        do {
-          let result = try api.getAppGroupId()
-          reply(wrapResult(result))
-        } catch {
-          reply(wrapError(error))
-        }
-      }
-    } else {
-      getAppGroupIdChannel.setMessageHandler(nil)
-    }
   }
 }

mobile/ios/Runner/Core/NetworkApiImpl.swift

@@ -61,10 +61,6 @@ class NetworkApiImpl: NetworkApi {
     return Int64(Int(bitPattern: pointer))
   }
   
-  func getAppGroupId() throws -> String {
-    return Bundle.main.object(forInfoDictionaryKey: "AppGroupId") as! String
-  }
-
   func setRequestHeaders(headers: [String : String], serverUrls: [String], token: String?) throws {
     URLSessionManager.setServerUrls(serverUrls)
 

mobile/ios/Runner/Core/URLSessionManager.swift

@@ -4,7 +4,7 @@ import native_video_player
 let CLIENT_CERT_LABEL = "app.alextran.immich.client_identity"
 let HEADERS_KEY = "immich.request_headers"
 let SERVER_URLS_KEY = "immich.server_urls"
-let APP_GROUP = Bundle.main.object(forInfoDictionaryKey: "AppGroupId") as! String
+let APP_GROUP = "group.app.immich.share"
 let COOKIE_EXPIRY_DAYS: TimeInterval = 400
 
 enum AuthCookie: CaseIterable {

mobile/ios/Runner/Permission/PermissionApi.g.swift

@@ -1,106 +0,0 @@
-// Autogenerated from Pigeon (v26.3.4), do not edit directly.
-// See also: https://pub.dev/packages/pigeon
-
-import Foundation
-
-#if os(iOS)
-  import Flutter
-#elseif os(macOS)
-  import FlutterMacOS
-#else
-  #error("Unsupported platform.")
-#endif
-
-private func wrapResult(_ result: Any?) -> [Any?] {
-  return [result]
-}
-
-private func wrapError(_ error: Any) -> [Any?] {
-  if let pigeonError = error as? PigeonError {
-    return [
-      pigeonError.code,
-      pigeonError.message,
-      pigeonError.details,
-    ]
-  }
-  if let flutterError = error as? FlutterError {
-    return [
-      flutterError.code,
-      flutterError.message,
-      flutterError.details,
-    ]
-  }
-  return [
-    "\(error)",
-    "\(Swift.type(of: error))",
-    "Stacktrace: \(Thread.callStackSymbols)",
-  ]
-}
-
-private func isNullish(_ value: Any?) -> Bool {
-  return value is NSNull || value == nil
-}
-
-private func nilOrValue<T>(_ value: Any?) -> T? {
-  if value is NSNull { return nil }
-  return value as! T?
-}
-
-/// Generated protocol from Pigeon that represents a handler of messages from Flutter.
-protocol PermissionApi {
-  func hasManageMediaPermission() throws -> Bool
-  func requestManageMediaPermission(completion: @escaping (Result<Bool, Error>) -> Void)
-  func manageMediaPermission(completion: @escaping (Result<Bool, Error>) -> Void)
-}
-
-/// Generated setup class from Pigeon to handle messages through the `binaryMessenger`.
-class PermissionApiSetup {
-  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 hasManageMediaPermissionChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.PermissionApi.hasManageMediaPermission\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
-    if let api = api {
-      hasManageMediaPermissionChannel.setMessageHandler { _, reply in
-        do {
-          let result = try api.hasManageMediaPermission()
-          reply(wrapResult(result))
-        } catch {
-          reply(wrapError(error))
-        }
-      }
-    } else {
-      hasManageMediaPermissionChannel.setMessageHandler(nil)
-    }
-    let requestManageMediaPermissionChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.PermissionApi.requestManageMediaPermission\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
-    if let api = api {
-      requestManageMediaPermissionChannel.setMessageHandler { _, reply in
-        api.requestManageMediaPermission { result in
-          switch result {
-          case .success(let res):
-            reply(wrapResult(res))
-          case .failure(let error):
-            reply(wrapError(error))
-          }
-        }
-      }
-    } else {
-      requestManageMediaPermissionChannel.setMessageHandler(nil)
-    }
-    let manageMediaPermissionChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.PermissionApi.manageMediaPermission\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
-    if let api = api {
-      manageMediaPermissionChannel.setMessageHandler { _, reply in
-        api.manageMediaPermission { result in
-          switch result {
-          case .success(let res):
-            reply(wrapResult(res))
-          case .failure(let error):
-            reply(wrapError(error))
-          }
-        }
-      }
-    } else {
-      manageMediaPermissionChannel.setMessageHandler(nil)
-    }
-  }
-}

mobile/ios/Runner/Permission/PermissionApiImpl.swift

@@ -1,15 +0,0 @@
-import Foundation
-
-class PermissionApiImpl: PermissionApi {
-  func hasManageMediaPermission() throws -> Bool {
-    return false
-  }
-
-  func requestManageMediaPermission(completion: @escaping (Result<Bool, Error>) -> Void) {
-    completion(.success(false))
-  }
-
-  func manageMediaPermission(completion: @escaping (Result<Bool, Error>) -> Void) {
-    completion(.success(false))
-  }
-}

mobile/ios/Runner/Runner.entitlements

@@ -10,7 +10,7 @@
 	<true/>
 	<key>com.apple.security.application-groups</key>
 	<array>
-		<string>$(CUSTOM_GROUP_ID)</string>
+		<string>group.app.immich.share</string>
 	</array>
 </dict>
 </plist>

mobile/ios/Runner/RunnerProfile.entitlements

@@ -12,7 +12,7 @@
 	<true/>
 	<key>com.apple.security.application-groups</key>
 	<array>
-		<string>$(CUSTOM_GROUP_ID)</string>
+		<string>group.app.immich.share</string>
 	</array>
 </dict>
 </plist>

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

@@ -537,7 +537,6 @@ protocol NativeSyncApi {
   func hashAssets(assetIds: [String], allowNetworkAccess: Bool, completion: @escaping (Result<[HashResult], Error>) -> Void)
   func cancelHashing() throws
   func getTrashedAssets() throws -> [String: [PlatformAsset]]
-  func restoreFromTrashById(mediaId: String, type: Int64, completion: @escaping (Result<Bool, Error>) -> Void)
   func getCloudIdForAssetIds(assetIds: [String]) throws -> [CloudIdResult]
 }
 
@@ -722,24 +721,6 @@ class NativeSyncApiSetup {
     } else {
       getTrashedAssetsChannel.setMessageHandler(nil)
     }
-    let restoreFromTrashByIdChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.NativeSyncApi.restoreFromTrashById\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
-    if let api = api {
-      restoreFromTrashByIdChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
-        let mediaIdArg = args[0] as! String
-        let typeArg = args[1] as! Int64
-        api.restoreFromTrashById(mediaId: mediaIdArg, type: typeArg) { result in
-          switch result {
-          case .success(let res):
-            reply(wrapResult(res))
-          case .failure(let error):
-            reply(wrapError(error))
-          }
-        }
-      }
-    } else {
-      restoreFromTrashByIdChannel.setMessageHandler(nil)
-    }
     let getCloudIdForAssetIdsChannel = taskQueue == nil
       ? FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.NativeSyncApi.getCloudIdForAssetIds\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
       : FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.NativeSyncApi.getCloudIdForAssetIds\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec, taskQueue: taskQueue)

mobile/ios/Runner/Sync/MessagesImpl.swift

@@ -382,10 +382,6 @@ class NativeSyncApiImpl: ImmichPlugin, NativeSyncApi, FlutterPlugin {
   func getTrashedAssets() throws -> [String: [PlatformAsset]] {
     throw PigeonError(code: "UNSUPPORTED_OS", message: "This feature not supported on iOS.", details: nil)
   }
-
-  func restoreFromTrashById(mediaId: String, type: Int64, completion: @escaping (Result<Bool, Error>) -> Void) {
-    completion(.success(false))
-  }
   
   private func getAssetsFromAlbum(in album: PHAssetCollection, options: PHFetchOptions) -> PHFetchResult<PHAsset> {
     // Ensure to actually getting all assets for the Recents album

mobile/ios/ShareExtension/ShareExtension.entitlements

@@ -4,7 +4,7 @@
   <dict>
     <key>com.apple.security.application-groups</key>
     <array>
-      <string>$(CUSTOM_GROUP_ID)</string>
+      <string>group.app.immich.share</string>
     </array>
   </dict>
 </plist>

mobile/ios/WidgetExtension/ImmichAPI.swift

@@ -2,7 +2,7 @@ import Foundation
 import SwiftUI
 import WidgetKit
 
-let IMMICH_SHARE_GROUP = Bundle.main.object(forInfoDictionaryKey: "AppGroupId") as! String
+let IMMICH_SHARE_GROUP = "group.app.immich.share"
 
 enum WidgetError: Error, Codable {
   case noLogin

mobile/ios/WidgetExtension/Info.plist

@@ -2,8 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>AppGroupId</key>
-	<string>$(CUSTOM_GROUP_ID)</string>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>

mobile/ios/WidgetExtension/WidgetExtension.entitlements

@@ -4,7 +4,7 @@
   <dict>
     <key>com.apple.security.application-groups</key>
     <array>
-      <string>$(CUSTOM_GROUP_ID)</string>
+      <string>group.app.immich.share</string>
     </array>
   </dict>
 </plist>

mobile/ios/fastlane/Fastfile

@@ -21,7 +21,6 @@ platform :ios do
   CODE_SIGN_IDENTITY = "Apple Distribution: FUTO Holdings, Inc. (#{TEAM_ID})"
   BASE_BUNDLE_ID = "app.alextran.immich"
   DEV_BUNDLE_ID  = "tech.futo.immich.testflight"
-  DEV_GROUP_ID   = "group.app.immich.share.testflight"
 
   # Helper method to get App Store Connect API key
   def get_api_key
@@ -34,13 +33,6 @@ platform :ios do
     )
   end
   
-  # Helper method to assemble xcargs with optional CUSTOM_GROUP_ID override
-  def build_xcargs(group_id: nil)
-    args = "-skipMacroValidation CODE_SIGN_IDENTITY='#{CODE_SIGN_IDENTITY}' CODE_SIGN_STYLE=Manual"
-    args += " CUSTOM_GROUP_ID='#{group_id}'" if group_id
-    args
-  end
-
   # Helper method to get version from pubspec.yaml
 def get_version_from_pubspec
   require 'yaml'
@@ -97,8 +89,7 @@ end
     version_number: nil,
     profile_name_main:,
     profile_name_share:,
-    profile_name_widget:,
-    group_id: nil
+    profile_name_widget:
   )
     app_identifier = base_bundle_id
 
@@ -106,7 +97,7 @@ end
     if version_number
       increment_version_number(version_number: version_number)
     end
-
+    
     # Increment build number
     increment_build_number(
       build_number: latest_testflight_build_number(
@@ -115,14 +106,14 @@ end
       ) + 1,
       xcodeproj: "./Runner.xcodeproj"
     )
-
+    
     # Build the app
     build_app(
       scheme: "Runner",
       workspace: "Runner.xcworkspace",
       configuration: configuration,
       export_method: "app-store",
-      xcargs: build_xcargs(group_id: group_id),
+      xcargs: "-skipMacroValidation CODE_SIGN_IDENTITY='#{CODE_SIGN_IDENTITY}' CODE_SIGN_STYLE=Manual",
       export_options: {
         provisioningProfiles: {
           "#{app_identifier}" => profile_name_main,
@@ -174,8 +165,7 @@ end
       distribute_external: false,
       profile_name_main: main_profile_name,
       profile_name_share: share_profile_name,
-      profile_name_widget: widget_profile_name,
-      group_id: DEV_GROUP_ID
+      profile_name_widget: widget_profile_name
     )
   end
 
@@ -284,7 +274,7 @@ end
       configuration: "Release",
       export_method: "app-store",
       skip_package_ipa: true,
-      xcargs: build_xcargs(group_id: DEV_GROUP_ID),
+      xcargs: "-skipMacroValidation CODE_SIGN_IDENTITY='#{CODE_SIGN_IDENTITY}' CODE_SIGN_STYLE=Manual",
       export_options: {
         provisioningProfiles: {
           DEV_BUNDLE_ID => main_profile_name,

mobile/lib/constants/constants.dart

@@ -23,7 +23,6 @@ const String kBackupLivePhotoGroup = 'backup_live_photo_group';
 const String kDownloadGroupImage = 'group_image';
 const String kDownloadGroupVideo = 'group_video';
 const String kDownloadGroupLivePhoto = 'group_livephoto';
-const String kShareDownloadGroup = 'group_share';
 
 // Timeline constants
 const int kTimelineNoneSegmentSize = 120;
@@ -31,6 +30,7 @@ const int kTimelineAssetLoadBatchSize = 1024;
 const int kTimelineAssetLoadOppositeSize = 64;
 
 // Widget keys
+const String appShareGroupId = "group.app.immich.share";
 const String kWidgetAuthToken = "widget_auth_token";
 const String kWidgetServerEndpoint = "widget_server_url";
 const String kWidgetCustomHeaders = "widget_custom_headers";

mobile/lib/domain/models/config/app_config.dart

@@ -1,25 +1,14 @@
-import 'package:flutter/material.dart';
-import 'package:immich_mobile/constants/colors.dart';
-import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/config/album_config.dart';
 import 'package:immich_mobile/domain/models/config/backup_config.dart';
 import 'package:immich_mobile/domain/models/config/cleanup_config.dart';
 import 'package:immich_mobile/domain/models/config/image_config.dart';
 import 'package:immich_mobile/domain/models/config/map_config.dart';
-import 'package:immich_mobile/domain/models/config/network_config.dart';
 import 'package:immich_mobile/domain/models/config/slideshow_config.dart';
 import 'package:immich_mobile/domain/models/config/theme_config.dart';
 import 'package:immich_mobile/domain/models/config/timeline_config.dart';
 import 'package:immich_mobile/domain/models/config/viewer_config.dart';
-import 'package:immich_mobile/domain/models/log.model.dart';
-import 'package:immich_mobile/domain/models/metadata_key.dart';
-import 'package:immich_mobile/domain/models/timeline.model.dart';
-import 'package:immich_mobile/providers/album/album_sort_by_options.provider.dart';
-
-const defaultConfig = AppConfig();
 
 class AppConfig {
-  final LogLevel logLevel;
   final ThemeConfig theme;
   final CleanupConfig cleanup;
   final MapConfig map;
@@ -29,10 +18,8 @@ class AppConfig {
   final SlideshowConfig slideshow;
   final AlbumConfig album;
   final BackupConfig backup;
-  final NetworkConfig network;
 
   const AppConfig({
-    this.logLevel = .info,
     this.theme = const .new(),
     this.cleanup = const .new(),
     this.map = const .new(),
@@ -42,11 +29,9 @@ class AppConfig {
     this.slideshow = const .new(),
     this.album = const .new(),
     this.backup = const .new(),
-    this.network = const .new(),
   });
 
   AppConfig copyWith({
-    LogLevel? logLevel,
     ThemeConfig? theme,
     CleanupConfig? cleanup,
     MapConfig? map,
@@ -56,9 +41,7 @@ class AppConfig {
     SlideshowConfig? slideshow,
     AlbumConfig? album,
     BackupConfig? backup,
-    NetworkConfig? network,
   }) => .new(
-    logLevel: logLevel ?? this.logLevel,
     theme: theme ?? this.theme,
     cleanup: cleanup ?? this.cleanup,
     map: map ?? this.map,
@@ -68,14 +51,12 @@ class AppConfig {
     slideshow: slideshow ?? this.slideshow,
     album: album ?? this.album,
     backup: backup ?? this.backup,
-    network: network ?? this.network,
   );
 
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
       (other is AppConfig &&
-          other.logLevel == logLevel &&
           other.theme == theme &&
           other.cleanup == cleanup &&
           other.map == map &&
@@ -84,118 +65,12 @@ class AppConfig {
           other.viewer == viewer &&
           other.slideshow == slideshow &&
           other.album == album &&
-          other.backup == backup &&
-          other.network == network);
+          other.backup == backup);
 
   @override
-  int get hashCode =>
-      Object.hash(logLevel, theme, cleanup, map, timeline, image, viewer, slideshow, album, backup, network);
+  int get hashCode => Object.hash(theme, cleanup, map, timeline, image, viewer, slideshow, album, backup);
 
   @override
   String toString() =>
-      'AppConfig(logLevel: $logLevel, theme: $theme, cleanup: $cleanup, map: $map, timeline: $timeline, image: $image, viewer: $viewer, slideshow: $slideshow, album: $album, backup: $backup, network: $network)';
-
-  T read<T extends Object>(MetadataKey<T> key) =>
-      (switch (key) {
-            .logLevel => logLevel,
-            .themePrimaryColor => theme.primaryColor,
-            .themeMode => theme.mode,
-            .themeDynamic => theme.dynamicTheme,
-            .themeColorfulInterface => theme.colorfulInterface,
-            .imagePreferRemote => image.preferRemote,
-            .imageLoadOriginal => image.loadOriginal,
-            .viewerLoopVideo => viewer.loopVideo,
-            .viewerLoadOriginalVideo => viewer.loadOriginalVideo,
-            .viewerAutoPlayVideo => viewer.autoPlayVideo,
-            .viewerTapToNavigate => viewer.tapToNavigate,
-            .networkAutoEndpointSwitching => network.autoEndpointSwitching,
-            .networkPreferredWifiName => network.preferredWifiName,
-            .networkLocalEndpoint => network.localEndpoint,
-            .networkExternalEndpointList => network.externalEndpointList,
-            .networkCustomHeaders => network.customHeaders,
-            .albumSortMode => album.sortMode,
-            .albumIsReverse => album.isReverse,
-            .albumIsGrid => album.isGrid,
-            .backupEnabled => backup.enabled,
-            .backupUseCellularForVideos => backup.useCellularForVideos,
-            .backupUseCellularForPhotos => backup.useCellularForPhotos,
-            .backupRequireCharging => backup.requireCharging,
-            .backupTriggerDelay => backup.triggerDelay,
-            .backupSyncAlbums => backup.syncAlbums,
-            .timelineTilesPerRow => timeline.tilesPerRow,
-            .timelineGroupAssetsBy => timeline.groupAssetsBy,
-            .timelineStorageIndicator => timeline.storageIndicator,
-            .mapShowFavoriteOnly => map.favoritesOnly,
-            .mapRelativeDate => map.relativeDays,
-            .mapIncludeArchived => map.includeArchived,
-            .mapThemeMode => map.themeMode,
-            .mapWithPartners => map.withPartners,
-            .cleanupKeepFavorites => cleanup.keepFavorites,
-            .cleanupKeepMediaType => cleanup.keepMediaType,
-            .cleanupKeepAlbumIds => cleanup.keepAlbumIds,
-            .cleanupCutoffDaysAgo => cleanup.cutoffDaysAgo,
-            .cleanupDefaultsInitialized => cleanup.defaultsInitialized,
-            .slideshowTransition => slideshow.transition,
-            .slideshowRepeat => slideshow.repeat,
-            .slideshowDuration => slideshow.duration,
-            .slideshowLook => slideshow.look,
-            .slideshowDirection => slideshow.direction,
-          })
-          as T;
-
-  factory AppConfig.fromEntries(Map<MetadataKey<Object>, Object> entries) {
-    var config = const AppConfig();
-    for (final MapEntry(key: key, value: value) in entries.entries) {
-      config = config.write(key, value);
-    }
-    return config;
-  }
-
-  AppConfig write<T extends Object>(MetadataKey<T> key, T value) {
-    return switch (key) {
-      .logLevel => copyWith(logLevel: value as LogLevel),
-      .themePrimaryColor => copyWith(theme: theme.copyWith(primaryColor: value as ImmichColorPreset)),
-      .themeMode => copyWith(theme: theme.copyWith(mode: value as ThemeMode)),
-      .themeDynamic => copyWith(theme: theme.copyWith(dynamicTheme: value as bool)),
-      .themeColorfulInterface => copyWith(theme: theme.copyWith(colorfulInterface: value as bool)),
-      .imagePreferRemote => copyWith(image: image.copyWith(preferRemote: value as bool)),
-      .imageLoadOriginal => copyWith(image: image.copyWith(loadOriginal: value as bool)),
-      .viewerLoopVideo => copyWith(viewer: viewer.copyWith(loopVideo: value as bool)),
-      .viewerLoadOriginalVideo => copyWith(viewer: viewer.copyWith(loadOriginalVideo: value as bool)),
-      .viewerAutoPlayVideo => copyWith(viewer: viewer.copyWith(autoPlayVideo: value as bool)),
-      .viewerTapToNavigate => copyWith(viewer: viewer.copyWith(tapToNavigate: value as bool)),
-      .networkAutoEndpointSwitching => copyWith(network: network.copyWith(autoEndpointSwitching: value as bool)),
-      .networkPreferredWifiName => copyWith(network: network.copyWith(preferredWifiName: (value as String))),
-      .networkLocalEndpoint => copyWith(network: network.copyWith(localEndpoint: (value as String))),
-      .networkExternalEndpointList => copyWith(network: network.copyWith(externalEndpointList: value as List<String>)),
-      .networkCustomHeaders => copyWith(network: network.copyWith(customHeaders: value as Map<String, String>)),
-      .albumSortMode => copyWith(album: album.copyWith(sortMode: value as AlbumSortMode)),
-      .albumIsReverse => copyWith(album: album.copyWith(isReverse: value as bool)),
-      .albumIsGrid => copyWith(album: album.copyWith(isGrid: value as bool)),
-      .backupEnabled => copyWith(backup: backup.copyWith(enabled: value as bool)),
-      .backupUseCellularForVideos => copyWith(backup: backup.copyWith(useCellularForVideos: value as bool)),
-      .backupUseCellularForPhotos => copyWith(backup: backup.copyWith(useCellularForPhotos: value as bool)),
-      .backupRequireCharging => copyWith(backup: backup.copyWith(requireCharging: value as bool)),
-      .backupTriggerDelay => copyWith(backup: backup.copyWith(triggerDelay: value as int)),
-      .backupSyncAlbums => copyWith(backup: backup.copyWith(syncAlbums: value as bool)),
-      .timelineTilesPerRow => copyWith(timeline: timeline.copyWith(tilesPerRow: value as int)),
-      .timelineGroupAssetsBy => copyWith(timeline: timeline.copyWith(groupAssetsBy: value as GroupAssetsBy)),
-      .timelineStorageIndicator => copyWith(timeline: timeline.copyWith(storageIndicator: value as bool)),
-      .mapShowFavoriteOnly => copyWith(map: map.copyWith(favoritesOnly: value as bool)),
-      .mapRelativeDate => copyWith(map: map.copyWith(relativeDays: value as int)),
-      .mapIncludeArchived => copyWith(map: map.copyWith(includeArchived: value as bool)),
-      .mapThemeMode => copyWith(map: map.copyWith(themeMode: value as ThemeMode)),
-      .mapWithPartners => copyWith(map: map.copyWith(withPartners: value as bool)),
-      .cleanupKeepFavorites => copyWith(cleanup: cleanup.copyWith(keepFavorites: value as bool)),
-      .cleanupKeepMediaType => copyWith(cleanup: cleanup.copyWith(keepMediaType: value as AssetKeepType)),
-      .cleanupKeepAlbumIds => copyWith(cleanup: cleanup.copyWith(keepAlbumIds: value as List<String>)),
-      .cleanupCutoffDaysAgo => copyWith(cleanup: cleanup.copyWith(cutoffDaysAgo: value as int)),
-      .cleanupDefaultsInitialized => copyWith(cleanup: cleanup.copyWith(defaultsInitialized: value as bool)),
-      .slideshowTransition => copyWith(slideshow: slideshow.copyWith(transition: value as bool)),
-      .slideshowRepeat => copyWith(slideshow: slideshow.copyWith(repeat: value as bool)),
-      .slideshowDuration => copyWith(slideshow: slideshow.copyWith(duration: value as int)),
-      .slideshowLook => copyWith(slideshow: slideshow.copyWith(look: value as SlideshowLook)),
-      .slideshowDirection => copyWith(slideshow: slideshow.copyWith(direction: value as SlideshowDirection)),
-    };
-  }
+      'AppConfig(theme: $theme, cleanup: $cleanup, map: $map, timeline: $timeline, image: $image, viewer: $viewer, slideshow: $slideshow, album: $album, backup: $backup)';
 }

mobile/lib/domain/models/config/network_config.dart

@@ -2,15 +2,15 @@ import 'package:flutter/foundation.dart';
 
 class NetworkConfig {
   final bool autoEndpointSwitching;
-  final String preferredWifiName;
-  final String localEndpoint;
+  final String? preferredWifiName;
+  final String? localEndpoint;
   final List<String> externalEndpointList;
   final Map<String, String> customHeaders;
 
   const NetworkConfig({
     this.autoEndpointSwitching = false,
-    this.preferredWifiName = '',
-    this.localEndpoint = '',
+    this.preferredWifiName,
+    this.localEndpoint,
     this.externalEndpointList = const [],
     this.customHeaders = const {},
   });

mobile/lib/domain/models/config/system_config.dart

@@ -0,0 +1,22 @@
+import 'package:immich_mobile/domain/models/config/network_config.dart';
+import 'package:immich_mobile/domain/models/log.model.dart';
+
+class SystemConfig {
+  final LogLevel logLevel;
+  final NetworkConfig network;
+
+  const SystemConfig({this.logLevel = .info, this.network = const .new()});
+
+  SystemConfig copyWith({LogLevel? logLevel, NetworkConfig? network}) =>
+      SystemConfig(logLevel: logLevel ?? this.logLevel, network: network ?? this.network);
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) || (other is SystemConfig && other.logLevel == logLevel && other.network == network);
+
+  @override
+  int get hashCode => Object.hash(logLevel, network);
+
+  @override
+  String toString() => 'SystemConfig(logLevel: $logLevel, network: $network)';
+}

mobile/lib/domain/models/metadata_key.dart

@@ -1,105 +1,142 @@
 import 'dart:convert';
 
+import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:immich_mobile/constants/colors.dart';
 import 'package:immich_mobile/constants/enums.dart';
+import 'package:immich_mobile/domain/models/config/app_config.dart';
+import 'package:immich_mobile/domain/models/config/system_config.dart';
 import 'package:immich_mobile/domain/models/log.model.dart';
 import 'package:immich_mobile/domain/models/timeline.model.dart';
 import 'package:immich_mobile/providers/album/album_sort_by_options.provider.dart';
 
-enum MetadataScope {
-  user, // keys with this scope are deleted on logout
-  system;
+enum MetadataDomain<T extends Object> {
+  appConfig<AppConfig>('config.app'),
+  systemConfig<SystemConfig>('config.system');
 
-  const MetadataScope();
+  final String prefix;
+  const MetadataDomain(this.prefix);
 }
 
 enum MetadataKey<T extends Object> {
   // Theme
-  themePrimaryColor<ImmichColorPreset>(codec: _EnumCodec(ImmichColorPreset.values)),
-  themeMode<ThemeMode>(codec: _EnumCodec(ThemeMode.values)),
-  themeDynamic<bool>(),
-  themeColorfulInterface<bool>(),
+  themePrimaryColor<ImmichColorPreset>(.appConfig, 'theme.primaryColor', .indigo, _EnumCodec(ImmichColorPreset.values)),
+  themeMode<ThemeMode>(.appConfig, 'theme.mode', .system, _EnumCodec(ThemeMode.values)),
+  themeDynamic<bool>(.appConfig, 'theme.dynamic', false),
+  themeColorfulInterface<bool>(.appConfig, 'theme.colorfulInterface', true),
 
   // Image
-  imagePreferRemote<bool>(),
-  imageLoadOriginal<bool>(),
+  imagePreferRemote<bool>(.appConfig, 'image.preferRemote', false),
+  imageLoadOriginal<bool>(.appConfig, 'image.loadOriginal', false),
 
   // Viewer
-  viewerLoopVideo<bool>(),
-  viewerLoadOriginalVideo<bool>(),
-  viewerAutoPlayVideo<bool>(),
-  viewerTapToNavigate<bool>(),
+  viewerLoopVideo<bool>(.appConfig, 'viewer.loopVideo', true),
+  viewerLoadOriginalVideo<bool>(.appConfig, 'viewer.loadOriginalVideo', false),
+  viewerAutoPlayVideo<bool>(.appConfig, 'viewer.autoPlayVideo', true),
+  viewerTapToNavigate<bool>(.appConfig, 'viewer.tapToNavigate', false),
 
   // Network
-  networkAutoEndpointSwitching<bool>(scope: .system),
-  networkPreferredWifiName<String>(scope: .system),
-  networkLocalEndpoint<String>(scope: .system),
-  networkExternalEndpointList<List<String>>(scope: .system, codec: _ListCodec(_PrimitiveCodec.string)),
+  networkAutoEndpointSwitching<bool>(.systemConfig, 'network.autoEndpointSwitching', false),
+  networkPreferredWifiName<String>(.systemConfig, 'network.preferredWifiName', ''),
+  networkLocalEndpoint<String>(.systemConfig, 'network.localEndpoint', ''),
+  networkExternalEndpointList<List<String>>(
+    .systemConfig,
+    'network.externalEndpointList',
+    [],
+    _ListCodec(_PrimitiveCodec.string),
+  ),
   networkCustomHeaders<Map<String, String>>(
-    scope: .system,
-    codec: _MapCodec(_PrimitiveCodec.string, _PrimitiveCodec.string),
+    .systemConfig,
+    'network.customHeaders',
+    {},
+    _MapCodec(_PrimitiveCodec.string, _PrimitiveCodec.string),
   ),
 
   // Album
-  albumSortMode<AlbumSortMode>(codec: _EnumCodec(AlbumSortMode.values)),
-  albumIsReverse<bool>(),
-  albumIsGrid<bool>(),
+  albumSortMode<AlbumSortMode>(
+    .appConfig,
+    'album.sortMode',
+    AlbumSortMode.mostRecent,
+    _EnumCodec(AlbumSortMode.values),
+  ),
+  albumIsReverse<bool>(.appConfig, 'album.isReverse', true),
+  albumIsGrid<bool>(.appConfig, 'album.isGrid', false),
 
   // Backup
-  backupEnabled<bool>(),
-  backupUseCellularForVideos<bool>(),
-  backupUseCellularForPhotos<bool>(),
-  backupRequireCharging<bool>(),
-  backupTriggerDelay<int>(),
-  backupSyncAlbums<bool>(),
+  backupEnabled<bool>(.appConfig, 'backup.enabled', false),
+  backupUseCellularForVideos<bool>(.appConfig, 'backup.useCellularForVideos', false),
+  backupUseCellularForPhotos<bool>(.appConfig, 'backup.useCellularForPhotos', false),
+  backupRequireCharging<bool>(.appConfig, 'backup.requireCharging', false),
+  backupTriggerDelay<int>(.appConfig, 'backup.triggerDelay', 30),
+  backupSyncAlbums<bool>(.appConfig, 'backup.syncAlbums', false),
 
   // Timeline
-  timelineTilesPerRow<int>(),
-  timelineGroupAssetsBy<GroupAssetsBy>(codec: _EnumCodec(GroupAssetsBy.values)),
-  timelineStorageIndicator<bool>(),
+  timelineTilesPerRow<int>(.appConfig, 'timeline.tilesPerRow', 4),
+  timelineGroupAssetsBy<GroupAssetsBy>(
+    .appConfig,
+    'timeline.groupAssetsBy',
+    GroupAssetsBy.day,
+    _EnumCodec(GroupAssetsBy.values),
+  ),
+  timelineStorageIndicator<bool>(.appConfig, 'timeline.storageIndicator', true),
 
   // Log
-  logLevel<LogLevel>(scope: .system, codec: _EnumCodec(LogLevel.values)),
+  logLevel<LogLevel>(.systemConfig, 'log.level', .info, _EnumCodec(LogLevel.values)),
 
   // Map
-  mapShowFavoriteOnly<bool>(),
-  mapRelativeDate<int>(),
-  mapIncludeArchived<bool>(),
-  mapThemeMode<ThemeMode>(codec: _EnumCodec(ThemeMode.values)),
-  mapWithPartners<bool>(),
+  mapShowFavoriteOnly<bool>(.appConfig, 'map.showFavoriteOnly', false),
+  mapRelativeDate<int>(.appConfig, 'map.relativeDate', 0),
+  mapIncludeArchived<bool>(.appConfig, 'map.includeArchived', false),
+  mapThemeMode<ThemeMode>(.appConfig, 'map.themeMode', .system, _EnumCodec(ThemeMode.values)),
+  mapWithPartners<bool>(.appConfig, 'map.withPartners', false),
 
   // Cleanup
-  cleanupKeepFavorites<bool>(),
-  cleanupKeepMediaType<AssetKeepType>(codec: _EnumCodec(AssetKeepType.values)),
-  cleanupKeepAlbumIds<List<String>>(codec: _ListCodec(_PrimitiveCodec.string)),
-  cleanupCutoffDaysAgo<int>(),
-  cleanupDefaultsInitialized<bool>(),
+  cleanupKeepFavorites<bool>(.appConfig, 'cleanup.keepFavorites', true),
+  cleanupKeepMediaType<AssetKeepType>(
+    .appConfig,
+    'cleanup.keepMediaType',
+    AssetKeepType.none,
+    _EnumCodec(AssetKeepType.values),
+  ),
+  cleanupKeepAlbumIds<List<String>>(.appConfig, 'cleanup.keepAlbumIds', [], _ListCodec(_PrimitiveCodec.string)),
+  cleanupCutoffDaysAgo<int>(.appConfig, 'cleanup.cutoffDaysAgo', -1),
+  cleanupDefaultsInitialized<bool>(.appConfig, 'cleanup.defaultsInitialized', false),
 
   // Slideshow
-  slideshowTransition<bool>(),
-  slideshowRepeat<bool>(),
-  slideshowDuration<int>(),
-  slideshowLook<SlideshowLook>(codec: _EnumCodec(SlideshowLook.values)),
-  slideshowDirection<SlideshowDirection>(codec: _EnumCodec(SlideshowDirection.values));
+  slideshowTransition<bool>(.appConfig, 'slideshow.transition', true),
+  slideshowRepeat<bool>(.appConfig, 'slideshow.repeat', true),
+  slideshowDuration<int>(.appConfig, 'slideshow.duration', 5),
+  slideshowLook<SlideshowLook>(.appConfig, 'slideshow.look', SlideshowLook.contain, _EnumCodec(SlideshowLook.values)),
+  slideshowDirection<SlideshowDirection>(
+    .appConfig,
+    'slideshow.direction',
+    SlideshowDirection.forward,
+    _EnumCodec(SlideshowDirection.values),
+  );
 
-  final MetadataScope scope;
+  final MetadataDomain domain;
+  final String name;
+  final T defaultValue;
   final _MetadataCodec<T>? _codecOverride;
 
-  const MetadataKey({this.scope = .user, _MetadataCodec<T>? codec}) : _codecOverride = codec;
+  const MetadataKey(this.domain, this.name, this.defaultValue, [this._codecOverride]);
 
-  _MetadataCodec<T> get _codec => _codecOverride ?? _MetadataCodec.forType(T);
+  String get key => '${domain.prefix}.$name';
+
+  _MetadataCodec<T> get _codec => _codecOverride ?? _MetadataCodec.forPrimitive(defaultValue);
 
   String encode(T value) => _codec.encode(value);
 
-  T decode(String raw) => _codec.decode(raw);
+  T decode(String raw) => _codec.decode(raw) ?? defaultValue;
+
+  static Map<String, MetadataKey<Object>> asKeyMap() => {for (var value in MetadataKey.values) value.key: value};
 }
 
 sealed class _MetadataCodec<T extends Object> {
   const _MetadataCodec();
 
   String encode(T value);
-  T decode(String raw);
+  T? decode(String raw);
 
   static const Map<Type, _MetadataCodec<Object>> _primitives = {
     int: _PrimitiveCodec.integer,
@@ -109,10 +146,12 @@ sealed class _MetadataCodec<T extends Object> {
     DateTime: _DateTimeCodec(),
   };
 
-  static _MetadataCodec<T> forType<T extends Object>(Type runtimeType) {
-    final codec = _primitives[runtimeType];
+  static _MetadataCodec<T> forPrimitive<T extends Object>(T sample) {
+    final codec = _primitives[sample.runtimeType];
     if (codec == null) {
-      throw StateError('No primitive codec for $runtimeType. Provide an explicit codec when defining the MetadataKey.');
+      throw StateError(
+        'No primitive codec for ${sample.runtimeType}. Provide an explicit codec when defining the MetadataKey.',
+      );
     }
     return codec as _MetadataCodec<T>;
   }
@@ -127,7 +166,7 @@ final class _EnumCodec<T extends Enum> extends _MetadataCodec<T> {
   String encode(T value) => value.name;
 
   @override
-  T decode(String raw) => values.firstWhere((v) => v.name == raw);
+  T? decode(String raw) => values.firstWhereOrNull((v) => v.name == raw);
 }
 
 final class _DateTimeCodec extends _MetadataCodec<DateTime> {
@@ -137,7 +176,7 @@ final class _DateTimeCodec extends _MetadataCodec<DateTime> {
   String encode(DateTime value) => value.toIso8601String();
 
   @override
-  DateTime decode(String raw) => DateTime.parse(raw);
+  DateTime? decode(String raw) => DateTime.tryParse(raw);
 }
 
 final class _MapCodec<K extends Object, V extends Object> extends _MetadataCodec<Map<K, V>> {
@@ -154,26 +193,29 @@ final class _MapCodec<K extends Object, V extends Object> extends _MetadataCodec
   }
 
   @override
-  Map<K, V> decode(String raw) {
+  Map<K, V>? decode(String raw) {
     try {
       final decoded = jsonDecode(raw);
       if (decoded is! Map) {
-        return {};
+        return null;
       }
       final result = <K, V>{};
       for (final entry in decoded.entries) {
         final rawKey = entry.key;
         final rawValue = entry.value;
         if (rawKey is! String || rawValue is! String) {
-          return {};
+          return null;
         }
         final k = _keyCodec.decode(rawKey);
         final v = _valueCodec.decode(rawValue);
+        if (k == null || v == null) {
+          return null;
+        }
         result[k] = v;
       }
       return result;
     } on FormatException {
-      return {};
+      return null;
     }
   }
 }
@@ -187,29 +229,32 @@ final class _ListCodec<T extends Object> extends _MetadataCodec<List<T>> {
   String encode(List<T> value) => jsonEncode(value.map(_elementCodec.encode).toList());
 
   @override
-  List<T> decode(String raw) {
+  List<T>? decode(String raw) {
     try {
       final decoded = jsonDecode(raw);
       if (decoded is! List) {
-        return [];
+        return null;
       }
       final result = <T>[];
       for (final item in decoded) {
         if (item is! String) {
-          return [];
+          return null;
         }
         final element = _elementCodec.decode(item);
+        if (element == null) {
+          return null;
+        }
         result.add(element);
       }
       return result;
     } on FormatException {
-      return [];
+      return null;
     }
   }
 }
 
 final class _PrimitiveCodec<T extends Object> extends _MetadataCodec<T> {
-  final T Function(String) _parse;
+  final T? Function(String) _parse;
 
   const _PrimitiveCodec._(this._parse);
 
@@ -217,12 +262,12 @@ final class _PrimitiveCodec<T extends Object> extends _MetadataCodec<T> {
   String encode(T value) => value.toString();
 
   @override
-  T decode(String raw) => _parse(raw);
+  T? decode(String raw) => _parse(raw);
 
-  static const integer = _PrimitiveCodec<int>._(int.parse);
-  static const real = _PrimitiveCodec<double>._(double.parse);
-  static const boolean = _PrimitiveCodec<bool>._(bool.parse);
+  static const integer = _PrimitiveCodec<int>._(int.tryParse);
+  static const real = _PrimitiveCodec<double>._(double.tryParse);
+  static const boolean = _PrimitiveCodec<bool>._(bool.tryParse);
   static const string = _PrimitiveCodec<String>._(_identity);
 
-  static String _identity(String s) => s;
+  static String? _identity(String s) => s;
 }

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

@@ -9,10 +9,10 @@ import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:immich_mobile/infrastructure/repositories/local_album.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/local_asset.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/storage.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/trashed_local_asset.repository.dart';
 import 'package:immich_mobile/platform/native_sync_api.g.dart';
-import 'package:immich_mobile/repositories/asset_media.repository.dart';
-import 'package:immich_mobile/repositories/permission.repository.dart';
+import 'package:immich_mobile/repositories/local_files_manager.repository.dart';
 import 'package:immich_mobile/utils/datetime_helpers.dart';
 import 'package:immich_mobile/utils/diff.dart';
 import 'package:logging/logging.dart';
@@ -23,24 +23,24 @@ class LocalSyncService {
   final DriftLocalAssetRepository _localAssetRepository;
   final NativeSyncApi _nativeSyncApi;
   final DriftTrashedLocalAssetRepository _trashedLocalAssetRepository;
-  final AssetMediaRepository _assetMediaRepository;
-  final IPermissionRepository _permissionRepository;
+  final LocalFilesManagerRepository _localFilesManager;
+  final StorageRepository _storageRepository;
   final Logger _log = Logger("DeviceSyncService");
 
   LocalSyncService({
     required this._localAlbumRepository,
     required this._localAssetRepository,
-    required this._nativeSyncApi,
     required this._trashedLocalAssetRepository,
-    required this._assetMediaRepository,
-    required this._permissionRepository,
+    required this._localFilesManager,
+    required this._storageRepository,
+    required this._nativeSyncApi,
   });
 
   Future<void> sync({bool full = false}) async {
     final Stopwatch stopwatch = Stopwatch()..start();
     try {
       if (CurrentPlatform.isAndroid && Store.get(StoreKey.manageLocalMediaAndroid, false)) {
-        final hasPermission = await _permissionRepository.hasManageMediaPermission();
+        final hasPermission = await _localFilesManager.hasManageMediaPermission();
         if (hasPermission) {
           await _syncTrashedAssets();
         } else {
@@ -368,7 +368,7 @@ class LocalSyncService {
 
     final assetsToRestore = await _trashedLocalAssetRepository.getToRestore();
     if (assetsToRestore.isNotEmpty) {
-      final restoredIds = await _assetMediaRepository.restoreAssetsFromTrash(assetsToRestore);
+      final restoredIds = await _localFilesManager.restoreAssetsFromTrash(assetsToRestore);
       await _trashedLocalAssetRepository.applyRestoredAssets(restoredIds);
     } else {
       _log.info("syncTrashedAssets, No remote assets found for restoration");
@@ -376,15 +376,15 @@ class LocalSyncService {
 
     final localAssetsToTrash = await _trashedLocalAssetRepository.getToTrash();
     if (localAssetsToTrash.isNotEmpty) {
-      final localIds = localAssetsToTrash.values.expand((assets) => assets).map((asset) => asset.id).toList();
-      _log.info("Moving to trash ${localIds.join(", ")} assets");
-      final movedIds = await _assetMediaRepository.deleteAll(localIds);
-      if (movedIds.isNotEmpty) {
-        final movedAssetsByAlbum = localAssetsToTrash.map(
-          (albumId, assets) => MapEntry(albumId, assets.where((asset) => movedIds.contains(asset.id)).toList()),
-        )..removeWhere((_, assets) => assets.isEmpty);
-
-        await _trashedLocalAssetRepository.trashLocalAsset(movedAssetsByAlbum);
+      final mediaUrls = await Future.wait(
+        localAssetsToTrash.values
+            .expand((e) => e)
+            .map((localAsset) => _storageRepository.getAssetEntityForAsset(localAsset).then((e) => e?.getMediaUrl())),
+      );
+      _log.info("Moving to trash ${mediaUrls.join(", ")} assets");
+      final result = await _localFilesManager.moveToTrash(mediaUrls.nonNulls.toList());
+      if (result) {
+        await _trashedLocalAssetRepository.trashLocalAsset(localAssetsToTrash);
       }
     } else {
       _log.info("syncTrashedAssets, No assets found in backup-enabled albums for move to trash");

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

@@ -56,7 +56,7 @@ class LogService {
   }) async {
     final instance = LogService._(logRepository, metadataRepository, shouldBuffer);
     await logRepository.truncate(limit: kLogTruncateLimit);
-    final level = instance._metadataRepository.appConfig.logLevel;
+    final level = instance._metadataRepository.systemConfig.logLevel;
     Logger.root.level = Level.LEVELS.elementAtOrNull(level.index) ?? Level.INFO;
     return instance;
   }

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

@@ -234,13 +234,24 @@ class RemoteAlbumService {
     final pendingAdds = <Future<void>>[];
     final localById = {for (final a in localAssets) a.id: a};
 
-    final UploadCallbacks(:onProgress, :onSuccess, :onError, :onICloudProgress) = userCallbacks;
     final wrappedCallbacks = UploadCallbacks(
-      onProgress: onProgress,
-      onICloudProgress: onICloudProgress,
-      onError: onError,
+      onProgress: (localId, filename, bytes, totalBytes) => _runUploadCallback(
+        'Upload progress callback failed for $localId',
+        () => userCallbacks.onProgress?.call(localId, filename, bytes, totalBytes),
+      ),
+      onICloudProgress: (localId, progress) => _runUploadCallback(
+        'iCloud progress callback failed for $localId',
+        () => userCallbacks.onICloudProgress?.call(localId, progress),
+      ),
+      onError: (localId, errorMessage) => _runUploadCallback(
+        'Upload error callback failed for $localId',
+        () => userCallbacks.onError?.call(localId, errorMessage),
+      ),
       onSuccess: (localId, remoteId) {
-        onSuccess?.call(localId, remoteId);
+        _runUploadCallback(
+          'Upload success callback failed for $localId',
+          () => userCallbacks.onSuccess?.call(localId, remoteId),
+        );
         final source = localById[localId];
         if (source == null) {
           _logger.warning('Upload success for $localId but source LocalAsset missing; skipping album link');
@@ -248,22 +259,29 @@ class RemoteAlbumService {
         }
         pendingAdds.add(
           _linkUploadedAssetToAlbum(albumId, remoteId, uploader, source)
-              .then<void>((added) => addedCount += added)
-              .onError(
-                (error, stack) =>
-                    _logger.warning('Failed to add uploaded asset $remoteId to album $albumId', error, stack),
-              ),
+              .then<void>((added) {
+                addedCount += added;
+              })
+              .catchError((Object error, StackTrace stack) {
+                _logger.warning('Failed to add uploaded asset $remoteId to album $albumId', error, stack);
+              }),
         );
       },
     );
 
-    await _uploadService.uploadManual(localAssets, cancelToken: null, callbacks: wrappedCallbacks);
+    await _uploadService.uploadManual(localAssets, callbacks: wrappedCallbacks);
     await Future.wait(pendingAdds);
     return addedCount;
   }
 
-  // TODO: this is a poorly designed flow; adding a "stub" just to satisfy FK constraints is hacky,
-  // it goes out of its way to insert one at a time, and it swallows errors that should be surfaced to the user.
+  void _runUploadCallback(String message, void Function() callback) {
+    try {
+      callback();
+    } catch (error, stack) {
+      _logger.warning(message, error, stack);
+    }
+  }
+
   /// Links a freshly-uploaded asset to an album, ensuring the local DB
   /// reflects the change without waiting for the next sync. We call the API
   /// (server is the source of truth), then upsert a placeholder

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

@@ -9,12 +9,12 @@ import 'package:immich_mobile/domain/models/sync_event.model.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:immich_mobile/infrastructure/repositories/local_asset.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/storage.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/sync_api.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/sync_migration.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/sync_stream.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/trashed_local_asset.repository.dart';
-import 'package:immich_mobile/repositories/asset_media.repository.dart';
-import 'package:immich_mobile/repositories/permission.repository.dart';
+import 'package:immich_mobile/repositories/local_files_manager.repository.dart';
 import 'package:immich_mobile/services/api.service.dart';
 import 'package:immich_mobile/utils/semver.dart';
 import 'package:logging/logging.dart';
@@ -34,8 +34,8 @@ class SyncStreamService {
   final SyncStreamRepository _syncStreamRepository;
   final DriftLocalAssetRepository _localAssetRepository;
   final DriftTrashedLocalAssetRepository _trashedLocalAssetRepository;
-  final AssetMediaRepository _assetMediaRepository;
-  final IPermissionRepository _permissionRepository;
+  final LocalFilesManagerRepository _localFilesManager;
+  final StorageRepository _storageRepository;
   final SyncMigrationRepository _syncMigrationRepository;
   final ApiService _api;
   final bool Function()? _cancelChecker;
@@ -45,8 +45,8 @@ class SyncStreamService {
     required this._syncStreamRepository,
     required this._localAssetRepository,
     required this._trashedLocalAssetRepository,
-    required this._assetMediaRepository,
-    required this._permissionRepository,
+    required this._localFilesManager,
+    required this._storageRepository,
     required this._syncMigrationRepository,
     required this._api,
     this._cancelChecker,
@@ -492,22 +492,22 @@ class SyncStreamService {
   }
 
   Future<void> _trashLocalAssets(Map<String, List<LocalAsset>> localAssetsToTrash) async {
-    final localIds = localAssetsToTrash.values.expand((assets) => assets).map((asset) => asset.id).toList();
-    _logger.info("Moving to trash ${localIds.join(", ")} assets");
-    final movedIds = await _assetMediaRepository.deleteAll(localIds);
-    if (movedIds.isNotEmpty) {
-      final movedAssetsByAlbum = localAssetsToTrash.map(
-        (albumId, assets) => MapEntry(albumId, assets.where((asset) => movedIds.contains(asset.id)).toList()),
-      )..removeWhere((_, assets) => assets.isEmpty);
-
-      await _trashedLocalAssetRepository.trashLocalAsset(movedAssetsByAlbum);
+    final mediaUrls = await Future.wait(
+      localAssetsToTrash.values
+          .expand((e) => e)
+          .map((localAsset) => _storageRepository.getAssetEntityForAsset(localAsset).then((e) => e?.getMediaUrl())),
+    );
+    _logger.info("Moving to trash ${mediaUrls.join(", ")} assets");
+    final result = await _localFilesManager.moveToTrash(mediaUrls.nonNulls.toList());
+    if (result) {
+      await _trashedLocalAssetRepository.trashLocalAsset(localAssetsToTrash);
     }
   }
 
   Future<void> _applyRemoteRestoreToLocal() async {
     final assetsToRestore = await _trashedLocalAssetRepository.getToRestore();
     if (assetsToRestore.isNotEmpty) {
-      final restoredIds = await _assetMediaRepository.restoreAssetsFromTrash(assetsToRestore);
+      final restoredIds = await _localFilesManager.restoreAssetsFromTrash(assetsToRestore);
       await _trashedLocalAssetRepository.applyRestoredAssets(restoredIds);
     } else {
       _logger.info("No remote assets found for restoration");
@@ -515,7 +515,7 @@ class SyncStreamService {
   }
 
   Future<void> _syncAssetTrashStatus(List<String> remoteIds) async {
-    if (!(await _permissionRepository.hasManageMediaPermission())) {
+    if (!(await _localFilesManager.hasManageMediaPermission())) {
       _logger.warning("Syncing asset trash status cannot proceed because MANAGE_MEDIA permission is missing");
       return;
     }
@@ -525,7 +525,7 @@ class SyncStreamService {
   }
 
   Future<void> _syncAssetDeletion(List<String> remoteIds) async {
-    if (!(await _permissionRepository.hasManageMediaPermission())) {
+    if (!(await _localFilesManager.hasManageMediaPermission())) {
       _logger.warning("Syncing asset deletion cannot proceed because MANAGE_MEDIA permission is missing");
       return;
     }

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

@@ -1,12 +1,14 @@
-import 'package:collection/collection.dart';
 import 'package:drift/drift.dart';
 import 'package:immich_mobile/domain/models/config/app_config.dart';
+import 'package:immich_mobile/domain/models/config/system_config.dart';
 import 'package:immich_mobile/domain/models/metadata_key.dart';
+import 'package:immich_mobile/extensions/string_extensions.dart';
 import 'package:immich_mobile/infrastructure/entities/metadata.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 
 class MetadataRepository extends DriftDatabaseRepository {
   final Drift _db;
+  final Map<MetadataKey, Object> _cache = {};
 
   MetadataRepository._(this._db) : super(_db);
 
@@ -23,50 +25,153 @@ class MetadataRepository extends DriftDatabaseRepository {
   AppConfig _appConfig = const .new();
   AppConfig get appConfig => _appConfig;
 
+  SystemConfig _systemConfig = const .new();
+  SystemConfig get systemConfig => _systemConfig;
+
   static Future<MetadataRepository> ensureInitialized(Drift db) async {
     if (_instance == null) {
       final instance = MetadataRepository._(db);
-      await instance.refresh();
+      await instance._hydrate();
       _instance = instance;
     }
     return _instance!;
   }
 
-  Future<void> refresh() async => _applyOverrides(await _db.select(_db.metadataEntity).get());
+  static Future<void> refresh() async {
+    instance._cache.clear();
+    instance._appConfig = const .new();
+    instance._systemConfig = const .new();
+    await instance._hydrate();
+  }
+
+  Future<void> _hydrate() async => _hydrateCache(await _db.select(_db.metadataEntity).get());
+
+  T _read<T extends Object>(MetadataKey<T> key) => (_cache[key] as T?) ?? key.defaultValue;
 
   Future<void> write<T extends Object, U extends T>(MetadataKey<T> key, U value) async {
-    if (value == _appConfig.read(key)) {
+    if (_read(key) == value) {
       return;
     }
 
-    if (value == defaultConfig.read(key)) {
-      await (_db.delete(_db.metadataEntity)..where((t) => t.key.equals(key.name))).go();
-    } else {
-      await _db
-          .into(_db.metadataEntity)
-          .insertOnConflictUpdate(
-            MetadataEntityCompanion.insert(key: key.name, value: key.encode(value), updatedAt: Value(DateTime.now())),
-          );
-    }
-
-    _appConfig = _appConfig.write(key, value);
+    await _db
+        .into(_db.metadataEntity)
+        .insertOnConflictUpdate(
+          MetadataEntityCompanion.insert(key: key.key, value: key.encode(value), updatedAt: Value(DateTime.now())),
+        );
+    _updateCache(key, value);
   }
 
-  Stream<AppConfig> watchConfig() => _db.select(_db.metadataEntity).watch().map((rows) {
-    _applyOverrides(rows);
-    return _appConfig;
-  });
+  Future<void> delete<T extends Object>(MetadataKey<T> key) async {
+    await (_db.delete(_db.metadataEntity)..where((t) => t.key.equals(key.key))).go();
+    _updateCache(key, key.defaultValue);
+  }
 
-  void _applyOverrides(List<MetadataEntityData> rows) {
-    _appConfig = AppConfig.fromEntries(
-      rows.fold({}, (overrides, row) {
-        final metadataKey = MetadataKey.values.firstWhereOrNull((key) => key.name == row.key);
-        if (metadataKey == null) {
-          return overrides;
-        }
+  Stream<AppConfig> watchAppConfig() => _watchDomain(.appConfig).distinct();
 
-        return {...overrides, metadataKey: metadataKey.decode(row.value)};
-      }),
-    );
+  Stream<SystemConfig> watchSystemConfig() => _watchDomain(.systemConfig).distinct();
+
+  Stream<T> _watchDomain<T extends Object>(MetadataDomain<T> domain) {
+    final query = _db.select(_db.metadataEntity)..where((t) => t.key.like('${domain.prefix}.%'));
+    return query.watch().map((rows) {
+      _hydrateCache(rows);
+      return domain.config(this);
+    });
+  }
+
+  void _hydrateCache(List<MetadataEntityData> rows) {
+    final keyMap = MetadataKey.asKeyMap();
+    for (final row in rows) {
+      final key = keyMap[row.key];
+      if (key == null) {
+        continue;
+      }
+      _updateCache(key, key.decode(row.value));
+    }
+  }
+
+  void _updateCache<T extends Object>(MetadataKey<T> key, T value) {
+    if (_cache[key] == value) {
+      return;
+    }
+    _cache[key] = value;
+    key.domain.rebuild(this);
+  }
+}
+
+extension<T extends Object> on MetadataDomain<T> {
+  T config(MetadataRepository repo) => switch (this) {
+    .appConfig => repo._appConfig as T,
+    .systemConfig => repo._systemConfig as T,
+  };
+
+  void rebuild(MetadataRepository repo) {
+    switch (this) {
+      case .appConfig:
+        repo._appConfig = .new(
+          theme: .new(
+            mode: repo._read(.themeMode),
+            primaryColor: repo._read(.themePrimaryColor),
+            dynamicTheme: repo._read(.themeDynamic),
+            colorfulInterface: repo._read(.themeColorfulInterface),
+          ),
+          cleanup: .new(
+            keepFavorites: repo._read(.cleanupKeepFavorites),
+            keepMediaType: repo._read(.cleanupKeepMediaType),
+            keepAlbumIds: repo._read(.cleanupKeepAlbumIds),
+            cutoffDaysAgo: repo._read(.cleanupCutoffDaysAgo),
+            defaultsInitialized: repo._read(.cleanupDefaultsInitialized),
+          ),
+          map: .new(
+            relativeDays: repo._read(.mapRelativeDate),
+            favoritesOnly: repo._read(.mapShowFavoriteOnly),
+            includeArchived: repo._read(.mapIncludeArchived),
+            themeMode: repo._read(.mapThemeMode),
+            withPartners: repo._read(.mapWithPartners),
+          ),
+          timeline: .new(
+            tilesPerRow: repo._read(.timelineTilesPerRow),
+            groupAssetsBy: repo._read(.timelineGroupAssetsBy),
+            storageIndicator: repo._read(.timelineStorageIndicator),
+          ),
+          image: .new(preferRemote: repo._read(.imagePreferRemote), loadOriginal: repo._read(.imageLoadOriginal)),
+          viewer: .new(
+            loopVideo: repo._read(.viewerLoopVideo),
+            loadOriginalVideo: repo._read(.viewerLoadOriginalVideo),
+            autoPlayVideo: repo._read(.viewerAutoPlayVideo),
+            tapToNavigate: repo._read(.viewerTapToNavigate),
+          ),
+          slideshow: .new(
+            transition: repo._read(.slideshowTransition),
+            repeat: repo._read(.slideshowRepeat),
+            duration: repo._read(.slideshowDuration),
+            look: repo._read(.slideshowLook),
+            direction: repo._read(.slideshowDirection),
+          ),
+          album: .new(
+            sortMode: repo._read(.albumSortMode),
+            isReverse: repo._read(.albumIsReverse),
+            isGrid: repo._read(.albumIsGrid),
+          ),
+          backup: .new(
+            enabled: repo._read(.backupEnabled),
+            useCellularForVideos: repo._read(.backupUseCellularForVideos),
+            useCellularForPhotos: repo._read(.backupUseCellularForPhotos),
+            requireCharging: repo._read(.backupRequireCharging),
+            triggerDelay: repo._read(.backupTriggerDelay),
+            syncAlbums: repo._read(.backupSyncAlbums),
+          ),
+        );
+      case .systemConfig:
+        repo._systemConfig = .new(
+          logLevel: repo._read(.logLevel),
+          network: .new(
+            autoEndpointSwitching: repo._read(.networkAutoEndpointSwitching),
+            preferredWifiName: repo._read(.networkPreferredWifiName).nullIfEmpty,
+            localEndpoint: repo._read(.networkLocalEndpoint).nullIfEmpty,
+            externalEndpointList: repo._read(.networkExternalEndpointList),
+            customHeaders: repo._read(.networkCustomHeaders),
+          ),
+        );
+    }
   }
 }

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

@@ -1,4 +1,3 @@
-import 'dart:async';
 import 'dart:io';
 
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
@@ -6,54 +5,66 @@ import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:logging/logging.dart';
 import 'package:photo_manager/photo_manager.dart';
 
-typedef OnProgress = void Function(String id, double progress);
-
 class StorageRepository {
-  static final log = Logger('StorageRepository');
+  final log = Logger('StorageRepository');
 
-  const StorageRepository();
+  StorageRepository();
 
-  Future<File?> getAssetFile(String assetId, {OnProgress? onProgress, Completer<void>? cancelToken}) {
-    return _getFileForAsset(assetId, isMotion: false, onProgress: onProgress, cancelToken: cancelToken);
-  }
-
-  Future<File?> getMotionFile(String assetId, {OnProgress? onProgress, Completer<void>? cancelToken}) {
-    return _getFileForAsset(assetId, isMotion: true, onProgress: onProgress, cancelToken: cancelToken);
-  }
-
-  Future<File?> _getFileForAsset(
-    String assetId, {
-    bool isMotion = false,
-    OnProgress? onProgress,
-    Completer<void>? cancelToken,
-  }) async {
-    final entity = await AssetEntity.fromId(assetId);
-    if (entity == null) {
-      log.warning("Cannot get AssetEntity for asset $assetId");
-      return null;
-    }
-
-    PMProgressHandler? progressHandler;
-    StreamSubscription<PMProgressState>? progressSubscription;
-    PMCancelToken? pmCancelToken;
-    if (cancelToken != null) {
-      progressHandler = PMProgressHandler();
-      progressSubscription = progressHandler.stream.listen((event) => onProgress?.call(assetId, event.progress));
-      pmCancelToken = PMCancelToken();
-      unawaited(cancelToken.future.then((_) => pmCancelToken!.cancelRequest()));
-    }
+  Future<File?> getFileForAsset(String assetId) async {
+    File? file;
+    final log = Logger('StorageRepository');
 
     try {
-      return await entity.loadFile(withSubtype: isMotion, progressHandler: progressHandler, cancelToken: pmCancelToken);
+      final entity = await AssetEntity.fromId(assetId);
+      file = await entity?.originFile;
+      if (file == null) {
+        log.warning("Cannot get file for asset $assetId");
+        return null;
+      }
+
+      final exists = await file.exists();
+      if (!exists) {
+        log.warning("File for asset $assetId does not exist");
+        return null;
+      }
     } catch (error, stackTrace) {
-      log.warning("Error loading file for asset $assetId", error, stackTrace);
-      return null;
-    } finally {
-      unawaited(progressSubscription?.cancel());
+      log.warning("Error getting file for asset $assetId", error, stackTrace);
     }
+    return file;
+  }
+
+  Future<File?> getMotionFileForAsset(LocalAsset asset) async {
+    File? file;
+    final log = Logger('StorageRepository');
+
+    try {
+      final entity = await AssetEntity.fromId(asset.id);
+      file = await entity?.originFileWithSubtype;
+      if (file == null) {
+        log.warning(
+          "Cannot get motion file for asset ${asset.id}, name: ${asset.name}, created on: ${asset.createdAt}",
+        );
+        return null;
+      }
+
+      final exists = await file.exists();
+      if (!exists) {
+        log.warning("Motion file for asset ${asset.id} does not exist");
+        return null;
+      }
+    } catch (error, stackTrace) {
+      log.warning(
+        "Error getting motion file for asset ${asset.id}, name: ${asset.name}, created on: ${asset.createdAt}",
+        error,
+        stackTrace,
+      );
+    }
+    return file;
   }
 
   Future<AssetEntity?> getAssetEntityForAsset(LocalAsset asset) async {
+    final log = Logger('StorageRepository');
+
     AssetEntity? entity;
 
     try {
@@ -88,7 +99,39 @@ class StorageRepository {
     }
   }
 
+  Future<File?> loadFileFromCloud(String assetId, {PMProgressHandler? progressHandler}) async {
+    try {
+      final entity = await AssetEntity.fromId(assetId);
+      if (entity == null) {
+        log.warning("Cannot get AssetEntity for asset $assetId");
+        return null;
+      }
+
+      return await entity.loadFile(progressHandler: progressHandler);
+    } catch (error, stackTrace) {
+      log.warning("Error loading file from cloud for asset $assetId", error, stackTrace);
+      return null;
+    }
+  }
+
+  Future<File?> loadMotionFileFromCloud(String assetId, {PMProgressHandler? progressHandler}) async {
+    try {
+      final entity = await AssetEntity.fromId(assetId);
+      if (entity == null) {
+        log.warning("Cannot get AssetEntity for asset $assetId");
+        return null;
+      }
+
+      return await entity.loadFile(withSubtype: true, progressHandler: progressHandler);
+    } catch (error, stackTrace) {
+      log.warning("Error loading motion file from cloud for asset $assetId", error, stackTrace);
+      return null;
+    }
+  }
+
   Future<void> clearCache() async {
+    final log = Logger('StorageRepository');
+
     try {
       await PhotoManager.clearFileCache();
     } catch (error, stackTrace) {

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

@@ -43,7 +43,7 @@ class _DriftBackupAlbumSelectionPageState extends ConsumerState<DriftBackupAlbum
     _searchController = TextEditingController();
     _searchFocusNode = FocusNode();
 
-    _enableSyncUploadAlbum.value = ref.read(appConfigProvider).backup.syncAlbums;
+    _enableSyncUploadAlbum.value = ref.read(metadataProvider).appConfig.backup.syncAlbums;
     ref.read(backupAlbumProvider.notifier).getAll();
 
     _initialTotalAssetCount = ref.read(driftBackupProvider.select((p) => p.totalCount));
@@ -55,7 +55,7 @@ class _DriftBackupAlbumSelectionPageState extends ConsumerState<DriftBackupAlbum
       return;
     }
 
-    final enableSyncUploadAlbum = ref.read(appConfigProvider).backup.syncAlbums;
+    final enableSyncUploadAlbum = ref.read(metadataProvider).appConfig.backup.syncAlbums;
     final selectedAlbums = ref
         .read(backupAlbumProvider)
         .where((a) => a.backupSelection == BackupSelection.selected)

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

@@ -19,7 +19,7 @@ class DriftBackupOptionsPage extends ConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     bool hasPopped = false;
-    final previousBackup = ref.read(appConfigProvider).backup;
+    final previousBackup = ref.read(metadataProvider).appConfig.backup;
     final previousCellularForVideos = previousBackup.useCellularForVideos;
     final previousCellularForPhotos = previousBackup.useCellularForPhotos;
     return PopScope(

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

@@ -22,7 +22,7 @@ class HeaderSettingsPage extends HookConsumerWidget {
     final headers = useState<List<SettingsHeader>>([]);
     final setInitialHeaders = useState(false);
 
-    final storedHeaders = ref.read(metadataProvider).appConfig.network.customHeaders;
+    final storedHeaders = ref.read(metadataProvider).systemConfig.network.customHeaders;
     if (!setInitialHeaders.value) {
       storedHeaders.forEach((k, v) {
         final header = SettingsHeader();

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

@@ -7,7 +7,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/locales.dart';
-import 'package:immich_mobile/domain/models/config/app_config.dart';
+import 'package:immich_mobile/domain/models/metadata_key.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/generated/codegen_loader.g.dart';
@@ -36,7 +36,7 @@ class BootstrapErrorWidget extends StatelessWidget {
 
   @override
   Widget build(BuildContext _) {
-    final immichTheme = defaultConfig.theme.primaryColor.themeOfPreset;
+    final immichTheme = MetadataKey.themePrimaryColor.defaultValue.themeOfPreset;
 
     return EasyLocalization(
       supportedLocales: locales.values.toList(),

mobile/lib/platform/native_sync_api.g.dart

@@ -654,25 +654,6 @@ class NativeSyncApi {
     return (pigeonVar_replyValue! as Map<Object?, Object?>).cast<String, List<PlatformAsset>>();
   }
 
-  Future<bool> restoreFromTrashById(String mediaId, int type) async {
-    final pigeonVar_channelName =
-        'dev.flutter.pigeon.immich_mobile.NativeSyncApi.restoreFromTrashById$pigeonVar_messageChannelSuffix';
-    final pigeonVar_channel = BasicMessageChannel<Object?>(
-      pigeonVar_channelName,
-      pigeonChannelCodec,
-      binaryMessenger: pigeonVar_binaryMessenger,
-    );
-    final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(<Object?>[mediaId, type]);
-    final pigeonVar_replyList = await pigeonVar_sendFuture as List<Object?>?;
-
-    final Object? pigeonVar_replyValue = _extractReplyValueOrThrow(
-      pigeonVar_replyList,
-      pigeonVar_channelName,
-      isNullValid: false,
-    );
-    return pigeonVar_replyValue! as bool;
-  }
-
   Future<List<CloudIdResult>> getCloudIdForAssetIds(List<String> assetIds) async {
     final pigeonVar_channelName =
         'dev.flutter.pigeon.immich_mobile.NativeSyncApi.getCloudIdForAssetIds$pigeonVar_messageChannelSuffix';

mobile/lib/platform/network_api.g.dart

@@ -309,23 +309,4 @@ class NetworkApi {
 
     _extractReplyValueOrThrow(pigeonVar_replyList, pigeonVar_channelName, isNullValid: true);
   }
-
-  Future<String> getAppGroupId() async {
-    final pigeonVar_channelName =
-        'dev.flutter.pigeon.immich_mobile.NetworkApi.getAppGroupId$pigeonVar_messageChannelSuffix';
-    final pigeonVar_channel = BasicMessageChannel<Object?>(
-      pigeonVar_channelName,
-      pigeonChannelCodec,
-      binaryMessenger: pigeonVar_binaryMessenger,
-    );
-    final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(null);
-    final pigeonVar_replyList = await pigeonVar_sendFuture as List<Object?>?;
-
-    final Object? pigeonVar_replyValue = _extractReplyValueOrThrow(
-      pigeonVar_replyList,
-      pigeonVar_channelName,
-      isNullValid: false,
-    );
-    return pigeonVar_replyValue! as String;
-  }
 }

mobile/lib/platform/permission_api.g.dart

@@ -1,119 +0,0 @@
-// Autogenerated from Pigeon (v26.3.4), do not edit directly.
-// See also: https://pub.dev/packages/pigeon
-// ignore_for_file: unused_import, unused_shown_name
-// ignore_for_file: type=lint
-
-import 'dart:async';
-import 'dart:typed_data' show Float64List, Int32List, Int64List;
-
-import 'package:flutter/services.dart';
-import 'package:meta/meta.dart' show immutable, protected, visibleForTesting;
-
-Object? _extractReplyValueOrThrow(List<Object?>? replyList, String channelName, {required bool isNullValid}) {
-  if (replyList == null) {
-    throw PlatformException(
-      code: 'channel-error',
-      message: 'Unable to establish connection on channel: "$channelName".',
-    );
-  } else if (replyList.length > 1) {
-    throw PlatformException(code: replyList[0]! as String, message: replyList[1] as String?, details: replyList[2]);
-  } else if (!isNullValid && (replyList.isNotEmpty && replyList[0] == null)) {
-    throw PlatformException(
-      code: 'null-error',
-      message: 'Host platform returned null value for non-null return value.',
-    );
-  }
-  return replyList.firstOrNull;
-}
-
-class _PigeonCodec extends StandardMessageCodec {
-  const _PigeonCodec();
-  @override
-  void writeValue(WriteBuffer buffer, Object? value) {
-    if (value is int) {
-      buffer.putUint8(4);
-      buffer.putInt64(value);
-    } else {
-      super.writeValue(buffer, value);
-    }
-  }
-
-  @override
-  Object? readValueOfType(int type, ReadBuffer buffer) {
-    switch (type) {
-      default:
-        return super.readValueOfType(type, buffer);
-    }
-  }
-}
-
-class PermissionApi {
-  /// Constructor for [PermissionApi].  The [binaryMessenger] named argument is
-  /// available for dependency injection.  If it is left null, the default
-  /// BinaryMessenger will be used which routes to the host platform.
-  PermissionApi({BinaryMessenger? binaryMessenger, String messageChannelSuffix = ''})
-    : pigeonVar_binaryMessenger = binaryMessenger,
-      pigeonVar_messageChannelSuffix = messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : '';
-  final BinaryMessenger? pigeonVar_binaryMessenger;
-
-  static const MessageCodec<Object?> pigeonChannelCodec = _PigeonCodec();
-
-  final String pigeonVar_messageChannelSuffix;
-
-  Future<bool> hasManageMediaPermission() async {
-    final pigeonVar_channelName =
-        'dev.flutter.pigeon.immich_mobile.PermissionApi.hasManageMediaPermission$pigeonVar_messageChannelSuffix';
-    final pigeonVar_channel = BasicMessageChannel<Object?>(
-      pigeonVar_channelName,
-      pigeonChannelCodec,
-      binaryMessenger: pigeonVar_binaryMessenger,
-    );
-    final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(null);
-    final pigeonVar_replyList = await pigeonVar_sendFuture as List<Object?>?;
-
-    final Object? pigeonVar_replyValue = _extractReplyValueOrThrow(
-      pigeonVar_replyList,
-      pigeonVar_channelName,
-      isNullValid: false,
-    );
-    return pigeonVar_replyValue! as bool;
-  }
-
-  Future<bool> requestManageMediaPermission() async {
-    final pigeonVar_channelName =
-        'dev.flutter.pigeon.immich_mobile.PermissionApi.requestManageMediaPermission$pigeonVar_messageChannelSuffix';
-    final pigeonVar_channel = BasicMessageChannel<Object?>(
-      pigeonVar_channelName,
-      pigeonChannelCodec,
-      binaryMessenger: pigeonVar_binaryMessenger,
-    );
-    final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(null);
-    final pigeonVar_replyList = await pigeonVar_sendFuture as List<Object?>?;
-
-    final Object? pigeonVar_replyValue = _extractReplyValueOrThrow(
-      pigeonVar_replyList,
-      pigeonVar_channelName,
-      isNullValid: false,
-    );
-    return pigeonVar_replyValue! as bool;
-  }
-
-  Future<bool> manageMediaPermission() async {
-    final pigeonVar_channelName =
-        'dev.flutter.pigeon.immich_mobile.PermissionApi.manageMediaPermission$pigeonVar_messageChannelSuffix';
-    final pigeonVar_channel = BasicMessageChannel<Object?>(
-      pigeonVar_channelName,
-      pigeonChannelCodec,
-      binaryMessenger: pigeonVar_binaryMessenger,
-    );
-    final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(null);
-    final pigeonVar_replyList = await pigeonVar_sendFuture as List<Object?>?;
-
-    final Object? pigeonVar_replyValue = _extractReplyValueOrThrow(
-      pigeonVar_replyList,
-      pigeonVar_channelName,
-      isNullValid: false,
-    );
-    return pigeonVar_replyValue! as bool;
-  }
-}

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

@@ -9,7 +9,6 @@ import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_bu
 import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 import 'package:immich_mobile/widgets/common/immich_toast.dart';
-import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
 
 /// This delete action has the following behavior:
 /// - Prompt to delete the asset locally
@@ -40,8 +39,6 @@ class DeleteLocalActionButton extends ConsumerWidget {
       return;
     }
 
-    ref.invalidate(localAlbumProvider);
-
     final successMessage = 'delete_local_action_prompt'.t(context: context, args: {'count': result.count.toString()});
 
     if (context.mounted) {

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

@@ -14,9 +14,7 @@ import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 import 'package:immich_mobile/widgets/common/immich_toast.dart';
 
 class _SharePreparingDialog extends StatelessWidget {
-  final ValueNotifier<double?> progress;
-
-  const _SharePreparingDialog({required this.progress});
+  const _SharePreparingDialog();
 
   @override
   Widget build(BuildContext context) {
@@ -24,24 +22,8 @@ class _SharePreparingDialog extends StatelessWidget {
       content: Column(
         mainAxisSize: MainAxisSize.min,
         children: [
-          Container(margin: const EdgeInsets.only(bottom: 12), child: const Text('share_dialog_preparing').tr()),
-          SizedBox(
-            width: 240,
-            child: ValueListenableBuilder<double?>(
-              valueListenable: progress,
-              builder: (context, value, _) {
-                final percent = value == null ? null : (value * 100).clamp(0, 100);
-                return Column(
-                  mainAxisSize: MainAxisSize.min,
-                  children: [
-                    LinearProgressIndicator(value: value, minHeight: 8.0),
-                    if (percent != null)
-                      Container(margin: const EdgeInsets.only(top: 8), child: Text('${percent.toStringAsFixed(0)}%')),
-                  ],
-                );
-              },
-            ),
-          ),
+          const CircularProgressIndicator(),
+          Container(margin: const EdgeInsets.only(top: 12), child: const Text('share_dialog_preparing').tr()),
         ],
       ),
     );
@@ -61,39 +43,32 @@ class ShareActionButton extends ConsumerWidget {
     }
 
     final cancelCompleter = Completer<void>();
-    final progress = ValueNotifier<double?>(null);
-    final preparingDialog = _SharePreparingDialog(progress: progress);
+    const preparingDialog = _SharePreparingDialog();
     await showDialog(
       context: context,
       builder: (BuildContext buildContext) {
-        ref
-            .read(actionProvider.notifier)
-            .shareAssets(
-              source,
-              context,
-              cancelCompleter: cancelCompleter,
-              onAssetDownloadProgress: (value) => progress.value = value,
-            )
-            .then((ActionResult result) {
-              if (cancelCompleter.isCompleted || !context.mounted) {
-                return;
-              }
+        ref.read(actionProvider.notifier).shareAssets(source, context, cancelCompleter: cancelCompleter).then((
+          ActionResult result,
+        ) {
+          if (cancelCompleter.isCompleted || !context.mounted) {
+            return;
+          }
 
-              ref.read(multiSelectProvider.notifier).reset();
+          ref.read(multiSelectProvider.notifier).reset();
 
-              if (!result.success) {
-                ImmichToast.show(
-                  context: context,
-                  msg: 'scaffold_body_error_occurred'.t(context: context),
-                  gravity: ToastGravity.BOTTOM,
-                  toastType: ToastType.error,
-                );
-              }
+          if (!result.success) {
+            ImmichToast.show(
+              context: context,
+              msg: 'scaffold_body_error_occurred'.t(context: context),
+              gravity: ToastGravity.BOTTOM,
+              toastType: ToastType.error,
+            );
+          }
 
-              buildContext.pop();
-            });
+          buildContext.pop();
+        });
 
-        // Show download progress with a "Preparing" message
+        // show a loading spinner with a "Preparing" message
         return preparingDialog;
       },
       barrierDismissible: false,
@@ -102,7 +77,6 @@ class ShareActionButton extends ConsumerWidget {
       if (!cancelCompleter.isCompleted) {
         cancelCompleter.complete();
       }
-      progress.dispose();
     });
   }
 

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

@@ -6,13 +6,13 @@ import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/extensions/platform_extensions.dart';
+import 'package:immich_mobile/infrastructure/repositories/storage.repository.dart';
 import 'package:immich_mobile/providers/asset_viewer/asset_viewer.provider.dart';
 import 'package:immich_mobile/providers/asset_viewer/is_motion_video_playing.provider.dart';
 import 'package:immich_mobile/providers/asset_viewer/video_player_provider.dart';
 import 'package:immich_mobile/providers/cast.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/storage.provider.dart';
 import 'package:immich_mobile/services/api.service.dart';
 import 'package:logging/logging.dart';
 import 'package:native_video_player/native_video_player.dart';
@@ -108,7 +108,7 @@ class _NativeVideoViewerState extends ConsumerState<NativeVideoViewer> with Widg
     try {
       if (videoAsset.hasLocal && videoAsset.livePhotoVideoId == null) {
         final id = videoAsset is LocalAsset ? videoAsset.id : (videoAsset as RemoteAsset).localId!;
-        final file = await ref.read(storageRepositoryProvider).getAssetFile(id);
+        final file = await StorageRepository().getFileForAsset(id);
         if (!mounted) {
           return null;
         }

mobile/lib/providers/auth.provider.dart

@@ -130,7 +130,7 @@ class AuthNotifier extends StateNotifier<AuthState> {
     await _apiService.updateHeaders();
 
     final serverEndpoint = Store.get(StoreKey.serverEndpoint);
-    final headerMap = _ref.read(metadataProvider).appConfig.network.customHeaders;
+    final headerMap = _ref.read(metadataProvider).systemConfig.network.customHeaders;
     final customHeaders = headerMap.isEmpty ? null : jsonEncode(headerMap);
     await _widgetService.writeCredentials(serverEndpoint, accessToken, customHeaders);
 
@@ -187,11 +187,11 @@ class AuthNotifier extends StateNotifier<AuthState> {
   }
 
   String? getSavedWifiName() {
-    return _ref.read(metadataProvider).appConfig.network.preferredWifiName;
+    return _ref.read(metadataProvider).systemConfig.network.preferredWifiName;
   }
 
   String? getSavedLocalEndpoint() {
-    return _ref.read(metadataProvider).appConfig.network.localEndpoint;
+    return _ref.read(metadataProvider).systemConfig.network.localEndpoint;
   }
 
   /// Returns the current server endpoint (with /api) URL from the store

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

@@ -2,7 +2,6 @@ import 'dart:async';
 
 import 'package:collection/collection.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:logging/logging.dart';
 
 import 'package:immich_mobile/constants/constants.dart';
@@ -274,7 +273,7 @@ class DriftBackupNotifier extends StateNotifier<DriftBackupState> {
         onProgress: _handleForegroundBackupProgress,
         onSuccess: _handleForegroundBackupSuccess,
         onError: _handleForegroundBackupError,
-        onICloudProgress: CurrentPlatform.isIOS ? _handleICloudProgress : null,
+        onICloudProgress: _handleICloudProgress,
       ),
     );
   }
@@ -283,7 +282,7 @@ class DriftBackupNotifier extends StateNotifier<DriftBackupState> {
     _cancelToken?.complete();
     _cancelToken = null;
     _uploadSpeedManager.clear();
-    state = state.copyWith(uploadItems: const {}, iCloudDownloadProgress: const {});
+    state = state.copyWith(uploadItems: {}, iCloudDownloadProgress: {});
   }
 
   void _handleICloudProgress(String localAssetId, double progress) {

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

@@ -14,7 +14,6 @@ import 'package:immich_mobile/providers/backup/asset_upload_progress.provider.da
 import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/asset_viewer/asset.provider.dart' show assetExifProvider;
 import 'package:immich_mobile/providers/infrastructure/tag.provider.dart';
-import 'package:immich_mobile/providers/server_info.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/providers/websocket.provider.dart';
@@ -22,7 +21,6 @@ import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/services/action.service.dart';
 import 'package:immich_mobile/services/download.service.dart';
 import 'package:immich_mobile/services/foreground_upload.service.dart';
-import 'package:immich_mobile/utils/semver.dart';
 import 'package:immich_mobile/widgets/asset_grid/delete_dialog.dart';
 import 'package:logging/logging.dart';
 import 'package:openapi/api.dart';
@@ -465,17 +463,11 @@ class ActionNotifier extends Notifier<void> {
     ActionSource source,
     BuildContext context, {
     Completer<void>? cancelCompleter,
-    void Function(double progress)? onAssetDownloadProgress,
   }) async {
     final ids = _getAssets(source).toList(growable: false);
 
     try {
-      await _service.shareAssets(
-        ids,
-        context,
-        cancelCompleter: cancelCompleter,
-        onAssetDownloadProgress: onAssetDownloadProgress,
-      );
+      await _service.shareAssets(ids, context, cancelCompleter: cancelCompleter);
       return ActionResult(count: ids.length, success: true);
     } catch (error, stack) {
       _logger.severe('Failed to share assets', error, stack);
@@ -544,22 +536,14 @@ class ActionNotifier extends Notifier<void> {
       return ActionResult(count: ids.length, success: false, error: 'Expected single asset for applying edits');
     }
 
-    Future<void> editReady;
-    if (ref.read(serverInfoProvider).serverVersion >= const SemVer(major: 3, minor: 0, patch: 0)) {
-      editReady = ref.read(websocketProvider.notifier).waitForEvent("AssetEditReadyV2", (dynamic data) {
-        final eventAsset = SyncAssetV2.fromJson(data["asset"]);
-        return eventAsset?.id == ids.first;
-      }, const Duration(seconds: 10));
-    } else {
-      editReady = ref.read(websocketProvider.notifier).waitForEvent("AssetEditReadyV1", (dynamic data) {
-        final eventAsset = SyncAssetV1.fromJson(data["asset"]);
-        return eventAsset?.id == ids.first;
-      }, const Duration(seconds: 10));
-    }
+    final completer = ref.read(websocketProvider.notifier).waitForEvent("AssetEditReadyV1", (dynamic data) {
+      final eventAsset = SyncAssetV1.fromJson(data["asset"]);
+      return eventAsset?.id == ids.first;
+    }, const Duration(seconds: 10));
 
     try {
       await _service.applyEdits(ids.first, edits);
-      await editReady;
+      await completer;
       return const ActionResult(count: 1, success: true);
     } catch (error, stack) {
       _logger.severe('Failed to apply edits to assets', error, stack);

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

@@ -1,12 +1,20 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/config/app_config.dart';
+import 'package:immich_mobile/domain/models/config/system_config.dart';
 import 'package:immich_mobile/infrastructure/repositories/metadata.repository.dart';
 
 final metadataProvider = Provider.autoDispose<MetadataRepository>((_) => MetadataRepository.instance);
 
 final appConfigProvider = Provider.autoDispose<AppConfig>((ref) {
   final repo = ref.watch(metadataProvider);
-  final subscription = repo.watchConfig().listen((event) => ref.state = event);
+  final subscription = repo.watchAppConfig().listen((event) => ref.state = event);
   ref.onDispose(subscription.cancel);
   return repo.appConfig;
 });
+
+final systemConfigProvider = Provider.autoDispose<SystemConfig>((ref) {
+  final repo = ref.watch(metadataProvider);
+  final subscription = repo.watchSystemConfig().listen((event) => ref.state = event);
+  ref.onDispose(subscription.cancel);
+  return repo.systemConfig;
+});

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

@@ -3,10 +3,9 @@ import 'package:immich_mobile/domain/services/background_worker.service.dart';
 import 'package:immich_mobile/platform/background_worker_api.g.dart';
 import 'package:immich_mobile/platform/background_worker_lock_api.g.dart';
 import 'package:immich_mobile/platform/connectivity_api.g.dart';
-import 'package:immich_mobile/platform/local_image_api.g.dart';
 import 'package:immich_mobile/platform/native_sync_api.g.dart';
+import 'package:immich_mobile/platform/local_image_api.g.dart';
 import 'package:immich_mobile/platform/network_api.g.dart';
-import 'package:immich_mobile/platform/permission_api.g.dart';
 import 'package:immich_mobile/platform/remote_image_api.g.dart';
 
 final backgroundWorkerFgServiceProvider = Provider((_) => BackgroundWorkerFgService(BackgroundWorkerFgHostApi()));
@@ -17,8 +16,6 @@ final backgroundWorkerLockServiceProvider = Provider<BackgroundWorkerLockService
 
 final nativeSyncApiProvider = Provider<NativeSyncApi>((_) => NativeSyncApi());
 
-final permissionApiProvider = Provider<PermissionApi>((_) => PermissionApi());
-
 final connectivityApiProvider = Provider<ConnectivityApi>((_) => ConnectivityApi());
 
 final localImageApi = LocalImageApi();

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

@@ -1,4 +1,4 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/infrastructure/repositories/storage.repository.dart';
 
-final storageRepositoryProvider = Provider<StorageRepository>((ref) => const StorageRepository());
+final storageRepositoryProvider = Provider<StorageRepository>((ref) => StorageRepository());

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

@@ -11,8 +11,8 @@ import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/cancel.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
-import 'package:immich_mobile/repositories/asset_media.repository.dart';
-import 'package:immich_mobile/repositories/permission.repository.dart';
+import 'package:immich_mobile/providers/infrastructure/storage.provider.dart';
+import 'package:immich_mobile/repositories/local_files_manager.repository.dart';
 
 final syncMigrationRepositoryProvider = Provider((ref) => SyncMigrationRepository(ref.watch(driftProvider)));
 
@@ -22,8 +22,8 @@ final syncStreamServiceProvider = Provider(
     syncStreamRepository: ref.watch(syncStreamRepositoryProvider),
     localAssetRepository: ref.watch(localAssetRepository),
     trashedLocalAssetRepository: ref.watch(trashedLocalAssetRepository),
-    assetMediaRepository: ref.watch(assetMediaRepositoryProvider),
-    permissionRepository: ref.watch(permissionRepositoryProvider),
+    localFilesManager: ref.watch(localFilesManagerRepositoryProvider),
+    storageRepository: ref.watch(storageRepositoryProvider),
     syncMigrationRepository: ref.watch(syncMigrationRepositoryProvider),
     api: ref.watch(apiServiceProvider),
     cancelChecker: ref.watch(cancellationProvider),
@@ -39,8 +39,8 @@ final localSyncServiceProvider = Provider(
     localAlbumRepository: ref.watch(localAlbumRepository),
     localAssetRepository: ref.watch(localAssetRepository),
     trashedLocalAssetRepository: ref.watch(trashedLocalAssetRepository),
-    assetMediaRepository: ref.watch(assetMediaRepositoryProvider),
-    permissionRepository: ref.watch(permissionRepositoryProvider),
+    localFilesManager: ref.watch(localFilesManagerRepositoryProvider),
+    storageRepository: ref.watch(storageRepositoryProvider),
     nativeSyncApi: ref.watch(nativeSyncApiProvider),
   ),
 );

mobile/lib/repositories/asset_media.repository.dart

@@ -1,29 +1,26 @@
 import 'dart:async';
 import 'dart:io';
 
-import 'package:background_downloader/background_downloader.dart';
 import 'package:device_info_plus/device_info_plus.dart';
 import 'package:flutter/widgets.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/constants/constants.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/platform_extensions.dart';
-import 'package:immich_mobile/platform/native_sync_api.g.dart';
-import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
-import 'package:immich_mobile/services/api.service.dart';
-import 'package:immich_mobile/utils/image_url_builder.dart';
+import 'package:immich_mobile/extensions/response_extensions.dart';
+import 'package:immich_mobile/repositories/asset_api.repository.dart';
 import 'package:logging/logging.dart';
+import 'package:path_provider/path_provider.dart';
 import 'package:photo_manager/photo_manager.dart';
 import 'package:share_plus/share_plus.dart';
 
-final assetMediaRepositoryProvider = Provider((ref) => AssetMediaRepository(ref.watch(nativeSyncApiProvider)));
+final assetMediaRepositoryProvider = Provider((ref) => AssetMediaRepository(ref.watch(assetApiRepositoryProvider)));
 
 class AssetMediaRepository {
-  final NativeSyncApi _nativeSyncApi;
+  final AssetApiRepository _assetApiRepository;
   static final Logger _log = Logger("AssetMediaRepository");
 
-  const AssetMediaRepository(this._nativeSyncApi);
+  const AssetMediaRepository(this._assetApiRepository);
 
   Future<bool> _androidSupportsTrash() async {
     if (Platform.isAndroid) {
@@ -48,27 +45,6 @@ class AssetMediaRepository {
     return PhotoManager.editor.deleteWithIds(ids);
   }
 
-  Future<bool> _restoreFromTrashById(String mediaId, int type) async {
-    try {
-      return await _nativeSyncApi.restoreFromTrashById(mediaId, type);
-    } catch (e, s) {
-      _log.warning('Error restore file from trash by Id', e, s);
-      return false;
-    }
-  }
-
-  Future<List<String>> restoreAssetsFromTrash(Iterable<LocalAsset> assets) async {
-    final restoredIds = <String>[];
-    for (final asset in assets) {
-      _log.info("Restoring from trash, localId: ${asset.id}, checksum: ${asset.checksum}");
-      final result = await _restoreFromTrashById(asset.id, asset.type.index);
-      if (result) {
-        restoredIds.add(asset.id);
-      }
-    }
-    return restoredIds;
-  }
-
   Future<AssetEntity?> get(String id) async {
     final entity = await AssetEntity.fromId(id);
     return entity;
@@ -105,29 +81,10 @@ class AssetMediaRepository {
     );
   }
 
-  Future<int> shareAssets(
-    List<BaseAsset> assets,
-    BuildContext context, {
-    Completer<void>? cancelCompleter,
-    void Function(double progress)? onAssetDownloadProgress,
-  }) async {
+  // TODO: make this more efficient
+  Future<int> shareAssets(List<BaseAsset> assets, BuildContext context, {Completer<void>? cancelCompleter}) async {
     final downloadedXFiles = <XFile>[];
     final tempFiles = <File>[];
-    final totalAssets = assets.length;
-    var processedAssets = 0;
-
-    void updateProgress([double currentAssetProgress = 0.0]) {
-      if (totalAssets <= 0) {
-        onAssetDownloadProgress?.call(1.0);
-        return;
-      }
-
-      final normalizedAssetProgress = currentAssetProgress.clamp(0.0, 1.0);
-      final overallProgress = ((processedAssets + normalizedAssetProgress) / totalAssets).clamp(0.0, 1.0);
-      onAssetDownloadProgress?.call(overallProgress);
-    }
-
-    updateProgress();
 
     for (var asset in assets) {
       if (cancelCompleter != null && cancelCompleter.isCompleted) {
@@ -144,8 +101,6 @@ class AssetMediaRepository {
       if (localId != null && !asset.isEdited) {
         File? f = await AssetEntity(id: localId, width: 1, height: 1, typeInt: 0).originFile;
         downloadedXFiles.add(XFile(f!.path));
-        processedAssets++;
-        updateProgress();
         if (CurrentPlatform.isIOS) {
           tempFiles.add(f);
         }
@@ -153,50 +108,22 @@ class AssetMediaRepository {
         final remoteId = (asset is RemoteAsset) ? asset.id : asset.remoteId;
         if (remoteId == null) {
           _log.warning("Asset has no remote ID for sharing: $asset");
-          processedAssets++;
-          updateProgress();
           continue;
         }
 
-        final taskId = 'share-$remoteId-${DateTime.now().microsecondsSinceEpoch}';
-        final sanitizedFilename = asset.name.replaceAll(RegExp(r'[\\/]'), '_');
-        final task = DownloadTask(
-          taskId: taskId,
-          url: getOriginalUrlForRemoteId(remoteId, edited: asset.isEdited),
-          headers: ApiService.getRequestHeaders(),
-          filename: sanitizedFilename,
-          baseDirectory: BaseDirectory.temporary,
-          group: kShareDownloadGroup,
-          updates: Updates.statusAndProgress,
-        );
-        final statusUpdate = await FileDownloader().download(
-          task,
-          onProgress: (value) {
-            if (cancelCompleter != null && cancelCompleter.isCompleted) {
-              unawaited(FileDownloader().cancelTaskWithId(taskId));
-              return;
-            }
-            updateProgress(value);
-          },
-        );
+        final tempDir = await getTemporaryDirectory();
+        final name = asset.name;
+        final tempFile = await File('${tempDir.path}/$name').create();
+        final res = await _assetApiRepository.downloadAsset(remoteId, edited: true);
 
-        if (cancelCompleter != null && cancelCompleter.isCompleted) {
-          await _cleanupTempFiles(tempFiles);
-          return 0;
-        }
-
-        if (statusUpdate.status == TaskStatus.complete) {
-          final filePath = await task.filePath();
-          final file = File(filePath);
-          tempFiles.add(file);
-          downloadedXFiles.add(XFile(filePath));
-          processedAssets++;
-          updateProgress();
+        if (res.statusCode != 200) {
+          _log.severe("Download for $name failed", res.toLoggerString());
           continue;
         }
-        _log.severe("Download for ${asset.name} failed with status ${statusUpdate.status}", statusUpdate.exception);
-        processedAssets++;
-        updateProgress();
+
+        await tempFile.writeAsBytes(res.bodyBytes);
+        downloadedXFiles.add(XFile(tempFile.path));
+        tempFiles.add(tempFile);
       }
     }
 

mobile/lib/repositories/auth.repository.dart

@@ -1,38 +1,40 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/domain/models/config/app_config.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/metadata.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/sync_stream.repository.dart';
 import 'package:immich_mobile/models/auth/auxilary_endpoint.model.dart';
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 
 final authRepositoryProvider = Provider<AuthRepository>(
-  (ref) => AuthRepository(ref.watch(driftProvider), ref.watch(appConfigProvider)),
+  (ref) => AuthRepository(ref.watch(driftProvider), ref.watch(metadataProvider)),
 );
 
 class AuthRepository {
   final Drift _drift;
-  final AppConfig _config;
+  final MetadataRepository _metadata;
 
-  const AuthRepository(this._drift, this._config);
+  const AuthRepository(this._drift, this._metadata);
 
   Future<void> clearLocalData() async {
     await SyncStreamRepository(_drift).reset();
   }
 
   bool getEndpointSwitchingFeature() {
-    return _config.network.autoEndpointSwitching;
+    return _metadata.systemConfig.network.autoEndpointSwitching;
   }
 
   String? getPreferredWifiName() {
-    return _config.network.preferredWifiName;
+    return _metadata.systemConfig.network.preferredWifiName;
   }
 
   String? getLocalEndpoint() {
-    return _config.network.localEndpoint;
+    return _metadata.systemConfig.network.localEndpoint;
   }
 
   List<AuxilaryEndpoint> getExternalEndpointList() {
-    return _config.network.externalEndpointList.map((url) => AuxilaryEndpoint(url: url, status: .valid)).toList();
+    return _metadata.systemConfig.network.externalEndpointList
+        .map((url) => AuxilaryEndpoint(url: url, status: .valid))
+        .toList();
   }
 }

mobile/lib/repositories/local_files_manager.repository.dart

@@ -0,0 +1,51 @@
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/services/local_files_manager.service.dart';
+import 'package:logging/logging.dart';
+
+final localFilesManagerRepositoryProvider = Provider(
+  (ref) => LocalFilesManagerRepository(ref.watch(localFileManagerServiceProvider)),
+);
+
+class LocalFilesManagerRepository {
+  LocalFilesManagerRepository(this._service);
+
+  final Logger _logger = Logger('LocalFilesManagerRepo');
+  final LocalFilesManagerService _service;
+
+  Future<bool> moveToTrash(List<String> mediaUrls) async {
+    return await _service.moveToTrash(mediaUrls);
+  }
+
+  Future<bool> restoreFromTrash(String fileName, int type) async {
+    return await _service.restoreFromTrash(fileName, type);
+  }
+
+  Future<bool> requestManageMediaPermission() async {
+    return await _service.requestManageMediaPermission();
+  }
+
+  Future<bool> hasManageMediaPermission() async {
+    return await _service.hasManageMediaPermission();
+  }
+
+  Future<bool> manageMediaPermission() async {
+    return await _service.manageMediaPermission();
+  }
+
+  Future<List<String>> restoreAssetsFromTrash(Iterable<LocalAsset> assets) async {
+    final restoredIds = <String>[];
+    for (final asset in assets) {
+      _logger.info("Restoring from trash, localId: ${asset.id}, remoteId: ${asset.checksum}");
+      try {
+        final result = await _service.restoreFromTrashById(asset.id, asset.type.index);
+        if (result) {
+          restoredIds.add(asset.id);
+        }
+      } catch (e) {
+        _logger.warning("Restoring failure: $e");
+      }
+    }
+    return restoredIds;
+  }
+}

mobile/lib/repositories/permission.repository.dart

@@ -1,16 +1,12 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/platform/permission_api.g.dart';
-import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
 import 'package:permission_handler/permission_handler.dart';
 
-final permissionRepositoryProvider = Provider((ref) {
-  return PermissionRepository(ref.watch(permissionApiProvider));
+final permissionRepositoryProvider = Provider((_) {
+  return const PermissionRepository();
 });
 
 class PermissionRepository implements IPermissionRepository {
-  final PermissionApi _permissionApi;
-
-  const PermissionRepository(this._permissionApi);
+  const PermissionRepository();
 
   @override
   Future<bool> hasLocationWhenInUsePermission() {
@@ -38,21 +34,6 @@ class PermissionRepository implements IPermissionRepository {
   Future<bool> openSettings() {
     return openAppSettings();
   }
-
-  @override
-  Future<bool> hasManageMediaPermission() {
-    return _permissionApi.hasManageMediaPermission();
-  }
-
-  @override
-  Future<bool> requestManageMediaPermission() {
-    return _permissionApi.requestManageMediaPermission();
-  }
-
-  @override
-  Future<bool> manageMediaPermission() {
-    return _permissionApi.manageMediaPermission();
-  }
 }
 
 abstract interface class IPermissionRepository {
@@ -61,7 +42,4 @@ abstract interface class IPermissionRepository {
   Future<bool> hasLocationAlwaysPermission();
   Future<bool> requestLocationAlwaysPermission();
   Future<bool> openSettings();
-  Future<bool> hasManageMediaPermission();
-  Future<bool> requestManageMediaPermission();
-  Future<bool> manageMediaPermission();
 }

mobile/lib/repositories/upload.repository.dart

@@ -10,6 +10,7 @@ import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/infrastructure/repositories/network.repository.dart';
 import 'package:logging/logging.dart';
 import 'package:http/http.dart';
+import 'package:immich_mobile/utils/debug_print.dart';
 
 final uploadRepositoryProvider = Provider((ref) => UploadRepository());
 
@@ -19,14 +20,21 @@ class UploadRepository {
   void Function(TaskProgressUpdate)? onTaskProgress;
 
   UploadRepository() {
-    final downloader = FileDownloader();
-    for (final group in const [kBackupGroup, kBackupLivePhotoGroup, kManualUploadGroup]) {
-      downloader.registerCallbacks(
-        group: group,
-        taskStatusCallback: onUploadStatus,
-        taskProgressCallback: onTaskProgress,
-      );
-    }
+    FileDownloader().registerCallbacks(
+      group: kBackupGroup,
+      taskStatusCallback: (update) => onUploadStatus?.call(update),
+      taskProgressCallback: (update) => onTaskProgress?.call(update),
+    );
+    FileDownloader().registerCallbacks(
+      group: kBackupLivePhotoGroup,
+      taskStatusCallback: (update) => onUploadStatus?.call(update),
+      taskProgressCallback: (update) => onTaskProgress?.call(update),
+    );
+    FileDownloader().registerCallbacks(
+      group: kManualUploadGroup,
+      taskStatusCallback: (update) => onUploadStatus?.call(update),
+      taskProgressCallback: (update) => onTaskProgress?.call(update),
+    );
   }
 
   Future<void> enqueueBackground(UploadTask task) {
@@ -58,6 +66,28 @@ class UploadRepository {
     return FileDownloader().start();
   }
 
+  Future<void> getUploadInfo() async {
+    final [enqueuedTasks, runningTasks, canceledTasks, waitingTasks, pausedTasks] = await Future.wait([
+      FileDownloader().database.allRecordsWithStatus(TaskStatus.enqueued, group: kBackupGroup),
+      FileDownloader().database.allRecordsWithStatus(TaskStatus.running, group: kBackupGroup),
+      FileDownloader().database.allRecordsWithStatus(TaskStatus.canceled, group: kBackupGroup),
+      FileDownloader().database.allRecordsWithStatus(TaskStatus.waitingToRetry, group: kBackupGroup),
+      FileDownloader().database.allRecordsWithStatus(TaskStatus.paused, group: kBackupGroup),
+    ]);
+
+    dPrint(
+      () =>
+          """
+      Upload Info:
+      Enqueued: ${enqueuedTasks.length}
+      Running: ${runningTasks.length}
+      Canceled: ${canceledTasks.length}
+      Waiting: ${waitingTasks.length}
+      Paused: ${pausedTasks.length}
+    """,
+    );
+  }
+
   Future<UploadResult> uploadFile({
     required File file,
     required String originalFileName,
@@ -81,30 +111,41 @@ class UploadRepository {
       baseRequest.fields.addAll(fields);
       baseRequest.files.add(assetRawUploadData);
 
-      final StreamedResponse(:statusCode, :stream) = await NetworkRepository.client.send(baseRequest);
-      final responseBodyString = await stream.bytesToString();
+      final response = await NetworkRepository.client.send(baseRequest);
+      final responseBodyString = await response.stream.bytesToString();
 
-      return switch ((statusCode, _tryJsonDecode(responseBodyString))) {
-        (200 || 201, {'id': String id}) => UploadSuccess(remoteAssetId: id),
-        (413, _) => const UploadError(statusCode: 413, message: 'File is too large to upload'),
-        (_, {'message': String message}) => UploadError(statusCode: statusCode, message: message),
-        _ => UploadError(statusCode: statusCode, message: 'Upload failed with status $statusCode'),
-      };
+      if (![200, 201].contains(response.statusCode)) {
+        String? errorMessage;
+
+        if (response.statusCode == 413) {
+          errorMessage = 'Error(413) File is too large to upload';
+          return UploadResult.error(statusCode: response.statusCode, errorMessage: errorMessage);
+        }
+
+        try {
+          final error = jsonDecode(responseBodyString);
+          errorMessage = error['message'] ?? error['error'];
+        } catch (_) {
+          errorMessage = responseBodyString.isNotEmpty
+              ? responseBodyString
+              : 'Upload failed with status ${response.statusCode}';
+        }
+
+        return UploadResult.error(statusCode: response.statusCode, errorMessage: errorMessage);
+      }
+
+      try {
+        final responseBody = jsonDecode(responseBodyString);
+        return UploadResult.success(remoteAssetId: responseBody['id'] as String);
+      } catch (e) {
+        return UploadResult.error(errorMessage: 'Failed to parse server response');
+      }
     } on RequestAbortedException {
       logger.warning("Upload $logContext was cancelled");
-      return const UploadCancelled();
+      return UploadResult.cancelled();
     } catch (error, stackTrace) {
       logger.warning("Error uploading $logContext: ${error.toString()}: $stackTrace");
-      return UploadError(message: error.toString());
-    }
-  }
-
-  @pragma('vm:prefer-inline')
-  Map? _tryJsonDecode(String s) {
-    try {
-      return (jsonDecode(s) as Map);
-    } catch (_) {
-      return null;
+      return UploadResult.error(errorMessage: error.toString());
     }
   }
 }
@@ -139,23 +180,30 @@ class ProgressMultipartRequest extends MultipartRequest with Abortable {
   }
 }
 
-sealed class UploadResult {
-  const UploadResult();
-}
-
-final class UploadSuccess extends UploadResult {
-  final String remoteAssetId;
-
-  const UploadSuccess({required this.remoteAssetId});
-}
-
-final class UploadError extends UploadResult {
-  final String message;
+class UploadResult {
+  final bool isSuccess;
+  final bool isCancelled;
+  final String? remoteAssetId;
+  final String? errorMessage;
   final int? statusCode;
 
-  const UploadError({required this.message, this.statusCode});
-}
+  const UploadResult({
+    required this.isSuccess,
+    required this.isCancelled,
+    this.remoteAssetId,
+    this.errorMessage,
+    this.statusCode,
+  });
 
-final class UploadCancelled extends UploadResult {
-  const UploadCancelled();
+  factory UploadResult.success({required String remoteAssetId}) {
+    return UploadResult(isSuccess: true, isCancelled: false, remoteAssetId: remoteAssetId);
+  }
+
+  factory UploadResult.error({String? errorMessage, int? statusCode}) {
+    return UploadResult(isSuccess: false, isCancelled: false, errorMessage: errorMessage, statusCode: statusCode);
+  }
+
+  factory UploadResult.cancelled() {
+    return const UploadResult(isSuccess: false, isCancelled: true);
+  }
 }

mobile/lib/repositories/widget.repository.dart

@@ -1,6 +1,5 @@
 import 'package:home_widget/home_widget.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
 
 final widgetRepositoryProvider = Provider((_) => const WidgetRepository());
 
@@ -15,7 +14,7 @@ class WidgetRepository {
     await HomeWidget.updateWidget(iOSName: iosName, qualifiedAndroidName: androidName);
   }
 
-  Future<void> setAppGroupId() async {
-    await HomeWidget.setAppGroupId(await networkApi.getAppGroupId());
+  Future<void> setAppGroupId(String appGroupId) async {
+    await HomeWidget.setAppGroupId(appGroupId);
   }
 }

mobile/lib/services/action.service.dart

@@ -269,18 +269,8 @@ class ActionService {
     await _assetApiRepository.unStack(stackIds);
   }
 
-  Future<int> shareAssets(
-    List<BaseAsset> assets,
-    BuildContext context, {
-    Completer<void>? cancelCompleter,
-    void Function(double progress)? onAssetDownloadProgress,
-  }) {
-    return _assetMediaRepository.shareAssets(
-      assets,
-      context,
-      cancelCompleter: cancelCompleter,
-      onAssetDownloadProgress: onAssetDownloadProgress,
-    );
+  Future<int> shareAssets(List<BaseAsset> assets, BuildContext context, {Completer<void>? cancelCompleter}) {
+    return _assetMediaRepository.shareAssets(assets, context, cancelCompleter: cancelCompleter);
   }
 
   Future<List<bool>> downloadAll(List<RemoteAsset> assets) {

mobile/lib/services/api.service.dart

@@ -177,9 +177,9 @@ class ApiService {
     if (serverEndpoint != null && serverEndpoint.isNotEmpty) {
       urls.add(serverEndpoint);
     }
-    final network = MetadataRepository.instance.appConfig.network;
+    final network = MetadataRepository.instance.systemConfig.network;
     final localEndpoint = network.localEndpoint;
-    if (localEndpoint.isNotEmpty) {
+    if (localEndpoint != null) {
       urls.add(localEndpoint);
     }
     for (final url in network.externalEndpointList) {
@@ -191,7 +191,7 @@ class ApiService {
   }
 
   static Map<String, String> getRequestHeaders() {
-    return MetadataRepository.instance.appConfig.network.customHeaders;
+    return MetadataRepository.instance.systemConfig.network.customHeaders;
   }
 
   ApiClient get apiClient => _apiClient;

mobile/lib/services/background_upload.service.dart

@@ -266,6 +266,8 @@ class BackgroundUploadService {
       return null;
     }
 
+    File? file;
+
     /// iOS LivePhoto has two files: a photo and a video.
     /// They are uploaded separately, with video file being upload first, then returned with the assetId
     /// The assetId is then used as a metadata for the photo file upload task.
@@ -276,9 +278,11 @@ class BackgroundUploadService {
     /// The cancel operation will only cancel the video group (normal group), the photo group will not
     /// be touched, as the video file is already uploaded.
 
-    final file = await (entity.isLivePhoto
-        ? _storageRepository.getMotionFile(asset.id)
-        : _storageRepository.getAssetFile(asset.id));
+    if (entity.isLivePhoto) {
+      file = await _storageRepository.getMotionFileForAsset(asset);
+    } else {
+      file = await _storageRepository.getFileForAsset(asset.id);
+    }
 
     if (file == null) {
       _logger.warning("Failed to get file for asset ${asset.id} - ${asset.name}");
@@ -326,7 +330,7 @@ class BackgroundUploadService {
       return null;
     }
 
-    final file = await _storageRepository.getAssetFile(asset.id);
+    final file = await _storageRepository.getFileForAsset(asset.id);
     if (file == null) {
       return null;
     }

mobile/lib/services/foreground_upload.service.dart

@@ -20,6 +20,7 @@ import 'package:immich_mobile/repositories/asset_media.repository.dart';
 import 'package:immich_mobile/repositories/upload.repository.dart';
 import 'package:logging/logging.dart';
 import 'package:path/path.dart' as p;
+import 'package:photo_manager/photo_manager.dart' show PMProgressHandler;
 
 /// Callbacks for upload progress and status updates
 class UploadCallbacks {
@@ -98,7 +99,7 @@ class ForegroundUploadService {
           final requireWifi = _shouldRequireWiFi(asset);
           return requireWifi && !hasWifi;
         },
-        processItem: (asset) => _uploadSingleAsset(asset, cancelToken: cancelToken, callbacks: callbacks),
+        processItem: (asset) => _uploadSingleAsset(asset, cancelToken, callbacks: callbacks),
       );
     }
   }
@@ -124,14 +125,14 @@ class ForegroundUploadService {
         continue;
       }
 
-      await _uploadSingleAsset(asset, cancelToken: cancelToken, callbacks: callbacks);
+      await _uploadSingleAsset(asset, cancelToken, callbacks: callbacks);
     }
   }
 
   /// Manually upload picked local assets
   Future<void> uploadManual(
     List<LocalAsset> localAssets, {
-    required Completer<void>? cancelToken,
+    Completer<void>? cancelToken,
     UploadCallbacks callbacks = const UploadCallbacks(),
   }) async {
     if (localAssets.isEmpty) {
@@ -141,7 +142,7 @@ class ForegroundUploadService {
     await _executeWithWorkerPool<LocalAsset>(
       items: localAssets,
       cancelToken: cancelToken,
-      processItem: (asset) => _uploadSingleAsset(asset, cancelToken: cancelToken, callbacks: callbacks),
+      processItem: (asset) => _uploadSingleAsset(asset, cancelToken, callbacks: callbacks),
     );
   }
 
@@ -169,11 +170,11 @@ class ForegroundUploadService {
           onProgress: (bytes, totalBytes) => onProgress?.call(fileId, bytes, totalBytes),
         );
 
-        return switch (result) {
-          UploadSuccess() => onSuccess?.call(fileId),
-          UploadError(:final message) => onError?.call(fileId, message),
-          UploadCancelled() => null,
-        };
+        if (result.isSuccess) {
+          onSuccess?.call(fileId);
+        } else if (!result.isCancelled && result.errorMessage != null) {
+          onError?.call(fileId, result.errorMessage!);
+        }
       },
     );
   }
@@ -215,7 +216,7 @@ class ForegroundUploadService {
 
         final item = items[index];
 
-        if (shouldSkip != null && shouldSkip(item)) {
+        if (shouldSkip?.call(item) ?? false) {
           continue;
         }
 
@@ -232,48 +233,78 @@ class ForegroundUploadService {
   }
 
   Future<void> _uploadSingleAsset(
-    LocalAsset asset, {
-    required Completer<void>? cancelToken,
+    LocalAsset asset,
+    Completer<void>? cancelToken, {
     required UploadCallbacks callbacks,
   }) async {
-    final UploadCallbacks(:onProgress, :onSuccess, :onError, :onICloudProgress) = callbacks;
-    File? assetFile;
+    File? file;
     File? livePhotoFile;
 
     try {
       final entity = await _storageRepository.getAssetEntityForAsset(asset);
       if (entity == null) {
-        onError?.call(
+        callbacks.onError?.call(
           asset.localId!,
           CurrentPlatform.isAndroid ? "asset_not_found_on_device_android".t() : "asset_not_found_on_device_ios".t(),
         );
         return;
       }
 
-      File? file;
-      if (entity.isLivePhoto) {
-        file = await _storageRepository.getMotionFile(asset.id, cancelToken: cancelToken, onProgress: onICloudProgress);
+      final isAvailableLocally = await _storageRepository.isAssetAvailableLocally(asset.id);
+
+      if (!isAvailableLocally && CurrentPlatform.isIOS) {
+        _logger.info("Loading iCloud asset ${asset.id} - ${asset.name}");
+
+        // Create progress handler for iCloud download
+        PMProgressHandler? progressHandler;
+        StreamSubscription? progressSubscription;
+
+        progressHandler = PMProgressHandler();
+        progressSubscription = progressHandler.stream.listen((event) {
+          callbacks.onICloudProgress?.call(asset.localId!, event.progress);
+        });
+
+        try {
+          file = await _storageRepository.loadFileFromCloud(asset.id, progressHandler: progressHandler);
+          if (entity.isLivePhoto) {
+            livePhotoFile = await _storageRepository.loadMotionFileFromCloud(
+              asset.id,
+              progressHandler: progressHandler,
+            );
+          }
+        } finally {
+          await progressSubscription.cancel();
+        }
+      } else {
+        // Get files locally
+        file = await _storageRepository.getFileForAsset(asset.id);
         if (file == null) {
-          _logger.warning("Failed to obtain motion part of the livePhoto - ${asset.name}");
-          onError?.call(
+          _logger.warning("Failed to get file ${asset.id} - ${asset.name}");
+          callbacks.onError?.call(
             asset.localId!,
             CurrentPlatform.isAndroid ? "asset_not_found_on_device_android".t() : "asset_not_found_on_device_ios".t(),
           );
           return;
         }
-        livePhotoFile = file;
+
+        // For live photos, get the motion video file
+        if (entity.isLivePhoto) {
+          livePhotoFile = await _storageRepository.getMotionFileForAsset(asset);
+          if (livePhotoFile == null) {
+            _logger.warning("Failed to obtain motion part of the livePhoto - ${asset.name}");
+            callbacks.onError?.call(
+              asset.localId!,
+              CurrentPlatform.isAndroid ? "asset_not_found_on_device_android".t() : "asset_not_found_on_device_ios".t(),
+            );
+          }
+        }
       }
 
-      file = await _storageRepository.getAssetFile(asset.id, cancelToken: cancelToken, onProgress: onICloudProgress);
       if (file == null) {
-        _logger.warning("Failed to get file ${asset.id} - ${asset.name}");
-        onError?.call(
-          asset.localId!,
-          CurrentPlatform.isAndroid ? "asset_not_found_on_device_android".t() : "asset_not_found_on_device_ios".t(),
-        );
+        _logger.warning("Failed to obtain file from iCloud for asset ${asset.id} - ${asset.name}");
+        callbacks.onError?.call(asset.localId!, "asset_not_found_on_icloud".t());
         return;
       }
-      assetFile = file;
 
       String fileName = await _assetMediaRepository.getOriginalFilename(asset.id) ?? asset.name;
 
@@ -299,9 +330,11 @@ class ForegroundUploadService {
       };
 
       // Upload live photo video first if available
+      String? livePhotoVideoId;
       if (entity.isLivePhoto && livePhotoFile != null) {
         final livePhotoTitle = p.setExtension(originalFileName, p.extension(livePhotoFile.path));
 
+        final onProgress = callbacks.onProgress;
         final livePhotoResult = await _uploadRepository.uploadFile(
           file: livePhotoFile,
           originalFileName: livePhotoTitle,
@@ -313,16 +346,15 @@ class ForegroundUploadService {
           logContext: 'livePhotoVideo[${asset.localId}]',
         );
 
-        switch (livePhotoResult) {
-          case UploadSuccess(:final remoteAssetId):
-            fields['livePhotoVideoId'] = remoteAssetId;
-          case UploadError(:final message):
-            onError?.call(asset.localId!, "Failed to upload live photo video: $message");
-            return;
-          case UploadCancelled():
+        if (livePhotoResult.isSuccess && livePhotoResult.remoteAssetId != null) {
+          livePhotoVideoId = livePhotoResult.remoteAssetId;
         }
       }
 
+      if (livePhotoVideoId != null) {
+        fields['livePhotoVideoId'] = livePhotoVideoId;
+      }
+
       // Add cloudId metadata only to the still image, not the motion video, becasue when the sync id happens, the motion video can get associated with the wrong still image.
       if (CurrentPlatform.isIOS && asset.cloudId != null) {
         fields['metadata'] = jsonEncode([
@@ -339,6 +371,7 @@ class ForegroundUploadService {
         ]);
       }
 
+      final onProgress = callbacks.onProgress;
       final result = await _uploadRepository.uploadFile(
         file: file,
         originalFileName: originalFileName,
@@ -350,33 +383,34 @@ class ForegroundUploadService {
         logContext: 'asset[${asset.localId}]',
       );
 
-      switch (result) {
-        case UploadSuccess(:final remoteAssetId):
-          onSuccess?.call(asset.localId!, remoteAssetId);
-        case UploadCancelled():
+      if (result.isSuccess && result.remoteAssetId != null) {
+        callbacks.onSuccess?.call(asset.localId!, result.remoteAssetId!);
+      } else if (result.isCancelled) {
+        _logger.warning(() => "Backup was cancelled by the user");
+        shouldAbortUpload = true;
+      } else if (result.errorMessage != null) {
+        _logger.severe(
+          () =>
+              "Error(${result.statusCode}) uploading ${asset.localId} | $originalFileName | Created on ${asset.createdAt} | ${result.errorMessage}",
+        );
+
+        callbacks.onError?.call(asset.localId!, result.errorMessage!);
+
+        if (result.errorMessage == "Quota has been exceeded!") {
           shouldAbortUpload = true;
-          _logger.warning("Upload was cancelled by the user for asset ${asset.localId}");
-        case UploadError(:final message, :final statusCode):
-          shouldAbortUpload |= message == "Quota has been exceeded!";
-          _logger.severe(
-            "Error(${statusCode ?? 'unknown'}) uploading ${asset.localId} | $originalFileName | Created on ${asset.createdAt} | $message",
-          );
-          onError?.call(asset.localId!, message);
+        }
       }
     } catch (error, stackTrace) {
-      _logger.severe("Asset backup failed", error, stackTrace);
-      onError?.call(asset.localId!, error.toString());
+      _logger.severe(() => "Error backup asset: ${error.toString()}", stackTrace);
+      callbacks.onError?.call(asset.localId!, error.toString());
     } finally {
       if (Platform.isIOS) {
-        unawaited(
-          Future.wait([
-            if (assetFile != null) assetFile.delete(),
-            if (livePhotoFile != null) livePhotoFile.delete(),
-          ]).onError((error, stackTrace) {
-            _logger.severe("Post-upload file cleanup failed", error, stackTrace);
-            return const [];
-          }),
-        );
+        try {
+          await file?.delete();
+          await livePhotoFile?.delete();
+        } catch (error, stackTrace) {
+          _logger.severe(() => "ERROR deleting file: ${error.toString()}", stackTrace);
+        }
       }
     }
   }
@@ -412,7 +446,7 @@ class ForegroundUploadService {
         logContext: 'shareIntent[$deviceAssetId]',
       );
     } catch (e) {
-      return UploadError(message: e.toString());
+      return UploadResult.error(errorMessage: e.toString());
     }
   }
 

mobile/lib/services/local_files_manager.service.dart

@@ -0,0 +1,66 @@
+import 'package:flutter/services.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:logging/logging.dart';
+
+final localFileManagerServiceProvider = Provider<LocalFilesManagerService>((ref) => const LocalFilesManagerService());
+
+class LocalFilesManagerService {
+  const LocalFilesManagerService();
+
+  static final Logger _logger = Logger('LocalFilesManager');
+  static const MethodChannel _channel = MethodChannel('file_trash');
+
+  Future<bool> moveToTrash(List<String> mediaUrls) async {
+    try {
+      return await _channel.invokeMethod('moveToTrash', {'mediaUrls': mediaUrls});
+    } catch (e, s) {
+      _logger.warning('Error moving file to trash', e, s);
+      return false;
+    }
+  }
+
+  Future<bool> restoreFromTrash(String fileName, int type) async {
+    try {
+      return await _channel.invokeMethod('restoreFromTrash', {'fileName': fileName, 'type': type});
+    } catch (e, s) {
+      _logger.warning('Error restore file from trash', e, s);
+      return false;
+    }
+  }
+
+  Future<bool> restoreFromTrashById(String mediaId, int type) async {
+    try {
+      return await _channel.invokeMethod('restoreFromTrash', {'mediaId': mediaId, 'type': type});
+    } catch (e, s) {
+      _logger.warning('Error restore file from trash by Id', e, s);
+      return false;
+    }
+  }
+
+  Future<bool> requestManageMediaPermission() async {
+    try {
+      return await _channel.invokeMethod('requestManageMediaPermission');
+    } catch (e, s) {
+      _logger.warning('Error requesting manage media permission', e, s);
+      return false;
+    }
+  }
+
+  Future<bool> hasManageMediaPermission() async {
+    try {
+      return await _channel.invokeMethod('hasManageMediaPermission');
+    } catch (e, s) {
+      _logger.warning('Error requesting manage media permission state', e, s);
+      return false;
+    }
+  }
+
+  Future<bool> manageMediaPermission() async {
+    try {
+      return await _channel.invokeMethod('manageMediaPermission');
+    } catch (e, s) {
+      _logger.warning('Error requesting manage media permission settings', e, s);
+      return false;
+    }
+  }
+}

mobile/lib/services/widget.service.dart

@@ -12,7 +12,7 @@ class WidgetService {
   const WidgetService(this._repository);
 
   Future<void> writeCredentials(String serverURL, String sessionKey, String? customHeaders) async {
-    await _repository.setAppGroupId();
+    await _repository.setAppGroupId(appShareGroupId);
     await _repository.saveData(kWidgetServerEndpoint, serverURL);
     await _repository.saveData(kWidgetAuthToken, sessionKey);
 
@@ -25,7 +25,7 @@ class WidgetService {
   }
 
   Future<void> clearCredentials() async {
-    await _repository.setAppGroupId();
+    await _repository.setAppGroupId(appShareGroupId);
     await _repository.saveData(kWidgetServerEndpoint, "");
     await _repository.saveData(kWidgetAuthToken, "");
     await _repository.saveData(kWidgetCustomHeaders, "");

mobile/lib/utils/migration.dart

@@ -1,12 +1,10 @@
 import 'dart:async';
 import 'dart:convert';
 
-import 'package:collection/collection.dart';
 import 'package:drift/drift.dart';
 import 'package:flutter/material.dart';
 import 'package:immich_mobile/constants/colors.dart';
 import 'package:immich_mobile/constants/enums.dart';
-import 'package:immich_mobile/domain/models/config/app_config.dart';
 import 'package:immich_mobile/domain/models/log.model.dart';
 import 'package:immich_mobile/domain/models/metadata_key.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
@@ -138,11 +136,15 @@ Future<void> _migrateTo26(Drift drift) async {
 
 Future<void> _migrateAlbumSortMode(_StoreMigrator migrator) async {
   final raw = await migrator.readLegacyStoreInt(StoreKey.legacySelectedAlbumSortOrder.id);
-  final mode = AlbumSortMode.values.firstWhereOrNull((e) => raw != null && e.storeIndex == raw);
-  if (mode == null) {
+  if (raw == null) {
     return;
   }
 
+  final mode = AlbumSortMode.values.firstWhere(
+    (e) => e.storeIndex == raw,
+    orElse: () => MetadataKey.albumSortMode.defaultValue,
+  );
+
   migrator.stage(StoreKey.legacySelectedAlbumSortOrder, MetadataKey.albumSortMode, mode);
 }
 
@@ -206,11 +208,7 @@ class _StoreMigrator {
       return;
     }
 
-    final enumValue = values.elementAtOrNull(index);
-    if (enumValue == null) {
-      return;
-    }
-
+    final enumValue = values.elementAtOrNull(index) ?? newKey.defaultValue;
     _cache[newKey] = enumValue;
     _migratedStoreIds.add(legacyKey.id);
   }
@@ -225,11 +223,7 @@ class _StoreMigrator {
       return;
     }
 
-    final enumValue = values.firstWhereOrNull((e) => e.name == name);
-    if (enumValue == null) {
-      return;
-    }
-
+    final enumValue = values.firstWhere((e) => e.name == name, orElse: () => newKey.defaultValue);
     _cache[newKey] = enumValue;
     _migratedStoreIds.add(legacyKey.id);
   }
@@ -273,12 +267,9 @@ class _StoreMigrator {
   Future<void> complete() async {
     await _db.batch((batch) {
       for (final entry in _cache.entries) {
-        if (entry.value == defaultConfig.read(entry.key)) {
-          continue;
-        }
         batch.insert(
           _db.metadataEntity,
-          MetadataEntityCompanion(key: Value(entry.key.name), value: Value(entry.key.encode(entry.value))),
+          MetadataEntityCompanion(key: Value(entry.key.key), value: Value(entry.key.encode(entry.value))),
           mode: InsertMode.insertOrReplace,
         );
       }

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

@@ -22,7 +22,7 @@ import 'package:immich_mobile/providers/gallery_permission.provider.dart';
 import 'package:immich_mobile/providers/oauth.provider.dart';
 import 'package:immich_mobile/providers/server_info.provider.dart';
 import 'package:immich_mobile/providers/websocket.provider.dart';
-import 'package:immich_mobile/repositories/permission.repository.dart';
+import 'package:immich_mobile/repositories/local_files_manager.repository.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/utils/provider_utils.dart';
 import 'package:immich_mobile/utils/url_helper.dart';
@@ -193,7 +193,7 @@ class LoginForm extends HookConsumerWidget {
     }
 
     getManageMediaPermission() async {
-      final hasPermission = await ref.read(permissionRepositoryProvider).hasManageMediaPermission();
+      final hasPermission = await ref.read(localFilesManagerRepositoryProvider).hasManageMediaPermission();
       if (!hasPermission) {
         await showDialog(
           context: context,
@@ -224,7 +224,7 @@ class LoginForm extends HookConsumerWidget {
                 ),
                 TextButton(
                   onPressed: () {
-                    unawaited(ref.read(permissionRepositoryProvider).requestManageMediaPermission());
+                    ref.read(localFilesManagerRepositoryProvider).requestManageMediaPermission();
                     Navigator.of(context).pop();
                   },
                   child: Text(

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

@@ -139,6 +139,8 @@ class PhotoViewCoreState extends State<PhotoViewCore>
 
   PhotoViewHeroAttributes? get heroAttributes => widget.heroAttributes;
 
+  late ScaleBoundaries cachedScaleBoundaries = widget.scaleBoundaries;
+
   void handleScaleAnimation() {
     scale = _scaleAnimation!.value;
   }
@@ -301,7 +303,7 @@ class PhotoViewCoreState extends State<PhotoViewCore>
     controller.scaleAnimationBuilder(_animateControllerScale);
     controller.rotationAnimationBuilder(_animateControllerRotation);
 
-    _updateScaleBoundaries();
+    cachedScaleBoundaries = widget.scaleBoundaries;
 
     _scaleAnimationController = AnimationController(vsync: this)
       ..addListener(handleScaleAnimation)
@@ -332,29 +334,14 @@ class PhotoViewCoreState extends State<PhotoViewCore>
     widget.onTapDown?.call(context, details, controller.value);
   }
 
-  void _updateScaleBoundaries() {
-    final prev = controller.scaleBoundaries;
-    if (prev == widget.scaleBoundaries) {
-      return;
-    }
-
-    if (prev != null && controller.scale != null && prev.initialScale > 0) {
-      final ratio = widget.scaleBoundaries.initialScale / prev.initialScale;
-      controller.setScaleInvisibly(controller.scale! * ratio);
-    } else {
-      markNeedsScaleRecalc = true;
-    }
-    controller.scaleBoundaries = widget.scaleBoundaries;
-  }
-
-  @override
-  void didUpdateWidget(PhotoViewCore oldWidget) {
-    super.didUpdateWidget(oldWidget);
-    _updateScaleBoundaries();
-  }
-
   @override
   Widget build(BuildContext context) {
+    // Check if we need a recalc on the scale
+    if (widget.scaleBoundaries != cachedScaleBoundaries) {
+      markNeedsScaleRecalc = true;
+      cachedScaleBoundaries = widget.scaleBoundaries;
+    }
+
     return StreamBuilder(
       stream: controller.outputStateStream,
       initialData: controller.prevValue,

mobile/lib/widgets/photo_view/src/photo_view_wrappers.dart

@@ -145,6 +145,7 @@ class _ImageWrapperState extends State<ImageWrapper> {
         _lastStack = null;
 
         _didLoadSynchronously = synchronousCall;
+        widget.controller.scaleBoundaries = scaleBoundaries;
       }
 
       synchronousCall && !_didLoadSynchronously ? setupCB() : setState(setupCB);

mobile/lib/widgets/settings/advanced_settings.dart

@@ -10,7 +10,7 @@ import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/readonly_mode.provider.dart';
-import 'package:immich_mobile/repositories/permission.repository.dart';
+import 'package:immich_mobile/repositories/local_files_manager.repository.dart';
 import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:immich_mobile/utils/bytes_units.dart';
 import 'package:immich_mobile/utils/hooks/app_settings_update_hook.dart';
@@ -31,7 +31,7 @@ class AdvancedSettings extends HookConsumerWidget {
     final manageLocalMediaAndroid = useAppSettingsState(AppSettingsEnum.manageLocalMediaAndroid);
     final isManageMediaSupported = useState(false);
     final manageMediaAndroidPermission = useState(false);
-    final levelId = useState<int>(ref.read(appConfigProvider).logLevel.index);
+    final levelId = useState<int>(ref.read(systemConfigProvider).logLevel.index);
     final preferRemote = useState(ref.read(appConfigProvider).image.preferRemote);
     useValueChanged(
       preferRemote.value,
@@ -57,7 +57,9 @@ class AdvancedSettings extends HookConsumerWidget {
       () async {
         isManageMediaSupported.value = await checkAndroidVersion();
         if (isManageMediaSupported.value) {
-          manageMediaAndroidPermission.value = await ref.read(permissionRepositoryProvider).hasManageMediaPermission();
+          manageMediaAndroidPermission.value = await ref
+              .read(localFilesManagerRepositoryProvider)
+              .hasManageMediaPermission();
         }
       }();
       return null;
@@ -80,7 +82,7 @@ class AdvancedSettings extends HookConsumerWidget {
               subtitle: "advanced_settings_sync_remote_deletions_subtitle".tr(),
               onChanged: (value) async {
                 if (value) {
-                  final result = await ref.read(permissionRepositoryProvider).requestManageMediaPermission();
+                  final result = await ref.read(localFilesManagerRepositoryProvider).requestManageMediaPermission();
                   manageLocalMediaAndroid.value = result;
                   manageMediaAndroidPermission.value = result;
                 }
@@ -94,7 +96,7 @@ class AdvancedSettings extends HookConsumerWidget {
                   ? const Color.fromARGB(255, 243, 188, 106)
                   : null,
               onActionTap: () async {
-                final result = await ref.read(permissionRepositoryProvider).manageMediaPermission();
+                final result = await ref.read(localFilesManagerRepositoryProvider).manageMediaPermission();
                 manageMediaAndroidPermission.value = result;
               },
             ),

mobile/lib/widgets/settings/networking_settings/external_network_preference.dart

@@ -64,7 +64,7 @@ class ExternalNetworkPreference extends HookConsumerWidget {
     }
 
     useEffect(() {
-      final urls = ref.read(appConfigProvider).network.externalEndpointList;
+      final urls = ref.read(metadataProvider).systemConfig.network.externalEndpointList;
 
       if (urls.isEmpty) {
         return null;

mobile/lib/widgets/settings/networking_settings/networking_settings.dart

@@ -19,7 +19,7 @@ class NetworkingSettings extends HookConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final currentEndpoint = getServerUrl();
-    final featureEnabled = useState(ref.read(appConfigProvider).network.autoEndpointSwitching);
+    final featureEnabled = useState(ref.read(systemConfigProvider).network.autoEndpointSwitching);
     useValueChanged<bool, void>(featureEnabled.value, (_, __) {
       ref.read(metadataProvider).write(.networkAutoEndpointSwitching, featureEnabled.value);
     });

mobile/mise.toml

@@ -78,15 +78,6 @@ alias = "migration"
 description = "Generate database migrations"
 run = "dart run drift_dev make-migrations"
 
-[tasks.install]
-alias = "install"
-description = "Install flutter dependencies"
-run = "flutter pub get"
-
-[tasks.start]
-alias = "start"
-description = "Start flutter app"
-run = "flutter run"
 
 # Internal tasks
 [tasks."i18n:loader"]

mobile/openapi/README.md

@@ -206,7 +206,6 @@ Class | Method | HTTP request | Description
 *PeopleApi* | [**updatePerson**](doc//PeopleApi.md#updateperson) | **PUT** /people/{id} | Update person
 *PluginsApi* | [**getPlugin**](doc//PluginsApi.md#getplugin) | **GET** /plugins/{id} | Retrieve a plugin
 *PluginsApi* | [**searchPluginMethods**](doc//PluginsApi.md#searchpluginmethods) | **GET** /plugins/methods | Retrieve plugin methods
-*PluginsApi* | [**searchPluginTemplates**](doc//PluginsApi.md#searchplugintemplates) | **GET** /plugins/templates | Retrieve workflow templates
 *PluginsApi* | [**searchPlugins**](doc//PluginsApi.md#searchplugins) | **GET** /plugins | List all plugins
 *QueuesApi* | [**emptyQueue**](doc//QueuesApi.md#emptyqueue) | **DELETE** /queues/{name}/jobs | Empty a queue
 *QueuesApi* | [**getQueue**](doc//QueuesApi.md#getqueue) | **GET** /queues/{name} | Retrieve a queue
@@ -492,8 +491,6 @@ Class | Method | HTTP request | Description
  - [PlacesResponseDto](doc//PlacesResponseDto.md)
  - [PluginMethodResponseDto](doc//PluginMethodResponseDto.md)
  - [PluginResponseDto](doc//PluginResponseDto.md)
- - [PluginTemplateResponseDto](doc//PluginTemplateResponseDto.md)
- - [PluginTemplateStepResponseDto](doc//PluginTemplateStepResponseDto.md)
  - [PurchaseResponse](doc//PurchaseResponse.md)
  - [PurchaseUpdate](doc//PurchaseUpdate.md)
  - [QueueCommand](doc//QueueCommand.md)

mobile/openapi/lib/api.dart

@@ -237,8 +237,6 @@ part 'model/pin_code_setup_dto.dart';
 part 'model/places_response_dto.dart';
 part 'model/plugin_method_response_dto.dart';
 part 'model/plugin_response_dto.dart';
-part 'model/plugin_template_response_dto.dart';
-part 'model/plugin_template_step_response_dto.dart';
 part 'model/purchase_response.dart';
 part 'model/purchase_update.dart';
 part 'model/queue_command.dart';

mobile/openapi/lib/api/plugins_api.dart

@@ -204,57 +204,6 @@ class PluginsApi {
     return null;
   }
 
-  /// Retrieve workflow templates
-  ///
-  /// Retrieve workflow templates provided by installed plugins
-  ///
-  /// Note: This method returns the HTTP [Response].
-  Future<Response> searchPluginTemplatesWithHttpInfo() async {
-    // ignore: prefer_const_declarations
-    final apiPath = r'/plugins/templates';
-
-    // ignore: prefer_final_locals
-    Object? postBody;
-
-    final queryParams = <QueryParam>[];
-    final headerParams = <String, String>{};
-    final formParams = <String, String>{};
-
-    const contentTypes = <String>[];
-
-
-    return apiClient.invokeAPI(
-      apiPath,
-      'GET',
-      queryParams,
-      postBody,
-      headerParams,
-      formParams,
-      contentTypes.isEmpty ? null : contentTypes.first,
-    );
-  }
-
-  /// Retrieve workflow templates
-  ///
-  /// Retrieve workflow templates provided by installed plugins
-  Future<List<PluginTemplateResponseDto>?> searchPluginTemplates() async {
-    final response = await searchPluginTemplatesWithHttpInfo();
-    if (response.statusCode >= HttpStatus.badRequest) {
-      throw ApiException(response.statusCode, await _decodeBodyBytes(response));
-    }
-    // When a remote server returns no body with a status of 204, we shall not decode it.
-    // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
-    // FormatException when trying to decode an empty string.
-    if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) {
-      final responseBody = await _decodeBodyBytes(response);
-      return (await apiClient.deserializeAsync(responseBody, 'List<PluginTemplateResponseDto>') as List)
-        .cast<PluginTemplateResponseDto>()
-        .toList(growable: false);
-
-    }
-    return null;
-  }
-
   /// List all plugins
   ///
   /// Retrieve a list of plugins available to the authenticated user.