fix: remove stray migration

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

@@ -15,7 +15,7 @@ services:
     volumes:
       - ${UPLOAD_LOCATION:-upload-devcontainer-volume}${UPLOAD_LOCATION:+/photos}:/data
       - /etc/localtime:/etc/localtime:ro
-      - build_cache:/buildcache
+      - pnpm_store_server:/buildcache/pnpm-store
       - ../packages/plugin-core:/build/plugins/immich-plugin-core
   immich-web:
     env_file: !reset []

.github/workflows/cli.yml

@@ -49,9 +49,7 @@ jobs:
 
       - name: Publish
         if: ${{ github.event_name == 'release' }}
-        env:
-          NPM_TAG: ${{ github.event.release.prerelease && 'rc' || 'latest' }}
-        run: mise run ci-publish -- --tag "$NPM_TAG"
+        run: mise run ci-publish
 
   docker:
     name: Docker
@@ -104,7 +102,7 @@ jobs:
             name=ghcr.io/${{ github.repository_owner }}/immich-cli
           tags: |
             type=raw,value=${{ steps.package-version.outputs.version }},enable=${{ github.event_name == 'release' }}
-            type=raw,value=latest,enable=${{ github.event_name == 'release' && !github.event.release.prerelease }}
+            type=raw,value=latest,enable=${{ github.event_name == 'release' }}
 
       - name: Build and push image
         uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7.1.0

.github/workflows/docker.yml

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

.github/workflows/docs-deploy.yml

@@ -98,16 +98,9 @@ jobs:
                 shouldDeploy: true
               };
             } else if (eventType == "release") {
-              const tag = context.payload.workflow_run.head_branch;
-              const { data: release } = await github.rest.repos.getReleaseByTag({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                tag,
-              });
               parameters = {
                 event: "release",
-                name: tag,
-                prerelease: release.prerelease,
+                name: context.payload.workflow_run.head_branch,
                 shouldDeploy: !isFork
               };
             }
@@ -153,7 +146,6 @@ jobs:
             const parameters = JSON.parse(process.env.PARAM_JSON);
             core.setOutput("event", parameters.event);
             core.setOutput("name", parameters.name);
-            core.setOutput("prerelease", parameters.prerelease);
             core.setOutput("shouldDeploy", parameters.shouldDeploy);
 
       - name: Download artifact
@@ -211,7 +203,7 @@ jobs:
         run: mise run //docs:deploy
 
       - name: Deploy Docs Release Domain
-        if: ${{ steps.parameters.outputs.event == 'release' && steps.parameters.outputs.prerelease != 'true' }}
+        if: ${{ steps.parameters.outputs.event == 'release' }}
         env:
           TF_VAR_prefix_name: ${{ steps.parameters.outputs.name}}
           CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}

.github/workflows/prepare-release.yml

@@ -137,7 +137,7 @@ jobs:
           github-token: ${{ steps.generate-token.outputs.token }}
 
       - name: Create draft release
-        uses: softprops/action-gh-release@b4309332981a82ec1c5618f44dd2e27cc8bfbfda # v3.0.0
+        uses: softprops/action-gh-release@3bb12739c298aeb8a4eeaf626c5b8d85266b0e65 # v2.6.2
         with:
           draft: true
           tag_name: ${{ needs.bump_version.outputs.version }}

.github/workflows/sdk.yml

@@ -39,6 +39,4 @@ jobs:
         run: pnpm --filter @immich/sdk build
 
       - name: Publish
-        env:
-          NPM_TAG: ${{ github.event.release.prerelease && 'rc' || 'latest' }}
-        run: pnpm --filter @immich/sdk publish --provenance --no-git-checks --tag "$NPM_TAG"
+        run: pnpm --filter @immich/sdk publish --provenance --no-git-checks

.github/workflows/static_analysis.yml

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

.github/workflows/test.yml

@@ -374,7 +374,7 @@ jobs:
           token: ${{ steps.token.outputs.token }}
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
+        uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v5.0.0
 
       - name: Setup Node
         uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
@@ -451,7 +451,7 @@ jobs:
           token: ${{ steps.token.outputs.token }}
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
+        uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v5.0.0
 
       - name: Setup Node
         uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0

Makefile

@@ -1,46 +1,46 @@
 dev:
-	@printf "This command has been removed. Please use:\n\n    mise dev          # or mise //:dev from another directory\n\n" >&2 && exit 1
+	@printf "This command has been removed. Please use:\n\n    mise dev          # or mise //:dev from another directory\n\n"\n\n >&2 && exit 1
 
 dev-down:
-	@printf "This command has been removed. Please use:\n\n    mise dev-down          # or mise //:dev-down from another directory\n\n" >&2 && exit 1
+	@printf "This command has been removed. Please use:\n\n    mise dev-down          # or mise //:dev-down from another directory\n\n"\n\n >&2 && exit 1
 
 dev-update:
-	@printf "This command has been removed. Please use:\n\n    mise dev-update          # or mise //:dev-update from another directory\n\n" >&2 && exit 1
+	@printf "This command has been removed. Please use:\n\n    mise dev-update          # or mise //:dev-update from another directory\n\n"\n\n >&2 && exit 1
 
 dev-scale:
-	@printf "This command has been removed. Please use:\n\n    mise dev-scale          # or mise //:dev-scale from another directory\n\n" >&2 && exit 1
+	@printf "This command has been removed. Please use:\n\n    mise dev-scale          # or mise //:dev-scale from another directory\n\n"\n\n >&2 && exit 1
 
 dev-docs:
 	npm --prefix docs run start
 
 .PHONY: e2e
 e2e:
-	@printf "This command has been removed. Please use:\n\n    mise e2e          # or mise //:e2e from another directory\n\n" >&2 && exit 1
+	@printf "This command has been removed. Please use:\n\n    mise e2e          # or mise //:e2e from another directory\n\n"\n\n >&2 && exit 1
 
 e2e-dev:
-	@printf "This command has been removed. Please use:\n\n    mise e2e-dev          # or mise //:e2e-dev from another directory\n\n" >&2 && exit 1
+	@printf "This command has been removed. Please use:\n\n    mise e2e-dev          # or mise //:e2e-dev from another directory\n\n"\n\n >&2 && exit 1
 
 e2e-update:
-	@printf "This command has been removed. Please use:\n\n    mise e2e-update          # or mise //:e2e-update from another directory\n\n" >&2 && exit 1
+	@printf "This command has been removed. Please use:\n\n    mise e2e-update          # or mise //:e2e-update from another directory\n\n"\n\n >&2 && exit 1
 
 e2e-down:
-	@printf "This command has been removed. Please use:\n\n    mise e2e-down          # or mise //:e2e-down from another directory\n\n" >&2 && exit 1
+	@printf "This command has been removed. Please use:\n\n    mise e2e-down          # or mise //:e2e-down from another directory\n\n"\n\n >&2 && exit 1
 
 prod:
-	@printf "This command has been removed. Please use:\n\n    mise prod          # or mise //:prod from another directory\n\n" >&2 && exit 1
+	@printf "This command has been removed. Please use:\n\n    mise prod          # or mise //:prod from another directory\n\n"\n\n >&2 && exit 1
 
 prod-down:
-	@printf "This command has been removed. Please use:\n\n    mise prod-down          # or mise //:prod-down from another directory\n\n" >&2 && exit 1
+	@printf "This command has been removed. Please use:\n\n    mise prod-down          # or mise //:prod-down from another directory\n\n"\n\n >&2 && exit 1
 
 prod-scale:
-	@printf "This command has been removed. Please use:\n\n    mise prod-scale          # or mise //:prod-scale from another directory\n\n" >&2 && exit 1
+	@printf "This command has been removed. Please use:\n\n    mise prod-scale          # or mise //:prod-scale from another directory\n\n"\n\n >&2 && exit 1
 
 .PHONY: open-api
 open-api:
-	@printf "This command has been removed. Please use:\n\n    mise open-api          # or mise //:open-api from another directory\n\n" >&2 && exit 1
+	@printf "This command has been removed. Please use:\n\n    mise open-api          # or mise //:open-api from another directory\n\n"\n\n >&2 && exit 1
 
 sql:
-	@printf "This command has been removed. Please use:\n\n    mise sql               # or mise //:sql from another directory\n\n" >&2 && exit 1
+	@printf "This command has been removed. Please use:\n\n    mise sql               # or mise //:sql from another directory\n\n"\n\n >&2 && exit 1
 
 
 renovate:
@@ -52,7 +52,16 @@ renovate:
 MODULES = e2e server web cli sdk docs .github
 
 test-e2e:
-	@printf "This command has been removed. Please use:\n\n    mise //e2e:test               # or mise //e2e:test-web for web tests, respectively\n\n" >&2 && exit 1
+	docker compose -f ./e2e/docker-compose.yml build
+	pnpm --filter immich-e2e run test
+	pnpm --filter immich-e2e run test:web
 
 clean:
-	@printf "This command has been removed. Please use:\n\n    mise clean               # or mise //:clean from another directory\n\n" >&2 && exit 1
+	find . -name "node_modules" -type d -prune -exec rm -rf {} +
+	find . -name "dist" -type d -prune -exec rm -rf '{}' +
+	find . -name "build" -type d -prune -exec rm -rf '{}' +
+	find . -name ".svelte-kit" -type d -prune -exec rm -rf '{}' +
+	find . -name "coverage" -type d -prune -exec rm -rf '{}' +
+	find . -name ".pnpm-store" -type d -prune -exec rm -rf '{}' +
+	command -v docker >/dev/null 2>&1 && docker compose -f ./docker/docker-compose.dev.yml down -v --remove-orphans || true
+	command -v docker >/dev/null 2>&1 && docker compose -f ./e2e/docker-compose.yml down -v --remove-orphans || true

docs/docs/developer/setup.md

@@ -109,24 +109,6 @@ mise //mobile:translation
 
 The mobile app asks you what backend to connect to. You can utilize the demo backend (https://demo.immich.app/) if you don't need to change server code or upload photos. Alternatively, you can run the server yourself per the instructions above.
 
-#### UI components and widget previews
-
-Shared design-system widgets (buttons, inputs, forms) live in the
-[`immich_ui` package](https://github.com/immich-app/immich/tree/main/mobile/packages/ui/)
-under `mobile/packages/ui/`. Components are defined in `lib/src/components/`
-and have matching previews in `lib/src/previews/`.
-
-To inspect a component in isolation with a light/dark toggle and hot reload,
-launch [Flutter's Widget Previewer](https://docs.flutter.dev/tools/widget-previewer):
-
-```bash
-cd mobile/packages/ui
-flutter widget-preview start
-```
-
-In VS Code or Android Studio with the Flutter plugin, the previewer
-auto-starts when you open the **Flutter Widget Preview** tab in the sidebar.
-
 ## IDE setup
 
 ### Lint / format extensions

e2e/mise.toml

@@ -1,21 +1,11 @@
 [tasks.install]
 run = "pnpm install --filter immich-e2e --frozen-lockfile"
 
-[tasks.build]
-dir = "{{ config_root }}"
-run = "docker compose build"
-
 [tasks.test]
-depends = ["//e2e:build", "//e2e:ci-setup"]
 env._.path = "./node_modules/.bin"
 run = "vitest --run"
 
-[tasks.playwright-install]
-env._.path = "./node_modules/.bin"
-run = "playwright install"
-
 [tasks."test-web"]
-depends = ["//e2e:build", "//e2e:ci-setup", "//e2e:playwright-install"]
 env._.path = "./node_modules/.bin"
 run = "playwright test"
 
@@ -40,12 +30,7 @@ run = "tsc --noEmit"
 
 
 [tasks.ci-setup]
-depends = [
-  "//:sdk:install",
-  "//:sdk:build",
-  "//packages/cli:install",
-  "//packages/cli:build",
-]
+depends = ["//:sdk:install", "//:sdk:build", "//cli:install", "//cli:build"]
 run = { task = ":install" }
 
 

e2e/src/specs/server/api/server.e2e-spec.ts

@@ -95,7 +95,6 @@ describe('/server', () => {
         major: expect.any(Number),
         minor: expect.any(Number),
         patch: expect.any(Number),
-        prerelease: null,
       });
     });
   });
@@ -116,7 +115,6 @@ describe('/server', () => {
         oauthAutoLaunch: false,
         ocr: false,
         passwordLogin: true,
-        realtimeTranscoding: false,
         search: true,
         sidecar: true,
         trash: true,

e2e/src/specs/server/api/system-config.e2e-spec.ts

@@ -21,18 +21,18 @@ describe('/system-config', () => {
       const response1 = await request(app)
         .put('/system-config')
         .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send({ ...config, newVersionCheck: { enabled: false, channel: 'stable' } });
+        .send({ ...config, newVersionCheck: { enabled: false } });
 
       expect(response1.status).toBe(200);
-      expect(response1.body).toEqual({ ...config, newVersionCheck: { enabled: false, channel: 'stable' } });
+      expect(response1.body).toEqual({ ...config, newVersionCheck: { enabled: false } });
 
       const response2 = await request(app)
         .put('/system-config')
         .set('Authorization', `Bearer ${admin.accessToken}`)
-        .send({ ...config, newVersionCheck: { enabled: true, channel: 'stable' } });
+        .send({ ...config, newVersionCheck: { enabled: true } });
 
       expect(response2.status).toBe(200);
-      expect(response2.body).toEqual({ ...config, newVersionCheck: { enabled: true, channel: 'stable' } });
+      expect(response2.body).toEqual({ ...config, newVersionCheck: { enabled: true } });
     });
 
     it('should reject an invalid config entry', async () => {

i18n/en.json

@@ -305,8 +305,6 @@
     "refreshing_all_libraries": "Refreshing all libraries",
     "registration": "Admin Registration",
     "registration_description": "Since you are the first user on the system, you will be assigned as the Admin and are responsible for administrative tasks, and additional users will be created by you.",
-    "release_channel_release_candidate": "Release candidate",
-    "release_channel_stable": "Stable",
     "remove_failed_jobs": "Remove failed jobs",
     "require_password_change_on_login": "Require user to change password on first login",
     "reset_settings_to_default": "Reset settings to default",
@@ -401,10 +399,6 @@
     "transcoding_preferred_hardware_device_description": "Applies only to VAAPI and QSV. Sets the dri node used for hardware transcoding.",
     "transcoding_preset_preset": "Preset (-preset)",
     "transcoding_preset_preset_description": "Compression speed. Slower presets produce smaller files, and increase quality when targeting a certain bitrate. VP9 ignores speeds above 'faster'.",
-    "transcoding_realtime": "Real-time Transcoding [EXPERIMENTAL]",
-    "transcoding_realtime_description": "Allows transcoding to be performed in real-time as the video is being streamed. Enables quality switching, but may cause higher playback latency and stuttering depending on server capabilities.",
-    "transcoding_realtime_enabled": "Enable real-time transcoding",
-    "transcoding_realtime_enabled_description": "If disabled, the server will refuse to start new real-time transcoding sessions.",
     "transcoding_reference_frames": "Reference frames",
     "transcoding_reference_frames_description": "The number of frames to reference when compressing a given frame. Higher values improve compression efficiency, but slow down encoding. 0 sets this value automatically.",
     "transcoding_required_description": "Only videos not in an accepted format",
@@ -448,8 +442,6 @@
     "user_settings_description": "Manage user settings",
     "user_successfully_removed": "User {email} has been successfully removed.",
     "users_page_description": "Admin users page",
-    "version_check_channel": "Release channel",
-    "version_check_channel_description": "Pick the release channel you want to get version announcements for",
     "version_check_enabled_description": "Enable version check",
     "version_check_implications": "The version check feature relies on periodic communication with {server}",
     "version_check_settings": "Version Check",
@@ -2141,8 +2133,6 @@
   "share_assets_selected": "{count} selected",
   "share_dialog_preparing": "Preparing...",
   "share_link": "Share Link",
-  "share_original": "Share original",
-  "share_preview": "Share preview",
   "shared": "Shared",
   "shared_album_activities_input_disable": "Comment is disabled",
   "shared_album_activity_remove_content": "Do you want to delete this activity?",
@@ -2243,7 +2233,6 @@
   "slideshow_repeat": "Repeat slideshow",
   "slideshow_repeat_description": "Loop back to beginning when slideshow ends",
   "slideshow_settings": "Slideshow settings",
-  "smart_album": "Smart album",
   "sort_albums_by": "Sort albums by...",
   "sort_created": "Date created",
   "sort_items": "Number of items",
@@ -2462,7 +2451,6 @@
   "video": "Video",
   "video_hover_setting": "Play video thumbnail on hover",
   "video_hover_setting_description": "Play video thumbnail when mouse is hovering over item. Even when disabled, playback can be started by hovering over the play icon.",
-  "video_quality": "Video quality",
   "videos": "Videos",
   "videos_count": "{count, plural, one {# Video} other {# Videos}}",
   "videos_only": "Videos only",

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

@@ -64,7 +64,6 @@ class TextRecognizer(InferenceModel):
                 rec_batch_num=max_batch_size if max_batch_size else 6,
                 rec_img_shape=(3, 48, 320),
                 lang_type=self.language,
-                model_root_dir=self.cache_dir,
             )
         )
         return session

machine-learning/test_main.py

@@ -1028,12 +1028,7 @@ class TestOcr:
         text_recognizer.load()
 
         rapid_recognizer.assert_called_once_with(
-            OcrOptions(
-              session=ort_session.return_value,
-              rec_batch_num=6,
-              rec_img_shape=(3, 48, 320),
-              model_root_dir=text_recognizer.cache_dir,
-            )
+            OcrOptions(session=ort_session.return_value, rec_batch_num=6, rec_img_shape=(3, 48, 320))
         )
 
     def test_set_custom_max_batch_size(self, ort_session: mock.Mock, path: mock.Mock, mocker: MockerFixture) -> None:
@@ -1046,12 +1041,7 @@ class TestOcr:
         text_recognizer.load()
 
         rapid_recognizer.assert_called_once_with(
-            OcrOptions(
-              session=ort_session.return_value,
-              rec_batch_num=4,
-              rec_img_shape=(3, 48, 320),
-              model_root_dir=text_recognizer.cache_dir,
-            )
+            OcrOptions(session=ort_session.return_value, rec_batch_num=4, rec_img_shape=(3, 48, 320))
         )
 
     def test_ignore_other_custom_max_batch_size(
@@ -1066,12 +1056,7 @@ class TestOcr:
         text_recognizer.load()
 
         rapid_recognizer.assert_called_once_with(
-            OcrOptions(
-              session=ort_session.return_value,
-              rec_batch_num=6,
-              rec_img_shape=(3, 48, 320),
-              model_root_dir=text_recognizer.cache_dir,
-            )
+            OcrOptions(session=ort_session.return_value, rec_batch_num=6, rec_img_shape=(3, 48, 320))
         )
 
 

mise.toml

@@ -54,8 +54,8 @@ lockfile = true
 
 [tasks.plugins]
 run = [
-  "pnpm --filter @immich/sdk --filter @immich/plugin-sdk --filter @immich/plugin-core install --frozen-lockfile",
-  "pnpm --filter @immich/sdk --filter @immich/plugin-sdk --filter @immich/plugin-core build",
+  "pnpm --filter @immich/plugin-sdk --filter @immich/plugin-core install --frozen-lockfile",
+  "pnpm --filter @immich/plugin-sdk --filter @immich/plugin-core build",
 ]
 
 [tasks.open-api-typescript]
@@ -108,7 +108,7 @@ depends = "//:plugins"
 dir = "docker"
 interactive = true
 env = { COMPOSE_BAKE = true }
-run = "docker compose -f ./docker-compose.prod.yml up --build --remove-orphans"
+run = "docker compose -f ./docker-compose.prod.yml up --remove-orphans"
 depends_post = "//:prod-down"
 
 [tasks.prod-scale]
@@ -165,14 +165,3 @@ run = "pnpm format"
 
 [tasks."i18n:format-fix"]
 run = "pnpm format:fix"
-
-[tasks.clean]
-run = [
-  "find . -name 'node_modules' -type d -prune -exec rm -rf '{}' +",
-  "find . -name 'dist' -type d -prune -exec rm -rf '{}' +",
-  "find . -name 'build' -type d -prune -exec rm -rf '{}' +",
-  "find . -name '.svelte-kit' -type d -prune -exec rm -rf '{}' +",
-  "find . -name 'coverage' -type d -prune -exec rm -rf '{}' +",
-  "find . -name '.pnpm-store' -type d -prune -exec rm -rf '{}' +",
-  { task = "//:*-down" },
-]

mobile/ios/Runner.xcodeproj/project.pbxproj

@@ -9,7 +9,7 @@
 /* Begin PBXBuildFile section */
 		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
-		467DA6EAF83F3481F8BD94AB /* Pods_ShareExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8AB817AA297EDEC88B23F3F6 /* Pods_ShareExtension.framework */; };
+		3B6A31FED0FC846D6BD69BBC /* Pods_ShareExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 357FC57E54FD0F51795CF28A /* Pods_ShareExtension.framework */; };
 		74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
 		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
 		97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
@@ -22,7 +22,7 @@
 		B2EE00022E72CA15008B6CA7 /* PermissionApi.g.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2EE00012E72CA15008B6CA7 /* PermissionApi.g.swift */; };
 		B2EE00042E72CA15008B6CA7 /* PermissionApiImpl.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2EE00032E72CA15008B6CA7 /* PermissionApiImpl.swift */; };
 		B2BE315F2E5E5229006EEF88 /* BackgroundWorker.g.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2BE315E2E5E5229006EEF88 /* BackgroundWorker.g.swift */; };
-		D3BED739C0BC29BB32E18EB2 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CC499FBCE6B29B2DAFED7130 /* Pods_Runner.framework */; };
+		D218389C4A4C4693F141F7D1 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 886774DBDDE6B35BF2B4F2CD /* Pods_Runner.framework */; };
 		F02538E92DFBCBDD008C3FA3 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
 		F0B57D3A2DF764BD00DC5BCC /* WidgetKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F0B57D392DF764BD00DC5BCC /* WidgetKit.framework */; };
 		F0B57D3C2DF764BD00DC5BCC /* SwiftUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F0B57D3B2DF764BD00DC5BCC /* SwiftUI.framework */; };
@@ -85,18 +85,16 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		10B378D23F917891A0F23E33 /* Pods-ShareExtension.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ShareExtension.release.xcconfig"; path = "Target Support Files/Pods-ShareExtension/Pods-ShareExtension.release.xcconfig"; sourceTree = "<group>"; };
 		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
 		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
+		2E3441B73560D0F6FD25E04F /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
+		357FC57E54FD0F51795CF28A /* Pods_ShareExtension.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ShareExtension.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
-		614A7F5DC5DB09E89E4FCBE8 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
-		681FBA560D5D2ADDE4F0B59E /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
-		6D160F04A389B9FFBC557803 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
+		571EAA93D77181C7C98C2EA6 /* Pods-ShareExtension.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ShareExtension.release.xcconfig"; path = "Target Support Files/Pods-ShareExtension/Pods-ShareExtension.release.xcconfig"; sourceTree = "<group>"; };
 		74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
 		74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
-		8AB817AA297EDEC88B23F3F6 /* Pods_ShareExtension.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ShareExtension.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		937632897A02DE9C249F20A6 /* Pods-ShareExtension.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ShareExtension.debug.xcconfig"; path = "Target Support Files/Pods-ShareExtension/Pods-ShareExtension.debug.xcconfig"; sourceTree = "<group>"; };
+		886774DBDDE6B35BF2B4F2CD /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
 		9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
 		97C146EE1CF9000F007C117D /* Immich-Debug.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Immich-Debug.app"; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -105,6 +103,7 @@
 		97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		A01DD6982F7F43B40049AB63 /* ImageRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageRequest.swift; sourceTree = "<group>"; };
+		B1FBA9EE014DE20271B0FE77 /* Pods-ShareExtension.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ShareExtension.profile.xcconfig"; path = "Target Support Files/Pods-ShareExtension/Pods-ShareExtension.profile.xcconfig"; sourceTree = "<group>"; };
 		B21E34A92E5AFD210031FDB9 /* BackgroundWorkerApiImpl.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BackgroundWorkerApiImpl.swift; sourceTree = "<group>"; };
 		B21E34AB2E5B09100031FDB9 /* BackgroundWorker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BackgroundWorker.swift; sourceTree = "<group>"; };
 		B25D37782E72CA15008B6CA7 /* Connectivity.g.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Connectivity.g.swift; sourceTree = "<group>"; };
@@ -112,11 +111,12 @@
 		B2EE00012E72CA15008B6CA7 /* PermissionApi.g.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PermissionApi.g.swift; sourceTree = "<group>"; };
 		B2EE00032E72CA15008B6CA7 /* PermissionApiImpl.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PermissionApiImpl.swift; sourceTree = "<group>"; };
 		B2BE315E2E5E5229006EEF88 /* BackgroundWorker.g.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BackgroundWorker.g.swift; sourceTree = "<group>"; };
-		C4A6A71F33CE37B3C913115C /* Pods-ShareExtension.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ShareExtension.profile.xcconfig"; path = "Target Support Files/Pods-ShareExtension/Pods-ShareExtension.profile.xcconfig"; sourceTree = "<group>"; };
-		CC499FBCE6B29B2DAFED7130 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		E0E99CDC17B3EB7FA8BA2332 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
 		F0B57D382DF764BD00DC5BCC /* WidgetExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = WidgetExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; };
 		F0B57D392DF764BD00DC5BCC /* WidgetKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WidgetKit.framework; path = System/Library/Frameworks/WidgetKit.framework; sourceTree = SDKROOT; };
 		F0B57D3B2DF764BD00DC5BCC /* SwiftUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SwiftUI.framework; path = System/Library/Frameworks/SwiftUI.framework; sourceTree = SDKROOT; };
+		F7101BB0391A314774615E89 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
+		F8A35EA3C3E01BD66AFDE0E5 /* Pods-ShareExtension.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ShareExtension.debug.xcconfig"; path = "Target Support Files/Pods-ShareExtension/Pods-ShareExtension.debug.xcconfig"; sourceTree = "<group>"; };
 		FA9973382CF6DF4B000EF859 /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = "<group>"; };
 		FAC6F8902D287C890078CB2F /* ShareExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = ShareExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; };
 		FAC6F8B12D287F120078CB2F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -199,7 +199,7 @@
 				FEE084F82EC172460045228E /* SQLiteData in Frameworks */,
 				FEE084FB2EC1725A0045228E /* RawStructuredFieldValues in Frameworks */,
 				FEE084FD2EC1725A0045228E /* StructuredFieldValues in Frameworks */,
-				D3BED739C0BC29BB32E18EB2 /* Pods_Runner.framework in Frameworks */,
+				D218389C4A4C4693F141F7D1 /* Pods_Runner.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -216,7 +216,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				467DA6EAF83F3481F8BD94AB /* Pods_ShareExtension.framework in Frameworks */,
+				3B6A31FED0FC846D6BD69BBC /* Pods_ShareExtension.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -226,12 +226,12 @@
 		0FB772A5B9601143383626CA /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				614A7F5DC5DB09E89E4FCBE8 /* Pods-Runner.debug.xcconfig */,
