dart generator

.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
 

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

mise.toml

@@ -66,8 +66,11 @@ run = [
 ]
 
 [tasks.open-api-dart]
-dir = "open-api"
-run = "bash ./bin/generate-dart-sdk.sh"
+dir = "open-api/dart-generator"
+run = [
+  "dart pub get",
+  "dart run bin/generate.dart --spec ../immich-openapi-specs.json --out ../../mobile/openapi",
+]
 
 [tasks.open-api]
 env = { SHARP_IGNORE_GLOBAL_LIBVIPS = true }

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,10 @@ class AppConfig {
           })
           as T;
 
-  factory AppConfig.fromEntries(Map<SettingsKey<Object>, Object> overrides) =>
+  factory AppConfig.fromEntries(Map<MetadataKey<Object>, Object> overrides) =>
       overrides.entries.fold(const AppConfig(), (config, entry) => config.write(entry.key, entry.value));
 
-  AppConfig write<T extends Object>(SettingsKey<T> key, T value) {
+  AppConfig write<T extends Object>(MetadataKey<T> key, T value) {
     return switch (key) {
       .logLevel => copyWith(logLevel: value as LogLevel),
       .themePrimaryColor => copyWith(theme: theme.copyWith(primaryColor: value as ImmichColorPreset)),

mobile/lib/domain/models/metadata_key.dart

@@ -7,7 +7,7 @@ import 'package:immich_mobile/domain/models/log.model.dart';
 import 'package:immich_mobile/domain/models/timeline.model.dart';
 import 'package:immich_mobile/providers/album/album_sort_by_options.provider.dart';
 
-enum SettingsKey<T extends Object> {
+enum MetadataKey<T extends Object> {
   // Theme
   themePrimaryColor<ImmichColorPreset>(codec: _EnumCodec(ImmichColorPreset.values)),
   themeMode<ThemeMode>(codec: _EnumCodec(ThemeMode.values)),
@@ -73,24 +73,24 @@ enum SettingsKey<T extends Object> {
   slideshowLook<SlideshowLook>(codec: _EnumCodec(SlideshowLook.values)),
   slideshowDirection<SlideshowDirection>(codec: _EnumCodec(SlideshowDirection.values));
 
-  final _SettingsCodec<T>? _codecOverride;
+  final _MetadataCodec<T>? _codecOverride;
 
-  const SettingsKey({_SettingsCodec<T>? codec}) : _codecOverride = codec;
+  const MetadataKey({_MetadataCodec<T>? codec}) : _codecOverride = codec;
 
-  _SettingsCodec<T> get _codec => _codecOverride ?? _SettingsCodec.forType(T);
+  _MetadataCodec<T> get _codec => _codecOverride ?? _MetadataCodec.forType(T);
 
   String encode(T value) => _codec.encode(value);
 
   T decode(String raw) => _codec.decode(raw);
 }
 
-sealed class _SettingsCodec<T extends Object> {
-  const _SettingsCodec();
+sealed class _MetadataCodec<T extends Object> {
+  const _MetadataCodec();
 
   String encode(T value);
   T decode(String raw);
 
-  static const Map<Type, _SettingsCodec<Object>> _primitives = {
+  static const Map<Type, _MetadataCodec<Object>> _primitives = {
     int: _PrimitiveCodec.integer,
     double: _PrimitiveCodec.real,
     bool: _PrimitiveCodec.boolean,
@@ -98,16 +98,16 @@ sealed class _SettingsCodec<T extends Object> {
     DateTime: _DateTimeCodec(),
   };
 
-  static _SettingsCodec<T> forType<T extends Object>(Type runtimeType) {
+  static _MetadataCodec<T> forType<T extends Object>(Type runtimeType) {
     final codec = _primitives[runtimeType];
     if (codec == null) {
-      throw StateError('No primitive codec for $runtimeType. Provide an explicit codec when defining the SettingsKey.');
+      throw StateError('No primitive codec for $runtimeType. Provide an explicit codec when defining the MetadataKey.');
     }
-    return codec as _SettingsCodec<T>;
+    return codec as _MetadataCodec<T>;
   }
 }
 
-final class _EnumCodec<T extends Enum> extends _SettingsCodec<T> {
+final class _EnumCodec<T extends Enum> extends _MetadataCodec<T> {
   final List<T> values;
 
   const _EnumCodec(this.values);
@@ -119,7 +119,7 @@ final class _EnumCodec<T extends Enum> extends _SettingsCodec<T> {
   T decode(String raw) => values.firstWhere((v) => v.name == raw);
 }
 
-final class _DateTimeCodec extends _SettingsCodec<DateTime> {
+final class _DateTimeCodec extends _MetadataCodec<DateTime> {
   const _DateTimeCodec();
 
   @override
@@ -129,9 +129,9 @@ final class _DateTimeCodec extends _SettingsCodec<DateTime> {
   DateTime decode(String raw) => DateTime.parse(raw);
 }
 
-final class _MapCodec<K extends Object, V extends Object> extends _SettingsCodec<Map<K, V>> {
-  final _SettingsCodec<K> _keyCodec;
-  final _SettingsCodec<V> _valueCodec;
+final class _MapCodec<K extends Object, V extends Object> extends _MetadataCodec<Map<K, V>> {
+  final _MetadataCodec<K> _keyCodec;
+  final _MetadataCodec<V> _valueCodec;
 
   const _MapCodec(this._keyCodec, this._valueCodec);
 
@@ -167,8 +167,8 @@ final class _MapCodec<K extends Object, V extends Object> extends _SettingsCodec
   }
 }
 
-final class _ListCodec<T extends Object> extends _SettingsCodec<List<T>> {
-  final _SettingsCodec<T> _elementCodec;
+final class _ListCodec<T extends Object> extends _MetadataCodec<List<T>> {
+  final _MetadataCodec<T> _elementCodec;
 
   const _ListCodec(this._elementCodec);
 
@@ -197,7 +197,7 @@ final class _ListCodec<T extends Object> extends _SettingsCodec<List<T>> {
   }
 }
 
-final class _PrimitiveCodec<T extends Object> extends _SettingsCodec<T> {
+final class _PrimitiveCodec<T extends Object> extends _MetadataCodec<T> {
   final T Function(String) _parse;
 
   const _PrimitiveCodec._(this._parse);

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/sync_stream.service.dart

@@ -57,12 +57,8 @@ class SyncStreamService {
   Future<bool> sync() async {
     _logger.info("Remote sync request for user");
     final serverVersion = await _api.serverInfoApi.getServerVersion();
-    if (serverVersion == null) {
-      _logger.severe("Cannot perform sync: unable to determine server version");
-      return false;
-    }
 
-    final serverSemVer = SemVer(major: serverVersion.major, minor: serverVersion.minor, patch: serverVersion.patch_);
+    final serverSemVer = SemVer(major: serverVersion.major, minor: serverVersion.minor, patch: serverVersion.patch);
 
     final value = Store.get(StoreKey.syncMigrationStatus, "[]");
     final migrations = (jsonDecode(value) as List).cast<String>();

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/extensions/asset_extensions.dart

@@ -64,10 +64,10 @@ extension on api.AssetVisibility {
 
 extension on api.AssetTypeEnum {
   AssetType toAssetType() => switch (this) {
-    api.AssetTypeEnum.IMAGE => AssetType.image,
-    api.AssetTypeEnum.VIDEO => AssetType.video,
-    api.AssetTypeEnum.AUDIO => AssetType.audio,
-    api.AssetTypeEnum.OTHER => AssetType.other,
+    api.AssetTypeEnum.image => AssetType.image,
+    api.AssetTypeEnum.video => AssetType.video,
+    api.AssetTypeEnum.audio => AssetType.audio,
+    api.AssetTypeEnum.other => AssetType.other,
     _ => throw Exception('Unknown AssetType value: $this'),
   };
 }

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

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

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

@@ -11,59 +11,60 @@ class SearchApiRepository extends ApiRepository {
   Future<SearchResponseDto?> search(SearchFilter filter, int page) {
     AssetTypeEnum? type;
     if (filter.mediaType.index == AssetType.image.index) {
-      type = AssetTypeEnum.IMAGE;
+      type = AssetTypeEnum.image;
     } else if (filter.mediaType.index == AssetType.video.index) {
-      type = AssetTypeEnum.VIDEO;
+      type = AssetTypeEnum.video;
     }
 
     if ((filter.context != null && filter.context!.isNotEmpty) ||
         (filter.assetId != null && filter.assetId!.isNotEmpty)) {
       return _api.searchSmart(
         SmartSearchDto(
-          query: filter.context,
-          queryAssetId: filter.assetId,
-          language: filter.language,
-          country: filter.location.country,
-          state: filter.location.state,
-          city: filter.location.city,
-          make: filter.camera.make,
-          model: filter.camera.model,
-          takenAfter: filter.date.takenAfter,
-          takenBefore: filter.date.takenBefore,
-          visibility: filter.display.isArchive ? AssetVisibility.archive : AssetVisibility.timeline,
-          rating: filter.rating.rating,
-          isFavorite: filter.display.isFavorite ? true : null,
-          isNotInAlbum: filter.display.isNotInAlbum ? true : null,
-          personIds: filter.people.map((e) => e.id).toList(),
-          tagIds: filter.tagIds,
-          type: type,
-          page: page,
-          size: 100,
+          query: filter.context.toOptional(),
+          queryAssetId: filter.assetId.toOptional(),
+          language: filter.language.toOptional(),
+          country: filter.location.country.toOptional(),
+          state: filter.location.state.toOptional(),
+          city: filter.location.city.toOptional(),
+          make: filter.camera.make.toOptional(),
+          model: filter.camera.model.toOptional(),
+          takenAfter: filter.date.takenAfter.toOptional(),
+          takenBefore: filter.date.takenBefore.toOptional(),
+          visibility: (filter.display.isArchive ? AssetVisibility.archive : AssetVisibility.timeline).toOptional(),
+          rating: filter.rating.rating.toOptional(),
+          isFavorite: (filter.display.isFavorite ? true : null).toOptional(),
+          isNotInAlbum: (filter.display.isNotInAlbum ? true : null).toOptional(),
+          personIds: filter.people.map((e) => e.id).toList().toOptional(),
+          tagIds: filter.tagIds.toOptional(),
+          type: type.toOptional(),
+          page: page.toOptional(),
+          size: 100.toOptional(),
         ),
       );
     }
 
     return _api.searchAssets(
       MetadataSearchDto(
-        originalFileName: filter.filename != null && filter.filename!.isNotEmpty ? filter.filename : null,
-        country: filter.location.country,
-        description: filter.description != null && filter.description!.isNotEmpty ? filter.description : null,
-        ocr: filter.ocr != null && filter.ocr!.isNotEmpty ? filter.ocr : null,
-        state: filter.location.state,
-        city: filter.location.city,
-        make: filter.camera.make,
-        model: filter.camera.model,
-        takenAfter: filter.date.takenAfter,
-        takenBefore: filter.date.takenBefore,
-        visibility: filter.display.isArchive ? AssetVisibility.archive : AssetVisibility.timeline,
-        rating: filter.rating.rating,
-        isFavorite: filter.display.isFavorite ? true : null,
-        isNotInAlbum: filter.display.isNotInAlbum ? true : null,
-        personIds: filter.people.map((e) => e.id).toList(),
-        tagIds: filter.tagIds,
-        type: type,
-        page: page,
-        size: 1000,
+        originalFileName: (filter.filename != null && filter.filename!.isNotEmpty ? filter.filename : null).toOptional(),
+        country: filter.location.country.toOptional(),
+        description: (filter.description != null && filter.description!.isNotEmpty ? filter.description : null)
+            .toOptional(),
+        ocr: (filter.ocr != null && filter.ocr!.isNotEmpty ? filter.ocr : null).toOptional(),
+        state: filter.location.state.toOptional(),
+        city: filter.location.city.toOptional(),
+        make: filter.camera.make.toOptional(),
+        model: filter.camera.model.toOptional(),
+        takenAfter: filter.date.takenAfter.toOptional(),
+        takenBefore: filter.date.takenBefore.toOptional(),
+        visibility: (filter.display.isArchive ? AssetVisibility.archive : AssetVisibility.timeline).toOptional(),
+        rating: filter.rating.rating.toOptional(),
+        isFavorite: (filter.display.isFavorite ? true : null).toOptional(),
+        isNotInAlbum: (filter.display.isNotInAlbum ? true : null).toOptional(),
+        personIds: filter.people.map((e) => e.id).toList().toOptional(),
+        tagIds: filter.tagIds.toOptional(),
+        type: type.toOptional(),
+        page: page.toOptional(),
+        size: 1000.toOptional(),
       ),
     );
   }
@@ -74,5 +75,5 @@ class SearchApiRepository extends ApiRepository {
     String? state,
     String? make,
     String? model,
-  }) => _api.getSearchSuggestions(type, country: country, state: state, make: make, model: model);
+  }) => _api.getSearchSuggestions(type: type, country: country, state: state, make: make, model: model);
 }

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

@@ -20,7 +20,7 @@ class SyncApiRepository {
   }
 
   Future<void> deleteSyncAck(List<SyncEntityType> types) {
-    return _api.syncApi.deleteSyncAck(SyncAckDeleteDto(types: types));
+    return _api.syncApi.deleteSyncAck(SyncAckDeleteDto(types: types.toOptional()));
   }
 
   Future<void> streamChanges(

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

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

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

@@ -17,7 +17,7 @@ class TagsApiRepository extends ApiRepository {
 
   Future<int> bulkTagAssets(List<String> assetIds, List<String> tagIds) async {
     final response = await _api.bulkTagAssets(TagBulkAssetsDto(assetIds: assetIds, tagIds: tagIds));
-    return response?.count ?? 0;
+    return response.count;
   }
 
   Future<List<TagResponseDto>?> upsertTags(List<String> tags) async {

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

@@ -12,9 +12,6 @@ class UserApiRepository extends ApiRepository {
 
   Future<UserDto?> getMyUser() async {
     final (adminDto, preferenceDto) = await (_api.getMyUser(), _api.getMyPreferences()).wait;
-    if (adminDto == null) {
-      return null;
-    }
 
     return UserConverter.fromAdminDto(adminDto, preferenceDto);
   }

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';
@@ -40,6 +40,7 @@ import 'package:immich_mobile/utils/cache/widgets_binding.dart';
 import 'package:immich_mobile/utils/debug_print.dart';
 import 'package:immich_mobile/utils/licenses.dart';
 import 'package:immich_mobile/utils/migration.dart';
+import 'package:immich_mobile/utils/openapi_compat.dart';
 import 'package:immich_mobile/wm_executor.dart';
 import 'package:immich_ui/immich_ui.dart';
 import 'package:intl/date_symbol_data_local.dart';
@@ -49,6 +50,8 @@ import 'package:timezone/data/latest.dart';
 void main() async {
   try {
     ImmichWidgetsBinding();
+    // Register backward-compat back-fills before any API response is parsed.
+    configureOpenApiCompat();
     unawaited(BackgroundWorkerLockService(BackgroundWorkerLockApi()).lock());
     await EasyLocalization.ensureInitialized();
     final (drift, _) = await Bootstrap.initDomain();

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

@@ -9,7 +9,7 @@ class ServerVersion extends SemVer {
     return 'ServerVersion(major: $major, minor: $minor, patch: $patch)';
   }
 
-  ServerVersion.fromDto(ServerVersionResponseDto dto) : super(major: dto.major, minor: dto.minor, patch: dto.patch_);
+  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/models/shared_link/shared_link.model.dart

@@ -71,11 +71,11 @@ class SharedLink {
       key = dto.key,
       showMetadata = dto.showMetadata,
       slug = dto.slug,
-      type = dto.type == SharedLinkType.ALBUM ? SharedLinkSource.album : SharedLinkSource.individual,
-      title = dto.type == SharedLinkType.ALBUM
+      type = dto.type == SharedLinkType.album ? SharedLinkSource.album : SharedLinkSource.individual,
+      title = dto.type == SharedLinkType.album
           ? dto.album?.albumName.toUpperCase() ?? "UNKNOWN SHARE"
           : "INDIVIDUAL SHARE",
-      thumbAssetId = dto.type == SharedLinkType.ALBUM
+      thumbAssetId = dto.type == SharedLinkType.album
           ? dto.album?.albumThumbnailAssetId
           : dto.assets.isNotEmpty
           ? dto.assets[0].id

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/pages/edit/drift_edit.page.dart

@@ -45,16 +45,16 @@ class _DriftEditImagePageState extends ConsumerState<DriftEditImagePage> with Ti
     }
 
     if (editorState.flipHorizontal) {
-      edits.add(MirrorEdit(MirrorParameters(axis: MirrorAxis.horizontal)));
+      edits.add(const MirrorEdit(MirrorParameters(axis: MirrorAxis.horizontal)));
     }
 
     if (editorState.flipVertical) {
-      edits.add(MirrorEdit(MirrorParameters(axis: MirrorAxis.vertical)));
+      edits.add(const MirrorEdit(MirrorParameters(axis: MirrorAxis.vertical)));
     }
 
     final normalizedRotation = (editorState.rotationAngle % 360 + 360) % 360;
     if (normalizedRotation != 0) {
-      edits.add(RotateEdit(RotateParameters(angle: normalizedRotation)));
+      edits.add(RotateEdit(RotateParameters(angle: normalizedRotation.toDouble())));
     }
 
     try {

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/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 {
@@ -544,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>();
@@ -575,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/activity_api.repository.dart

@@ -15,7 +15,7 @@ class ActivityApiRepository extends ApiRepository {
   ActivityApiRepository(this._api);
 
   Future<List<Activity>> getAll(String albumId, {String? assetId}) async {
-    final response = await checkNull(_api.getActivities(albumId, assetId: assetId));
+    final response = await checkNull(_api.getActivities(albumId: albumId, assetId: assetId));
     return response.map(_toActivity).toList();
   }
 
@@ -23,8 +23,8 @@ class ActivityApiRepository extends ApiRepository {
     final dto = ActivityCreateDto(
       albumId: albumId,
       type: type == ActivityType.comment ? ReactionType.comment : ReactionType.like,
-      assetId: assetId,
-      comment: comment,
+      assetId: assetId.toOptional(),
+      comment: comment.toOptional(),
     );
     final response = await checkNull(_api.createActivity(dto));
     return _toActivity(response);
@@ -35,7 +35,7 @@ class ActivityApiRepository extends ApiRepository {
   }
 
   Future<ActivityStats> getStats(String albumId, {String? assetId}) async {
-    final response = await checkNull(_api.getActivityStatistics(albumId, assetId: assetId));
+    final response = await checkNull(_api.getActivityStatistics(albumId: albumId, assetId: assetId));
     return ActivityStats(comments: response.comments);
   }
 

mobile/lib/repositories/asset_api.repository.dart

@@ -24,7 +24,7 @@ class AssetApiRepository extends ApiRepository {
   AssetApiRepository(this._api, this._stacksApi, this._trashApi);
 
   Future<void> delete(List<String> ids, bool force) async {
-    return _api.deleteAssets(AssetBulkDeleteDto(ids: ids, force: force));
+    return _api.deleteAssets(AssetBulkDeleteDto(ids: ids, force: force.toOptional()));
   }
 
   Future<void> restoreTrash(List<String> ids) async {
@@ -33,12 +33,12 @@ class AssetApiRepository extends ApiRepository {
 
   Future<int> emptyTrash() async {
     final response = await _trashApi.emptyTrash();
-    return response?.count ?? 0;
+    return response.count;
   }
 
   Future<int> restoreAllTrash() async {
     final response = await _trashApi.restoreTrash();
-    return response?.count ?? 0;
+    return response.count;
   }
 
   Future<void> updateVisibility(List<String> ids, AssetVisibilityEnum visibility) async {
@@ -46,15 +46,17 @@ class AssetApiRepository extends ApiRepository {
   }
 
   Future<void> updateFavorite(List<String> ids, bool isFavorite) async {
-    return _api.updateAssets(AssetBulkUpdateDto(ids: ids, isFavorite: isFavorite));
+    return _api.updateAssets(AssetBulkUpdateDto(ids: ids, isFavorite: isFavorite.toOptional()));
   }
 
   Future<void> updateLocation(List<String> ids, LatLng location) async {
-    return _api.updateAssets(AssetBulkUpdateDto(ids: ids, latitude: location.latitude, longitude: location.longitude));
+    return _api.updateAssets(
+      AssetBulkUpdateDto(ids: ids, latitude: location.latitude.toOptional(), longitude: location.longitude.toOptional()),
+    );
   }
 
   Future<void> updateDateTime(List<String> ids, DateTime dateTime) async {
-    return _api.updateAssets(AssetBulkUpdateDto(ids: ids, dateTimeOriginal: dateTime.toIso8601String()));
+    return _api.updateAssets(AssetBulkUpdateDto(ids: ids, dateTimeOriginal: dateTime.toIso8601String().toOptional()));
   }
 
   Future<StackResponse> stack(List<String> ids) async {
@@ -86,11 +88,11 @@ class AssetApiRepository extends ApiRepository {
   }
 
   Future<void> updateDescription(String assetId, String description) {
-    return _api.updateAsset(assetId, UpdateAssetDto(description: description));
+    return _api.updateAsset(assetId, UpdateAssetDto(description: description.toOptional()));
   }
 
   Future<void> updateRating(String assetId, int rating) {
-    return _api.updateAsset(assetId, UpdateAssetDto(rating: rating));
+    return _api.updateAsset(assetId, UpdateAssetDto(rating: rating.toOptional()));
   }
 
   Future<AssetEditsResponseDto?> editAsset(String assetId, List<AssetEdit> edits) {

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/repositories/auth_api.repository.dart

@@ -13,7 +13,7 @@ class AuthApiRepository extends ApiRepository {
   AuthApiRepository(this._apiService);
 
   Future<void> changePassword(String newPassword) async {
-    await _apiService.usersApi.updateMyUser(UserUpdateMeDto(password: newPassword));
+    await _apiService.usersApi.updateMyUser(UserUpdateMeDto(password: newPassword.toOptional()));
   }
 
   Future<LoginResponse> login(String email, String password) async {
@@ -46,7 +46,7 @@ class AuthApiRepository extends ApiRepository {
 
   Future<bool> unlockPinCode(String pinCode) async {
     try {
-      await _apiService.authenticationApi.unlockAuthSession(SessionUnlockDto(pinCode: pinCode));
+      await _apiService.authenticationApi.unlockAuthSession(SessionUnlockDto(pinCode: pinCode.toOptional()));
       return true;
     } catch (_) {
       return false;

mobile/lib/repositories/drift_album_api_repository.dart

@@ -22,7 +22,9 @@ class DriftAlbumApiRepository extends ApiRepository {
     String? description,
   }) async {
     final responseDto = await checkNull(
-      _api.createAlbum(CreateAlbumDto(albumName: name, description: description, assetIds: assetIds.toList())),
+      _api.createAlbum(
+        CreateAlbumDto(albumName: name, description: description.toOptional(), assetIds: assetIds.toList().toOptional()),
+      ),
     );
 
     return responseDto.toRemoteAlbum(owner);
@@ -73,11 +75,11 @@ class DriftAlbumApiRepository extends ApiRepository {
       _api.updateAlbumInfo(
         albumId,
         UpdateAlbumDto(
-          albumName: name,
-          description: description,
-          albumThumbnailAssetId: thumbnailAssetId,
-          isActivityEnabled: isActivityEnabled,
-          order: apiOrder,
+          albumName: name.toOptional(),
+          description: description.toOptional(),
+          albumThumbnailAssetId: thumbnailAssetId.toOptional(),
+          isActivityEnabled: isActivityEnabled.toOptional(),
+          order: apiOrder.toOptional(),
         ),
       ),
     );
@@ -99,7 +101,9 @@ class DriftAlbumApiRepository extends ApiRepository {
   }
 
   Future<bool> setActivityStatus(String albumId, bool isEnabled) async {
-    final response = await checkNull(_api.updateAlbumInfo(albumId, UpdateAlbumDto(isActivityEnabled: isEnabled)));
+    final response = await checkNull(
+      _api.updateAlbumInfo(albumId, UpdateAlbumDto(isActivityEnabled: isEnabled.toOptional())),
+    );
     return response.isActivityEnabled;
   }
 }

mobile/lib/repositories/folder_api.repository.dart

@@ -17,7 +17,7 @@ class FolderApiRepository extends ApiRepository {
   Future<List<String>> getAllUniquePaths() async {
     try {
       final list = await _api.getUniqueOriginalPaths();
-      return list ?? [];
+      return list;
     } catch (e, stack) {
       _log.severe("Failed to fetch unique original links", e, stack);
       return [];
@@ -26,8 +26,8 @@ class FolderApiRepository extends ApiRepository {
 
   Future<List<RemoteAssetExif>> getAssetsForPath(String? path) async {
     try {
-      final list = await _api.getAssetsByOriginalPath(path ?? '/');
-      return list != null ? list.map((e) => e.toDtoWithExif()).toList() : [];
+      final list = await _api.getAssetsByOriginalPath(path: path ?? '/');
+      return list.map((e) => e.toDtoWithExif()).toList();
     } catch (e, stack) {
       _log.severe("Failed to fetch Assets by original path", e, stack);
       return [];

mobile/lib/repositories/partner_api.repository.dart

@@ -16,7 +16,9 @@ class PartnerApiRepository extends ApiRepository {
 
   Future<List<UserDto>> getAll(Direction direction) async {
     final response = await checkNull(
-      _api.getPartners(direction == Direction.sharedByMe ? PartnerDirection.by : PartnerDirection.with_),
+      _api.getPartners(
+        direction: direction == Direction.sharedByMe ? PartnerDirection.sharedBy : PartnerDirection.sharedWith,
+      ),
     );
     return response.map(UserConverter.fromPartnerDto).toList();
   }

mobile/lib/repositories/person_api.repository.dart

@@ -18,7 +18,7 @@ class PersonApiRepository extends ApiRepository {
 
   Future<PersonDto> update(String id, {String? name, DateTime? birthday}) async {
     final birthdayUtc = birthday == null ? null : DateTime.utc(birthday.year, birthday.month, birthday.day);
-    final dto = PersonUpdateDto(name: name, birthDate: birthdayUtc);
+    final dto = PersonUpdateDto(name: name.toOptional(), birthDate: birthdayUtc.toOptional());
     final response = await checkNull(_api.updatePerson(id, dto));
     return _toPerson(response);
   }

mobile/lib/repositories/sessions_api.repository.dart

@@ -15,7 +15,13 @@ class SessionsAPIRepository extends ApiRepository {
 
   Future<SessionCreateResponse> createSession(String deviceType, String deviceOS, {int? duration}) async {
     final dto = await checkNull(
-      _api.createSession(SessionCreateDto(deviceType: deviceType, deviceOS: deviceOS, duration: duration)),
+      _api.createSession(
+        SessionCreateDto(
+          deviceType: deviceType.toOptional(),
+          deviceOs: deviceOS.toOptional(),
+          duration: duration.toOptional(),
+        ),
+      ),
     );
 
     return SessionCreateResponse(

mobile/lib/routing/auth_guard.dart

@@ -47,7 +47,7 @@ class AuthGuard extends AutoRouteGuard {
     _validateInFlight = true;
     try {
       final res = await _apiService.authenticationApi.validateAccessToken();
-      if (res == null || res.authStatus != true) {
+      if (res.authStatus != true) {
         // Token may have changed during validation (user logged out + logged in
         // again); only act if it still applies to the current session.
         if (Store.tryGet(StoreKey.accessToken) != token) {

mobile/lib/routing/locked_guard.dart

@@ -24,11 +24,6 @@ class LockedGuard extends AutoRouteGuard {
   void onNavigation(NavigationResolver resolver, StackRouter router) async {
     final authStatus = await _apiService.authenticationApi.getAuthStatus();
 
-    if (authStatus == null) {
-      resolver.next(false);
-      return;
-    }
-
     /// Check if a pincode has been created but this user. Show the form to create if not exist
     if (!authStatus.pinCode) {
       unawaited(router.push(PinAuthRoute(createPinCode: true)));
@@ -55,7 +50,7 @@ class LockedGuard extends AutoRouteGuard {
         return;
       }
 
-      await _apiService.authenticationApi.unlockAuthSession(SessionUnlockDto(pinCode: securePinCode));
+      await _apiService.authenticationApi.unlockAuthSession(SessionUnlockDto(pinCode: securePinCode.toOptional()));
 
       resolver.next(true);
     } on PlatformException catch (error) {

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';
@@ -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);
     }
   }
 
@@ -120,7 +120,7 @@ class AuthService {
       _authRepository.clearLocalData(),
       Store.delete(StoreKey.currentUser),
       Store.delete(StoreKey.accessToken),
-      SettingsRepository.instance.clear(const [
+      MetadataRepository.instance.clear(const [
         .networkAutoEndpointSwitching,
         .networkPreferredWifiName,
         .networkLocalEndpoint,

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/services/map.service.dart

@@ -36,7 +36,7 @@ class MapService with ErrorLoggerMixin {
           fileCreatedBefore: fileCreatedBefore,
         );
 
-        return markers?.map(MapMarker.fromDto) ?? [];
+        return markers.map(MapMarker.fromDto);
       },
       defaultValue: [],
       errorMessage: "Failed to get map markers",

mobile/lib/services/oauth.service.dart

@@ -18,10 +18,10 @@ class OAuthService {
     log.info("Starting OAuth flow with redirect URI: $redirectUri");
 
     final dto = await _apiService.oAuthApi.startOAuth(
-      OAuthConfigDto(redirectUri: redirectUri, state: state, codeChallenge: codeChallenge),
+      OAuthConfigDto(redirectUri: redirectUri, state: state.toOptional(), codeChallenge: codeChallenge.toOptional()),
     );
 
-    final authUrl = dto?.url;
+    final authUrl = dto.url;
     log.info('Received Authorization URL: $authUrl');
 
     return authUrl;
@@ -37,7 +37,7 @@ class OAuthService {
     }
 
     return await _apiService.oAuthApi.finishOAuth(
-      OAuthCallbackDto(url: result, state: state, codeVerifier: codeVerifier),
+      OAuthCallbackDto(url: result, state: state.toOptional(), codeVerifier: codeVerifier.toOptional()),
     );
   }
 }

mobile/lib/services/server_info.service.dart

@@ -17,9 +17,7 @@ class ServerInfoService {
   Future<ServerDiskInfo?> getDiskInfo() async {
     try {
       final dto = await _apiService.serverInfoApi.getStorage();
-      if (dto != null) {
-        return ServerDiskInfo.fromDto(dto);
-      }
+      return ServerDiskInfo.fromDto(dto);
     } catch (e) {
       dPrint(() => "Error [getDiskInfo] ${e.toString()}");
     }
@@ -29,9 +27,7 @@ class ServerInfoService {
   Future<ServerVersion?> getServerVersion() async {
     try {
       final dto = await _apiService.serverInfoApi.getServerVersion();
-      if (dto != null) {
-        return ServerVersion.fromDto(dto);
-      }
+      return ServerVersion.fromDto(dto);
     } catch (e) {
       dPrint(() => "Error [getServerVersion] ${e.toString()}");
     }
@@ -41,9 +37,7 @@ class ServerInfoService {
   Future<ServerFeatures?> getServerFeatures() async {
     try {
       final dto = await _apiService.serverInfoApi.getServerFeatures();
-      if (dto != null) {
-        return ServerFeatures.fromDto(dto);
-      }
+      return ServerFeatures.fromDto(dto);
     } catch (e) {
       dPrint(() => "Error [getServerFeatures] ${e.toString()}");
     }
@@ -53,9 +47,7 @@ class ServerInfoService {
   Future<ServerConfig?> getServerConfig() async {
     try {
       final dto = await _apiService.serverInfoApi.getServerConfig();
-      if (dto != null) {
-        return ServerConfig.fromDto(dto);
-      }
+      return ServerConfig.fromDto(dto);
     } catch (e) {
       dPrint(() => "Error [getServerConfig] ${e.toString()}");
     }

mobile/lib/services/shared_link.service.dart

@@ -16,7 +16,7 @@ class SharedLinkService {
   Future<AsyncValue<List<SharedLink>>> getAllSharedLinks() async {
     try {
       final list = await _apiService.sharedLinksApi.getAllSharedLinks();
-      return list != null ? AsyncData(list.map(SharedLink.fromDto).toList()) : const AsyncData([]);
+      return AsyncData(list.map(SharedLink.fromDto).toList());
     } catch (e, stack) {
       _log.severe("Failed to fetch shared links", e, stack);
       return AsyncError(e, stack);
@@ -43,39 +43,37 @@ class SharedLinkService {
     DateTime? expiresAt,
   }) async {
     try {
-      final type = albumId != null ? SharedLinkType.ALBUM : SharedLinkType.INDIVIDUAL;
+      final type = albumId != null ? SharedLinkType.album : SharedLinkType.individual;
       SharedLinkCreateDto? dto;
-      if (type == SharedLinkType.ALBUM) {
+      if (type == SharedLinkType.album) {
         dto = SharedLinkCreateDto(
           type: type,
-          albumId: albumId,
-          showMetadata: showMeta,
-          allowDownload: allowDownload,
-          allowUpload: allowUpload,
-          expiresAt: expiresAt,
-          description: description,
-          password: password,
-          slug: slug,
+          albumId: albumId.toOptional(),
+          showMetadata: showMeta.toOptional(),
+          allowDownload: allowDownload.toOptional(),
+          allowUpload: allowUpload.toOptional(),
+          expiresAt: expiresAt.toOptional(),
+          description: description.toOptional(),
+          password: password.toOptional(),
+          slug: slug.toOptional(),
         );
       } else if (assetIds != null) {
         dto = SharedLinkCreateDto(
           type: type,
-          showMetadata: showMeta,
-          allowDownload: allowDownload,
-          allowUpload: allowUpload,
-          expiresAt: expiresAt,
-          description: description,
-          password: password,
-          slug: slug,
-          assetIds: assetIds,
+          showMetadata: showMeta.toOptional(),
+          allowDownload: allowDownload.toOptional(),
+          allowUpload: allowUpload.toOptional(),
+          expiresAt: expiresAt.toOptional(),
+          description: description.toOptional(),
+          password: password.toOptional(),
+          slug: slug.toOptional(),
+          assetIds: assetIds.toOptional(),
         );
       }
 
       if (dto != null) {
         final responseDto = await _apiService.sharedLinksApi.createSharedLink(dto);
-        if (responseDto != null) {
-          return SharedLink.fromDto(responseDto);
-        }
+        return SharedLink.fromDto(responseDto);
       }
     } catch (e) {
       _log.severe("Failed to create shared link", e);
@@ -98,19 +96,17 @@ class SharedLinkService {
       final responseDto = await _apiService.sharedLinksApi.updateSharedLink(
         id,
         SharedLinkEditDto(
-          showMetadata: showMeta,
-          allowDownload: allowDownload,
-          allowUpload: allowUpload,
-          expiresAt: expiresAt,
-          description: description,
-          password: password,
-          slug: slug,
-          changeExpiryTime: changeExpiry,
+          showMetadata: showMeta.toOptional(),
+          allowDownload: allowDownload.toOptional(),
+          allowUpload: allowUpload.toOptional(),
+          expiresAt: expiresAt.toOptional(),
+          description: description.toOptional(),
+          password: password.toOptional(),
+          slug: slug.toOptional(),
+          changeExpiryTime: changeExpiry.toOptional(),
         ),
       );
-      if (responseDto != null) {
-        return SharedLink.fromDto(responseDto);
-      }
+      return SharedLink.fromDto(responseDto);
     } catch (e) {
       _log.severe("Failed to update shared link id - $id", e);
     }

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/openapi_compat.dart

@@ -0,0 +1,42 @@
+import 'package:openapi/api.dart';
+
+/// Registers backward-compatibility back-fills so the generated client tolerates
+/// responses from older Immich servers (fields newer DTOs expect but older
+/// servers omit). Call once at startup, before any API request.
+///
+/// The mechanism ([ApiCompat]) lives in the generated client; the rules live
+/// here because the defaults are app/server-version knowledge. Keyed by DTO
+/// type, so a renamed or removed DTO is a compile error. Static-only rule lists
+/// are `const`; lists using a DTO's `toJson()` or `DateTime.now()` are built at
+/// startup.
+void configureOpenApiCompat() {
+  ApiCompat.configure({
+    UserPreferencesResponseDto: [
+      const .new('download.includeEmbeddedVideos', false),
+      .new('folders', const FoldersResponse(enabled: false, sidebarWeb: false).toJson()),
+      .new('memories', const MemoriesResponse(enabled: true, duration: 5).toJson()),
+      .new('ratings', const RatingsResponse(enabled: false).toJson()),
+      .new('people', const PeopleResponse(enabled: true, sidebarWeb: false).toJson()),
+      .new('tags', const TagsResponse(enabled: false, sidebarWeb: false).toJson()),
+      .new('sharedLinks', const SharedLinksResponse(enabled: true, sidebarWeb: false).toJson()),
+      .new('cast', const CastResponse(gCastEnabled: false).toJson()),
+      const .new('albums', {'defaultAssetOrder': 'desc'}),
+    ],
+    ServerConfigDto: const [
+      .new('mapLightStyleUrl', 'https://tiles.immich.cloud/v1/style/light.json'),
+      .new('mapDarkStyleUrl', 'https://tiles.immich.cloud/v1/style/dark.json'),
+    ],
+    UserResponseDto: [.new('profileChangedAt', DateTime.now().toIso8601String())],
+    AssetResponseDto: [
+      const .new('visibility', 'timeline'),
+      .new('createdAt', DateTime.now().toIso8601String()),
+      const .new('isEdited', false),
+    ],
+    UserAdminResponseDto: [.new('profileChangedAt', DateTime.now().toIso8601String())],
+    LoginResponseDto: const [.new('isOnboarded', false)],
+    SyncUserV1: [.new('profileChangedAt', DateTime.now().toIso8601String()), const .new('hasProfileImage', false)],
+    SyncAssetV1: const [.new('isEdited', false)],
+    ServerFeaturesDto: const [.new('ocr', false)],
+    MemoriesResponse: const [.new('duration', 5)],
+  });
+}

mobile/lib/utils/openapi_patching.dart

@@ -1,82 +0,0 @@
-import 'package:openapi/api.dart';
-
-dynamic upgradeDto(dynamic value, String targetType) {
-  switch (targetType) {
-    case 'UserPreferencesResponseDto':
-      if (value is Map) {
-        addDefault(value, 'download.includeEmbeddedVideos', false);
-        addDefault(value, 'folders', FoldersResponse(enabled: false, sidebarWeb: false).toJson());
-        addDefault(value, 'memories', MemoriesResponse(enabled: true, duration: 5).toJson());
-        addDefault(value, 'ratings', RatingsResponse(enabled: false).toJson());
-        addDefault(value, 'people', PeopleResponse(enabled: true, sidebarWeb: false).toJson());
-        addDefault(value, 'tags', TagsResponse(enabled: false, sidebarWeb: false).toJson());
-        addDefault(value, 'sharedLinks', SharedLinksResponse(enabled: true, sidebarWeb: false).toJson());
-        addDefault(value, 'cast', CastResponse(gCastEnabled: false).toJson());
-        addDefault(value, 'albums', {'defaultAssetOrder': 'desc'});
-      }
-      break;
-    case 'ServerConfigDto':
-      if (value is Map) {
-        addDefault(value, 'mapLightStyleUrl', 'https://tiles.immich.cloud/v1/style/light.json');
-        addDefault(value, 'mapDarkStyleUrl', 'https://tiles.immich.cloud/v1/style/dark.json');
-      }
-    case 'UserResponseDto':
-      if (value is Map) {
-        addDefault(value, 'profileChangedAt', DateTime.now().toIso8601String());
-      }
-      break;
-    case 'AssetResponseDto':
-      if (value is Map) {
-        addDefault(value, 'visibility', 'timeline');
-        addDefault(value, 'createdAt', DateTime.now().toIso8601String());
-        addDefault(value, 'isEdited', false);
-      }
-      break;
-    case 'UserAdminResponseDto':
-      if (value is Map) {
-        addDefault(value, 'profileChangedAt', DateTime.now().toIso8601String());
-      }
-      break;
-    case 'LoginResponseDto':
-      if (value is Map) {
-        addDefault(value, 'isOnboarded', false);
-      }
-      break;
-    case 'SyncUserV1':
-      if (value is Map) {
-        addDefault(value, 'profileChangedAt', DateTime.now().toIso8601String());
-        addDefault(value, 'hasProfileImage', false);
-      }
-    case 'SyncAssetV1':
-      if (value is Map) {
-        addDefault(value, 'isEdited', false);
-      }
-    case 'ServerFeaturesDto':
-      if (value is Map) {
-        addDefault(value, 'ocr', false);
-      }
-      break;
-    case 'MemoriesResponse':
-      if (value is Map) {
-        addDefault(value, 'duration', 5);
-      }
-      break;
-  }
-}
-
-addDefault(dynamic value, String keys, dynamic defaultValue) {
-  // Loop through the keys and assign the default value if the key is not present
-  List<String> keyList = keys.split('.');
-  dynamic current = value;
-
-  for (int i = 0; i < keyList.length - 1; i++) {
-    if (current[keyList[i]] == null) {
-      current[keyList[i]] = {};
-    }
-    current = current[keyList[i]];
-  }
-
-  if (current[keyList.last] == null) {
-    current[keyList.last] = defaultValue;
-  }
-}

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/.gitignore

@@ -1,19 +0,0 @@
-# See https://dart.dev/guides/libraries/private-files
-
-.dart_tool/
-.packages
-build/
-
-# Except for application packages
-pubspec.lock
-
-doc/api/
-
-# IntelliJ
-*.iml
-*.ipr
-*.iws
-.idea/
-
-# Mac
-.DS_Store

mobile/openapi/.openapi-generator-ignore

@@ -1,23 +0,0 @@
-# OpenAPI Generator Ignore
-# Generated by openapi-generator https://github.com/openapitools/openapi-generator
-
-# Use this file to prevent files from being overwritten by the generator.
-# The patterns follow closely to .gitignore or .dockerignore.
-
-# As an example, the C# client generator defines ApiClient.cs.
-# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
-#ApiClient.cs
-
-# You can match any string of characters against a directory, file or extension with a single asterisk (*):
-#foo/*/qux
-# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
-
-# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
-#foo/**/qux
-# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
-
-# You can also negate patterns with an exclamation (!).
-# For example, you can ignore all files in a docs folder with the file extension .md:
-#docs/*.md
-# Then explicitly reverse the ignore rule for a single file:
-#!docs/README.md