-				6D160F04A389B9FFBC557803 /* Pods-Runner.release.xcconfig */,
-				681FBA560D5D2ADDE4F0B59E /* Pods-Runner.profile.xcconfig */,
-				937632897A02DE9C249F20A6 /* Pods-ShareExtension.debug.xcconfig */,
-				10B378D23F917891A0F23E33 /* Pods-ShareExtension.release.xcconfig */,
-				C4A6A71F33CE37B3C913115C /* Pods-ShareExtension.profile.xcconfig */,
+				2E3441B73560D0F6FD25E04F /* Pods-Runner.debug.xcconfig */,
+				E0E99CDC17B3EB7FA8BA2332 /* Pods-Runner.release.xcconfig */,
+				F7101BB0391A314774615E89 /* Pods-Runner.profile.xcconfig */,
+				F8A35EA3C3E01BD66AFDE0E5 /* Pods-ShareExtension.debug.xcconfig */,
+				571EAA93D77181C7C98C2EA6 /* Pods-ShareExtension.release.xcconfig */,
+				B1FBA9EE014DE20271B0FE77 /* Pods-ShareExtension.profile.xcconfig */,
 			);
 			path = Pods;
 			sourceTree = "<group>";
@@ -239,10 +239,10 @@
 		1754452DD81DA6620E279E51 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				886774DBDDE6B35BF2B4F2CD /* Pods_Runner.framework */,
+				357FC57E54FD0F51795CF28A /* Pods_ShareExtension.framework */,
 				F0B57D392DF764BD00DC5BCC /* WidgetKit.framework */,
 				F0B57D3B2DF764BD00DC5BCC /* SwiftUI.framework */,
-				CC499FBCE6B29B2DAFED7130 /* Pods_Runner.framework */,
-				8AB817AA297EDEC88B23F3F6 /* Pods_ShareExtension.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -370,7 +370,7 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
 			buildPhases = (
-				BAEA01ACA3F5C9CD3D732370 /* [CP] Check Pods Manifest.lock */,
+				4044AF030EF7D8721844FFBA /* [CP] Check Pods Manifest.lock */,
 				9740EEB61CF901F6004384FC /* Run Script */,
 				97C146EA1CF9000F007C117D /* Sources */,
 				97C146EB1CF9000F007C117D /* Frameworks */,
@@ -378,8 +378,8 @@
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				FAC6F89A2D287C890078CB2F /* Embed Foundation Extensions */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
-				513DA7292DED6106813332F4 /* [CP] Embed Pods Frameworks */,
-				2FA39DEC809D6D7C4A01EFCB /* [CP] Copy Pods Resources */,
+				D218A34AEE62BC1EF119F5B0 /* [CP] Embed Pods Frameworks */,
+				6724EEB7D74949FA08581154 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -393,9 +393,6 @@
 				FEE084F22EC172080045228E /* Schemas */,
 			);
 			name = Runner;
-			packageProductDependencies = (
-				78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */,
-			);
 			productName = Runner;
 			productReference = 97C146EE1CF9000F007C117D /* Immich-Debug.app */;
 			productType = "com.apple.product-type.application";
@@ -424,7 +421,7 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = FAC6F8A02D287C890078CB2F /* Build configuration list for PBXNativeTarget "ShareExtension" */;
 			buildPhases = (
-				8EC9CF3E20AF32BF24D4F3E1 /* [CP] Check Pods Manifest.lock */,
+				3BEF3D71D97E337D921C0EB5 /* [CP] Check Pods Manifest.lock */,
 				FAC6F88C2D287C890078CB2F /* Sources */,
 				FAC6F88D2D287C890078CB2F /* Frameworks */,
 				FAC6F88E2D287C890078CB2F /* Resources */,
@@ -473,7 +470,7 @@
 			);
 			mainGroup = 97C146E51CF9000F007C117D;
 			packageReferences = (
-				781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */,
+				781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */,
 				FEE084F62EC172460045228E /* XCRemoteSwiftPackageReference "sqlite-data" */,
 				FEE084F92EC1725A0045228E /* XCRemoteSwiftPackageReference "swift-http-structured-headers" */,
 			);
@@ -520,23 +517,6 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		2FA39DEC809D6D7C4A01EFCB /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
-			);
-			name = "[CP] Copy Pods Resources";
-			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
 			isa = PBXShellScriptBuildPhase;
 			alwaysOutOfDate = 1;
@@ -553,24 +533,7 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
 		};
-		513DA7292DED6106813332F4 /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		8EC9CF3E20AF32BF24D4F3E1 /* [CP] Check Pods Manifest.lock */ = {
+		3BEF3D71D97E337D921C0EB5 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -592,22 +555,7 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		9740EEB61CF901F6004384FC /* Run Script */ = {
-			isa = PBXShellScriptBuildPhase;
-			alwaysOutOfDate = 1;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "Run Script";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build\n";
-		};
-		BAEA01ACA3F5C9CD3D732370 /* [CP] Check Pods Manifest.lock */ = {
+		4044AF030EF7D8721844FFBA /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -629,6 +577,55 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
+		6724EEB7D74949FA08581154 /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
+			);
+			name = "[CP] Copy Pods Resources";
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		9740EEB61CF901F6004384FC /* Run Script */ = {
+			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Run Script";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build\n";
+		};
+		D218A34AEE62BC1EF119F5B0 /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -1095,7 +1092,7 @@
 		};
 		FAC6F89C2D287C890078CB2F /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 937632897A02DE9C249F20A6 /* Pods-ShareExtension.debug.xcconfig */;
+			baseConfigurationReference = F8A35EA3C3E01BD66AFDE0E5 /* Pods-ShareExtension.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@@ -1138,7 +1135,7 @@
 		};
 		FAC6F89D2D287C890078CB2F /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 10B378D23F917891A0F23E33 /* Pods-ShareExtension.release.xcconfig */;
+			baseConfigurationReference = 571EAA93D77181C7C98C2EA6 /* Pods-ShareExtension.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@@ -1178,7 +1175,7 @@
 		};
 		FAC6F89E2D287C890078CB2F /* Profile */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = C4A6A71F33CE37B3C913115C /* Pods-ShareExtension.profile.xcconfig */;
+			baseConfigurationReference = B1FBA9EE014DE20271B0FE77 /* Pods-ShareExtension.profile.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@@ -1261,13 +1258,6 @@
 		};
 /* End XCConfigurationList section */
 
-/* Begin XCLocalSwiftPackageReference section */
-		781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */ = {
-			isa = XCLocalSwiftPackageReference;
-			relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage;
-		};
-/* End XCLocalSwiftPackageReference section */
-
 /* Begin XCRemoteSwiftPackageReference section */
 		FEE084F62EC172460045228E /* XCRemoteSwiftPackageReference "sqlite-data" */ = {
 			isa = XCRemoteSwiftPackageReference;
@@ -1288,10 +1278,6 @@
 /* End XCRemoteSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
-		78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */ = {
-			isa = XCSwiftPackageProductDependency;
-			productName = FlutterGeneratedPluginSwiftPackage;
-		};
 		FEE084F72EC172460045228E /* SQLiteData */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = FEE084F62EC172460045228E /* XCRemoteSwiftPackageReference "sqlite-data" */;

mobile/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -5,8 +5,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/combine-schedulers",
       "state" : {
-        "revision" : "fd16d76fd8b9a976d88bfb6cacc05ca8d19c91b6",
-        "version" : "1.1.0"
+        "revision" : "5928286acce13def418ec36d05a001a9641086f2",
+        "version" : "1.0.3"
       }
     },
     {

mobile/ios/fastlane/Fastfile

@@ -49,7 +49,7 @@ def get_version_from_pubspec
   pubspec = YAML.load_file(pubspec_path)
   
   version_string = pubspec['version']
-  version_string ? version_string.split('+').first.split('-').first : nil
+  version_string ? version_string.split('+').first : nil
 end
   
   # Helper method to configure code signing for all targets

mobile/lib/constants/enums.dart

@@ -13,8 +13,6 @@ enum AssetVisibilityEnum { timeline, hidden, archive, locked }
 
 enum ActionSource { timeline, viewer }
 
-enum ShareAssetFileType { original, preview }
-
 enum CleanupStep { selectDate, scan, delete }
 
 enum AssetKeepType { none, photosOnly, videosOnly }

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

@@ -12,7 +12,7 @@ import 'package:immich_mobile/domain/models/config/theme_config.dart';
 import 'package:immich_mobile/domain/models/config/timeline_config.dart';
 import 'package:immich_mobile/domain/models/config/viewer_config.dart';
 import 'package:immich_mobile/domain/models/log.model.dart';
-import 'package:immich_mobile/domain/models/settings_key.dart';
+import 'package:immich_mobile/domain/models/metadata_key.dart';
 import 'package:immich_mobile/domain/models/timeline.model.dart';
 import 'package:immich_mobile/providers/album/album_sort_by_options.provider.dart';
 
@@ -95,7 +95,7 @@ class AppConfig {
   String toString() =>
       'AppConfig(logLevel: $logLevel, theme: $theme, cleanup: $cleanup, map: $map, timeline: $timeline, image: $image, viewer: $viewer, slideshow: $slideshow, album: $album, backup: $backup, network: $network)';
 
-  T read<T extends Object>(SettingsKey<T> key) =>
+  T read<T extends Object>(MetadataKey<T> key) =>
       (switch (key) {
             .logLevel => logLevel,
             .themePrimaryColor => theme.primaryColor,
@@ -143,10 +143,15 @@ class AppConfig {
           })
           as T;
 
-  factory AppConfig.fromEntries(Map<SettingsKey<Object>, Object> overrides) =>
-      overrides.entries.fold(const AppConfig(), (config, entry) => config.write(entry.key, entry.value));
+  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>(SettingsKey<T> key, T value) {
+  AppConfig write<T extends Object>(MetadataKey<T> key, T value) {
     return switch (key) {
       .logLevel => copyWith(logLevel: value as LogLevel),
       .themePrimaryColor => copyWith(theme: theme.copyWith(primaryColor: value as ImmichColorPreset)),

mobile/lib/domain/models/metadata_key.dart

@@ -7,7 +7,14 @@ import 'package:immich_mobile/domain/models/log.model.dart';
 import 'package:immich_mobile/domain/models/timeline.model.dart';
 import 'package:immich_mobile/providers/album/album_sort_by_options.provider.dart';
 
-enum SettingsKey<T extends Object> {
+enum MetadataScope {
+  user, // keys with this scope are deleted on logout
+  system;
+
+  const MetadataScope();
+}
+
+enum MetadataKey<T extends Object> {
   // Theme
   themePrimaryColor<ImmichColorPreset>(codec: _EnumCodec(ImmichColorPreset.values)),
   themeMode<ThemeMode>(codec: _EnumCodec(ThemeMode.values)),
@@ -25,11 +32,14 @@ enum SettingsKey<T extends Object> {
   viewerTapToNavigate<bool>(),
 
   // Network
-  networkAutoEndpointSwitching<bool>(),
-  networkPreferredWifiName<String>(),
-  networkLocalEndpoint<String>(),
-  networkExternalEndpointList<List<String>>(codec: _ListCodec(_PrimitiveCodec.string)),
-  networkCustomHeaders<Map<String, String>>(codec: _MapCodec(_PrimitiveCodec.string, _PrimitiveCodec.string)),
+  networkAutoEndpointSwitching<bool>(scope: .system),
+  networkPreferredWifiName<String>(scope: .system),
+  networkLocalEndpoint<String>(scope: .system),
+  networkExternalEndpointList<List<String>>(scope: .system, codec: _ListCodec(_PrimitiveCodec.string)),
+  networkCustomHeaders<Map<String, String>>(
+    scope: .system,
+    codec: _MapCodec(_PrimitiveCodec.string, _PrimitiveCodec.string),
+  ),
 
   // Album
   albumSortMode<AlbumSortMode>(codec: _EnumCodec(AlbumSortMode.values)),
@@ -50,7 +60,7 @@ enum SettingsKey<T extends Object> {
   timelineStorageIndicator<bool>(),
 
   // Log
-  logLevel<LogLevel>(codec: _EnumCodec(LogLevel.values)),
+  logLevel<LogLevel>(scope: .system, codec: _EnumCodec(LogLevel.values)),
 
   // Map
   mapShowFavoriteOnly<bool>(),
@@ -73,24 +83,25 @@ enum SettingsKey<T extends Object> {
   slideshowLook<SlideshowLook>(codec: _EnumCodec(SlideshowLook.values)),
   slideshowDirection<SlideshowDirection>(codec: _EnumCodec(SlideshowDirection.values));
 
-  final _SettingsCodec<T>? _codecOverride;
+  final MetadataScope scope;
+  final _MetadataCodec<T>? _codecOverride;
 
-  const SettingsKey({_SettingsCodec<T>? codec}) : _codecOverride = codec;
+  const MetadataKey({this.scope = .user, _MetadataCodec<T>? codec}) : _codecOverride = codec;
 
-  _SettingsCodec<T> get _codec => _codecOverride ?? _SettingsCodec.forType(T);
+  _MetadataCodec<T> get _codec => _codecOverride ?? _MetadataCodec.forType(T);
 
   String encode(T value) => _codec.encode(value);
 
   T decode(String raw) => _codec.decode(raw);
 }
 
-sealed class _SettingsCodec<T extends Object> {
-  const _SettingsCodec();
+sealed class _MetadataCodec<T extends Object> {
+  const _MetadataCodec();
 
   String encode(T value);
   T decode(String raw);
 
-  static const Map<Type, _SettingsCodec<Object>> _primitives = {
+  static const Map<Type, _MetadataCodec<Object>> _primitives = {
     int: _PrimitiveCodec.integer,
     double: _PrimitiveCodec.real,
     bool: _PrimitiveCodec.boolean,
@@ -98,16 +109,16 @@ sealed class _SettingsCodec<T extends Object> {
     DateTime: _DateTimeCodec(),
   };
 
-  static _SettingsCodec<T> forType<T extends Object>(Type runtimeType) {
+  static _MetadataCodec<T> forType<T extends Object>(Type runtimeType) {
     final codec = _primitives[runtimeType];
     if (codec == null) {
-      throw StateError('No primitive codec for $runtimeType. Provide an explicit codec when defining the SettingsKey.');
+      throw StateError('No primitive codec for $runtimeType. Provide an explicit codec when defining the MetadataKey.');
     }
-    return codec as _SettingsCodec<T>;
+    return codec as _MetadataCodec<T>;
   }
 }
 
-final class _EnumCodec<T extends Enum> extends _SettingsCodec<T> {
+final class _EnumCodec<T extends Enum> extends _MetadataCodec<T> {
   final List<T> values;
 
   const _EnumCodec(this.values);
@@ -119,7 +130,7 @@ final class _EnumCodec<T extends Enum> extends _SettingsCodec<T> {
   T decode(String raw) => values.firstWhere((v) => v.name == raw);
 }
 
-final class _DateTimeCodec extends _SettingsCodec<DateTime> {
+final class _DateTimeCodec extends _MetadataCodec<DateTime> {
   const _DateTimeCodec();
 
   @override
@@ -129,9 +140,9 @@ final class _DateTimeCodec extends _SettingsCodec<DateTime> {
   DateTime decode(String raw) => DateTime.parse(raw);
 }
 
-final class _MapCodec<K extends Object, V extends Object> extends _SettingsCodec<Map<K, V>> {
-  final _SettingsCodec<K> _keyCodec;
-  final _SettingsCodec<V> _valueCodec;
+final class _MapCodec<K extends Object, V extends Object> extends _MetadataCodec<Map<K, V>> {
+  final _MetadataCodec<K> _keyCodec;
+  final _MetadataCodec<V> _valueCodec;
 
   const _MapCodec(this._keyCodec, this._valueCodec);
 
@@ -167,8 +178,8 @@ final class _MapCodec<K extends Object, V extends Object> extends _SettingsCodec
   }
 }
 
-final class _ListCodec<T extends Object> extends _SettingsCodec<List<T>> {
-  final _SettingsCodec<T> _elementCodec;
+final class _ListCodec<T extends Object> extends _MetadataCodec<List<T>> {
+  final _MetadataCodec<T> _elementCodec;
 
   const _ListCodec(this._elementCodec);
 
@@ -197,7 +208,7 @@ final class _ListCodec<T extends Object> extends _SettingsCodec<List<T>> {
   }
 }
 
-final class _PrimitiveCodec<T extends Object> extends _SettingsCodec<T> {
+final class _PrimitiveCodec<T extends Object> extends _MetadataCodec<T> {
   final T Function(String) _parse;
 
   const _PrimitiveCodec._(this._parse);

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

@@ -11,7 +11,7 @@ import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/logger_db.repository.dart';
-import 'package:immich_mobile/infrastructure/repositories/settings.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/metadata.repository.dart';
 import 'package:immich_mobile/platform/background_worker_api.g.dart';
 import 'package:immich_mobile/platform/background_worker_lock_api.g.dart';
 import 'package:immich_mobile/providers/background_sync.provider.dart';
@@ -39,7 +39,7 @@ class BackgroundWorkerFgService {
       _foregroundHostApi.saveNotificationMessage(title, body);
 
   Future<void> configure({int? minimumDelaySeconds, bool? requireCharging}) {
-    final backup = SettingsRepository.instance.appConfig.backup;
+    final backup = MetadataRepository.instance.appConfig.backup;
     return _foregroundHostApi.configure(
       BackgroundWorkerSettings(
         minimumDelaySeconds: minimumDelaySeconds ?? backup.triggerDelay,
@@ -67,7 +67,7 @@ class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {
     BackgroundWorkerFlutterApi.setUp(this);
   }
 
-  bool get _isBackupEnabled => SettingsRepository.instance.appConfig.backup.enabled;
+  bool get _isBackupEnabled => MetadataRepository.instance.appConfig.backup.enabled;
 
   Future<void> init() async {
     try {

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

@@ -2,9 +2,9 @@ import 'dart:async';
 
 import 'package:immich_mobile/constants/constants.dart';
 import 'package:immich_mobile/domain/models/log.model.dart';
-import 'package:immich_mobile/domain/models/settings_key.dart';
+import 'package:immich_mobile/domain/models/metadata_key.dart';
 import 'package:immich_mobile/infrastructure/repositories/log.repository.dart';
-import 'package:immich_mobile/infrastructure/repositories/settings.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/metadata.repository.dart';
 import 'package:immich_mobile/utils/debug_print.dart';
 import 'package:logging/logging.dart';
 
@@ -12,10 +12,10 @@ import 'package:logging/logging.dart';
 ///
 /// It listens to Dart's [Logger.root], buffers logs in memory (optionally),
 /// writes them to a persistent [LogRepository], and manages log levels via
-/// [SettingsRepository].
+/// [MetadataRepository].
 class LogService {
   final LogRepository _logRepository;
-  final SettingsRepository _settingsRepository;
+  final MetadataRepository _metadataRepository;
 
   final List<LogMessage> _msgBuffer = [];
 
@@ -38,12 +38,12 @@ class LogService {
 
   static Future<LogService> init({
     required LogRepository logRepository,
-    required SettingsRepository settingsRepository,
+    required MetadataRepository metadataRepository,
     bool shouldBuffer = true,
   }) async {
     _instance ??= await create(
       logRepository: logRepository,
-      settingsRepository: settingsRepository,
+      metadataRepository: metadataRepository,
       shouldBuffer: shouldBuffer,
     );
     return _instance!;
@@ -51,17 +51,17 @@ class LogService {
 
   static Future<LogService> create({
     required LogRepository logRepository,
-    required SettingsRepository settingsRepository,
+    required MetadataRepository metadataRepository,
     bool shouldBuffer = true,
   }) async {
-    final instance = LogService._(logRepository, settingsRepository, shouldBuffer);
+    final instance = LogService._(logRepository, metadataRepository, shouldBuffer);
     await logRepository.truncate(limit: kLogTruncateLimit);
-    final level = instance._settingsRepository.appConfig.logLevel;
+    final level = instance._metadataRepository.appConfig.logLevel;
     Logger.root.level = Level.LEVELS.elementAtOrNull(level.index) ?? Level.INFO;
     return instance;
   }
 
-  LogService._(this._logRepository, this._settingsRepository, this._shouldBuffer) {
+  LogService._(this._logRepository, this._metadataRepository, this._shouldBuffer) {
     _logSubscription = Logger.root.onRecord.listen(_handleLogRecord);
   }
 
@@ -91,7 +91,7 @@ class LogService {
   }
 
   Future<void> setLogLevel(LogLevel level) async {
-    await _settingsRepository.write(SettingsKey.logLevel, level);
+    await _metadataRepository.write(MetadataKey.logLevel, level);
     Logger.root.level = level.toLevel();
   }
 

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

@@ -192,30 +192,43 @@ class RemoteAlbumService {
     required UserDto uploader,
     required AlbumAssetCandidates candidates,
     UploadCallbacks uploadCallbacks = const UploadCallbacks(),
-    Completer<void>? cancelToken,
   }) async {
     int addedCount = 0;
     if (candidates.remoteAssetIds.isNotEmpty) {
       addedCount += await addAssets(albumId: albumId, assetIds: candidates.remoteAssetIds);
     }
     if (candidates.localAssetsToUpload.isNotEmpty) {
-      addedCount += await _uploadAndAddLocals(
-        albumId,
-        uploader,
-        candidates.localAssetsToUpload,
-        uploadCallbacks,
-        cancelToken,
-      );
+      addedCount += await _uploadAndAddLocals(albumId, uploader, candidates.localAssetsToUpload, uploadCallbacks);
     }
     return addedCount;
   }
 
+  /// Creates an album, seeding it with already-remote asset IDs, then uploads
+  /// local-only assets and links each one as it finishes.
+  Future<RemoteAlbum> createAlbumWithAssets({
+    required String title,
+    required UserDto owner,
+    String? description,
+    AlbumAssetCandidates candidates = const AlbumAssetCandidates(remoteAssetIds: [], localAssetsToUpload: []),
+    UploadCallbacks uploadCallbacks = const UploadCallbacks(),
+  }) async {
+    final album = await createAlbum(
+      title: title,
+      owner: owner,
+      description: description,
+      assetIds: candidates.remoteAssetIds,
+    );
+    if (candidates.localAssetsToUpload.isNotEmpty) {
+      await _uploadAndAddLocals(album.id, owner, candidates.localAssetsToUpload, uploadCallbacks);
+    }
+    return album;
+  }
+
   Future<int> _uploadAndAddLocals(
     String albumId,
     UserDto uploader,
     List<LocalAsset> localAssets,
     UploadCallbacks userCallbacks,
-    Completer<void>? cancelToken,
   ) async {
     int addedCount = 0;
     final pendingAdds = <Future<void>>[];
@@ -245,7 +258,7 @@ class RemoteAlbumService {
           return;
         }
         pendingAdds.add(
-          linkUploadedAssetToAlbum(albumId, remoteId, uploader, source)
+          _linkUploadedAssetToAlbum(albumId, remoteId, uploader, source)
               .then<void>((added) {
                 addedCount += added;
               })
@@ -256,7 +269,7 @@ class RemoteAlbumService {
       },
     );
 
-    await _uploadService.uploadManual(localAssets, callbacks: wrappedCallbacks, cancelToken: cancelToken);
+    await _uploadService.uploadManual(localAssets, callbacks: wrappedCallbacks);
     await Future.wait(pendingAdds);
     return addedCount;
   }
@@ -275,7 +288,7 @@ class RemoteAlbumService {
   /// `remote_asset_entity` row from the local source so the FK-protected
   /// junction insert succeeds. Sync overwrites the placeholder later with
   /// the authoritative server data.
-  Future<int> linkUploadedAssetToAlbum(String albumId, String remoteId, UserDto uploader, LocalAsset source) async {
+  Future<int> _linkUploadedAssetToAlbum(String albumId, String remoteId, UserDto uploader, LocalAsset source) async {
     final result = await _albumApiRepository.addAssets(albumId, [remoteId]);
     if (result.added.isEmpty) {
       return 0;

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

@@ -7,7 +7,7 @@ import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/events.model.dart';
 import 'package:immich_mobile/domain/models/timeline.model.dart';
 import 'package:immich_mobile/domain/utils/event_stream.dart';
-import 'package:immich_mobile/infrastructure/repositories/settings.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/metadata.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/timeline.repository.dart';
 import 'package:immich_mobile/utils/async_mutex.dart';
 
@@ -39,12 +39,12 @@ enum TimelineOrigin {
 
 class TimelineFactory {
   final DriftTimelineRepository _timelineRepository;
-  final SettingsRepository _settingsRepository;
+  final MetadataRepository _metadataRepository;
 
-  const TimelineFactory({required this._timelineRepository, required this._settingsRepository});
+  const TimelineFactory({required this._timelineRepository, required this._metadataRepository});
 
   GroupAssetsBy get groupBy {
-    final group = _settingsRepository.appConfig.timeline.groupAssetsBy;
+    final group = _metadataRepository.appConfig.timeline.groupAssetsBy;
     // We do not support auto grouping in the new timeline yet, fallback to day grouping
     return group == GroupAssetsBy.auto ? GroupAssetsBy.day : group;
   }

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

@@ -1,8 +1,8 @@
 import 'package:drift/drift.dart';
 import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';
 
-class SettingsEntity extends Table with DriftDefaultsMixin {
-  const SettingsEntity();
+class MetadataEntity extends Table with DriftDefaultsMixin {
+  const MetadataEntity();
 
   TextColumn get key => text()();
 
@@ -14,5 +14,5 @@ class SettingsEntity extends Table with DriftDefaultsMixin {
   Set<Column> get primaryKey => {key};
 
   @override
-  String get tableName => "settings";
+  String get tableName => "metadata";
 }

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

@@ -1,28 +1,28 @@
 // dart format width=80
 // ignore_for_file: type=lint
 import 'package:drift/drift.dart' as i0;
-import 'package:immich_mobile/infrastructure/entities/settings.entity.drift.dart'
+import 'package:immich_mobile/infrastructure/entities/metadata.entity.drift.dart'
     as i1;
-import 'package:immich_mobile/infrastructure/entities/settings.entity.dart'
+import 'package:immich_mobile/infrastructure/entities/metadata.entity.dart'
     as i2;
 import 'package:drift/src/runtime/query_builder/query_builder.dart' as i3;
 
-typedef $$SettingsEntityTableCreateCompanionBuilder =
-    i1.SettingsEntityCompanion Function({
+typedef $$MetadataEntityTableCreateCompanionBuilder =
+    i1.MetadataEntityCompanion Function({
       required String key,
       required String value,
       i0.Value<DateTime> updatedAt,
     });
-typedef $$SettingsEntityTableUpdateCompanionBuilder =
-    i1.SettingsEntityCompanion Function({
+typedef $$MetadataEntityTableUpdateCompanionBuilder =
+    i1.MetadataEntityCompanion Function({
       i0.Value<String> key,
       i0.Value<String> value,
       i0.Value<DateTime> updatedAt,
     });
 
-class $$SettingsEntityTableFilterComposer
-    extends i0.Composer<i0.GeneratedDatabase, i1.$SettingsEntityTable> {
-  $$SettingsEntityTableFilterComposer({
+class $$MetadataEntityTableFilterComposer
+    extends i0.Composer<i0.GeneratedDatabase, i1.$MetadataEntityTable> {
+  $$MetadataEntityTableFilterComposer({
     required super.$db,
     required super.$table,
     super.joinBuilder,
@@ -45,9 +45,9 @@ class $$SettingsEntityTableFilterComposer
   );
 }
 
-class $$SettingsEntityTableOrderingComposer
-    extends i0.Composer<i0.GeneratedDatabase, i1.$SettingsEntityTable> {
-  $$SettingsEntityTableOrderingComposer({
+class $$MetadataEntityTableOrderingComposer
+    extends i0.Composer<i0.GeneratedDatabase, i1.$MetadataEntityTable> {
+  $$MetadataEntityTableOrderingComposer({
     required super.$db,
     required super.$table,
     super.joinBuilder,
@@ -70,9 +70,9 @@ class $$SettingsEntityTableOrderingComposer
   );
 }
 
-class $$SettingsEntityTableAnnotationComposer
-    extends i0.Composer<i0.GeneratedDatabase, i1.$SettingsEntityTable> {
-  $$SettingsEntityTableAnnotationComposer({
+class $$MetadataEntityTableAnnotationComposer
+    extends i0.Composer<i0.GeneratedDatabase, i1.$MetadataEntityTable> {
+  $$MetadataEntityTableAnnotationComposer({
     required super.$db,
     required super.$table,
     super.joinBuilder,
@@ -89,47 +89,47 @@ class $$SettingsEntityTableAnnotationComposer
       $composableBuilder(column: $table.updatedAt, builder: (column) => column);
 }
 
-class $$SettingsEntityTableTableManager
+class $$MetadataEntityTableTableManager
     extends
         i0.RootTableManager<
           i0.GeneratedDatabase,
-          i1.$SettingsEntityTable,
-          i1.SettingsEntityData,
-          i1.$$SettingsEntityTableFilterComposer,
-          i1.$$SettingsEntityTableOrderingComposer,
-          i1.$$SettingsEntityTableAnnotationComposer,
-          $$SettingsEntityTableCreateCompanionBuilder,
-          $$SettingsEntityTableUpdateCompanionBuilder,
+          i1.$MetadataEntityTable,
+          i1.MetadataEntityData,
+          i1.$$MetadataEntityTableFilterComposer,
+          i1.$$MetadataEntityTableOrderingComposer,
+          i1.$$MetadataEntityTableAnnotationComposer,
+          $$MetadataEntityTableCreateCompanionBuilder,
+          $$MetadataEntityTableUpdateCompanionBuilder,
           (
-            i1.SettingsEntityData,
+            i1.MetadataEntityData,
             i0.BaseReferences<
               i0.GeneratedDatabase,
-              i1.$SettingsEntityTable,
-              i1.SettingsEntityData
+              i1.$MetadataEntityTable,
+              i1.MetadataEntityData
             >,
           ),
-          i1.SettingsEntityData,
+          i1.MetadataEntityData,
           i0.PrefetchHooks Function()
         > {
-  $$SettingsEntityTableTableManager(
+  $$MetadataEntityTableTableManager(
     i0.GeneratedDatabase db,
-    i1.$SettingsEntityTable table,
+    i1.$MetadataEntityTable table,
   ) : super(
         i0.TableManagerState(
           db: db,
           table: table,
           createFilteringComposer: () =>
-              i1.$$SettingsEntityTableFilterComposer($db: db, $table: table),
+              i1.$$MetadataEntityTableFilterComposer($db: db, $table: table),
           createOrderingComposer: () =>
-              i1.$$SettingsEntityTableOrderingComposer($db: db, $table: table),
+              i1.$$MetadataEntityTableOrderingComposer($db: db, $table: table),
           createComputedFieldComposer: () => i1
-              .$$SettingsEntityTableAnnotationComposer($db: db, $table: table),
+              .$$MetadataEntityTableAnnotationComposer($db: db, $table: table),
           updateCompanionCallback:
               ({
                 i0.Value<String> key = const i0.Value.absent(),
                 i0.Value<String> value = const i0.Value.absent(),
                 i0.Value<DateTime> updatedAt = const i0.Value.absent(),
-              }) => i1.SettingsEntityCompanion(
+              }) => i1.MetadataEntityCompanion(
                 key: key,
                 value: value,
                 updatedAt: updatedAt,
@@ -139,7 +139,7 @@ class $$SettingsEntityTableTableManager
                 required String key,
                 required String value,
                 i0.Value<DateTime> updatedAt = const i0.Value.absent(),
-              }) => i1.SettingsEntityCompanion.insert(
+              }) => i1.MetadataEntityCompanion.insert(
                 key: key,
                 value: value,
                 updatedAt: updatedAt,
@@ -152,34 +152,34 @@ class $$SettingsEntityTableTableManager
       );
 }
 
-typedef $$SettingsEntityTableProcessedTableManager =
+typedef $$MetadataEntityTableProcessedTableManager =
     i0.ProcessedTableManager<
       i0.GeneratedDatabase,
-      i1.$SettingsEntityTable,
-      i1.SettingsEntityData,
-      i1.$$SettingsEntityTableFilterComposer,
-      i1.$$SettingsEntityTableOrderingComposer,
-      i1.$$SettingsEntityTableAnnotationComposer,
-      $$SettingsEntityTableCreateCompanionBuilder,
-      $$SettingsEntityTableUpdateCompanionBuilder,
+      i1.$MetadataEntityTable,
+      i1.MetadataEntityData,
+      i1.$$MetadataEntityTableFilterComposer,
+      i1.$$MetadataEntityTableOrderingComposer,
+      i1.$$MetadataEntityTableAnnotationComposer,
+      $$MetadataEntityTableCreateCompanionBuilder,
+      $$MetadataEntityTableUpdateCompanionBuilder,
       (
-        i1.SettingsEntityData,
+        i1.MetadataEntityData,
         i0.BaseReferences<
           i0.GeneratedDatabase,
-          i1.$SettingsEntityTable,
-          i1.SettingsEntityData
+          i1.$MetadataEntityTable,
+          i1.MetadataEntityData
         >,
       ),
-      i1.SettingsEntityData,
+      i1.MetadataEntityData,
       i0.PrefetchHooks Function()
     >;
 
-class $SettingsEntityTable extends i2.SettingsEntity
-    with i0.TableInfo<$SettingsEntityTable, i1.SettingsEntityData> {
+class $MetadataEntityTable extends i2.MetadataEntity
+    with i0.TableInfo<$MetadataEntityTable, i1.MetadataEntityData> {
   @override
   final i0.GeneratedDatabase attachedDatabase;
   final String? _alias;
-  $SettingsEntityTable(this.attachedDatabase, [this._alias]);
+  $MetadataEntityTable(this.attachedDatabase, [this._alias]);
   static const i0.VerificationMeta _keyMeta = const i0.VerificationMeta('key');
   @override
   late final i0.GeneratedColumn<String> key = i0.GeneratedColumn<String>(
@@ -219,10 +219,10 @@ class $SettingsEntityTable extends i2.SettingsEntity
   String get aliasedName => _alias ?? actualTableName;
   @override
   String get actualTableName => $name;
-  static const String $name = 'settings';
+  static const String $name = 'metadata';
   @override
   i0.VerificationContext validateIntegrity(
-    i0.Insertable<i1.SettingsEntityData> instance, {
+    i0.Insertable<i1.MetadataEntityData> instance, {
     bool isInserting = false,
   }) {
     final context = i0.VerificationContext();
@@ -255,9 +255,9 @@ class $SettingsEntityTable extends i2.SettingsEntity
   @override
   Set<i0.GeneratedColumn> get $primaryKey => {key};
   @override
-  i1.SettingsEntityData map(Map<String, dynamic> data, {String? tablePrefix}) {
+  i1.MetadataEntityData map(Map<String, dynamic> data, {String? tablePrefix}) {
     final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
-    return i1.SettingsEntityData(
+    return i1.MetadataEntityData(
       key: attachedDatabase.typeMapping.read(
         i0.DriftSqlType.string,
         data['${effectivePrefix}key'],
@@ -274,8 +274,8 @@ class $SettingsEntityTable extends i2.SettingsEntity
   }
 
   @override
-  $SettingsEntityTable createAlias(String alias) {
-    return $SettingsEntityTable(attachedDatabase, alias);
+  $MetadataEntityTable createAlias(String alias) {
+    return $MetadataEntityTable(attachedDatabase, alias);
   }
 
   @override
@@ -284,12 +284,12 @@ class $SettingsEntityTable extends i2.SettingsEntity
   bool get isStrict => true;
 }
 
-class SettingsEntityData extends i0.DataClass
-    implements i0.Insertable<i1.SettingsEntityData> {
+class MetadataEntityData extends i0.DataClass
+    implements i0.Insertable<i1.MetadataEntityData> {
   final String key;
   final String value;
   final DateTime updatedAt;
-  const SettingsEntityData({
+  const MetadataEntityData({
     required this.key,
     required this.value,
     required this.updatedAt,
@@ -303,12 +303,12 @@ class SettingsEntityData extends i0.DataClass
     return map;
   }
 
-  factory SettingsEntityData.fromJson(
+  factory MetadataEntityData.fromJson(
     Map<String, dynamic> json, {
     i0.ValueSerializer? serializer,
   }) {
     serializer ??= i0.driftRuntimeOptions.defaultSerializer;
-    return SettingsEntityData(
+    return MetadataEntityData(
       key: serializer.fromJson<String>(json['key']),
       value: serializer.fromJson<String>(json['value']),
       updatedAt: serializer.fromJson<DateTime>(json['updatedAt']),
@@ -324,17 +324,17 @@ class SettingsEntityData extends i0.DataClass
     };
   }
 
-  i1.SettingsEntityData copyWith({
+  i1.MetadataEntityData copyWith({
     String? key,
     String? value,
     DateTime? updatedAt,
-  }) => i1.SettingsEntityData(
+  }) => i1.MetadataEntityData(
     key: key ?? this.key,
     value: value ?? this.value,
     updatedAt: updatedAt ?? this.updatedAt,
   );
-  SettingsEntityData copyWithCompanion(i1.SettingsEntityCompanion data) {
-    return SettingsEntityData(
+  MetadataEntityData copyWithCompanion(i1.MetadataEntityCompanion data) {
+    return MetadataEntityData(
       key: data.key.present ? data.key.value : this.key,
       value: data.value.present ? data.value.value : this.value,
       updatedAt: data.updatedAt.present ? data.updatedAt.value : this.updatedAt,
@@ -343,7 +343,7 @@ class SettingsEntityData extends i0.DataClass
 
   @override
   String toString() {
-    return (StringBuffer('SettingsEntityData(')
+    return (StringBuffer('MetadataEntityData(')
           ..write('key: $key, ')
           ..write('value: $value, ')
           ..write('updatedAt: $updatedAt')
@@ -356,29 +356,29 @@ class SettingsEntityData extends i0.DataClass
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
-      (other is i1.SettingsEntityData &&
+      (other is i1.MetadataEntityData &&
           other.key == this.key &&
           other.value == this.value &&
           other.updatedAt == this.updatedAt);
 }
 
-class SettingsEntityCompanion
-    extends i0.UpdateCompanion<i1.SettingsEntityData> {
+class MetadataEntityCompanion
+    extends i0.UpdateCompanion<i1.MetadataEntityData> {
   final i0.Value<String> key;
   final i0.Value<String> value;
   final i0.Value<DateTime> updatedAt;
-  const SettingsEntityCompanion({
+  const MetadataEntityCompanion({
     this.key = const i0.Value.absent(),
     this.value = const i0.Value.absent(),
     this.updatedAt = const i0.Value.absent(),
   });
-  SettingsEntityCompanion.insert({
+  MetadataEntityCompanion.insert({
     required String key,
     required String value,
     this.updatedAt = const i0.Value.absent(),
   }) : key = i0.Value(key),
        value = i0.Value(value);
-  static i0.Insertable<i1.SettingsEntityData> custom({
+  static i0.Insertable<i1.MetadataEntityData> custom({
     i0.Expression<String>? key,
     i0.Expression<String>? value,
     i0.Expression<DateTime>? updatedAt,
@@ -390,12 +390,12 @@ class SettingsEntityCompanion
     });
   }
 
-  i1.SettingsEntityCompanion copyWith({
+  i1.MetadataEntityCompanion copyWith({
     i0.Value<String>? key,
     i0.Value<String>? value,
     i0.Value<DateTime>? updatedAt,
   }) {
-    return i1.SettingsEntityCompanion(
+    return i1.MetadataEntityCompanion(
       key: key ?? this.key,
       value: value ?? this.value,
       updatedAt: updatedAt ?? this.updatedAt,
@@ -419,7 +419,7 @@ class SettingsEntityCompanion
 
   @override
   String toString() {
-    return (StringBuffer('SettingsEntityCompanion(')
+    return (StringBuffer('MetadataEntityCompanion(')
           ..write('key: $key, ')
           ..write('value: $value, ')
           ..write('updatedAt: $updatedAt')

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

@@ -13,7 +13,7 @@ import 'package:immich_mobile/infrastructure/entities/local_asset.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/local_asset.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/memory.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/memory_asset.entity.dart';
-import 'package:immich_mobile/infrastructure/entities/settings.entity.dart';
+import 'package:immich_mobile/infrastructure/entities/metadata.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/partner.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/person.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_album.entity.dart';
@@ -55,7 +55,7 @@ import 'package:logging/logging.dart';
     StoreEntity,
     TrashedLocalAssetEntity,
     AssetEditEntity,
-    SettingsEntity,
+    MetadataEntity,
   ],
   include: {'package:immich_mobile/infrastructure/entities/merged_asset.drift'},
 )
@@ -98,7 +98,7 @@ class Drift extends $Drift {
   }
 
   @override
-  int get schemaVersion => 27;
+  int get schemaVersion => 26;
 
   @override
   MigrationStrategy get migration => MigrationStrategy(
@@ -276,9 +276,6 @@ class Drift extends $Drift {
           from25To26: (m, v26) async {
             await m.addColumn(v26.remoteAssetEntity, v26.remoteAssetEntity.uploadedAt);
           },
-          from26To27: (m, v27) async {
-            await customStatement('ALTER TABLE metadata RENAME TO settings');
-          },
         ),
       );
 

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

@@ -43,7 +43,7 @@ import 'package:immich_mobile/infrastructure/entities/trashed_local_asset.entity
     as i20;
 import 'package:immich_mobile/infrastructure/entities/asset_edit.entity.drift.dart'
     as i21;
-import 'package:immich_mobile/infrastructure/entities/settings.entity.drift.dart'
+import 'package:immich_mobile/infrastructure/entities/metadata.entity.drift.dart'
     as i22;
 import 'package:immich_mobile/infrastructure/entities/merged_asset.drift.dart'
     as i23;
@@ -91,7 +91,7 @@ abstract class $Drift extends i0.GeneratedDatabase {
       .$TrashedLocalAssetEntityTable(this);
   late final i21.$AssetEditEntityTable assetEditEntity = i21
       .$AssetEditEntityTable(this);
-  late final i22.$SettingsEntityTable settingsEntity = i22.$SettingsEntityTable(
+  late final i22.$MetadataEntityTable metadataEntity = i22.$MetadataEntityTable(
     this,
   );
   i23.MergedAssetDrift get mergedAssetDrift => i24.ReadDatabaseContainer(
@@ -132,7 +132,7 @@ abstract class $Drift extends i0.GeneratedDatabase {
     storeEntity,
     trashedLocalAssetEntity,
     assetEditEntity,
-    settingsEntity,
+    metadataEntity,
     i10.idxPartnerSharedWithId,
     i11.idxLatLng,
     i11.idxRemoteExifCity,
@@ -395,6 +395,6 @@ class $DriftManager {
       );
   i21.$$AssetEditEntityTableTableManager get assetEditEntity =>
       i21.$$AssetEditEntityTableTableManager(_db, _db.assetEditEntity);
-  i22.$$SettingsEntityTableTableManager get settingsEntity =>
-      i22.$$SettingsEntityTableTableManager(_db, _db.settingsEntity);
+  i22.$$MetadataEntityTableTableManager get metadataEntity =>
+      i22.$$MetadataEntityTableTableManager(_db, _db.metadataEntity);
 }

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

@@ -13539,550 +13539,6 @@ i1.GeneratedColumn<String> _column_212(String aliasedName) =>
       type: i1.DriftSqlType.string,
       $customConstraints: 'NULL',
     );
-
-final class Schema27 extends i0.VersionedSchema {
-  Schema27({required super.database}) : super(version: 27);
-  @override
-  late final List<i1.DatabaseSchemaEntity> entities = [
-    userEntity,
-    remoteAssetEntity,
-    stackEntity,
-    localAssetEntity,
-    remoteAlbumEntity,
-    localAlbumEntity,
-    localAlbumAssetEntity,
-    idxLocalAlbumAssetAlbumAsset,
-    idxLocalAssetChecksum,
-    idxLocalAssetCloudId,
-    idxStackPrimaryAssetId,
-    uQRemoteAssetsOwnerChecksum,
-    uQRemoteAssetsOwnerLibraryChecksum,
-    idxRemoteAssetChecksum,
-    idxRemoteAssetStackId,
-    idxRemoteAssetOwnerVisibilityDeletedCreated,
-    authUserEntity,
-    userMetadataEntity,
-    partnerEntity,
-    remoteExifEntity,
-    remoteAlbumAssetEntity,
-    remoteAlbumUserEntity,
-    remoteAssetCloudIdEntity,
-    memoryEntity,
-    memoryAssetEntity,
-    personEntity,
-    assetFaceEntity,
-    storeEntity,
-    trashedLocalAssetEntity,
-    assetEditEntity,
-    settings,
-    idxPartnerSharedWithId,
-    idxLatLng,
-    idxRemoteExifCity,
-    idxRemoteAlbumAssetAlbumAsset,
-    idxRemoteAssetCloudId,
-    idxPersonOwnerId,
-    idxAssetFacePersonId,
-    idxAssetFaceAssetId,
-    idxAssetFaceVisiblePerson,
-    idxTrashedLocalAssetChecksum,
-    idxTrashedLocalAssetAlbum,
-    idxAssetEditAssetId,
-  ];
-  late final Shape33 userEntity = Shape33(
-    source: i0.VersionedTable(
-      entityName: 'user_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_107,
-        _column_108,
-        _column_109,
-        _column_110,
-        _column_111,
-        _column_112,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape50 remoteAssetEntity = Shape50(
-    source: i0.VersionedTable(
-      entityName: 'remote_asset_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_108,
-        _column_113,
-        _column_114,
-        _column_115,
-        _column_116,
-        _column_117,
-        _column_118,
-        _column_107,
-        _column_119,
-        _column_120,
-        _column_121,
-        _column_122,
-        _column_123,
-        _column_124,
-        _column_212,
-        _column_125,
-        _column_126,
-        _column_127,
-        _column_128,
-        _column_129,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape35 stackEntity = Shape35(
-    source: i0.VersionedTable(
-      entityName: 'stack_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_107,
-        _column_114,
-        _column_115,
-        _column_121,
-        _column_130,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape36 localAssetEntity = Shape36(
-    source: i0.VersionedTable(
-      entityName: 'local_asset_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_108,
-        _column_113,
-        _column_114,
-        _column_115,
-        _column_116,
-        _column_117,
-        _column_118,
-        _column_107,
-        _column_131,
-        _column_120,
-        _column_132,
-        _column_133,
-        _column_134,
-        _column_135,
-        _column_136,
-        _column_137,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape48 remoteAlbumEntity = Shape48(
-    source: i0.VersionedTable(
-      entityName: 'remote_album_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_107,
-        _column_108,
-        _column_138,
-        _column_114,
-        _column_115,
-        _column_139,
-        _column_140,
-        _column_141,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape38 localAlbumEntity = Shape38(
-    source: i0.VersionedTable(
-      entityName: 'local_album_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_107,
-        _column_108,
-        _column_115,
-        _column_142,
-        _column_143,
-        _column_144,
-        _column_145,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape39 localAlbumAssetEntity = Shape39(
-    source: i0.VersionedTable(
-      entityName: 'local_album_asset_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(asset_id, album_id)'],
-      columns: [_column_146, _column_147, _column_145],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  final i1.Index idxLocalAlbumAssetAlbumAsset = i1.Index(
-    'idx_local_album_asset_album_asset',
-    'CREATE INDEX IF NOT EXISTS idx_local_album_asset_album_asset ON local_album_asset_entity (album_id, asset_id)',
-  );
-  final i1.Index idxLocalAssetChecksum = i1.Index(
-    'idx_local_asset_checksum',
-    'CREATE INDEX IF NOT EXISTS idx_local_asset_checksum ON local_asset_entity (checksum)',
-  );
-  final i1.Index idxLocalAssetCloudId = i1.Index(
-    'idx_local_asset_cloud_id',
-    'CREATE INDEX IF NOT EXISTS idx_local_asset_cloud_id ON local_asset_entity (i_cloud_id)',
-  );
-  final i1.Index idxStackPrimaryAssetId = i1.Index(
-    'idx_stack_primary_asset_id',
-    'CREATE INDEX IF NOT EXISTS idx_stack_primary_asset_id ON stack_entity (primary_asset_id)',
-  );
-  final i1.Index uQRemoteAssetsOwnerChecksum = i1.Index(
-    'UQ_remote_assets_owner_checksum',
-    'CREATE UNIQUE INDEX IF NOT EXISTS UQ_remote_assets_owner_checksum ON remote_asset_entity (owner_id, checksum) WHERE(library_id IS NULL)',
-  );
-  final i1.Index uQRemoteAssetsOwnerLibraryChecksum = i1.Index(
-    'UQ_remote_assets_owner_library_checksum',
-    'CREATE UNIQUE INDEX IF NOT EXISTS UQ_remote_assets_owner_library_checksum ON remote_asset_entity (owner_id, library_id, checksum) WHERE(library_id IS NOT NULL)',
-  );
-  final i1.Index idxRemoteAssetChecksum = i1.Index(
-    'idx_remote_asset_checksum',
-    'CREATE INDEX IF NOT EXISTS idx_remote_asset_checksum ON remote_asset_entity (checksum)',
-  );
-  final i1.Index idxRemoteAssetStackId = i1.Index(
-    'idx_remote_asset_stack_id',
-    'CREATE INDEX IF NOT EXISTS idx_remote_asset_stack_id ON remote_asset_entity (stack_id)',
-  );
-  final i1.Index idxRemoteAssetOwnerVisibilityDeletedCreated = i1.Index(
-    'idx_remote_asset_owner_visibility_deleted_created',
-    'CREATE INDEX IF NOT EXISTS idx_remote_asset_owner_visibility_deleted_created ON remote_asset_entity (owner_id, visibility, deleted_at, created_at DESC)',
-  );
-  late final Shape40 authUserEntity = Shape40(
-    source: i0.VersionedTable(
-      entityName: 'auth_user_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_107,
-        _column_108,
-        _column_109,
-        _column_148,
-        _column_110,
-        _column_111,
-        _column_149,
-        _column_150,
-        _column_151,
-        _column_152,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape4 userMetadataEntity = Shape4(
-    source: i0.VersionedTable(
-      entityName: 'user_metadata_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(user_id, "key")'],
-      columns: [_column_153, _column_154, _column_155],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape41 partnerEntity = Shape41(
-    source: i0.VersionedTable(
-      entityName: 'partner_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(shared_by_id, shared_with_id)'],
-      columns: [_column_156, _column_157, _column_158],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape42 remoteExifEntity = Shape42(
-    source: i0.VersionedTable(
-      entityName: 'remote_exif_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(asset_id)'],
-      columns: [
-        _column_159,
-        _column_160,
-        _column_161,
-        _column_162,
-        _column_163,
-        _column_164,
-        _column_117,
-        _column_116,
-        _column_165,
-        _column_166,
-        _column_167,
-        _column_168,
-        _column_135,
-        _column_136,
-        _column_169,
-        _column_170,
-        _column_171,
-        _column_172,
-        _column_173,
-        _column_174,
-        _column_175,
-        _column_176,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape7 remoteAlbumAssetEntity = Shape7(
-    source: i0.VersionedTable(
-      entityName: 'remote_album_asset_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(asset_id, album_id)'],
-      columns: [_column_159, _column_177],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape10 remoteAlbumUserEntity = Shape10(
-    source: i0.VersionedTable(
-      entityName: 'remote_album_user_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(album_id, user_id)'],
-      columns: [_column_177, _column_153, _column_178],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape43 remoteAssetCloudIdEntity = Shape43(
-    source: i0.VersionedTable(
-      entityName: 'remote_asset_cloud_id_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(asset_id)'],
-      columns: [
-        _column_159,
-        _column_179,
-        _column_180,
-        _column_134,
-        _column_135,
-        _column_136,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape44 memoryEntity = Shape44(
-    source: i0.VersionedTable(
-      entityName: 'memory_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_107,
-        _column_114,
-        _column_115,
-        _column_124,
-        _column_121,
-        _column_113,
-        _column_181,
-        _column_182,
-        _column_183,
-        _column_184,
-        _column_185,
-        _column_186,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape12 memoryAssetEntity = Shape12(
-    source: i0.VersionedTable(
-      entityName: 'memory_asset_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(asset_id, memory_id)'],
-      columns: [_column_159, _column_187],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape45 personEntity = Shape45(
-    source: i0.VersionedTable(
-      entityName: 'person_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_107,
-        _column_114,
-        _column_115,
-        _column_121,
-        _column_108,
-        _column_188,
-        _column_189,
-        _column_190,
-        _column_191,
-        _column_192,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape46 assetFaceEntity = Shape46(
-    source: i0.VersionedTable(
-      entityName: 'asset_face_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_107,
-        _column_159,
-        _column_193,
-        _column_194,
-        _column_195,
-        _column_196,
-        _column_197,
-        _column_198,
-        _column_199,
-        _column_200,
-        _column_201,
-        _column_124,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape18 storeEntity = Shape18(
-    source: i0.VersionedTable(
-      entityName: 'store_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [_column_202, _column_203, _column_204],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape47 trashedLocalAssetEntity = Shape47(
-    source: i0.VersionedTable(
-      entityName: 'trashed_local_asset_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id, album_id)'],
-      columns: [
-        _column_108,
-        _column_113,
-        _column_114,
-        _column_115,
-        _column_116,
-        _column_117,
-        _column_118,
-        _column_107,
-        _column_205,
-        _column_131,
-        _column_120,
-        _column_132,
-        _column_206,
-        _column_137,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape32 assetEditEntity = Shape32(
-    source: i0.VersionedTable(
-      entityName: 'asset_edit_entity',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY(id)'],
-      columns: [
-        _column_107,
-        _column_159,
-        _column_207,
-        _column_208,
-        _column_209,
-      ],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  late final Shape49 settings = Shape49(
-    source: i0.VersionedTable(
-      entityName: 'settings',
-      withoutRowId: true,
-      isStrict: true,
-      tableConstraints: ['PRIMARY KEY("key")'],
-      columns: [_column_210, _column_211, _column_115],
-      attachedDatabase: database,
-    ),
-    alias: null,
-  );
-  final i1.Index idxPartnerSharedWithId = i1.Index(
-    'idx_partner_shared_with_id',
-    'CREATE INDEX IF NOT EXISTS idx_partner_shared_with_id ON partner_entity (shared_with_id)',
-  );
-  final i1.Index idxLatLng = i1.Index(
-    'idx_lat_lng',
-    'CREATE INDEX IF NOT EXISTS idx_lat_lng ON remote_exif_entity (latitude, longitude)',
-  );
-  final i1.Index idxRemoteExifCity = i1.Index(
-    'idx_remote_exif_city',
-    'CREATE INDEX IF NOT EXISTS idx_remote_exif_city ON remote_exif_entity (city) WHERE city IS NOT NULL',
-  );
-  final i1.Index idxRemoteAlbumAssetAlbumAsset = i1.Index(
-    'idx_remote_album_asset_album_asset',
-    'CREATE INDEX IF NOT EXISTS idx_remote_album_asset_album_asset ON remote_album_asset_entity (album_id, asset_id)',
-  );
-  final i1.Index idxRemoteAssetCloudId = i1.Index(
-    'idx_remote_asset_cloud_id',
-    'CREATE INDEX IF NOT EXISTS idx_remote_asset_cloud_id ON remote_asset_cloud_id_entity (cloud_id)',
-  );
-  final i1.Index idxPersonOwnerId = i1.Index(
-    'idx_person_owner_id',
-    'CREATE INDEX IF NOT EXISTS idx_person_owner_id ON person_entity (owner_id)',
-  );
-  final i1.Index idxAssetFacePersonId = i1.Index(
-    'idx_asset_face_person_id',
-    'CREATE INDEX IF NOT EXISTS idx_asset_face_person_id ON asset_face_entity (person_id)',
-  );
-  final i1.Index idxAssetFaceAssetId = i1.Index(
-    'idx_asset_face_asset_id',
-    'CREATE INDEX IF NOT EXISTS idx_asset_face_asset_id ON asset_face_entity (asset_id)',
-  );
-  final i1.Index idxAssetFaceVisiblePerson = i1.Index(
-    'idx_asset_face_visible_person',
-    'CREATE INDEX IF NOT EXISTS idx_asset_face_visible_person ON asset_face_entity (person_id, asset_id) WHERE is_visible = 1 AND deleted_at IS NULL',
-  );
-  final i1.Index idxTrashedLocalAssetChecksum = i1.Index(
-    'idx_trashed_local_asset_checksum',
-    'CREATE INDEX IF NOT EXISTS idx_trashed_local_asset_checksum ON trashed_local_asset_entity (checksum)',
-  );
-  final i1.Index idxTrashedLocalAssetAlbum = i1.Index(
-    'idx_trashed_local_asset_album',
-    'CREATE INDEX IF NOT EXISTS idx_trashed_local_asset_album ON trashed_local_asset_entity (album_id)',
-  );
-  final i1.Index idxAssetEditAssetId = i1.Index(
-    'idx_asset_edit_asset_id',
-    'CREATE INDEX IF NOT EXISTS idx_asset_edit_asset_id ON asset_edit_entity (asset_id)',
-  );
-}
-
 i0.MigrationStepWithVersion migrationSteps({
   required Future<void> Function(i1.Migrator m, Schema2 schema) from1To2,
   required Future<void> Function(i1.Migrator m, Schema3 schema) from2To3,
@@ -14109,7 +13565,6 @@ i0.MigrationStepWithVersion migrationSteps({
   required Future<void> Function(i1.Migrator m, Schema24 schema) from23To24,
   required Future<void> Function(i1.Migrator m, Schema25 schema) from24To25,
   required Future<void> Function(i1.Migrator m, Schema26 schema) from25To26,
-  required Future<void> Function(i1.Migrator m, Schema27 schema) from26To27,
 }) {
   return (currentVersion, database) async {
     switch (currentVersion) {
@@ -14238,11 +13693,6 @@ i0.MigrationStepWithVersion migrationSteps({
         final migrator = i1.Migrator(database, schema);
         await from25To26(migrator, schema);
         return 26;
-      case 26:
-        final schema = Schema27(database: database);
-        final migrator = i1.Migrator(database, schema);
-        await from26To27(migrator, schema);
-        return 27;
       default:
         throw ArgumentError.value('Unknown migration from $currentVersion');
     }
@@ -14275,7 +13725,6 @@ i1.OnUpgrade stepByStep({
   required Future<void> Function(i1.Migrator m, Schema24 schema) from23To24,
   required Future<void> Function(i1.Migrator m, Schema25 schema) from24To25,
   required Future<void> Function(i1.Migrator m, Schema26 schema) from25To26,
-  required Future<void> Function(i1.Migrator m, Schema27 schema) from26To27,
 }) => i0.VersionedSchema.stepByStepHelper(
   step: migrationSteps(
     from1To2: from1To2,
@@ -14303,6 +13752,5 @@ i1.OnUpgrade stepByStep({
     from23To24: from23To24,
     from24To25: from24To25,
     from25To26: from25To26,
-    from26To27: from26To27,
   ),
 );

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

@@ -0,0 +1,72 @@
+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/metadata_key.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;
+
+  MetadataRepository._(this._db) : super(_db);
+
+  static MetadataRepository? _instance;
+
+  static MetadataRepository get instance {
+    final instance = _instance;
+    if (instance == null) {
+      throw StateError('MetadataRepository not initialized. Call ensureInitialized() first');
+    }
+    return instance;
+  }
+
+  AppConfig _appConfig = const .new();
+  AppConfig get appConfig => _appConfig;
+
+  static Future<MetadataRepository> ensureInitialized(Drift db) async {
+    if (_instance == null) {
+      final instance = MetadataRepository._(db);
+      await instance.refresh();
+      _instance = instance;
+    }
+    return _instance!;
+  }
+
+  Future<void> refresh() async => _applyOverrides(await _db.select(_db.metadataEntity).get());
+
+  Future<void> write<T extends Object, U extends T>(MetadataKey<T> key, U value) async {
+    if (value == _appConfig.read(key)) {
+      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);
+  }
+
+  Stream<AppConfig> watchConfig() => _db.select(_db.metadataEntity).watch().map((rows) {
+    _applyOverrides(rows);
+    return _appConfig;
+  });
+
+  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;
+        }
+
+        return {...overrides, metadataKey: metadataKey.decode(row.value)};
+      }),
+    );
+  }
+}

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

@@ -1,84 +0,0 @@
-import 'package:collection/collection.dart';
-import 'package:drift/drift.dart';
-import 'package:immich_mobile/domain/models/config/app_config.dart';
-import 'package:immich_mobile/domain/models/settings_key.dart';
-import 'package:immich_mobile/infrastructure/entities/settings.entity.drift.dart';
-import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
-
-class SettingsRepository extends DriftDatabaseRepository {
-  final Drift _db;
-
-  SettingsRepository._(this._db) : super(_db);
-
-  static SettingsRepository? _instance;
-
-  static SettingsRepository get instance {
-    final instance = _instance;
-    if (instance == null) {
-      throw StateError('SettingsRepository not initialized. Call ensureInitialized() first');
-    }
-    return instance;
-  }
-
-  AppConfig _appConfig = const .new();
-  AppConfig get appConfig => _appConfig;
-
-  static Future<SettingsRepository> ensureInitialized(Drift db) async {
-    if (_instance == null) {
-      final instance = SettingsRepository._(db);
-      await instance.refresh();
-      _instance = instance;
-    }
-    return _instance!;
-  }
-
-  Future<void> refresh() async => _applyOverrides(await _db.select(_db.settingsEntity).get());
-
-  Future<void> clear(Iterable<SettingsKey> keys) async {
-    if (keys.isEmpty) {
-      return;
-    }
-
-    final names = keys.map((key) => key.name).toList();
-    await (_db.delete(_db.settingsEntity)..where((row) => row.key.isIn(names))).go();
-
-    for (final key in keys) {
-      _appConfig = _appConfig.write(key, defaultConfig.read(key));
-    }
-  }
-
-  Future<void> write<T extends Object, U extends T>(SettingsKey<T> key, U value) async {
-    if (value == _appConfig.read(key)) {
-      return;
-    }
-
-    if (value == defaultConfig.read(key)) {
-      return clear([key]);
-    }
-
-    await _db
-        .into(_db.settingsEntity)
-        .insertOnConflictUpdate(
-          SettingsEntityCompanion.insert(key: key.name, value: key.encode(value), updatedAt: Value(DateTime.now())),
-        );
-    _appConfig = _appConfig.write(key, value);
-  }
-
-  Stream<AppConfig> watchConfig() => _db.select(_db.settingsEntity).watch().map((rows) {
-    _applyOverrides(rows);
-    return _appConfig;
-  });
-
-  void _applyOverrides(List<SettingsEntityData> rows) {
-    _appConfig = AppConfig.fromEntries(
-      rows.fold({}, (overrides, row) {
-        final metadataKey = SettingsKey.values.firstWhereOrNull((key) => key.name == row.key);
-        if (metadataKey == null) {
-          return overrides;
-        }
-
-        return {...overrides, metadataKey: metadataKey.decode(row.value)};
-      }),
-    );
-  }
-}

mobile/lib/main.dart

@@ -25,7 +25,7 @@ import 'package:immich_mobile/platform/background_worker_lock_api.g.dart';
 import 'package:immich_mobile/providers/app_life_cycle.provider.dart';
 import 'package:immich_mobile/providers/asset_viewer/share_intent_upload.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
 import 'package:immich_mobile/providers/locale_provider.dart';
 import 'package:immich_mobile/providers/routes.provider.dart';

mobile/lib/models/server_info/server_version.model.dart

@@ -2,12 +2,16 @@ import 'package:immich_mobile/utils/semver.dart';
 import 'package:openapi/api.dart';
 
 class ServerVersion extends SemVer {
-  const ServerVersion({required super.major, required super.minor, required super.patch, super.prerelease});
+  const ServerVersion({required super.major, required super.minor, required super.patch});
 
-  ServerVersion.fromDto(ServerVersionResponseDto dto)
-    : super(major: dto.major, minor: dto.minor, patch: dto.patch_, prerelease: dto.prerelease);
+  @override
+  String toString() {
+    return 'ServerVersion(major: $major, minor: $minor, patch: $patch)';
+  }
 
-  bool isAtLeast({int major = 0, int minor = 0, int patch = 0, int? prerelease}) {
-    return this >= SemVer(major: major, minor: minor, patch: patch, prerelease: prerelease);
+  ServerVersion.fromDto(ServerVersionResponseDto dto) : super(major: dto.major, minor: dto.minor, patch: dto.patch_);
+
+  bool isAtLeast({int major = 0, int minor = 0, int patch = 0}) {
+    return this >= SemVer(major: major, minor: minor, patch: patch);
   }
 }

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

@@ -8,11 +8,11 @@ import 'package:immich_mobile/domain/models/album/local_album.model.dart';
 import 'package:immich_mobile/domain/services/sync_linked_album.service.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
-import 'package:immich_mobile/infrastructure/repositories/settings.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/metadata.repository.dart';
 import 'package:immich_mobile/providers/background_sync.provider.dart';
 import 'package:immich_mobile/providers/backup/backup_album.provider.dart';
 import 'package:immich_mobile/providers/backup/drift_backup.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/widgets/backup/drift_album_info_list_tile.dart';
@@ -103,7 +103,7 @@ class _DriftBackupAlbumSelectionPageState extends ConsumerState<DriftBackupAlbum
             return;
           }
 
-          final isBackupEnabled = SettingsRepository.instance.appConfig.backup.enabled;
+          final isBackupEnabled = MetadataRepository.instance.appConfig.backup.enabled;
           await ref.read(driftBackupProvider.notifier).getBackupStatus(user.id);
           final currentTotalAssetCount = ref.read(driftBackupProvider.select((p) => p.totalCount));
           final totalChanged = currentTotalAssetCount != _initialTotalAssetCount;

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

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

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

@@ -3,9 +3,10 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/metadata_key.dart';
 import 'package:immich_mobile/generated/translations.g.dart';
 import 'package:immich_mobile/providers/api.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 
 class SettingsHeader {
   String key = "";
@@ -21,7 +22,7 @@ class HeaderSettingsPage extends HookConsumerWidget {
     final headers = useState<List<SettingsHeader>>([]);
     final setInitialHeaders = useState(false);
 
-    final storedHeaders = ref.read(appConfigProvider).network.customHeaders;
+    final storedHeaders = ref.read(metadataProvider).appConfig.network.customHeaders;
     if (!setInitialHeaders.value) {
       storedHeaders.forEach((k, v) {
         final header = SettingsHeader();
@@ -93,7 +94,7 @@ class HeaderSettingsPage extends HookConsumerWidget {
       headersMap[key] = value;
     }
 
-    await ref.read(settingsProvider).write(.networkCustomHeaders, headersMap);
+    await ref.read(metadataProvider).write(MetadataKey.networkCustomHeaders, headersMap);
     await ref.read(apiServiceProvider).updateHeaders();
   }
 }

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

@@ -12,7 +12,7 @@ import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/generated/codegen_loader.g.dart';
 import 'package:immich_mobile/generated/translations.g.dart';
-import 'package:immich_mobile/infrastructure/repositories/settings.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/metadata.repository.dart';
 import 'package:immich_mobile/providers/auth.provider.dart';
 import 'package:immich_mobile/providers/background_sync.provider.dart';
 import 'package:immich_mobile/providers/backup/drift_backup.provider.dart';
@@ -341,7 +341,7 @@ class SplashScreenPageState extends ConsumerState<SplashScreenPage> {
                 await backgroundManager.hashAssets();
               }
 
-              if (SettingsRepository.instance.appConfig.backup.syncAlbums) {
+              if (MetadataRepository.instance.appConfig.backup.syncAlbums) {
                 await backgroundManager.syncLinkedAlbum();
               }
             } catch (e) {
@@ -370,7 +370,7 @@ class SplashScreenPageState extends ConsumerState<SplashScreenPage> {
   }
 
   Future<void> _resumeBackup(DriftBackupNotifier notifier) async {
-    final isEnableBackup = SettingsRepository.instance.appConfig.backup.enabled;
+    final isEnableBackup = MetadataRepository.instance.appConfig.backup.enabled;
 
     if (isEnableBackup) {
       final currentUser = Store.tryGet(StoreKey.currentUser);

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

@@ -17,7 +17,7 @@ import 'package:immich_mobile/presentation/widgets/asset_viewer/video_viewer.wid
 import 'package:immich_mobile/presentation/widgets/images/image_provider.dart';
 import 'package:immich_mobile/providers/asset_viewer/asset_viewer.provider.dart';
 import 'package:immich_mobile/providers/asset_viewer/video_player_provider.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/widgets/common/immich_loading_indicator.dart';
 import 'package:immich_mobile/widgets/photo_view/photo_view.dart';

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

@@ -6,7 +6,6 @@ import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_bu
 import 'package:immich_mobile/presentation/widgets/action_buttons/unarchive_action_button.widget.dart';
 import 'package:immich_mobile/providers/asset_viewer/asset_viewer.provider.dart';
 import 'package:immich_mobile/presentation/widgets/album/album_selector.widget.dart';
-import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
 import 'package:immich_mobile/providers/routes.provider.dart';
 import 'package:immich_mobile/widgets/common/immich_toast.dart';
@@ -143,18 +142,13 @@ class _AddActionButtonState extends ConsumerState<AddActionButton> {
       return;
     }
 
-    final result = await ref.read(actionProvider.notifier).addToAlbum(ActionSource.viewer, album);
+    final addedCount = await ref.read(remoteAlbumProvider.notifier).addAssets(album.id, [latest.remoteId!]);
 
     if (!context.mounted) {
       return;
     }
 
-    if (!result.success) {
-      ImmichToast.show(context: context, msg: 'scaffold_body_error_occurred'.tr(), toastType: ToastType.error);
-      return;
-    }
-
-    if (result.count == 0) {
+    if (addedCount == 0) {
       ImmichToast.show(
         context: context,
         msg: 'add_to_album_bottom_sheet_already_exists'.tr(namedArgs: {'album': album.name}),
@@ -165,7 +159,7 @@ class _AddActionButtonState extends ConsumerState<AddActionButton> {
         msg: 'add_to_album_bottom_sheet_added'.tr(namedArgs: {'album': album.name}),
       );
 
-      // Refresh the "Appears in" list on the asset's info panel.
+      // Invalidate using the asset's remote ID to refresh the "Appears in" list
       ref.invalidate(albumsContainingAssetProvider(latest.remoteId!));
     }
 

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

@@ -48,33 +48,6 @@ class _SharePreparingDialog extends StatelessWidget {
   }
 }
 
-class _ShareFileTypeDialog extends StatelessWidget {
-  const _ShareFileTypeDialog();
-
-  @override
-  Widget build(BuildContext context) {
-    return AlertDialog(
-      title: Text('share'.t(context: context)),
-      contentPadding: const EdgeInsets.symmetric(vertical: 8),
-      content: Column(
-        mainAxisSize: MainAxisSize.min,
-        children: [
-          ListTile(
-            leading: const Icon(Icons.high_quality_rounded),
-            title: Text('share_original'.t(context: context)),
-            onTap: () => context.pop(ShareAssetFileType.original),
-          ),
-          ListTile(
-            leading: const Icon(Icons.photo_size_select_large_rounded),
-            title: Text('share_preview'.t(context: context)),
-            onTap: () => context.pop(ShareAssetFileType.preview),
-          ),
-        ],
-      ),
-    );
-  }
-}
-
 class ShareActionButton extends ConsumerWidget {
   final ActionSource source;
   final bool iconOnly;
@@ -87,15 +60,6 @@ class ShareActionButton extends ConsumerWidget {
       return;
     }
 
-    final fileType = await showDialog<ShareAssetFileType>(
-      context: context,
-      builder: (_) => const _ShareFileTypeDialog(),
-      useRootNavigator: false,
-    );
-    if (fileType == null || !context.mounted) {
-      return;
-    }
-
     final cancelCompleter = Completer<void>();
     final progress = ValueNotifier<double?>(null);
     final preparingDialog = _SharePreparingDialog(progress: progress);
@@ -107,7 +71,6 @@ class ShareActionButton extends ConsumerWidget {
             .shareAssets(
               source,
               context,
-              fileType: fileType,
               cancelCompleter: cancelCompleter,
               onAssetDownloadProgress: (value) => progress.value = value,
             )

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

@@ -7,6 +7,7 @@ import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/album/album.model.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/theme_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
@@ -14,11 +15,12 @@ import 'package:immich_mobile/models/albums/album_search.model.dart';
 import 'package:immich_mobile/presentation/widgets/album/album_tile.dart';
 import 'package:immich_mobile/presentation/widgets/album/new_album_name_modal.widget.dart';
 import 'package:immich_mobile/presentation/widgets/images/thumbnail.widget.dart';
+import 'package:immich_mobile/domain/models/metadata_key.dart';
 import 'package:immich_mobile/providers/album/album_sort_by_options.provider.dart';
 import 'package:immich_mobile/providers/asset_viewer/asset_viewer.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
@@ -56,7 +58,7 @@ class _AlbumSelectorState extends ConsumerState<AlbumSelector> {
     super.initState();
 
     WidgetsBinding.instance.addPostFrameCallback((_) {
-      final albumConfig = ref.read(appConfigProvider).album;
+      final albumConfig = ref.read(metadataProvider).appConfig.album;
 
       setState(() {
         sort = AlbumSort(mode: albumConfig.sortMode, isReverse: albumConfig.isReverse);
@@ -92,7 +94,7 @@ class _AlbumSelectorState extends ConsumerState<AlbumSelector> {
     setState(() {
       isGrid = !isGrid;
     });
-    ref.read(settingsProvider).write(.albumIsGrid, isGrid);
+    ref.read(metadataProvider).write(MetadataKey.albumIsGrid, isGrid);
   }
 
   void changeFilter(QuickFilterMode mode) {
@@ -108,9 +110,9 @@ class _AlbumSelectorState extends ConsumerState<AlbumSelector> {
       this.sort = sort;
     });
 
-    final metadata = ref.read(settingsProvider);
-    await metadata.write(.albumSortMode, sort.mode);
-    await metadata.write(.albumIsReverse, sort.isReverse);
+    final metadata = ref.read(metadataProvider);
+    await metadata.write(MetadataKey.albumSortMode, sort.mode);
+    await metadata.write(MetadataKey.albumIsReverse, sort.isReverse);
 
     await sortAlbums();
   }
@@ -745,10 +747,12 @@ class AddToAlbumHeader extends ConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     Future<void> onCreateAlbum() async {
-      final selectedAssets = ref.read(multiSelectProvider).selectedAssets;
       final newAlbum = await ref
           .read(remoteAlbumProvider.notifier)
-          .createAlbumWithAssets(title: "Untitled Album", assets: selectedAssets);
+          .createAlbum(
+            title: "Untitled Album",
+            assetIds: ref.read(multiSelectProvider).selectedAssets.map((e) => (e as RemoteAsset).id).toList(),
+          );
 
       if (newAlbum == null) {
         ImmichToast.show(context: context, toastType: ToastType.error, msg: 'errors.failed_to_create_album'.tr());

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

@@ -5,7 +5,6 @@ import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/images/thumbnail.widget.dart';
 import 'package:immich_mobile/providers/album/pending_album_uploads.provider.dart';
-import 'package:immich_mobile/providers/backup/asset_upload_progress.provider.dart';
 
 /// Pinned banner sliver that surfaces in-flight album uploads directly under
 /// the album app bar. Renders nothing while the queue is empty. Tapping the
@@ -166,8 +165,6 @@ class _PendingUploadsSheet extends ConsumerWidget {
     }
 
     final failedCount = pending.where((p) => p.failed).length;
-    final inFlightCount = pending.length - failedCount;
-    final canAbort = inFlightCount > 0 && ref.watch(manualUploadCancelTokenProvider) != null;
 
     return SafeArea(
       child: Padding(
@@ -186,21 +183,7 @@ class _PendingUploadsSheet extends ConsumerWidget {
                       style: context.textTheme.titleMedium,
                     ),
                   ),
-                  if (canAbort)
-                    TextButton.icon(
-                      onPressed: () {
-                        final cancelToken = ref.read(manualUploadCancelTokenProvider);
-                        if (cancelToken != null && !cancelToken.isCompleted) {
-                          cancelToken.complete();
-                        }
-                        ref.read(manualUploadCancelTokenProvider.notifier).state = null;
-                        ref.read(pendingAlbumUploadsProvider(albumId).notifier).clear();
-                      },
-                      icon: const Icon(Icons.stop_circle_outlined, size: 18),
-                      label: Text('cancel'.t(context: context)),
-                      style: TextButton.styleFrom(foregroundColor: context.colorScheme.error),
-                    )
-                  else if (failedCount > 0)
+                  if (failedCount > 0)
                     TextButton.icon(
                       onPressed: () => ref.read(pendingAlbumUploadsProvider(albumId).notifier).clearFailed(),
                       icon: const Icon(Icons.clear_rounded, size: 18),

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

@@ -19,7 +19,7 @@ import 'package:immich_mobile/presentation/widgets/images/image_provider.dart';
 import 'package:immich_mobile/presentation/widgets/images/thumbnail.widget.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/infrastructure/settings.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
 import 'package:immich_mobile/widgets/common/immich_loading_indicator.dart';
 import 'package:immich_mobile/widgets/photo_view/photo_view.dart';
@@ -241,7 +241,7 @@ class _AssetPageState extends ConsumerState<AssetPage> {
       return;
     }
 
-    final tapToNavigate = ref.read(appConfigProvider).viewer.tapToNavigate;
+    final tapToNavigate = ref.read(metadataProvider).appConfig.viewer.tapToNavigate;
     if (!tapToNavigate) {
       _viewer.toggleControls();
       return;

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

@@ -12,7 +12,7 @@ import 'package:immich_mobile/providers/asset_viewer/is_motion_video_playing.pro
 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/settings.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/services/api.service.dart';
 import 'package:logging/logging.dart';
 import 'package:native_video_player/native_video_player.dart';
@@ -128,7 +128,7 @@ class _NativeVideoViewerState extends ConsumerState<NativeVideoViewer> with Widg
       final remoteId = (videoAsset as RemoteAsset).id;
 
       final serverEndpoint = Store.get(StoreKey.serverEndpoint);
-      final isOriginalVideo = ref.read(appConfigProvider).viewer.loadOriginalVideo;
+      final isOriginalVideo = ref.read(metadataProvider).appConfig.viewer.loadOriginalVideo;
       final String postfixUrl = isOriginalVideo ? 'original' : 'video/playback';
       final String videoUrl = videoAsset.livePhotoVideoId != null
           ? '$serverEndpoint/assets/${videoAsset.livePhotoVideoId}/$postfixUrl'
@@ -161,7 +161,7 @@ class _NativeVideoViewerState extends ConsumerState<NativeVideoViewer> with Widg
       return;
     }
 
-    final autoPlayVideo = ref.read(appConfigProvider).viewer.autoPlayVideo;
+    final autoPlayVideo = ref.read(metadataProvider).appConfig.viewer.autoPlayVideo;
     if (autoPlayVideo || widget.asset.isMotionPhoto) {
       await _notifier.play();
     }
@@ -212,7 +212,7 @@ class _NativeVideoViewerState extends ConsumerState<NativeVideoViewer> with Widg
     }
 
     await _notifier.load(source);
-    final loopVideo = ref.read(appConfigProvider).viewer.loopVideo;
+    final loopVideo = ref.read(metadataProvider).appConfig.viewer.loopVideo;
     await _notifier.setLoop(!widget.asset.isMotionPhoto && loopVideo);
     await _notifier.setVolume(1);
   }

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

@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/domain/models/setting.model.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/providers/asset_viewer/asset_viewer.provider.dart';
 import 'package:immich_mobile/providers/cast.provider.dart';
@@ -33,7 +34,7 @@ class ViewerKebabMenu extends ConsumerWidget {
     final isInLockedView = ref.watch(inLockedViewProvider);
     final currentAlbum = ref.watch(currentRemoteAlbumProvider);
     final isArchived = asset is RemoteAsset && asset.visibility == AssetVisibility.archive;
-    final advancedTroubleshooting = ref.watch(settingsProvider.notifier).get(.advancedTroubleshooting);
+    final advancedTroubleshooting = ref.watch(settingsProvider.notifier).get(Setting.advancedTroubleshooting);
 
     final actionContext = ActionButtonContext(
       asset: asset,

mobile/lib/presentation/widgets/backup/backup_toggle_button.widget.dart

@@ -1,9 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/metadata_key.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/providers/backup/drift_backup.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 
 class BackupToggleButton extends ConsumerStatefulWidget {
   final VoidCallback onStart;
@@ -30,7 +31,7 @@ class BackupToggleButtonState extends ConsumerState<BackupToggleButton> with Sin
       end: 1,
     ).animate(CurvedAnimation(parent: _animationController, curve: Curves.easeInOut));
 
-    _isEnabled = ref.read(appConfigProvider).backup.enabled;
+    _isEnabled = ref.read(metadataProvider).appConfig.backup.enabled;
   }
 
   @override
@@ -40,7 +41,7 @@ class BackupToggleButtonState extends ConsumerState<BackupToggleButton> with Sin
   }
 
   Future<void> _onToggle(bool value) async {
-    await ref.read(settingsProvider).write(.backupEnabled, value);
+    await ref.read(metadataProvider).write(MetadataKey.backupEnabled, value);
 
     setState(() {
       _isEnabled = value;

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

@@ -3,7 +3,9 @@ import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/album/album.model.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/setting.model.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/advanced_info_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/archive_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/bulk_tag_assets_action_button.widget.dart';
@@ -23,7 +25,7 @@ import 'package:immich_mobile/presentation/widgets/action_buttons/unstack_action
 import 'package:immich_mobile/presentation/widgets/action_buttons/upload_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/album/album_selector.widget.dart';
 import 'package:immich_mobile/presentation/widgets/bottom_sheet/base_bottom_sheet.widget.dart';
-import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/setting.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/user_metadata.provider.dart';
 import 'package:immich_mobile/providers/server_info.provider.dart';
@@ -61,23 +63,37 @@ class _GeneralBottomSheetState extends ConsumerState<GeneralBottomSheet> {
       userMetadataPreferencesProvider.select((value) => value.valueOrNull?.tagsEnabled ?? false),
     );
 
-    Future<void> addToAlbum(RemoteAlbum album) async {
-      final result = await ref.read(actionProvider.notifier).addToAlbum(ActionSource.timeline, album);
-
-      if (!context.mounted) {
+    Future<void> addAssetsToAlbum(RemoteAlbum album) async {
+      final selectedAssets = multiselect.selectedAssets;
+      if (selectedAssets.isEmpty) {
         return;
       }
 
-      if (!result.success) {
-        ImmichToast.show(context: context, msg: 'scaffold_body_error_occurred'.tr(), toastType: ToastType.error);
-        return;
+      final remoteAssets = selectedAssets.whereType<RemoteAsset>();
+      final addedCount = await ref
+          .read(remoteAlbumProvider.notifier)
+          .addAssets(album.id, remoteAssets.map((e) => e.id).toList());
+
+      if (selectedAssets.length != remoteAssets.length) {
+        ImmichToast.show(
+          context: context,
+          msg: 'add_to_album_bottom_sheet_some_local_assets'.t(context: context),
+        );
       }
-      ImmichToast.show(
-        context: context,
-        msg: result.count == 0
-            ? 'add_to_album_bottom_sheet_already_exists'.tr(namedArgs: {'album': album.name})
-            : 'add_to_album_bottom_sheet_added'.tr(namedArgs: {'album': album.name}),
-      );
+
+      if (addedCount != remoteAssets.length) {
+        ImmichToast.show(
+          context: context,
+          msg: 'add_to_album_bottom_sheet_already_exists'.tr(namedArgs: {"album": album.name}),
+        );
+      } else {
+        ImmichToast.show(
+          context: context,
+          msg: 'add_to_album_bottom_sheet_added'.tr(namedArgs: {"album": album.name}),
+        );
+      }
+
+      ref.read(multiSelectProvider.notifier).reset();
     }
 
     Future<void> onKeyboardExpand() {
@@ -115,10 +131,12 @@ class _GeneralBottomSheetState extends ConsumerState<GeneralBottomSheet> {
           const DeleteLocalActionButton(source: ActionSource.timeline),
         if (multiselect.onlyLocal) const UploadActionButton(source: ActionSource.timeline),
       ],
-      slivers: [
-        const AddToAlbumHeader(),
-        AlbumSelector(onAlbumSelected: addToAlbum, onKeyboardExpanded: onKeyboardExpand),
-      ],
+      slivers: multiselect.hasRemote
+          ? [
+              const AddToAlbumHeader(),
+              AlbumSelector(onAlbumSelected: addAssetsToAlbum, onKeyboardExpanded: onKeyboardExpand),
+            ]
+          : [],
     );
   }
 }

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

@@ -1,78 +1,25 @@
-import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.dart';
-import 'package:immich_mobile/domain/models/album/album.model.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_local_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/share_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/upload_action_button.widget.dart';
-import 'package:immich_mobile/presentation/widgets/album/album_selector.widget.dart';
 import 'package:immich_mobile/presentation/widgets/bottom_sheet/base_bottom_sheet.widget.dart';
-import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
-import 'package:immich_mobile/widgets/common/immich_toast.dart';
 
-class LocalAlbumBottomSheet extends ConsumerStatefulWidget {
+class LocalAlbumBottomSheet extends ConsumerWidget {
   const LocalAlbumBottomSheet({super.key});
 
   @override
-  ConsumerState<LocalAlbumBottomSheet> createState() => _LocalAlbumBottomSheetState();
-}
-
-class _LocalAlbumBottomSheetState extends ConsumerState<LocalAlbumBottomSheet> {
-  late final DraggableScrollableController sheetController;
-
-  @override
-  void initState() {
-    super.initState();
-    sheetController = DraggableScrollableController();
-  }
-
-  @override
-  void dispose() {
-    sheetController.dispose();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    Future<void> addToAlbum(RemoteAlbum album) async {
-      final result = await ref.read(actionProvider.notifier).addToAlbum(ActionSource.timeline, album);
-
-      if (!context.mounted) {
-        return;
-      }
-
-      if (!result.success) {
-        ImmichToast.show(context: context, msg: 'scaffold_body_error_occurred'.tr(), toastType: ToastType.error);
-        return;
-      }
-
-      ImmichToast.show(
-        context: context,
-        msg: result.count == 0
-            ? 'add_to_album_bottom_sheet_already_exists'.tr(namedArgs: {'album': album.name})
-            : 'add_to_album_bottom_sheet_added'.tr(namedArgs: {'album': album.name}),
-      );
-    }
-
-    Future<void> onKeyboardExpand() {
-      return sheetController.animateTo(0.85, duration: const Duration(milliseconds: 200), curve: Curves.easeInOut);
-    }
-
-    return BaseBottomSheet(
-      controller: sheetController,
+  Widget build(BuildContext context, WidgetRef ref) {
+    return const BaseBottomSheet(
       initialChildSize: 0.25,
-      maxChildSize: 0.85,
+      maxChildSize: 0.4,
       shouldCloseOnMinExtent: false,
-      actions: const [
+      actions: [
         ShareActionButton(source: ActionSource.timeline),
         DeleteLocalActionButton(source: ActionSource.timeline),
         UploadActionButton(source: ActionSource.timeline),
       ],
-      slivers: [
-        const AddToAlbumHeader(),
-        AlbumSelector(onAlbumSelected: addToAlbum, onKeyboardExpanded: onKeyboardExpand),
-      ],
     );
   }
 }

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

@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/album/album.model.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/archive_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_local_action_button.widget.dart';
@@ -20,7 +21,7 @@ import 'package:immich_mobile/presentation/widgets/action_buttons/trash_action_b
 import 'package:immich_mobile/presentation/widgets/action_buttons/unstack_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/album/album_selector.widget.dart';
 import 'package:immich_mobile/presentation/widgets/bottom_sheet/base_bottom_sheet.widget.dart';
-import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/album.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';
@@ -55,28 +56,29 @@ class _RemoteAlbumBottomSheetState extends ConsumerState<RemoteAlbumBottomSheet>
     final isTrashEnable = ref.watch(serverInfoProvider.select((state) => state.serverFeatures.trash));
     final ownsAlbum = ref.watch(currentUserProvider)?.id == widget.album.ownerId;
 
-    Future<void> addToAlbum(RemoteAlbum album) async {
-      final result = await ref.read(actionProvider.notifier).addToAlbum(ActionSource.timeline, album);
-
-      if (!context.mounted) {
+    Future<void> addAssetsToAlbum(RemoteAlbum album) async {
+      final selectedAssets = multiselect.selectedAssets;
+      if (selectedAssets.isEmpty) {
         return;
       }
 
-      if (!result.success) {
+      final addedCount = await ref
+          .read(remoteAlbumProvider.notifier)
+          .addAssets(album.id, selectedAssets.map((e) => (e as RemoteAsset).id).toList());
+
+      if (addedCount != selectedAssets.length) {
         ImmichToast.show(
           context: context,
-          msg: 'scaffold_body_error_occurred'.t(context: context),
-          toastType: ToastType.error,
+          msg: 'add_to_album_bottom_sheet_already_exists'.t(context: context, args: {"album": album.name}),
+        );
+      } else {
+        ImmichToast.show(
+          context: context,
+          msg: 'add_to_album_bottom_sheet_added'.t(context: context, args: {"album": album.name}),
         );
-        return;
       }
 
-      ImmichToast.show(
-        context: context,
-        msg: result.count == 0
-            ? 'add_to_album_bottom_sheet_already_exists'.t(context: context, args: {"album": album.name})
-            : 'add_to_album_bottom_sheet_added'.t(context: context, args: {"album": album.name}),
-      );
+      ref.read(multiSelectProvider.notifier).reset();
     }
 
     Future<void> onKeyboardExpand() {
@@ -116,7 +118,10 @@ class _RemoteAlbumBottomSheetState extends ConsumerState<RemoteAlbumBottomSheet>
           SetAlbumCoverActionButton(source: ActionSource.timeline, albumId: widget.album.id),
       ],
       slivers: ownsAlbum
-          ? [const AddToAlbumHeader(), AlbumSelector(onAlbumSelected: addToAlbum, onKeyboardExpanded: onKeyboardExpand)]
+          ? [
+              const AddToAlbumHeader(),
+              AlbumSelector(onAlbumSelected: addAssetsToAlbum, onKeyboardExpanded: onKeyboardExpand),
+            ]
           : null,
     );
   }

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

@@ -4,7 +4,7 @@ import 'package:async/async.dart';
 import 'package:flutter/widgets.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/infrastructure/loaders/image_request.dart';
-import 'package:immich_mobile/infrastructure/repositories/settings.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/metadata.repository.dart';
 import 'package:immich_mobile/presentation/widgets/images/local_image_provider.dart';
 import 'package:immich_mobile/presentation/widgets/images/remote_image_provider.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/constants.dart';
@@ -189,5 +189,5 @@ ImageProvider? getThumbnailImageProvider(BaseAsset asset, {Size size = kThumbnai
 
 bool _shouldUseLocalAsset(BaseAsset asset) =>
     asset.hasLocal &&
-    (!asset.hasRemote || !SettingsRepository.instance.appConfig.image.preferRemote) &&
+    (!asset.hasRemote || !MetadataRepository.instance.appConfig.image.preferRemote) &&
     !asset.isEdited;

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

@@ -2,7 +2,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/infrastructure/loaders/image_request.dart';
-import 'package:immich_mobile/infrastructure/repositories/settings.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/metadata.repository.dart';
 import 'package:immich_mobile/presentation/widgets/images/animated_image_stream_completer.dart';
 import 'package:immich_mobile/presentation/widgets/images/image_provider.dart';
 import 'package:immich_mobile/presentation/widgets/images/one_frame_multi_image_stream_completer.dart';
@@ -104,7 +104,7 @@ class LocalFullImageProvider extends CancellableImageProvider<LocalFullImageProv
       return;
     }
 
-    final loadOriginal = SettingsRepository.instance.appConfig.image.loadOriginal;
+    final loadOriginal = MetadataRepository.instance.appConfig.image.loadOriginal;
     final devicePixelRatio = PlatformDispatcher.instance.views.first.devicePixelRatio;
     var request = this.request = LocalImageRequest(
       localId: key.id,

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

@@ -2,7 +2,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/painting.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/infrastructure/loaders/image_request.dart';
-import 'package:immich_mobile/infrastructure/repositories/settings.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/metadata.repository.dart';
 import 'package:immich_mobile/presentation/widgets/images/animated_image_stream_completer.dart';
 import 'package:immich_mobile/presentation/widgets/images/image_provider.dart';
 import 'package:immich_mobile/presentation/widgets/images/one_frame_multi_image_stream_completer.dart';
@@ -122,7 +122,7 @@ class RemoteFullImageProvider extends CancellableImageProvider<RemoteFullImagePr
         edited: key.edited,
       ),
     );
-    final loadOriginal = assetType == AssetType.image && SettingsRepository.instance.appConfig.image.loadOriginal;
+    final loadOriginal = assetType == AssetType.image && MetadataRepository.instance.appConfig.image.loadOriginal;
     yield* loadRequest(previewRequest, decode, isFinal: !loadOriginal);
 
     if (!loadOriginal) {

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

@@ -9,7 +9,7 @@ import 'package:immich_mobile/presentation/widgets/images/thumbnail.widget.dart'
 import 'package:immich_mobile/presentation/widgets/timeline/constants.dart';
 import 'package:immich_mobile/providers/asset_viewer/asset_viewer.provider.dart';
 import 'package:immich_mobile/providers/backup/asset_upload_progress.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 
 class ThumbnailTile extends ConsumerStatefulWidget {

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

@@ -1,10 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/events.model.dart';
+import 'package:immich_mobile/domain/models/metadata_key.dart';
 import 'package:immich_mobile/domain/utils/event_stream.dart';
 import 'package:immich_mobile/infrastructure/repositories/timeline.repository.dart';
 import 'package:immich_mobile/providers/infrastructure/map.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/providers/map/map_state.provider.dart';
 import 'package:maplibre_gl/maplibre_gl.dart';
 
@@ -80,25 +81,25 @@ class MapStateNotifier extends Notifier<MapState> {
   }
 
   void switchFavoriteOnly(bool isFavoriteOnly) {
-    ref.read(settingsProvider).write(.mapShowFavoriteOnly, isFavoriteOnly);
+    ref.read(metadataProvider).write(MetadataKey.mapShowFavoriteOnly, isFavoriteOnly);
     state = state.copyWith(onlyFavorites: isFavoriteOnly);
     EventStream.shared.emit(const MapMarkerReloadEvent());
   }
 
   void switchIncludeArchived(bool isIncludeArchived) {
-    ref.read(settingsProvider).write(.mapIncludeArchived, isIncludeArchived);
+    ref.read(metadataProvider).write(MetadataKey.mapIncludeArchived, isIncludeArchived);
     state = state.copyWith(includeArchived: isIncludeArchived);
     EventStream.shared.emit(const MapMarkerReloadEvent());
   }
 
   void switchWithPartners(bool isWithPartners) {
-    ref.read(settingsProvider).write(.mapWithPartners, isWithPartners);
+    ref.read(metadataProvider).write(MetadataKey.mapWithPartners, isWithPartners);
     state = state.copyWith(withPartners: isWithPartners);
     EventStream.shared.emit(const MapMarkerReloadEvent());
   }
 
   void setRelativeTime(int relativeDays) {
-    ref.read(settingsProvider).write(.mapRelativeDate, relativeDays);
+    ref.read(metadataProvider).write(MetadataKey.mapRelativeDate, relativeDays);
     state = state.copyWith(relativeDays: relativeDays);
     EventStream.shared.emit(const MapMarkerReloadEvent());
   }

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

@@ -5,7 +5,7 @@ import 'package:immich_mobile/domain/models/timeline.model.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/constants.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/fixed/segment_builder.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/segment.model.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
 
 class TimelineArgs {

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

@@ -10,6 +10,7 @@ import 'package:flutter/rendering.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/events.model.dart';
+import 'package:immich_mobile/domain/models/metadata_key.dart';
 import 'package:immich_mobile/domain/models/timeline.model.dart';
 import 'package:immich_mobile/domain/utils/event_stream.dart';
 import 'package:immich_mobile/extensions/asyncvalue_extensions.dart';
@@ -21,7 +22,7 @@ import 'package:immich_mobile/presentation/widgets/timeline/scrubber.widget.dart
 import 'package:immich_mobile/presentation/widgets/timeline/segment.model.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/timeline.state.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/timeline_drag_region.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/readonly_mode.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
@@ -458,7 +459,7 @@ class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
                             _restoreAssetIndex = targetAssetIndex;
                           });
 
-                          ref.read(settingsProvider).write(.timelineTilesPerRow, _perRow);
+                          ref.read(metadataProvider).write(MetadataKey.timelineTilesPerRow, _perRow);
                         }
                       };
                     },

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

@@ -67,11 +67,6 @@ class AlbumPendingUploadsNotifier extends AutoDisposeFamilyNotifier<List<Pending
     _syncKeepAlive();
   }
 
-  void clear() {
-    state = const [];
-    _syncKeepAlive();
-  }
-
   void _syncKeepAlive() {
     if (state.isEmpty) {
       _keepAliveLink?.close();

mobile/lib/providers/app_life_cycle.provider.dart

@@ -9,8 +9,8 @@ import 'package:immich_mobile/providers/auth.provider.dart';
 import 'package:immich_mobile/providers/background_sync.provider.dart';
 import 'package:immich_mobile/providers/backup/drift_backup.provider.dart';
 import 'package:immich_mobile/providers/gallery_permission.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
 import 'package:immich_mobile/providers/notification_permission.provider.dart';
 import 'package:immich_mobile/providers/server_info.provider.dart';
 import 'package:immich_mobile/providers/websocket.provider.dart';
@@ -107,7 +107,7 @@ class AppLifeCycleNotifier extends StateNotifier<AppLifeCycleEnum> {
     await Future.delayed(const Duration(milliseconds: 500));
 
     final backgroundManager = _ref.read(backgroundSyncProvider);
-    final isAlbumLinkedSyncEnable = _ref.read(appConfigProvider).backup.syncAlbums;
+    final isAlbumLinkedSyncEnable = _ref.read(metadataProvider).appConfig.backup.syncAlbums;
 
     try {
       bool syncSuccess = false;
@@ -137,7 +137,7 @@ class AppLifeCycleNotifier extends StateNotifier<AppLifeCycleEnum> {
   }
 
   Future<void> _resumeBackup() async {
-    final isEnableBackup = _ref.read(appConfigProvider).backup.enabled;
+    final isEnableBackup = _ref.read(metadataProvider).appConfig.backup.enabled;
 
     if (isEnableBackup) {
       final currentUser = Store.tryGet(StoreKey.currentUser);

mobile/lib/providers/auth.provider.dart

@@ -3,6 +3,7 @@ import 'dart:convert';
 import 'package:flutter_udid/flutter_udid.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/constants.dart';
+import 'package:immich_mobile/domain/models/metadata_key.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/domain/models/user.model.dart';
 import 'package:immich_mobile/domain/services/user.service.dart';
@@ -10,7 +11,7 @@ import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/models/auth/auth_state.model.dart';
 import 'package:immich_mobile/models/auth/login_response.model.dart';
 import 'package:immich_mobile/providers/api.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/user.provider.dart';
 import 'package:immich_mobile/services/api.service.dart';
 import 'package:immich_mobile/services/auth.service.dart';
@@ -129,7 +130,7 @@ class AuthNotifier extends StateNotifier<AuthState> {
     await _apiService.updateHeaders();
 
     final serverEndpoint = Store.get(StoreKey.serverEndpoint);
-    final headerMap = _ref.read(appConfigProvider).network.customHeaders;
+    final headerMap = _ref.read(metadataProvider).appConfig.network.customHeaders;
     final customHeaders = headerMap.isEmpty ? null : jsonEncode(headerMap);
     await _widgetService.writeCredentials(serverEndpoint, accessToken, customHeaders);
 
@@ -178,19 +179,19 @@ class AuthNotifier extends StateNotifier<AuthState> {
   }
 
   Future<void> saveWifiName(String wifiName) async {
-    await _ref.read(settingsProvider).write(.networkPreferredWifiName, wifiName);
+    await _ref.read(metadataProvider).write(MetadataKey.networkPreferredWifiName, wifiName);
   }
 
   Future<void> saveLocalEndpoint(String url) async {
-    await _ref.read(settingsProvider).write(.networkLocalEndpoint, url);
+    await _ref.read(metadataProvider).write(MetadataKey.networkLocalEndpoint, url);
   }
 
   String? getSavedWifiName() {
-    return _ref.read(appConfigProvider).network.preferredWifiName;
+    return _ref.read(metadataProvider).appConfig.network.preferredWifiName;
   }
 
   String? getSavedLocalEndpoint() {
-    return _ref.read(appConfigProvider).network.localEndpoint;
+    return _ref.read(metadataProvider).appConfig.network.localEndpoint;
   }
 
   /// Returns the current server endpoint (with /api) URL from the store

mobile/lib/providers/cleanup.provider.dart

@@ -1,8 +1,8 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/infrastructure/repositories/settings.repository.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
+import 'package:immich_mobile/infrastructure/repositories/metadata.repository.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/services/cleanup.service.dart';
 
@@ -54,21 +54,21 @@ final cleanupProvider = StateNotifierProvider<CleanupNotifier, CleanupState>((re
   return CleanupNotifier(
     ref.watch(cleanupServiceProvider),
     ref.watch(currentUserProvider)?.id,
-    ref.watch(settingsProvider),
+    ref.watch(metadataProvider),
   );
 });
 
 class CleanupNotifier extends StateNotifier<CleanupState> {
   final CleanupService _cleanupService;
   final String? _userId;
-  final SettingsRepository _settingsRepository;
+  final MetadataRepository _metadataRepository;
 
-  CleanupNotifier(this._cleanupService, this._userId, this._settingsRepository) : super(const CleanupState()) {
+  CleanupNotifier(this._cleanupService, this._userId, this._metadataRepository) : super(const CleanupState()) {
     _loadPersistedSettings();
   }
 
   void _loadPersistedSettings() {
-    final cleanup = _settingsRepository.appConfig.cleanup;
+    final cleanup = _metadataRepository.appConfig.cleanup;
     final keepFavorites = cleanup.keepFavorites;
     final keepMediaType = cleanup.keepMediaType;
     final keepAlbumIds = cleanup.keepAlbumIds.toSet();
@@ -87,18 +87,18 @@ class CleanupNotifier extends StateNotifier<CleanupState> {
     state = state.copyWith(selectedDate: date, assetsToDelete: []);
     if (date != null) {
       final daysAgo = DateTime.now().difference(date).inDays;
-      _settingsRepository.write(.cleanupCutoffDaysAgo, daysAgo);
+      _metadataRepository.write(.cleanupCutoffDaysAgo, daysAgo);
     }
   }
 
   void setKeepMediaType(AssetKeepType keepMediaType) {
     state = state.copyWith(keepMediaType: keepMediaType, assetsToDelete: []);
-    _settingsRepository.write(.cleanupKeepMediaType, keepMediaType);
+    _metadataRepository.write(.cleanupKeepMediaType, keepMediaType);
   }
 
   void setKeepFavorites(bool keepFavorites) {
     state = state.copyWith(keepFavorites: keepFavorites, assetsToDelete: []);
-    _settingsRepository.write(.cleanupKeepFavorites, keepFavorites);
+    _metadataRepository.write(.cleanupKeepFavorites, keepFavorites);
   }
 
   void toggleKeepAlbum(String albumId) {
@@ -118,7 +118,7 @@ class CleanupNotifier extends StateNotifier<CleanupState> {
   }
 
   void _persistExcludedAlbumIds(Set<String> albumIds) {
-    _settingsRepository.write(.cleanupKeepAlbumIds, albumIds.toList());
+    _metadataRepository.write(.cleanupKeepAlbumIds, albumIds.toList());
   }
 
   void cleanupStaleAlbumIds(Set<String> existingAlbumIds) {
@@ -131,7 +131,7 @@ class CleanupNotifier extends StateNotifier<CleanupState> {
   }
 
   void applyDefaultAlbumSelections(List<(String id, String name)> albums) {
-    final isInitialized = _settingsRepository.appConfig.cleanup.defaultsInitialized;
+    final isInitialized = _metadataRepository.appConfig.cleanup.defaultsInitialized;
     if (isInitialized) {
       return;
     }
@@ -144,7 +144,7 @@ class CleanupNotifier extends StateNotifier<CleanupState> {
       _persistExcludedAlbumIds(keepAlbumIds);
     }
 
-    _settingsRepository.write(.cleanupDefaultsInitialized, true);
+    _metadataRepository.write(.cleanupDefaultsInitialized, true);
   }
 
   Future<void> scanAssets() async {

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

@@ -5,15 +5,12 @@ import 'package:background_downloader/background_downloader.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.dart';
-import 'package:immich_mobile/domain/models/album/album.model.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/asset_edit.model.dart';
 import 'package:immich_mobile/domain/services/asset.service.dart';
-import 'package:immich_mobile/domain/services/remote_album.service.dart';
 import 'package:immich_mobile/models/download/livephotos_medatada.model.dart';
 import 'package:immich_mobile/providers/asset_viewer/asset_viewer.provider.dart';
 import 'package:immich_mobile/providers/backup/asset_upload_progress.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
 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';
@@ -376,52 +373,6 @@ class ActionNotifier extends Notifier<void> {
     }
   }
 
-  Future<ActionResult> addToAlbum(ActionSource source, RemoteAlbum album) async {
-    final selected = _getAssets(source).toList(growable: false);
-    if (selected.isEmpty) {
-      return const ActionResult(count: 0, success: true);
-    }
-
-    final candidates = RemoteAlbumService.categorizeCandidates(selected);
-    final remoteIds = candidates.remoteAssetIds;
-    final localAssets = candidates.localAssetsToUpload;
-    final albumNotifier = ref.read(remoteAlbumProvider.notifier);
-
-    int addedRemote = 0;
-    if (remoteIds.isNotEmpty) {
-      try {
-        addedRemote = await albumNotifier.addAssets(album.id, remoteIds);
-      } catch (error, stack) {
-        _logger.severe('Failed to add assets to album ${album.id}', error, stack);
-        return ActionResult(count: 0, success: false, error: error.toString());
-      }
-    }
-
-    // Keep the selection available for retry if the remote add fails. Once the
-    // album mutation succeeds, clear timeline selection so upload overlays can render.
-    if (source == ActionSource.timeline) {
-      ref.read(multiSelectProvider.notifier).reset();
-    }
-
-    if (localAssets.isEmpty) {
-      return ActionResult(count: addedRemote, success: true);
-    }
-
-    final uploadResult = await upload(
-      source,
-      assets: localAssets,
-      onAssetUploaded: (asset, remoteId) async {
-        await albumNotifier.linkUploadedAssetToAlbum(album.id, asset, remoteId);
-      },
-    );
-
-    return ActionResult(
-      count: addedRemote + uploadResult.count,
-      success: uploadResult.success,
-      error: uploadResult.error,
-    );
-  }
-
   Future<ActionResult> removeFromAlbum(ActionSource source, String albumId) async {
     final ids = _getRemoteIdsForSource(source);
     try {
@@ -513,21 +464,19 @@ class ActionNotifier extends Notifier<void> {
   Future<ActionResult> shareAssets(
     ActionSource source,
     BuildContext context, {
-    ShareAssetFileType fileType = ShareAssetFileType.original,
     Completer<void>? cancelCompleter,
     void Function(double progress)? onAssetDownloadProgress,
   }) async {
     final ids = _getAssets(source).toList(growable: false);
 
     try {
-      final count = await _service.shareAssets(
+      await _service.shareAssets(
         ids,
         context,
-        fileType: fileType,
         cancelCompleter: cancelCompleter,
         onAssetDownloadProgress: onAssetDownloadProgress,
       );
-      return ActionResult(count: count, success: count > 0 || ids.isEmpty);
+      return ActionResult(count: ids.length, success: true);
     } catch (error, stack) {
       _logger.severe('Failed to share assets', error, stack);
       return ActionResult(count: ids.length, success: false, error: error.toString());
@@ -546,16 +495,8 @@ class ActionNotifier extends Notifier<void> {
     }
   }
 
-  Future<ActionResult> upload(
-    ActionSource source, {
-    List<LocalAsset>? assets,
-    FutureOr<void> Function(LocalAsset asset, String remoteId)? onAssetUploaded,
-  }) async {
+  Future<ActionResult> upload(ActionSource source, {List<LocalAsset>? assets}) async {
     final assetsToUpload = assets ?? _getAssets(source).whereType<LocalAsset>().toList();
-    final assetById = {for (final a in assetsToUpload) a.id: a};
-    final uploadedAssetIds = <String>{};
-    final failedAssetIds = <String>{};
-    final postUploadTasks = <Future<void>>[];
 
     final progressNotifier = ref.read(assetUploadProgressProvider.notifier);
     final cancelToken = Completer<void>();
@@ -577,43 +518,16 @@ class ActionNotifier extends Notifier<void> {
           },
           onSuccess: (localAssetId, remoteAssetId) {
             progressNotifier.remove(localAssetId);
-            uploadedAssetIds.add(localAssetId);
-            final asset = assetById[localAssetId];
-            final callback = onAssetUploaded;
-            if (asset != null && callback != null) {
-              postUploadTasks.add(
-                Future.sync(() => callback(asset, remoteAssetId)).catchError((Object error, StackTrace stack) {
-                  failedAssetIds.add(localAssetId);
-                  progressNotifier.setError(localAssetId);
-                  _logger.warning('Post-upload callback failed for $localAssetId', error, stack);
-                }),
-              );
-            }
           },
           onError: (localAssetId, errorMessage) {
-            failedAssetIds.add(localAssetId);
             progressNotifier.setError(localAssetId);
           },
         ),
       );
-
-      await Future.wait(postUploadTasks);
-      final successCount = uploadedAssetIds.difference(failedAssetIds).length;
-      final isSuccess = successCount == assetsToUpload.length && failedAssetIds.isEmpty;
-
-      return ActionResult(
-        count: successCount,
-        success: isSuccess,
-        error: isSuccess ? null : 'Failed to upload ${assetsToUpload.length - successCount} assets',
-      );
+      return ActionResult(count: assetsToUpload.length, success: true);
     } catch (error, stack) {
       _logger.severe('Failed manually upload assets', error, stack);
-
-      return ActionResult(
-        count: uploadedAssetIds.difference(failedAssetIds).length,
-        success: false,
-        error: error.toString(),
-      );
+      return ActionResult(count: assetsToUpload.length, success: false, error: error.toString());
     } finally {
       ref.read(manualUploadCancelTokenProvider.notifier).state = null;
       Future.delayed(const Duration(seconds: 2), () {

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

@@ -1,11 +1,11 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/config/app_config.dart';
-import 'package:immich_mobile/infrastructure/repositories/settings.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/metadata.repository.dart';
 
-final settingsProvider = Provider.autoDispose<SettingsRepository>((_) => SettingsRepository.instance);
+final metadataProvider = Provider.autoDispose<MetadataRepository>((_) => MetadataRepository.instance);
 
 final appConfigProvider = Provider.autoDispose<AppConfig>((ref) {
-  final repo = ref.watch(settingsProvider);
+  final repo = ref.watch(metadataProvider);
   final subscription = repo.watchConfig().listen((event) => ref.state = event);
   ref.onDispose(subscription.cancel);
   return repo.appConfig;

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

@@ -9,7 +9,6 @@ import 'package:immich_mobile/domain/services/remote_album.service.dart';
 import 'package:immich_mobile/models/albums/album_search.model.dart';
 import 'package:immich_mobile/providers/album/album_sort_by_options.provider.dart';
 import 'package:immich_mobile/providers/album/pending_album_uploads.provider.dart';
-import 'package:immich_mobile/providers/backup/asset_upload_progress.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/services/foreground_upload.service.dart';
@@ -208,22 +207,6 @@ class RemoteAlbumNotifier extends Notifier<RemoteAlbumState> {
     return added;
   }
 
-  /// Links a freshly-uploaded local asset to an album using its new remote ID,
-  /// upserting a placeholder remote asset row so the local DB join survives
-  /// until the next sync catches up.
-  Future<int> linkUploadedAssetToAlbum(String albumId, LocalAsset source, String remoteId) async {
-    final currentUser = ref.read(currentUserProvider);
-    if (currentUser == null) {
-      throw Exception('User not logged in');
-    }
-
-    final added = await _remoteAlbumService.linkUploadedAssetToAlbum(albumId, remoteId, currentUser, source);
-    if (added > 0) {
-      await _refreshAlbumInState(albumId);
-    }
-    return added;
-  }
-
   /// Adds a heterogeneous asset selection to an album. Already-remote assets
   /// are linked immediately; local-only assets are queued in
   /// [pendingAlbumUploadsProvider] (so the album page can show them with
@@ -238,18 +221,11 @@ class RemoteAlbumNotifier extends Notifier<RemoteAlbumState> {
     final pendingNotifier = ref.read(pendingAlbumUploadsProvider(albumId).notifier);
     pendingNotifier.enqueue(candidates.localAssetsToUpload);
 
-    Completer<void>? cancelToken;
-    if (candidates.localAssetsToUpload.isNotEmpty) {
-      cancelToken = Completer<void>();
-      ref.read(manualUploadCancelTokenProvider.notifier).state = cancelToken;
-    }
-
     try {
       final added = await _remoteAlbumService.addAssetsToAlbum(
         albumId: albumId,
         uploader: currentUser,
         candidates: candidates,
-        cancelToken: cancelToken,
         uploadCallbacks: UploadCallbacks(
           onProgress: (localAssetId, _, bytes, totalBytes) {
             final progress = totalBytes > 0 ? bytes / totalBytes : 0.0;
@@ -269,15 +245,6 @@ class RemoteAlbumNotifier extends Notifier<RemoteAlbumState> {
       }
       _logger.severe('Failed to add assets to album $albumId', error, stack);
       rethrow;
-    } finally {
-      if (cancelToken != null) {
-        if (cancelToken.isCompleted) {
-          pendingNotifier.clear();
-        }
-        if (ref.read(manualUploadCancelTokenProvider) == cancelToken) {
-          ref.read(manualUploadCancelTokenProvider.notifier).state = null;
-        }
-      }
     }
   }
 

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

@@ -3,7 +3,7 @@ import 'package:immich_mobile/domain/services/timeline.service.dart';
 import 'package:immich_mobile/infrastructure/repositories/timeline.repository.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/timeline.state.dart';
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
 
 final timelineRepositoryProvider = Provider<DriftTimelineRepository>(
@@ -29,7 +29,7 @@ final timelineServiceProvider = Provider<TimelineService>(
 final timelineFactoryProvider = Provider<TimelineFactory>(
   (ref) => TimelineFactory(
     timelineRepository: ref.watch(timelineRepositoryProvider),
-    settingsRepository: ref.watch(settingsProvider),
+    metadataRepository: ref.watch(metadataProvider),
   ),
 );
 

mobile/lib/providers/map/map_state.provider.dart

@@ -1,7 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/metadata_key.dart';
 import 'package:immich_mobile/models/map/map_state.model.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/providers/server_info.provider.dart';
 
 final mapStateNotifierProvider = NotifierProvider<MapStateNotifier, MapState>(MapStateNotifier.new);
@@ -26,12 +27,12 @@ class MapStateNotifier extends Notifier<MapState> {
   }
 
   void switchTheme(ThemeMode mode) {
-    ref.read(settingsProvider).write(.mapThemeMode, mode);
+    ref.read(metadataProvider).write(MetadataKey.mapThemeMode, mode);
     state = state.copyWith(themeMode: mode);
   }
 
   void switchFavoriteOnly(bool isFavoriteOnly) {
-    ref.read(settingsProvider).write(.mapShowFavoriteOnly, isFavoriteOnly);
+    ref.read(metadataProvider).write(MetadataKey.mapShowFavoriteOnly, isFavoriteOnly);
     state = state.copyWith(showFavoriteOnly: isFavoriteOnly, shouldRefetchMarkers: true);
   }
 
@@ -40,17 +41,17 @@ class MapStateNotifier extends Notifier<MapState> {
   }
 
   void switchIncludeArchived(bool isIncludeArchived) {
-    ref.read(settingsProvider).write(.mapIncludeArchived, isIncludeArchived);
+    ref.read(metadataProvider).write(MetadataKey.mapIncludeArchived, isIncludeArchived);
     state = state.copyWith(includeArchived: isIncludeArchived, shouldRefetchMarkers: true);
   }
 
   void switchWithPartners(bool isWithPartners) {
-    ref.read(settingsProvider).write(.mapWithPartners, isWithPartners);
+    ref.read(metadataProvider).write(MetadataKey.mapWithPartners, isWithPartners);
     state = state.copyWith(withPartners: isWithPartners, shouldRefetchMarkers: true);
   }
 
   void setRelativeTime(int relativeTime) {
-    ref.read(settingsProvider).write(.mapRelativeDate, relativeTime);
+    ref.read(metadataProvider).write(MetadataKey.mapRelativeDate, relativeTime);
     state = state.copyWith(relativeTime: relativeTime, shouldRefetchMarkers: true);
   }
 }

mobile/lib/providers/theme.provider.dart

@@ -1,5 +1,5 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/theme/color_scheme.dart';
 import 'package:immich_mobile/theme/dynamic_theme.dart';
 import 'package:immich_mobile/theme/theme_data.dart';

mobile/lib/providers/websocket.provider.dart

@@ -7,7 +7,7 @@ import 'package:immich_mobile/infrastructure/repositories/network.repository.dar
 import 'package:immich_mobile/models/server_info/server_version.model.dart';
 import 'package:immich_mobile/providers/auth.provider.dart';
 import 'package:immich_mobile/providers/background_sync.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/providers/server_info.provider.dart';
 import 'package:immich_mobile/utils/debounce.dart';
 import 'package:immich_mobile/utils/debug_print.dart';
@@ -193,7 +193,7 @@ class WebsocketNotifier extends StateNotifier<WebsocketState> {
       return;
     }
 
-    final isSyncAlbumEnabled = _ref.read(appConfigProvider).backup.syncAlbums;
+    final isSyncAlbumEnabled = _ref.read(metadataProvider).appConfig.backup.syncAlbums;
     try {
       unawaited(
         _ref.read(backgroundSyncProvider).syncWebsocketBatchV1(_batchedAssetUploadReady.toList()).then((_) {
@@ -214,7 +214,7 @@ class WebsocketNotifier extends StateNotifier<WebsocketState> {
       return;
     }
 
-    final isSyncAlbumEnabled = _ref.read(appConfigProvider).backup.syncAlbums;
+    final isSyncAlbumEnabled = _ref.read(metadataProvider).appConfig.backup.syncAlbums;
     try {
       unawaited(
         _ref.read(backgroundSyncProvider).syncWebsocketBatchV2(_batchedAssetUploadReady.toList()).then((_) {

mobile/lib/repositories/asset_media.repository.dart

@@ -6,7 +6,6 @@ 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/constants/enums.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';
@@ -15,9 +14,6 @@ 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:logging/logging.dart';
-import 'package:openapi/api.dart';
-import 'package:path/path.dart' as p;
-import 'package:path_provider/path_provider.dart';
 import 'package:photo_manager/photo_manager.dart';
 import 'package:share_plus/share_plus.dart';
 
@@ -26,8 +22,6 @@ final assetMediaRepositoryProvider = Provider((ref) => AssetMediaRepository(ref.
 class AssetMediaRepository {
   final NativeSyncApi _nativeSyncApi;
   static final Logger _log = Logger("AssetMediaRepository");
-  static const int _localPreviewMaxDimension = 1440;
-  static const int _localPreviewQuality = 90;
 
   const AssetMediaRepository(this._nativeSyncApi);
 
@@ -111,210 +105,9 @@ class AssetMediaRepository {
     );
   }
 
-  String? _getLocalId(BaseAsset asset) {
-    if (asset is LocalAsset) {
-      return asset.id;
-    }
-    if (asset is RemoteAsset) {
-      return asset.localId;
-    }
-    return null;
-  }
-
-  String? _getRemoteId(BaseAsset asset) {
-    if (asset is RemoteAsset) {
-      return asset.id;
-    }
-    return asset.remoteId;
-  }
-
-  String _sanitizeFilename(String filename) {
-    return filename.replaceAll(RegExp(r'[\\/]'), '_');
-  }
-
-  String _getPreviewFilename(BaseAsset asset) {
-    final sanitizedFilename = _sanitizeFilename(asset.name);
-    final baseName = p.basenameWithoutExtension(sanitizedFilename);
-    final fallbackName = asset.remoteId ?? asset.localId ?? 'asset';
-    return '${baseName.isEmpty ? fallbackName : baseName}-preview.jpg';
-  }
-
-  ThumbnailSize _getLocalPreviewSize(BaseAsset asset) {
-    final width = asset.width;
-    final height = asset.height;
-    if (width == null || height == null || width <= 0 || height <= 0) {
-      return const ThumbnailSize.square(_localPreviewMaxDimension);
-    }
-
-    if (width >= height) {
-      final scaledHeight = (height * _localPreviewMaxDimension / width).round();
-      return ThumbnailSize(_localPreviewMaxDimension, scaledHeight < 1 ? 1 : scaledHeight);
-    }
-
-    final scaledWidth = (width * _localPreviewMaxDimension / height).round();
-    return ThumbnailSize(scaledWidth < 1 ? 1 : scaledWidth, _localPreviewMaxDimension);
-  }
-
-  Future<({File file, bool cleanup})?> _getLocalOriginalShareFile(BaseAsset asset, String localId) async {
-    final file = await AssetEntity(
-      id: localId,
-      width: asset.width ?? 1,
-      height: asset.height ?? 1,
-      typeInt: asset.type.index,
-    ).originFile;
-    if (file == null) {
-      _log.warning("Local original file not found for sharing: $asset");
-      return null;
-    }
-
-    return (file: file, cleanup: CurrentPlatform.isIOS);
-  }
-
-  Future<({File file, bool cleanup})?> _getLocalPreviewShareFile(BaseAsset asset, String localId) async {
-    final entity = AssetEntity(
-      id: localId,
-      width: asset.width ?? 1,
-      height: asset.height ?? 1,
-      typeInt: asset.type.index,
-    );
-    final data = await entity.thumbnailDataWithSize(
-      _getLocalPreviewSize(asset),
-      format: ThumbnailFormat.jpeg,
-      quality: _localPreviewQuality,
-    );
-    if (data == null) {
-      _log.warning("Local preview file not found for sharing: $asset");
-      return null;
-    }
-
-    final tempDirectory = await getTemporaryDirectory();
-    final file = File(
-      p.join(tempDirectory.path, 'immich-share-${DateTime.now().microsecondsSinceEpoch}-${_getPreviewFilename(asset)}'),
-    );
-    await file.writeAsBytes(data, flush: true);
-    return (file: file, cleanup: true);
-  }
-
-  Future<({File file, bool cleanup})?> _downloadRemoteShareFile({
-    required String taskId,
-    required String url,
-    required String filename,
-    Completer<void>? cancelCompleter,
-    required void Function(double progress) onProgress,
-  }) async {
-    final task = DownloadTask(
-      taskId: taskId,
-      url: url,
-      headers: ApiService.getRequestHeaders(),
-      filename: filename,
-      baseDirectory: BaseDirectory.temporary,
-      group: kShareDownloadGroup,
-      updates: Updates.statusAndProgress,
-    );
-    final downloader = FileDownloader();
-    final statusUpdate = await downloader.download(
-      task,
-      onProgress: (value) {
-        if (cancelCompleter != null && cancelCompleter.isCompleted) {
-          unawaited(downloader.cancelTaskWithId(taskId));
-          return;
-        }
-        onProgress(value);
-      },
-    );
-
-    if (cancelCompleter != null && cancelCompleter.isCompleted) {
-      return null;
-    }
-
-    if (statusUpdate.status == TaskStatus.complete) {
-      return (file: File(await task.filePath()), cleanup: true);
-    }
-
-    _log.severe("Download for $filename failed with status ${statusUpdate.status}", statusUpdate.exception);
-    return null;
-  }
-
-  Future<({File file, bool cleanup})?> _getRemoteOriginalShareFile(
-    BaseAsset asset,
-    String remoteId, {
-    Completer<void>? cancelCompleter,
-    required void Function(double progress) onProgress,
-  }) {
-    return _downloadRemoteShareFile(
-      taskId: 'share-original-$remoteId-${DateTime.now().microsecondsSinceEpoch}',
-      url: getOriginalUrlForRemoteId(remoteId, edited: asset.isEdited),
-      filename: _sanitizeFilename(asset.name),
-      cancelCompleter: cancelCompleter,
-      onProgress: onProgress,
-    );
-  }
-
-  Future<({File file, bool cleanup})?> _getRemotePreviewShareFile(
-    BaseAsset asset,
-    String remoteId, {
-    Completer<void>? cancelCompleter,
-    required void Function(double progress) onProgress,
-  }) {
-    return _downloadRemoteShareFile(
-      taskId: 'share-preview-$remoteId-${DateTime.now().microsecondsSinceEpoch}',
-      url: getThumbnailUrlForRemoteId(remoteId, type: AssetMediaSize.preview, edited: asset.isEdited),
-      filename: _getPreviewFilename(asset),
-      cancelCompleter: cancelCompleter,
-      onProgress: onProgress,
-    );
-  }
-
-  Future<({File file, bool cleanup})?> _getOriginalShareFile(
-    BaseAsset asset, {
-    Completer<void>? cancelCompleter,
-    required void Function(double progress) onProgress,
-  }) {
-    final localId = _getLocalId(asset);
-    if (localId != null && !asset.isEdited) {
-      return _getLocalOriginalShareFile(asset, localId);
-    }
-
-    final remoteId = _getRemoteId(asset);
-    if (remoteId == null) {
-      _log.warning("Asset has no remote ID for sharing: $asset");
-      return Future.value(null);
-    }
-
-    return _getRemoteOriginalShareFile(asset, remoteId, cancelCompleter: cancelCompleter, onProgress: onProgress);
-  }
-
-  Future<({File file, bool cleanup})?> _getPreviewShareFile(
-    BaseAsset asset, {
-    Completer<void>? cancelCompleter,
-    required void Function(double progress) onProgress,
-  }) async {
-    final remoteId = _getRemoteId(asset);
-    if (remoteId != null) {
-      final remotePreview = await _getRemotePreviewShareFile(
-        asset,
-        remoteId,
-        cancelCompleter: cancelCompleter,
-        onProgress: onProgress,
-      );
-      if (remotePreview != null || asset.isEdited) {
-        return remotePreview;
-      }
-    }
-
-    final localId = _getLocalId(asset);
-    if (localId != null) {
-      return _getLocalPreviewShareFile(asset, localId);
-    }
-
-    _log.warning("Asset has no local or remote ID for preview sharing: $asset");
-    return null;
-  }
-
   Future<int> shareAssets(
     List<BaseAsset> assets,
     BuildContext context, {
-    ShareAssetFileType fileType = ShareAssetFileType.original,
     Completer<void>? cancelCompleter,
     void Function(double progress)? onAssetDownloadProgress,
   }) async {
@@ -336,43 +129,75 @@ class AssetMediaRepository {
 
     updateProgress();
 
-    for (final asset in assets) {
+    for (var asset in assets) {
       if (cancelCompleter != null && cancelCompleter.isCompleted) {
         // if cancelled, delete any temp files created so far
         await _cleanupTempFiles(tempFiles);
         return 0;
       }
 
-      final shareFile = switch (fileType) {
-        ShareAssetFileType.original => await _getOriginalShareFile(
-          asset,
-          cancelCompleter: cancelCompleter,
-          onProgress: updateProgress,
-        ),
-        ShareAssetFileType.preview => await _getPreviewShareFile(
-          asset,
-          cancelCompleter: cancelCompleter,
-          onProgress: updateProgress,
-        ),
-      };
-
-      if (cancelCompleter != null && cancelCompleter.isCompleted) {
-        await _cleanupTempFiles(tempFiles);
-        return 0;
-      }
-
-      if (shareFile == null) {
+      final localId = (asset is LocalAsset)
+          ? asset.id
+          : asset is RemoteAsset
+          ? asset.localId
+          : null;
+      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();
-        continue;
-      }
+        if (CurrentPlatform.isIOS) {
+          tempFiles.add(f);
+        }
+      } else {
+        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;
+        }
 
-      downloadedXFiles.add(XFile(shareFile.file.path));
-      if (shareFile.cleanup) {
-        tempFiles.add(shareFile.file);
+        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);
+          },
+        );
+
+        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();
+          continue;
+        }
+        _log.severe("Download for ${asset.name} failed with status ${statusUpdate.status}", statusUpdate.exception);
+        processedAssets++;
+        updateProgress();
       }
-      processedAssets++;
-      updateProgress();
     }
 
     if (downloadedXFiles.isEmpty) {

mobile/lib/repositories/auth.repository.dart

@@ -1,40 +1,38 @@
 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/settings.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/settings.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 
 final authRepositoryProvider = Provider<AuthRepository>(
-  (ref) => AuthRepository(ref.watch(driftProvider), ref.watch(settingsProvider)),
+  (ref) => AuthRepository(ref.watch(driftProvider), ref.watch(appConfigProvider)),
 );
 
 class AuthRepository {
   final Drift _drift;
-  final SettingsRepository _settings;
+  final AppConfig _config;
 
-  const AuthRepository(this._drift, this._settings);
+  const AuthRepository(this._drift, this._config);
 
   Future<void> clearLocalData() async {
     await SyncStreamRepository(_drift).reset();
   }
 
   bool getEndpointSwitchingFeature() {
-    return _settings.appConfig.network.autoEndpointSwitching;
+    return _config.network.autoEndpointSwitching;
   }
 
   String? getPreferredWifiName() {
-    return _settings.appConfig.network.preferredWifiName;
+    return _config.network.preferredWifiName;
   }
 
   String? getLocalEndpoint() {
-    return _settings.appConfig.network.localEndpoint;
+    return _config.network.localEndpoint;
   }
 
   List<AuxilaryEndpoint> getExternalEndpointList() {
-    return _settings.appConfig.network.externalEndpointList
-        .map((url) => AuxilaryEndpoint(url: url, status: .valid))
-        .toList();
+    return _config.network.externalEndpointList.map((url) => AuxilaryEndpoint(url: url, status: .valid)).toList();
   }
 }

mobile/lib/services/action.service.dart

@@ -272,14 +272,12 @@ class ActionService {
   Future<int> shareAssets(
     List<BaseAsset> assets,
     BuildContext context, {
-    ShareAssetFileType fileType = ShareAssetFileType.original,
     Completer<void>? cancelCompleter,
     void Function(double progress)? onAssetDownloadProgress,
   }) {
     return _assetMediaRepository.shareAssets(
       assets,
       context,
-      fileType: fileType,
       cancelCompleter: cancelCompleter,
       onAssetDownloadProgress: onAssetDownloadProgress,
     );

mobile/lib/services/api.service.dart

@@ -5,7 +5,7 @@ import 'dart:io';
 import 'package:device_info_plus/device_info_plus.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
-import 'package:immich_mobile/infrastructure/repositories/settings.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/metadata.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/network.repository.dart';
 import 'package:immich_mobile/utils/debug_print.dart';
 import 'package:immich_mobile/utils/url_helper.dart';
@@ -13,7 +13,7 @@ import 'package:logging/logging.dart';
 import 'package:openapi/api.dart';
 
 class ApiService {
-  final ApiClient _apiClient = ApiClient(basePath: '');
+  late ApiClient _apiClient;
 
   late UsersApi usersApi;
   late AuthenticationApi authenticationApi;
@@ -54,7 +54,7 @@ class ApiService {
   }
 
   setEndpoint(String endpoint) {
-    _apiClient.basePath = endpoint;
+    _apiClient = ApiClient(basePath: endpoint);
     _apiClient.client = NetworkRepository.client;
     usersApi = UsersApi(_apiClient);
     authenticationApi = AuthenticationApi(_apiClient);
@@ -177,7 +177,7 @@ class ApiService {
     if (serverEndpoint != null && serverEndpoint.isNotEmpty) {
       urls.add(serverEndpoint);
     }
-    final network = SettingsRepository.instance.appConfig.network;
+    final network = MetadataRepository.instance.appConfig.network;
     final localEndpoint = network.localEndpoint;
     if (localEndpoint.isNotEmpty) {
       urls.add(localEndpoint);
@@ -191,7 +191,7 @@ class ApiService {
   }
 
   static Map<String, String> getRequestHeaders() {
-    return SettingsRepository.instance.appConfig.network.customHeaders;
+    return MetadataRepository.instance.appConfig.network.customHeaders;
   }
 
   ApiClient get apiClient => _apiClient;

mobile/lib/services/auth.service.dart

@@ -1,11 +1,11 @@
 import 'dart:async';
 
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/domain/models/settings_key.dart';
+import 'package:immich_mobile/domain/models/metadata_key.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/domain/utils/background_sync.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
-import 'package:immich_mobile/infrastructure/repositories/settings.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/metadata.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/network.repository.dart';
 import 'package:immich_mobile/models/auth/auxilary_endpoint.model.dart';
 import 'package:immich_mobile/models/auth/login_response.model.dart';
@@ -100,7 +100,7 @@ class AuthService {
         _log.severe("Error clearing local data", error, stackTrace);
       });
 
-      await SettingsRepository.instance.write(SettingsKey.backupEnabled, false);
+      await MetadataRepository.instance.write(MetadataKey.backupEnabled, false);
     }
   }
 
@@ -110,7 +110,7 @@ class AuthService {
   /// - Authentication repository data
   /// - Current user information
   /// - Access token
-  /// - Server-specific endpoint configuration
+  /// - Asset ETag
   ///
   /// All deletions are executed in parallel using [Future.wait].
   Future<void> clearLocalData() async {
@@ -120,12 +120,6 @@ class AuthService {
       _authRepository.clearLocalData(),
       Store.delete(StoreKey.currentUser),
       Store.delete(StoreKey.accessToken),
-      SettingsRepository.instance.clear(const [
-        .networkAutoEndpointSwitching,
-        .networkPreferredWifiName,
-        .networkLocalEndpoint,
-        .networkExternalEndpointList,
-      ]),
     ]);
   }
 

mobile/lib/services/background_upload.service.dart

@@ -13,7 +13,7 @@ import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:immich_mobile/infrastructure/repositories/backup.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/local_asset.repository.dart';
-import 'package:immich_mobile/infrastructure/repositories/settings.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/metadata.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/storage.repository.dart';
 import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/storage.provider.dart';
@@ -359,7 +359,7 @@ class BackgroundUploadService {
   }
 
   bool _shouldRequireWiFi(LocalAsset asset) {
-    final backup = SettingsRepository.instance.appConfig.backup;
+    final backup = MetadataRepository.instance.appConfig.backup;
     if (asset.isVideo && backup.useCellularForVideos) {
       return false;
     }

mobile/lib/services/foreground_upload.service.dart

@@ -11,7 +11,7 @@ import 'package:immich_mobile/extensions/network_capability_extensions.dart';
 import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/infrastructure/repositories/backup.repository.dart';
-import 'package:immich_mobile/infrastructure/repositories/settings.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/metadata.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/storage.repository.dart';
 import 'package:immich_mobile/platform/connectivity_api.g.dart';
 import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
@@ -451,7 +451,7 @@ class ForegroundUploadService {
   }
 
   bool _shouldRequireWiFi(LocalAsset asset) {
-    final backup = SettingsRepository.instance.appConfig.backup;
+    final backup = MetadataRepository.instance.appConfig.backup;
     if (asset.isVideo && backup.useCellularForVideos) {
       return false;
     }

mobile/lib/utils/bootstrap.dart

@@ -6,7 +6,7 @@ import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/log.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/logger_db.repository.dart';
-import 'package:immich_mobile/infrastructure/repositories/settings.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/metadata.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/network.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/store.repository.dart';
 import 'package:photo_manager/photo_manager.dart';
@@ -49,11 +49,11 @@ abstract final class Bootstrap {
 
     await StoreService.init(storeRepository: storeRepo, listenUpdates: listenStoreUpdates);
 
-    final settingsRepo = await SettingsRepository.ensureInitialized(drift);
+    final metadataRepo = await MetadataRepository.ensureInitialized(drift);
 
     await LogService.init(
       logRepository: LogRepository(logDb),
-      settingsRepository: settingsRepo,
+      metadataRepository: metadataRepo,
       shouldBuffer: shouldBufferLogs,
     );
 

mobile/lib/utils/migration.dart

@@ -8,11 +8,11 @@ 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/settings_key.dart';
+import 'package:immich_mobile/domain/models/metadata_key.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/domain/models/timeline.model.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
-import 'package:immich_mobile/infrastructure/entities/settings.entity.drift.dart';
+import 'package:immich_mobile/infrastructure/entities/metadata.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/network.repository.dart';
 import 'package:immich_mobile/models/auth/auxilary_endpoint.model.dart';
@@ -74,65 +74,65 @@ Future<void> _migrateTo25() async {
 
 Future<void> _migrateTo26(Drift drift) async {
   final migrator = _StoreMigrator(drift);
-  await migrator.migrateEnumIndex(StoreKey.legacyLogLevel, SettingsKey.logLevel, LogLevel.values);
+  await migrator.migrateEnumIndex(StoreKey.legacyLogLevel, MetadataKey.logLevel, LogLevel.values);
   // Theme
-  await migrator.migrateEnumName(StoreKey.legacyThemeMode, SettingsKey.themeMode, ThemeMode.values);
-  await migrator.migrateEnumName(StoreKey.legacyPrimaryColor, SettingsKey.themePrimaryColor, ImmichColorPreset.values);
-  await migrator.migrateBool(StoreKey.legacyDynamicTheme, SettingsKey.themeDynamic);
-  await migrator.migrateBool(StoreKey.legacyColorfulInterface, SettingsKey.themeColorfulInterface);
+  await migrator.migrateEnumName(StoreKey.legacyThemeMode, MetadataKey.themeMode, ThemeMode.values);
+  await migrator.migrateEnumName(StoreKey.legacyPrimaryColor, MetadataKey.themePrimaryColor, ImmichColorPreset.values);
+  await migrator.migrateBool(StoreKey.legacyDynamicTheme, MetadataKey.themeDynamic);
+  await migrator.migrateBool(StoreKey.legacyColorfulInterface, MetadataKey.themeColorfulInterface);
   // Cleanup
   final cleanupKeepAlbumIds = await migrator.readLegacyStoreString(StoreKey.legacyCleanupKeepAlbumIds.id);
   if (cleanupKeepAlbumIds != null) {
     final ids = cleanupKeepAlbumIds.split(',').where((id) => id.isNotEmpty).toList();
-    migrator.stage(StoreKey.legacyCleanupKeepAlbumIds, SettingsKey.cleanupKeepAlbumIds, ids);
+    migrator.stage(StoreKey.legacyCleanupKeepAlbumIds, MetadataKey.cleanupKeepAlbumIds, ids);
   }
-  await migrator.migrateBool(StoreKey.legacyCleanupKeepFavorites, SettingsKey.cleanupKeepFavorites);
+  await migrator.migrateBool(StoreKey.legacyCleanupKeepFavorites, MetadataKey.cleanupKeepFavorites);
   await migrator.migrateEnumIndex(
     StoreKey.legacyCleanupKeepMediaType,
-    SettingsKey.cleanupKeepMediaType,
+    MetadataKey.cleanupKeepMediaType,
     AssetKeepType.values,
   );
-  await migrator.migrateInt(StoreKey.legacyCleanupCutoffDaysAgo, SettingsKey.cleanupCutoffDaysAgo);
-  await migrator.migrateBool(StoreKey.legacyCleanupDefaultsInitialized, SettingsKey.cleanupDefaultsInitialized);
+  await migrator.migrateInt(StoreKey.legacyCleanupCutoffDaysAgo, MetadataKey.cleanupCutoffDaysAgo);
+  await migrator.migrateBool(StoreKey.legacyCleanupDefaultsInitialized, MetadataKey.cleanupDefaultsInitialized);
   // Map
-  await migrator.migrateBool(StoreKey.legacyMapShowFavoriteOnly, SettingsKey.mapShowFavoriteOnly);
-  await migrator.migrateInt(StoreKey.legacyMapRelativeDate, SettingsKey.mapRelativeDate);
-  await migrator.migrateBool(StoreKey.legacyMapIncludeArchived, SettingsKey.mapIncludeArchived);
-  await migrator.migrateEnumIndex(StoreKey.legacyMapThemeMode, SettingsKey.mapThemeMode, ThemeMode.values);
-  await migrator.migrateBool(StoreKey.legacyMapwithPartners, SettingsKey.mapWithPartners);
+  await migrator.migrateBool(StoreKey.legacyMapShowFavoriteOnly, MetadataKey.mapShowFavoriteOnly);
+  await migrator.migrateInt(StoreKey.legacyMapRelativeDate, MetadataKey.mapRelativeDate);
+  await migrator.migrateBool(StoreKey.legacyMapIncludeArchived, MetadataKey.mapIncludeArchived);
+  await migrator.migrateEnumIndex(StoreKey.legacyMapThemeMode, MetadataKey.mapThemeMode, ThemeMode.values);
+  await migrator.migrateBool(StoreKey.legacyMapwithPartners, MetadataKey.mapWithPartners);
   // Timeline
-  await migrator.migrateInt(StoreKey.legacyTilesPerRow, SettingsKey.timelineTilesPerRow);
+  await migrator.migrateInt(StoreKey.legacyTilesPerRow, MetadataKey.timelineTilesPerRow);
   await migrator.migrateEnumIndex(
     StoreKey.legacyGroupAssetsBy,
-    SettingsKey.timelineGroupAssetsBy,
+    MetadataKey.timelineGroupAssetsBy,
     GroupAssetsBy.values,
   );
-  await migrator.migrateBool(StoreKey.legacyStorageIndicator, SettingsKey.timelineStorageIndicator);
+  await migrator.migrateBool(StoreKey.legacyStorageIndicator, MetadataKey.timelineStorageIndicator);
   // Image
-  await migrator.migrateBool(StoreKey.legacyPreferRemoteImage, SettingsKey.imagePreferRemote);
-  await migrator.migrateBool(StoreKey.legacyLoadOriginal, SettingsKey.imageLoadOriginal);
+  await migrator.migrateBool(StoreKey.legacyPreferRemoteImage, MetadataKey.imagePreferRemote);
+  await migrator.migrateBool(StoreKey.legacyLoadOriginal, MetadataKey.imageLoadOriginal);
   // Viewer
-  await migrator.migrateBool(StoreKey.legacyLoopVideo, SettingsKey.viewerLoopVideo);
-  await migrator.migrateBool(StoreKey.legacyLoadOriginalVideo, SettingsKey.viewerLoadOriginalVideo);
-  await migrator.migrateBool(StoreKey.legacyAutoPlayVideo, SettingsKey.viewerAutoPlayVideo);
-  await migrator.migrateBool(StoreKey.legacyTapToNavigate, SettingsKey.viewerTapToNavigate);
+  await migrator.migrateBool(StoreKey.legacyLoopVideo, MetadataKey.viewerLoopVideo);
+  await migrator.migrateBool(StoreKey.legacyLoadOriginalVideo, MetadataKey.viewerLoadOriginalVideo);
+  await migrator.migrateBool(StoreKey.legacyAutoPlayVideo, MetadataKey.viewerAutoPlayVideo);
+  await migrator.migrateBool(StoreKey.legacyTapToNavigate, MetadataKey.viewerTapToNavigate);
   // Network
-  await migrator.migrateBool(StoreKey.legacyAutoEndpointSwitching, SettingsKey.networkAutoEndpointSwitching);
-  await migrator.migrateString(StoreKey.legacyPreferredWifiName, SettingsKey.networkPreferredWifiName);
-  await migrator.migrateString(StoreKey.legacyLocalEndpoint, SettingsKey.networkLocalEndpoint);
+  await migrator.migrateBool(StoreKey.legacyAutoEndpointSwitching, MetadataKey.networkAutoEndpointSwitching);
+  await migrator.migrateString(StoreKey.legacyPreferredWifiName, MetadataKey.networkPreferredWifiName);
+  await migrator.migrateString(StoreKey.legacyLocalEndpoint, MetadataKey.networkLocalEndpoint);
   await _migrateExternalEndpointList(migrator);
   await _migrateCustomHeaders(migrator);
   // Album
   await _migrateAlbumSortMode(migrator);
-  await migrator.migrateBool(StoreKey.legacySelectedAlbumSortReverse, SettingsKey.albumIsReverse);
-  await migrator.migrateBool(StoreKey.legacyAlbumGridView, SettingsKey.albumIsGrid);
+  await migrator.migrateBool(StoreKey.legacySelectedAlbumSortReverse, MetadataKey.albumIsReverse);
+  await migrator.migrateBool(StoreKey.legacyAlbumGridView, MetadataKey.albumIsGrid);
   // Backup
-  await migrator.migrateBool(StoreKey.legacyEnableBackup, SettingsKey.backupEnabled);
-  await migrator.migrateBool(StoreKey.legacyUseWifiForUploadVideos, SettingsKey.backupUseCellularForVideos);
-  await migrator.migrateBool(StoreKey.legacyUseWifiForUploadPhotos, SettingsKey.backupUseCellularForPhotos);
-  await migrator.migrateBool(StoreKey.legacyBackupRequireCharging, SettingsKey.backupRequireCharging);
-  await migrator.migrateInt(StoreKey.legacyBackupTriggerDelay, SettingsKey.backupTriggerDelay);
-  await migrator.migrateBool(StoreKey.legacySyncAlbums, SettingsKey.backupSyncAlbums);
+  await migrator.migrateBool(StoreKey.legacyEnableBackup, MetadataKey.backupEnabled);
+  await migrator.migrateBool(StoreKey.legacyUseWifiForUploadVideos, MetadataKey.backupUseCellularForVideos);
+  await migrator.migrateBool(StoreKey.legacyUseWifiForUploadPhotos, MetadataKey.backupUseCellularForPhotos);
+  await migrator.migrateBool(StoreKey.legacyBackupRequireCharging, MetadataKey.backupRequireCharging);
+  await migrator.migrateInt(StoreKey.legacyBackupTriggerDelay, MetadataKey.backupTriggerDelay);
+  await migrator.migrateBool(StoreKey.legacySyncAlbums, MetadataKey.backupSyncAlbums);
   await migrator.complete();
 }
 
@@ -143,7 +143,7 @@ Future<void> _migrateAlbumSortMode(_StoreMigrator migrator) async {
     return;
   }
 
-  migrator.stage(StoreKey.legacySelectedAlbumSortOrder, SettingsKey.albumSortMode, mode);
+  migrator.stage(StoreKey.legacySelectedAlbumSortOrder, MetadataKey.albumSortMode, mode);
 }
 
 Future<void> _migrateExternalEndpointList(_StoreMigrator migrator) async {
@@ -167,7 +167,7 @@ Future<void> _migrateExternalEndpointList(_StoreMigrator migrator) async {
     // ignore invalid entries
   }
 
-  migrator.stage(StoreKey.legacyExternalEndpointList, SettingsKey.networkExternalEndpointList, urls);
+  migrator.stage(StoreKey.legacyExternalEndpointList, MetadataKey.networkExternalEndpointList, urls);
 }
 
 Future<void> _migrateCustomHeaders(_StoreMigrator migrator) async {
@@ -190,17 +190,17 @@ Future<void> _migrateCustomHeaders(_StoreMigrator migrator) async {
     // ignore invalid entries
   }
 
-  migrator.stage(StoreKey.legacyCustomHeaders, SettingsKey.networkCustomHeaders, headers);
+  migrator.stage(StoreKey.legacyCustomHeaders, MetadataKey.networkCustomHeaders, headers);
 }
 
 class _StoreMigrator {
   final Drift _db;
-  final Map<SettingsKey<Object>, Object> _cache = {};
+  final Map<MetadataKey<Object>, Object> _cache = {};
   final List<int> _migratedStoreIds = [];
 
   _StoreMigrator(this._db);
 
-  Future<void> migrateEnumIndex<T extends Enum>(StoreKey<int> legacyKey, SettingsKey<T> newKey, List<T> values) async {
+  Future<void> migrateEnumIndex<T extends Enum>(StoreKey<int> legacyKey, MetadataKey<T> newKey, List<T> values) async {
     final index = await readLegacyStoreInt(legacyKey.id);
     if (index == null) {
       return;
@@ -217,7 +217,7 @@ class _StoreMigrator {
 
   Future<void> migrateEnumName<T extends Enum>(
     StoreKey<String> legacyKey,
-    SettingsKey<T> newKey,
+    MetadataKey<T> newKey,
     List<T> values,
   ) async {
     final name = await readLegacyStoreString(legacyKey.id);
@@ -234,7 +234,7 @@ class _StoreMigrator {
     _migratedStoreIds.add(legacyKey.id);
   }
 
-  Future<void> migrateBool(StoreKey<bool> legacyKey, SettingsKey<bool> newKey) async {
+  Future<void> migrateBool(StoreKey<bool> legacyKey, MetadataKey<bool> newKey) async {
     final intValue = await readLegacyStoreInt(legacyKey.id);
     if (intValue == null) {
       return;
@@ -245,7 +245,7 @@ class _StoreMigrator {
     _migratedStoreIds.add(legacyKey.id);
   }
 
-  Future<void> migrateInt(StoreKey<int> legacyKey, SettingsKey<int> newKey) async {
+  Future<void> migrateInt(StoreKey<int> legacyKey, MetadataKey<int> newKey) async {
     final intValue = await readLegacyStoreInt(legacyKey.id);
     if (intValue == null) {
       return;
@@ -255,7 +255,7 @@ class _StoreMigrator {
     _migratedStoreIds.add(legacyKey.id);
   }
 
-  Future<void> migrateString(StoreKey<String> legacyKey, SettingsKey<String> newKey) async {
+  Future<void> migrateString(StoreKey<String> legacyKey, MetadataKey<String> newKey) async {
     final value = await readLegacyStoreString(legacyKey.id);
     if (value == null) {
       return;
@@ -265,7 +265,7 @@ class _StoreMigrator {
     _migratedStoreIds.add(legacyKey.id);
   }
 
-  void stage<T extends Object>(StoreKey legacyKey, SettingsKey<T> newKey, T value) {
+  void stage<T extends Object>(StoreKey legacyKey, MetadataKey<T> newKey, T value) {
     _cache[newKey] = value;
     _migratedStoreIds.add(legacyKey.id);
   }
@@ -277,8 +277,8 @@ class _StoreMigrator {
           continue;
         }
         batch.insert(
-          _db.settingsEntity,
-          SettingsEntityCompanion(key: Value(entry.key.name), value: Value(entry.key.encode(entry.value))),
+          _db.metadataEntity,
+          MetadataEntityCompanion(key: Value(entry.key.name), value: Value(entry.key.encode(entry.value))),
           mode: InsertMode.insertOrReplace,
         );
       }

mobile/lib/utils/semver.dart

@@ -1,42 +1,36 @@
-enum SemVerType { major, minor, patch, prerelease }
+enum SemVerType { major, minor, patch }
 
 class SemVer {
   final int major;
   final int minor;
   final int patch;
-  final int? prerelease;
 
-  const SemVer({required this.major, required this.minor, required this.patch, this.prerelease});
+  const SemVer({required this.major, required this.minor, required this.patch});
 
   @override
   String toString() {
-    return '$major.$minor.$patch${prerelease == null ? '' : '-rc.$prerelease'}';
+    return '$major.$minor.$patch';
   }
 
-  SemVer copyWith({int? major, int? minor, int? patch, int? prerelease}) {
-    return SemVer(
-      major: major ?? this.major,
-      minor: minor ?? this.minor,
-      patch: patch ?? this.patch,
-      prerelease: prerelease ?? this.prerelease,
-    );
+  SemVer copyWith({int? major, int? minor, int? patch}) {
+    return SemVer(major: major ?? this.major, minor: minor ?? this.minor, patch: patch ?? this.patch);
   }
 
-  static final _pattern = RegExp(r'^v?(\d+)\.(\d+)\.(\d+)(?:-rc\.(\d+))?(?:[-+].*)?$', caseSensitive: false);
-
   factory SemVer.fromString(String version) {
-    final match = _pattern.firstMatch(version);
-    if (match == null) {
+    if (version.toLowerCase().startsWith("v")) {
+      version = version.substring(1);
+    }
+
+    final parts = version.split("-")[0].split('.');
+    if (parts.length != 3) {
       throw FormatException('Invalid semantic version string: $version');
     }
 
-    final prerelease = match.group(4);
-    return SemVer(
-      major: int.parse(match.group(1)!),
-      minor: int.parse(match.group(2)!),
-      patch: int.parse(match.group(3)!),
-      prerelease: prerelease == null ? null : int.parse(prerelease),
-    );
+    try {
+      return SemVer(major: int.parse(parts[0]), minor: int.parse(parts[1]), patch: int.parse(parts[2]));
+    } catch (e) {
+      throw FormatException('Invalid semantic version string: $version');
+    }
   }
 
   bool operator >(SemVer other) {
@@ -46,10 +40,7 @@ class SemVer {
     if (minor != other.minor) {
       return minor > other.minor;
     }
-    if (patch != other.patch) {
-      return patch > other.patch;
-    }
-    return _comparePrerelease(other) > 0;
+    return patch > other.patch;
   }
 
   bool operator <(SemVer other) {
@@ -59,23 +50,7 @@ class SemVer {
     if (minor != other.minor) {
       return minor < other.minor;
     }
-    if (patch != other.patch) {
-      return patch < other.patch;
-    }
-    return _comparePrerelease(other) < 0;
-  }
-
-  int _comparePrerelease(SemVer other) {
-    if (prerelease == other.prerelease) {
-      return 0;
-    }
-    if (prerelease == null) {
-      return 1;
-    }
-    if (other.prerelease == null) {
-      return -1;
-    }
-    return prerelease!.compareTo(other.prerelease!);
+    return patch < other.patch;
   }
 
   bool operator >=(SemVer other) {
@@ -92,11 +67,7 @@ class SemVer {
       return true;
     }
 
-    return other is SemVer &&
-        other.major == major &&
-        other.minor == minor &&
-        other.patch == patch &&
-        other.prerelease == prerelease;
+    return other is SemVer && other.major == major && other.minor == minor && other.patch == patch;
   }
 
   SemVerType? differenceType(SemVer other) {
@@ -109,13 +80,10 @@ class SemVer {
     if (patch != other.patch) {
       return SemVerType.patch;
     }
-    if (prerelease != other.prerelease) {
-      return SemVerType.prerelease;
-    }
 
     return null;
   }
 
   @override
-  int get hashCode => major.hashCode ^ minor.hashCode ^ patch.hashCode ^ prerelease.hashCode;
+  int get hashCode => major.hashCode ^ minor.hashCode ^ patch.hashCode;
 }

mobile/lib/widgets/common/app_bar_dialog/app_bar_server_info.dart

@@ -50,7 +50,9 @@ class AppBarServerInfo extends HookConsumerWidget {
           divider,
           _ServerInfoItem(
             label: "server_version".tr(),
-            text: serverInfoState.serverVersion.major > 0 ? "${serverInfoState.serverVersion}" : "--",
+            text: serverInfoState.serverVersion.major > 0
+                ? "${serverInfoState.serverVersion.major}.${serverInfoState.serverVersion.minor}.${serverInfoState.serverVersion.patch}"
+                : "--",
           ),
           divider,
           _ServerInfoItem(label: "server_info_box_server_url".tr(), text: getServerUrl() ?? '--', tooltip: true),
@@ -58,7 +60,9 @@ class AppBarServerInfo extends HookConsumerWidget {
             divider,
             _ServerInfoItem(
               label: "latest_version".tr(),
-              text: serverInfoState.latestVersion!.major > 0 ? "${serverInfoState.latestVersion!}" : "--",
+              text: serverInfoState.latestVersion!.major > 0
+                  ? "${serverInfoState.latestVersion!.major}.${serverInfoState.latestVersion!.minor}.${serverInfoState.latestVersion!.patch}"
+                  : "--",
               tooltip: true,
               icon: serverInfoState.versionStatus == VersionStatus.serverOutOfDate
                   ? const Icon(Icons.info, color: Color.fromARGB(255, 243, 188, 106), size: 12)

mobile/lib/widgets/common/immich_sliver_app_bar.dart

@@ -10,7 +10,7 @@ import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/models/server_info/server_info.model.dart';
 import 'package:immich_mobile/providers/backup/drift_backup.provider.dart';
 import 'package:immich_mobile/providers/cast.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/readonly_mode.provider.dart';
 import 'package:immich_mobile/providers/server_info.provider.dart';
 import 'package:immich_mobile/providers/sync_status.provider.dart';

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

@@ -15,7 +15,7 @@ import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
-import 'package:immich_mobile/infrastructure/repositories/settings.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/metadata.repository.dart';
 import 'package:immich_mobile/providers/auth.provider.dart';
 import 'package:immich_mobile/providers/background_sync.provider.dart';
 import 'package:immich_mobile/providers/gallery_permission.provider.dart';
@@ -187,7 +187,7 @@ class LoginForm extends HookConsumerWidget {
       await backgroundManager.syncRemote();
       await backgroundManager.hashAssets();
 
-      if (SettingsRepository.instance.appConfig.backup.syncAlbums) {
+      if (MetadataRepository.instance.appConfig.backup.syncAlbums) {
         await backgroundManager.syncLinkedAlbum();
       }
     }

mobile/lib/widgets/settings/advanced_settings.dart

@@ -7,7 +7,7 @@ import 'package:flutter_hooks/flutter_hooks.dart' hide Store;
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/services/log.service.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/readonly_mode.provider.dart';
 import 'package:immich_mobile/repositories/permission.repository.dart';
@@ -35,7 +35,7 @@ class AdvancedSettings extends HookConsumerWidget {
     final preferRemote = useState(ref.read(appConfigProvider).image.preferRemote);
     useValueChanged(
       preferRemote.value,
-      (_, __) => ref.read(settingsProvider).write(.imagePreferRemote, preferRemote.value),
+      (_, __) => ref.read(metadataProvider).write(.imagePreferRemote, preferRemote.value),
     );
     final readonlyModeEnabled = useAppSettingsState(AppSettingsEnum.readonlyModeEnabled);
 

mobile/lib/widgets/settings/asset_list_settings/asset_list_group_settings.dart

@@ -3,10 +3,11 @@ import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/metadata_key.dart';
 import 'package:immich_mobile/domain/models/timeline.model.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/providers/app_settings.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/widgets/settings/setting_group_title.dart';
 import 'package:immich_mobile/widgets/settings/settings_radio_list_tile.dart';
 
@@ -18,7 +19,7 @@ class GroupSettings extends HookConsumerWidget {
     final groupBy = useValueNotifier(ref.watch(appConfigProvider.select((s) => s.timeline.groupAssetsBy)));
 
     Future<void> updateAppSettings(GroupAssetsBy groupBy) async {
-      await ref.read(settingsProvider).write(.timelineGroupAssetsBy, groupBy);
+      await ref.read(metadataProvider).write(MetadataKey.timelineGroupAssetsBy, groupBy);
       ref.invalidate(appSettingsServiceProvider);
     }
 

mobile/lib/widgets/settings/asset_list_settings/asset_list_layout_settings.dart

@@ -2,9 +2,10 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/metadata_key.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/providers/app_settings.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/widgets/settings/setting_group_title.dart';
 import 'package:immich_mobile/widgets/settings/settings_slider_list_tile.dart';
 
@@ -15,7 +16,7 @@ class LayoutSettings extends HookConsumerWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     final tilesPerRow = useState(ref.read(appConfigProvider.select((s) => s.timeline.tilesPerRow)));
     useValueChanged<int, void>(tilesPerRow.value, (_, __) {
-      ref.read(settingsProvider).write(.timelineTilesPerRow, tilesPerRow.value);
+      ref.read(metadataProvider).write(MetadataKey.timelineTilesPerRow, tilesPerRow.value);
     });
 
     return Column(

mobile/lib/widgets/settings/asset_list_settings/asset_list_settings.dart

@@ -2,8 +2,10 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/metadata_key.dart';
 import 'package:immich_mobile/providers/app_settings.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/setting.provider.dart';
 import 'package:immich_mobile/widgets/settings/asset_list_settings/asset_list_group_settings.dart';
 import 'package:immich_mobile/widgets/settings/asset_list_settings/asset_list_layout_settings.dart';
 import 'package:immich_mobile/widgets/settings/settings_sub_page_scaffold.dart';
@@ -21,7 +23,7 @@ class AssetListSettings extends HookConsumerWidget {
         valueNotifier: storageIndicator,
         title: 'theme_setting_asset_list_storage_indicator_title'.tr(),
         onChanged: (value) {
-          ref.read(settingsProvider).write(.timelineStorageIndicator, value);
+          ref.read(metadataProvider).write(MetadataKey.timelineStorageIndicator, value);
           ref.invalidate(appSettingsServiceProvider);
           ref.invalidate(settingsProvider);
         },

mobile/lib/widgets/settings/asset_viewer_settings/image_viewer_quality_setting.dart

@@ -3,7 +3,7 @@ import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/providers/app_settings.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/widgets/settings/setting_group_title.dart';
 import 'package:immich_mobile/widgets/settings/settings_switch_list_tile.dart';
 
@@ -14,7 +14,7 @@ class ImageViewerQualitySetting extends HookConsumerWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     final isOriginal = useState(ref.read(appConfigProvider).image.loadOriginal);
     useValueChanged<bool, void>(isOriginal.value, (_, __) {
-      ref.read(settingsProvider).write(.imageLoadOriginal, isOriginal.value);
+      ref.read(metadataProvider).write(.imageLoadOriginal, isOriginal.value);
     });
 
     return Column(

mobile/lib/widgets/settings/asset_viewer_settings/image_viewer_tap_to_navigate_setting.dart

@@ -2,7 +2,7 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/widgets/settings/settings_sub_title.dart';
 import 'package:immich_mobile/widgets/settings/settings_switch_list_tile.dart';
 
@@ -13,7 +13,7 @@ class ImageViewerTapToNavigateSetting extends HookConsumerWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     final tapToNavigate = useState(ref.read(appConfigProvider).viewer.tapToNavigate);
     useValueChanged<bool, void>(tapToNavigate.value, (_, __) {
-      ref.read(settingsProvider).write(.viewerTapToNavigate, tapToNavigate.value);
+      ref.read(metadataProvider).write(.viewerTapToNavigate, tapToNavigate.value);
     });
 
     return Column(

mobile/lib/widgets/settings/asset_viewer_settings/slideshow_settings.dart

@@ -3,7 +3,7 @@ import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/widgets/settings/setting_group_title.dart';
 import 'package:immich_mobile/widgets/settings/settings_radio_list_tile.dart';
 import 'package:immich_mobile/widgets/settings/settings_slider_list_tile.dart';
@@ -23,19 +23,19 @@ class SlideshowSettings extends HookConsumerWidget {
     final useDirection = useState(slideshow.direction);
 
     useValueChanged<bool, void>(useTransition.value, (_, __) {
-      ref.read(settingsProvider).write(.slideshowTransition, useTransition.value);
+      ref.read(metadataProvider).write(.slideshowTransition, useTransition.value);
     });
     useValueChanged<bool, void>(useRepeat.value, (_, __) {
-      ref.read(settingsProvider).write(.slideshowRepeat, useRepeat.value);
+      ref.read(metadataProvider).write(.slideshowRepeat, useRepeat.value);
     });
     useValueChanged<int, void>(useDuration.value, (_, __) {
-      ref.read(settingsProvider).write(.slideshowDuration, useDuration.value);
+      ref.read(metadataProvider).write(.slideshowDuration, useDuration.value);
     });
     useValueChanged<SlideshowLook, void>(useLook.value, (_, __) {
-      ref.read(settingsProvider).write(.slideshowLook, useLook.value);
+      ref.read(metadataProvider).write(.slideshowLook, useLook.value);
     });
     useValueChanged<SlideshowDirection, void>(useDirection.value, (_, __) {
-      ref.read(settingsProvider).write(.slideshowDirection, useDirection.value);
+      ref.read(metadataProvider).write(.slideshowDirection, useDirection.value);
     });
 
     return Column(

mobile/lib/widgets/settings/asset_viewer_settings/video_viewer_settings.dart

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/widgets/settings/setting_group_title.dart';
 import 'package:immich_mobile/widgets/settings/settings_switch_list_tile.dart';
 
@@ -17,13 +17,13 @@ class VideoViewerSettings extends HookConsumerWidget {
     final useOriginalVideo = useState(viewer.loadOriginalVideo);
 
     useValueChanged<bool, void>(useAutoPlayVideo.value, (_, __) {
-      ref.read(settingsProvider).write(.viewerAutoPlayVideo, useAutoPlayVideo.value);
+      ref.read(metadataProvider).write(.viewerAutoPlayVideo, useAutoPlayVideo.value);
     });
     useValueChanged<bool, void>(useLoopVideo.value, (_, __) {
-      ref.read(settingsProvider).write(.viewerLoopVideo, useLoopVideo.value);
+      ref.read(metadataProvider).write(.viewerLoopVideo, useLoopVideo.value);
     });
     useValueChanged<bool, void>(useOriginalVideo.value, (_, __) {
-      ref.read(settingsProvider).write(.viewerLoadOriginalVideo, useOriginalVideo.value);
+      ref.read(metadataProvider).write(.viewerLoadOriginalVideo, useOriginalVideo.value);
     });
 
     return Column(

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

@@ -5,15 +5,15 @@ import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/album/local_album.model.dart';
 import 'package:immich_mobile/domain/models/config/app_config.dart';
-import 'package:immich_mobile/domain/models/settings_key.dart';
+import 'package:immich_mobile/domain/models/metadata_key.dart';
 import 'package:immich_mobile/domain/services/sync_linked_album.service.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/providers/background_sync.provider.dart';
 import 'package:immich_mobile/providers/backup/backup_album.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/widgets/settings/setting_group_title.dart';
 import 'package:immich_mobile/widgets/settings/setting_list_tile.dart';
@@ -112,7 +112,7 @@ class _AlbumSyncActionButtonState extends ConsumerState<_AlbumSyncActionButton>
                 trailing: Switch(
                   value: albumSyncEnable,
                   onChanged: (bool newValue) async {
-                    await ref.read(settingsProvider).write(.backupSyncAlbums, newValue);
+                    await ref.read(metadataProvider).write(MetadataKey.backupSyncAlbums, newValue);
 
                     if (newValue == true) {
                       await _manageLinkedAlbums();
@@ -158,7 +158,7 @@ class _AlbumSyncActionButtonState extends ConsumerState<_AlbumSyncActionButton>
 }
 
 class _BackupSwitchTile extends ConsumerWidget {
-  final SettingsKey<bool> metadataKey;
+  final MetadataKey<bool> metadataKey;
   final bool Function(AppConfig) selector;
   final String titleKey;
   final String subtitleKey;
@@ -183,7 +183,7 @@ class _BackupSwitchTile extends ConsumerWidget {
         trailing: Switch(
           value: value,
           onChanged: (bool newValue) async {
-            await ref.read(settingsProvider).write(metadataKey, newValue);
+            await ref.read(metadataProvider).write(metadataKey, newValue);
             onChanged?.call(newValue);
           },
         ),
@@ -198,7 +198,7 @@ class _UseCellularForVideosButton extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return _BackupSwitchTile(
-      metadataKey: SettingsKey.backupUseCellularForVideos,
+      metadataKey: MetadataKey.backupUseCellularForVideos,
       selector: (c) => c.backup.useCellularForVideos,
       titleKey: "videos",
       subtitleKey: "network_requirement_videos_upload",
@@ -212,7 +212,7 @@ class _UseCellularForPhotosButton extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return _BackupSwitchTile(
-      metadataKey: SettingsKey.backupUseCellularForPhotos,
+      metadataKey: MetadataKey.backupUseCellularForPhotos,
       selector: (c) => c.backup.useCellularForPhotos,
       titleKey: "photos",
       subtitleKey: "network_requirement_photos_upload",
@@ -227,7 +227,7 @@ class _BackupOnlyWhenChargingButton extends ConsumerWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     final fgService = ref.read(backgroundWorkerFgServiceProvider);
     return _BackupSwitchTile(
-      metadataKey: SettingsKey.backupRequireCharging,
+      metadataKey: MetadataKey.backupRequireCharging,
       selector: (c) => c.backup.requireCharging,
       titleKey: "charging",
       subtitleKey: "charging_requirement_mobile_backup",
@@ -282,11 +282,11 @@ class _BackupDelaySlider extends ConsumerWidget {
           value: currentValue.toDouble(),
           onChanged: (double v) async {
             final seconds = backupDelayToSeconds(v.toInt());
-            await ref.read(settingsProvider).write(SettingsKey.backupTriggerDelay, seconds);
+            await ref.read(metadataProvider).write(MetadataKey.backupTriggerDelay, seconds);
           },
           onChangeEnd: (double v) async {
             final seconds = backupDelayToSeconds(v.toInt());
-            await ref.read(settingsProvider).write(SettingsKey.backupTriggerDelay, seconds);
+            await ref.read(metadataProvider).write(MetadataKey.backupTriggerDelay, seconds);
           },
           max: 3.0,
           min: 0.0,

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

@@ -1,11 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/domain/models/settings_key.dart';
+import 'package:immich_mobile/domain/models/metadata_key.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/models/auth/auxilary_endpoint.model.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/widgets/settings/networking_settings/endpoint_input.dart';
 
 class ExternalNetworkPreference extends HookConsumerWidget {
@@ -26,7 +26,7 @@ class ExternalNetworkPreference extends HookConsumerWidget {
           .map((e) => e.url)
           .toList();
 
-      ref.read(settingsProvider).write(SettingsKey.networkExternalEndpointList, urls);
+      ref.read(metadataProvider).write(MetadataKey.networkExternalEndpointList, urls);
     }
 
     updateValidationStatus(String url, int index, AuxCheckStatus status) {

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

@@ -5,7 +5,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/models/auth/auxilary_endpoint.model.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/providers/network.provider.dart';
 import 'package:immich_mobile/utils/url_helper.dart';
 import 'package:immich_mobile/widgets/settings/networking_settings/external_network_preference.dart';
@@ -21,7 +21,7 @@ class NetworkingSettings extends HookConsumerWidget {
     final currentEndpoint = getServerUrl();
     final featureEnabled = useState(ref.read(appConfigProvider).network.autoEndpointSwitching);
     useValueChanged<bool, void>(featureEnabled.value, (_, __) {
-      ref.read(settingsProvider).write(.networkAutoEndpointSwitching, featureEnabled.value);
+      ref.read(metadataProvider).write(.networkAutoEndpointSwitching, featureEnabled.value);
     });
 
     Future<void> checkWifiReadPermission() async {

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

@@ -4,7 +4,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/colors.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/theme_extensions.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/providers/theme.provider.dart';
 import 'package:immich_mobile/theme/color_scheme.dart';
 import 'package:immich_mobile/theme/dynamic_theme.dart';
@@ -26,16 +26,16 @@ class PrimaryColorSetting extends HookConsumerWidget {
     }
 
     onUseSystemColorChange(bool newValue) {
-      ref.read(settingsProvider).write(.themeDynamic, newValue);
+      ref.read(metadataProvider).write(.themeDynamic, newValue);
       popBottomSheet();
     }
 
     onPrimaryColorChange(ImmichColorPreset colorPreset) {
-      ref.read(settingsProvider).write(.themePrimaryColor, colorPreset);
+      ref.read(metadataProvider).write(.themePrimaryColor, colorPreset);
 
       //turn off system color setting
       if (themeConfig.dynamicTheme) {
-        ref.read(settingsProvider).write(.themeDynamic, false);
+        ref.read(metadataProvider).write(.themeDynamic, false);
       }
       popBottomSheet();
     }

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

@@ -3,7 +3,7 @@ import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/widgets/settings/preference_settings/primary_color_setting.dart';
 import 'package:immich_mobile/widgets/settings/setting_group_title.dart';
 import 'package:immich_mobile/widgets/settings/settings_switch_list_tile.dart';
@@ -22,7 +22,7 @@ class ThemeSetting extends HookConsumerWidget {
 
     void onThemeChange(bool isDark) {
       currentTheme.value = isDark ? ThemeMode.dark : ThemeMode.light;
-      ref.read(settingsProvider).write(.themeMode, currentTheme.value);
+      ref.read(metadataProvider).write(.themeMode, currentTheme.value);
     }
 
     void onSystemThemeChange(bool isSystem) {
@@ -39,11 +39,11 @@ class ThemeSetting extends HookConsumerWidget {
           currentTheme.value = ThemeMode.dark;
         }
       }
-      ref.read(settingsProvider).write(.themeMode, currentTheme.value);
+      ref.read(metadataProvider).write(.themeMode, currentTheme.value);
     }
 
     void onSurfaceColorSettingChange(bool useColorfulInterface) {
-      ref.read(settingsProvider).write(.themeColorfulInterface, useColorfulInterface);
+      ref.read(metadataProvider).write(.themeColorfulInterface, useColorfulInterface);
       colorfulInterface.value = useColorfulInterface;
     }
 

mobile/openapi/README.md

@@ -92,10 +92,12 @@ Class | Method | HTTP request | Description
 *AlbumsApi* | [**getAlbumMapMarkers**](doc//AlbumsApi.md#getalbummapmarkers) | **GET** /albums/{id}/map-markers | Retrieve album map markers
 *AlbumsApi* | [**getAlbumStatistics**](doc//AlbumsApi.md#getalbumstatistics) | **GET** /albums/statistics | Retrieve album statistics
 *AlbumsApi* | [**getAllAlbums**](doc//AlbumsApi.md#getallalbums) | **GET** /albums | List all albums
+*AlbumsApi* | [**getOwnAlbumUser**](doc//AlbumsApi.md#getownalbumuser) | **GET** /albums/{id}/user/self | Get own sharing permissions
 *AlbumsApi* | [**removeAssetFromAlbum**](doc//AlbumsApi.md#removeassetfromalbum) | **DELETE** /albums/{id}/assets | Remove assets from an album
 *AlbumsApi* | [**removeUserFromAlbum**](doc//AlbumsApi.md#removeuserfromalbum) | **DELETE** /albums/{id}/user/{userId} | Remove user from album
 *AlbumsApi* | [**updateAlbumInfo**](doc//AlbumsApi.md#updatealbuminfo) | **PATCH** /albums/{id} | Update an album
 *AlbumsApi* | [**updateAlbumUser**](doc//AlbumsApi.md#updatealbumuser) | **PUT** /albums/{id}/user/{userId} | Update user role
+*AlbumsApi* | [**updateOwnAlbumUser**](doc//AlbumsApi.md#updateownalbumuser) | **PUT** /albums/{id}/user/self | Update own sharing permissions
 *AssetsApi* | [**checkBulkUpload**](doc//AssetsApi.md#checkbulkupload) | **POST** /assets/bulk-upload-check | Check bulk upload
 *AssetsApi* | [**copyAsset**](doc//AssetsApi.md#copyasset) | **PUT** /assets/copy | Copy asset
 *AssetsApi* | [**deleteAssetMetadata**](doc//AssetsApi.md#deleteassetmetadata) | **DELETE** /assets/{id}/metadata/{key} | Delete asset metadata by key
@@ -103,16 +105,12 @@ Class | Method | HTTP request | Description
 *AssetsApi* | [**deleteBulkAssetMetadata**](doc//AssetsApi.md#deletebulkassetmetadata) | **DELETE** /assets/metadata | Delete asset metadata
 *AssetsApi* | [**downloadAsset**](doc//AssetsApi.md#downloadasset) | **GET** /assets/{id}/original | Download original asset
 *AssetsApi* | [**editAsset**](doc//AssetsApi.md#editasset) | **PUT** /assets/{id}/edits | Apply edits to an existing asset
-*AssetsApi* | [**endSession**](doc//AssetsApi.md#endsession) | **DELETE** /assets/{id}/video/stream/{sessionId} | End HLS streaming session
 *AssetsApi* | [**getAssetEdits**](doc//AssetsApi.md#getassetedits) | **GET** /assets/{id}/edits | Retrieve edits for an existing asset
 *AssetsApi* | [**getAssetInfo**](doc//AssetsApi.md#getassetinfo) | **GET** /assets/{id} | Retrieve an asset
 *AssetsApi* | [**getAssetMetadata**](doc//AssetsApi.md#getassetmetadata) | **GET** /assets/{id}/metadata | Get asset metadata
 *AssetsApi* | [**getAssetMetadataByKey**](doc//AssetsApi.md#getassetmetadatabykey) | **GET** /assets/{id}/metadata/{key} | Retrieve asset metadata by key
 *AssetsApi* | [**getAssetOcr**](doc//AssetsApi.md#getassetocr) | **GET** /assets/{id}/ocr | Retrieve asset OCR data
 *AssetsApi* | [**getAssetStatistics**](doc//AssetsApi.md#getassetstatistics) | **GET** /assets/statistics | Get asset statistics
-*AssetsApi* | [**getMainPlaylist**](doc//AssetsApi.md#getmainplaylist) | **GET** /assets/{id}/video/stream/main.m3u8 | Get HLS main playlist
-*AssetsApi* | [**getMediaPlaylist**](doc//AssetsApi.md#getmediaplaylist) | **GET** /assets/{id}/video/stream/{sessionId}/{variantIndex}/playlist.m3u8 | Get HLS media playlist
-*AssetsApi* | [**getSegment**](doc//AssetsApi.md#getsegment) | **GET** /assets/{id}/video/stream/{sessionId}/{variantIndex}/{filename} | Get HLS segment or init file
 *AssetsApi* | [**playAssetVideo**](doc//AssetsApi.md#playassetvideo) | **GET** /assets/{id}/video/playback | Play asset video
 *AssetsApi* | [**removeAssetEdits**](doc//AssetsApi.md#removeassetedits) | **DELETE** /assets/{id}/edits | Remove edits from an existing asset
 *AssetsApi* | [**runAssetJobs**](doc//AssetsApi.md#runassetjobs) | **POST** /assets/jobs | Run an asset job
@@ -457,7 +455,7 @@ Class | Method | HTTP request | Description
  - [MemoryStatisticsResponseDto](doc//MemoryStatisticsResponseDto.md)
  - [MemoryType](doc//MemoryType.md)
  - [MemoryUpdateDto](doc//MemoryUpdateDto.md)
- - [MergePersonDto](doc//MergePersonDto.md)
+ - [MergeFaceClusterDto](doc//MergeFaceClusterDto.md)
  - [MetadataSearchDto](doc//MetadataSearchDto.md)
  - [MirrorAxis](doc//MirrorAxis.md)
  - [MirrorParameters](doc//MirrorParameters.md)
@@ -517,9 +515,6 @@ Class | Method | HTTP request | Description
  - [RatingsUpdate](doc//RatingsUpdate.md)
  - [ReactionLevel](doc//ReactionLevel.md)
  - [ReactionType](doc//ReactionType.md)
- - [ReleaseChannel](doc//ReleaseChannel.md)
- - [ReleaseEventV1](doc//ReleaseEventV1.md)
- - [ReleaseType](doc//ReleaseType.md)
  - [ReverseGeocodingStateResponseDto](doc//ReverseGeocodingStateResponseDto.md)
  - [RotateParameters](doc//RotateParameters.md)
  - [SearchAlbumResponseDto](doc//SearchAlbumResponseDto.md)
@@ -554,6 +549,8 @@ Class | Method | HTTP request | Description
  - [SharedLinkType](doc//SharedLinkType.md)
  - [SharedLinksResponse](doc//SharedLinksResponse.md)
  - [SharedLinksUpdate](doc//SharedLinksUpdate.md)
+ - [SharingOptionsResponseDto](doc//SharingOptionsResponseDto.md)
+ - [SharingPermission](doc//SharingPermission.md)
  - [SignUpDto](doc//SignUpDto.md)
  - [SmartSearchDto](doc//SmartSearchDto.md)
  - [SourceType](doc//SourceType.md)
@@ -604,7 +601,6 @@ Class | Method | HTTP request | Description
  - [SystemConfigBackupsDto](doc//SystemConfigBackupsDto.md)
  - [SystemConfigDto](doc//SystemConfigDto.md)
  - [SystemConfigFFmpegDto](doc//SystemConfigFFmpegDto.md)
- - [SystemConfigFFmpegRealtimeDto](doc//SystemConfigFFmpegRealtimeDto.md)
  - [SystemConfigFacesDto](doc//SystemConfigFacesDto.md)
  - [SystemConfigGeneratedFullsizeImageDto](doc//SystemConfigGeneratedFullsizeImageDto.md)
  - [SystemConfigGeneratedImageDto](doc//SystemConfigGeneratedImageDto.md)
@@ -654,6 +650,7 @@ Class | Method | HTTP request | Description
  - [UpdateAlbumUserDto](doc//UpdateAlbumUserDto.md)
  - [UpdateAssetDto](doc//UpdateAssetDto.md)
  - [UpdateLibraryDto](doc//UpdateLibraryDto.md)
+ - [UpdateSharingOptionsDto](doc//UpdateSharingOptionsDto.md)
  - [UsageByUserDto](doc//UsageByUserDto.md)
  - [UserAdminCreateDto](doc//UserAdminCreateDto.md)
  - [UserAdminDeleteDto](doc//UserAdminDeleteDto.md)

mobile/openapi/lib/api.dart

@@ -198,7 +198,7 @@ part 'model/memory_search_order.dart';
 part 'model/memory_statistics_response_dto.dart';
 part 'model/memory_type.dart';
 part 'model/memory_update_dto.dart';
-part 'model/merge_person_dto.dart';
+part 'model/merge_face_cluster_dto.dart';
 part 'model/metadata_search_dto.dart';
 part 'model/mirror_axis.dart';
 part 'model/mirror_parameters.dart';
@@ -258,9 +258,6 @@ part 'model/ratings_response.dart';
 part 'model/ratings_update.dart';
 part 'model/reaction_level.dart';
 part 'model/reaction_type.dart';
-part 'model/release_channel.dart';
-part 'model/release_event_v1.dart';
-part 'model/release_type.dart';
 part 'model/reverse_geocoding_state_response_dto.dart';
 part 'model/rotate_parameters.dart';
 part 'model/search_album_response_dto.dart';
@@ -295,6 +292,8 @@ part 'model/shared_link_response_dto.dart';
 part 'model/shared_link_type.dart';
 part 'model/shared_links_response.dart';
 part 'model/shared_links_update.dart';
+part 'model/sharing_options_response_dto.dart';
+part 'model/sharing_permission.dart';
 part 'model/sign_up_dto.dart';
 part 'model/smart_search_dto.dart';
 part 'model/source_type.dart';
@@ -345,7 +344,6 @@ part 'model/sync_user_v1.dart';
 part 'model/system_config_backups_dto.dart';
 part 'model/system_config_dto.dart';
 part 'model/system_config_f_fmpeg_dto.dart';
-part 'model/system_config_f_fmpeg_realtime_dto.dart';
 part 'model/system_config_faces_dto.dart';
 part 'model/system_config_generated_fullsize_image_dto.dart';
 part 'model/system_config_generated_image_dto.dart';
@@ -395,6 +393,7 @@ part 'model/update_album_dto.dart';
 part 'model/update_album_user_dto.dart';
 part 'model/update_asset_dto.dart';
 part 'model/update_library_dto.dart';
+part 'model/update_sharing_options_dto.dart';
 part 'model/usage_by_user_dto.dart';
 part 'model/user_admin_create_dto.dart';
 part 'model/user_admin_delete_dto.dart';

mobile/openapi/lib/api/activities_api.dart

@@ -25,7 +25,7 @@ class ActivitiesApi {
   /// Parameters:
   ///
   /// * [ActivityCreateDto] activityCreateDto (required):
-  Future<Response> createActivityWithHttpInfo(ActivityCreateDto activityCreateDto, { Future<void>? abortTrigger, }) async {
+  Future<Response> createActivityWithHttpInfo(ActivityCreateDto activityCreateDto,) async {
     // ignore: prefer_const_declarations
     final apiPath = r'/activities';
 
@@ -47,7 +47,6 @@ class ActivitiesApi {
       headerParams,
       formParams,
       contentTypes.isEmpty ? null : contentTypes.first,
-      abortTrigger: abortTrigger,
     );
   }
 
@@ -58,8 +57,8 @@ class ActivitiesApi {
   /// Parameters:
   ///
   /// * [ActivityCreateDto] activityCreateDto (required):
-  Future<ActivityResponseDto?> createActivity(ActivityCreateDto activityCreateDto, { Future<void>? abortTrigger, }) async {
-    final response = await createActivityWithHttpInfo(activityCreateDto, abortTrigger: abortTrigger,);
+  Future<ActivityResponseDto?> createActivity(ActivityCreateDto activityCreateDto,) async {
+    final response = await createActivityWithHttpInfo(activityCreateDto,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -82,7 +81,7 @@ class ActivitiesApi {
   /// Parameters:
   ///
   /// * [String] id (required):
-  Future<Response> deleteActivityWithHttpInfo(String id, { Future<void>? abortTrigger, }) async {
+  Future<Response> deleteActivityWithHttpInfo(String id,) async {
     // ignore: prefer_const_declarations
     final apiPath = r'/activities/{id}'
       .replaceAll('{id}', id);
@@ -105,7 +104,6 @@ class ActivitiesApi {
       headerParams,
       formParams,
       contentTypes.isEmpty ? null : contentTypes.first,
-      abortTrigger: abortTrigger,
     );
   }
 
@@ -116,8 +114,8 @@ class ActivitiesApi {
   /// Parameters:
   ///
   /// * [String] id (required):
-  Future<void> deleteActivity(String id, { Future<void>? abortTrigger, }) async {
-    final response = await deleteActivityWithHttpInfo(id, abortTrigger: abortTrigger,);
+  Future<void> deleteActivity(String id,) async {
+    final response = await deleteActivityWithHttpInfo(id,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -143,7 +141,7 @@ class ActivitiesApi {
   ///
   /// * [String] userId:
   ///   Filter by user ID
-  Future<Response> getActivitiesWithHttpInfo(String albumId, { String? assetId, ReactionLevel? level, ReactionType? type, String? userId, Future<void>? abortTrigger, }) async {
+  Future<Response> getActivitiesWithHttpInfo(String albumId, { String? assetId, ReactionLevel? level, ReactionType? type, String? userId, }) async {
     // ignore: prefer_const_declarations
     final apiPath = r'/activities';
 
@@ -179,7 +177,6 @@ class ActivitiesApi {
       headerParams,
       formParams,
       contentTypes.isEmpty ? null : contentTypes.first,
-      abortTrigger: abortTrigger,
     );
   }
 
@@ -201,8 +198,8 @@ class ActivitiesApi {
   ///
   /// * [String] userId:
   ///   Filter by user ID
-  Future<List<ActivityResponseDto>?> getActivities(String albumId, { String? assetId, ReactionLevel? level, ReactionType? type, String? userId, Future<void>? abortTrigger, }) async {
-    final response = await getActivitiesWithHttpInfo(albumId, assetId: assetId, level: level, type: type, userId: userId, abortTrigger: abortTrigger,);
+  Future<List<ActivityResponseDto>?> getActivities(String albumId, { String? assetId, ReactionLevel? level, ReactionType? type, String? userId, }) async {
+    final response = await getActivitiesWithHttpInfo(albumId,  assetId: assetId, level: level, type: type, userId: userId, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -232,7 +229,7 @@ class ActivitiesApi {
   ///
   /// * [String] assetId:
   ///   Asset ID (if activity is for an asset)
-  Future<Response> getActivityStatisticsWithHttpInfo(String albumId, { String? assetId, Future<void>? abortTrigger, }) async {
+  Future<Response> getActivityStatisticsWithHttpInfo(String albumId, { String? assetId, }) async {
     // ignore: prefer_const_declarations
     final apiPath = r'/activities/statistics';
 
@@ -259,7 +256,6 @@ class ActivitiesApi {
       headerParams,
       formParams,
       contentTypes.isEmpty ? null : contentTypes.first,
-      abortTrigger: abortTrigger,
     );
   }
 
@@ -274,8 +270,8 @@ class ActivitiesApi {
   ///
   /// * [String] assetId:
   ///   Asset ID (if activity is for an asset)
-  Future<ActivityStatisticsResponseDto?> getActivityStatistics(String albumId, { String? assetId, Future<void>? abortTrigger, }) async {
-    final response = await getActivityStatisticsWithHttpInfo(albumId, assetId: assetId, abortTrigger: abortTrigger,);
+  Future<ActivityStatisticsResponseDto?> getActivityStatistics(String albumId, { String? assetId, }) async {
+    final response = await getActivityStatisticsWithHttpInfo(albumId,  assetId: assetId, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }