pass cancel token to icloud download

more cleanup
use pattern matching
2026-05-28 02:22:34 -04:00 · 2026-05-28 01:57:39 -04:00 · 2026-05-28 00:44:11 -04:00 · 2026-05-27 20:02:51 -04:00 · 2026-05-27 17:33:49 -04:00 · 2026-05-28 01:20:32 +05:30
41 changed files with 544 additions and 801 deletions
@@ -1,39 +1,39 @@
 dev:
-	@printf "This command has been removed. Please use:\n\n    mise dev          # or mise //:dev from another directory\n\n"\n\n >&2 && exit 1
+	@trap 'make dev-down' EXIT; COMPOSE_BAKE=true docker compose -f ./docker/docker-compose.dev.yml up --remove-orphans

 dev-down:
-	@printf "This command has been removed. Please use:\n\n    mise dev-down          # or mise //:dev-down from another directory\n\n"\n\n >&2 && exit 1
+	docker compose -f ./docker/docker-compose.dev.yml down --remove-orphans

 dev-update:
-	@printf "This command has been removed. Please use:\n\n    mise dev-update          # or mise //:dev-update from another directory\n\n"\n\n >&2 && exit 1
+	@trap 'make dev-down' EXIT; COMPOSE_BAKE=true docker compose -f ./docker/docker-compose.dev.yml up --build -V --remove-orphans

 dev-scale:
-	@printf "This command has been removed. Please use:\n\n    mise dev-scale          # or mise //:dev-scale from another directory\n\n"\n\n >&2 && exit 1
+	@trap 'make dev-down' EXIT; COMPOSE_BAKE=true docker compose -f ./docker/docker-compose.dev.yml up --build -V --scale immich-server=3 --remove-orphans

 dev-docs:
 	npm --prefix docs run start

 .PHONY: e2e
 e2e:
-	@printf "This command has been removed. Please use:\n\n    mise e2e          # or mise //:e2e from another directory\n\n"\n\n >&2 && exit 1
+	@trap 'make e2e-down' EXIT; COMPOSE_BAKE=true docker compose -f ./e2e/docker-compose.yml up --remove-orphans

 e2e-dev:
-	@printf "This command has been removed. Please use:\n\n    mise e2e-dev          # or mise //:e2e-dev from another directory\n\n"\n\n >&2 && exit 1
+	@trap 'make e2e-down' EXIT; COMPOSE_BAKE=true docker compose -f ./e2e/docker-compose.dev.yml up --remove-orphans

 e2e-update:
-	@printf "This command has been removed. Please use:\n\n    mise e2e-update          # or mise //:e2e-update from another directory\n\n"\n\n >&2 && exit 1
+	@trap 'make e2e-down' EXIT; COMPOSE_BAKE=true docker compose -f ./e2e/docker-compose.yml up --build -V --remove-orphans

 e2e-down:
-	@printf "This command has been removed. Please use:\n\n    mise e2e-down          # or mise //:e2e-down from another directory\n\n"\n\n >&2 && exit 1
+	docker compose -f ./e2e/docker-compose.yml down --remove-orphans

 prod:
-	@printf "This command has been removed. Please use:\n\n    mise prod          # or mise //:prod from another directory\n\n"\n\n >&2 && exit 1
+	@trap 'make prod-down' EXIT; COMPOSE_BAKE=true docker compose -f ./docker/docker-compose.prod.yml up --build -V --remove-orphans

 prod-down:
-	@printf "This command has been removed. Please use:\n\n    mise prod-down          # or mise //:prod-down from another directory\n\n"\n\n >&2 && exit 1
+	docker compose -f ./docker/docker-compose.prod.yml down --remove-orphans

 prod-scale:
-	@printf "This command has been removed. Please use:\n\n    mise prod-scale          # or mise //:prod-scale from another directory\n\n"\n\n >&2 && exit 1
+	@trap 'make prod-down' EXIT; COMPOSE_BAKE=true docker compose -f ./docker/docker-compose.prod.yml up --build -V --scale immich-server=3 --scale immich-microservices=3 --remove-orphans

 .PHONY: open-api
 open-api:
@@ -84,72 +84,6 @@ run = [
 dir = "server"
 run = "node ./dist/bin/sync-sql.js"

-# TODO dev, prod, and e2e should be de-duplicated by using env but for some reason I ran into issues
-[tasks.dev]
-depends = "//:plugins"
-dir = "docker"
-interactive = true
-env = { COMPOSE_BAKE = true }
-run = "docker compose -f ./docker-compose.dev.yml up --remove-orphans"
-depends_post = "//:dev-down"
-
-[tasks.dev-update]
-run = { task = "//:dev", args = ["--build", "-V"] }
-
-[tasks.dev-scale]
-run = { task = "//:dev", args = ["--build", "-V", "--scale immich-server=3"] }
-
-[tasks.dev-down]
-dir = "docker"
-run = "docker compose -f ./docker-compose.dev.yml down --remove-orphans"
-
-[tasks.prod]
-depends = "//:plugins"
-dir = "docker"
-interactive = true
-env = { COMPOSE_BAKE = true }
-run = "docker compose -f ./docker-compose.prod.yml up --remove-orphans"
-depends_post = "//:prod-down"
-
-[tasks.prod-scale]
-run = { task = "//:prod", args = [
-  "--build",
-  "-V",
-  "--scale immich-server=3",
-  "--scale immich-microservices",
-] }
-
-[tasks.prod-down]
-dir = "docker"
-run = "docker compose -f ./docker-compose.prod.yml down --remove-orphans"
-
-[tasks.e2e]
-depends = "//:plugins"
-dir = "e2e"
-interactive = true
-env = { COMPOSE_BAKE = true }
-run = "docker compose -f ./docker-compose.yml up --remove-orphans"
-depends_post = "//:e2e-down"
-
-[tasks.e2e-dev]
-depends = "//:plugins"
-dir = "e2e"
-interactive = true
-env = { COMPOSE_BAKE = true }
-run = "docker compose -f ./docker-compose.dev.yml up --remove-orphans"
-depends_post = "//:e2e-dev-down"
-
-[tasks.e2e-update]
-run = { task = "//:e2e", args = ["--build", '-V'] }
-
-[tasks.e2e-down]
-dir = "e2e"
-run = "docker compose -f ./docker-compose.yml down --remove-orphans"
-
-[tasks.e2e-dev-down]
-dir = "e2e"
-run = "docker compose -f ./docker-compose.dev.yml down --remove-orphans"
-
 # SDK tasks
 [tasks."sdk:install"]
 dir = "packages/sdk"
@@ -1,14 +1,25 @@
+import 'package:flutter/material.dart';
+import 'package:immich_mobile/constants/colors.dart';
+import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/config/album_config.dart';
 import 'package:immich_mobile/domain/models/config/backup_config.dart';
 import 'package:immich_mobile/domain/models/config/cleanup_config.dart';
 import 'package:immich_mobile/domain/models/config/image_config.dart';
 import 'package:immich_mobile/domain/models/config/map_config.dart';
+import 'package:immich_mobile/domain/models/config/network_config.dart';
 import 'package:immich_mobile/domain/models/config/slideshow_config.dart';
 import 'package:immich_mobile/domain/models/config/theme_config.dart';
 import 'package:immich_mobile/domain/models/config/timeline_config.dart';
 import 'package:immich_mobile/domain/models/config/viewer_config.dart';
+import 'package:immich_mobile/domain/models/log.model.dart';
+import 'package:immich_mobile/domain/models/metadata_key.dart';
+import 'package:immich_mobile/domain/models/timeline.model.dart';
+import 'package:immich_mobile/providers/album/album_sort_by_options.provider.dart';
+
+const defaultConfig = AppConfig();

 class AppConfig {
+  final LogLevel logLevel;
  final ThemeConfig theme;
  final CleanupConfig cleanup;
  final MapConfig map;
@@ -18,8 +29,10 @@ class AppConfig {
  final SlideshowConfig slideshow;
  final AlbumConfig album;
  final BackupConfig backup;
+  final NetworkConfig network;

  const AppConfig({
+    this.logLevel = .info,
    this.theme = const .new(),
    this.cleanup = const .new(),
    this.map = const .new(),
@@ -29,9 +42,11 @@ class AppConfig {
    this.slideshow = const .new(),
    this.album = const .new(),
    this.backup = const .new(),
+    this.network = const .new(),
  });

  AppConfig copyWith({
+    LogLevel? logLevel,
    ThemeConfig? theme,
    CleanupConfig? cleanup,
    MapConfig? map,
@@ -41,7 +56,9 @@ class AppConfig {
    SlideshowConfig? slideshow,
    AlbumConfig? album,
    BackupConfig? backup,
+    NetworkConfig? network,
  }) => .new(
+    logLevel: logLevel ?? this.logLevel,
    theme: theme ?? this.theme,
    cleanup: cleanup ?? this.cleanup,
    map: map ?? this.map,
@@ -51,12 +68,14 @@ class AppConfig {
    slideshow: slideshow ?? this.slideshow,
    album: album ?? this.album,
    backup: backup ?? this.backup,
+    network: network ?? this.network,
  );

  @override
  bool operator ==(Object other) =>
      identical(this, other) ||
      (other is AppConfig &&
+          other.logLevel == logLevel &&
          other.theme == theme &&
          other.cleanup == cleanup &&
          other.map == map &&
@@ -65,12 +84,118 @@ class AppConfig {
          other.viewer == viewer &&
          other.slideshow == slideshow &&
          other.album == album &&
-          other.backup == backup);
+          other.backup == backup &&
+          other.network == network);

  @override
-  int get hashCode => Object.hash(theme, cleanup, map, timeline, image, viewer, slideshow, album, backup);
+  int get hashCode =>
+      Object.hash(logLevel, theme, cleanup, map, timeline, image, viewer, slideshow, album, backup, network);

  @override
  String toString() =>
-      'AppConfig(theme: $theme, cleanup: $cleanup, map: $map, timeline: $timeline, image: $image, viewer: $viewer, slideshow: $slideshow, album: $album, backup: $backup)';
+      'AppConfig(logLevel: $logLevel, theme: $theme, cleanup: $cleanup, map: $map, timeline: $timeline, image: $image, viewer: $viewer, slideshow: $slideshow, album: $album, backup: $backup, network: $network)';
+
+  T read<T extends Object>(MetadataKey<T> key) =>
+      (switch (key) {
+            .logLevel => logLevel,
+            .themePrimaryColor => theme.primaryColor,
+            .themeMode => theme.mode,
+            .themeDynamic => theme.dynamicTheme,
+            .themeColorfulInterface => theme.colorfulInterface,
+            .imagePreferRemote => image.preferRemote,
+            .imageLoadOriginal => image.loadOriginal,
+            .viewerLoopVideo => viewer.loopVideo,
+            .viewerLoadOriginalVideo => viewer.loadOriginalVideo,
+            .viewerAutoPlayVideo => viewer.autoPlayVideo,
+            .viewerTapToNavigate => viewer.tapToNavigate,
+            .networkAutoEndpointSwitching => network.autoEndpointSwitching,
+            .networkPreferredWifiName => network.preferredWifiName,
+            .networkLocalEndpoint => network.localEndpoint,
+            .networkExternalEndpointList => network.externalEndpointList,
+            .networkCustomHeaders => network.customHeaders,
+            .albumSortMode => album.sortMode,
+            .albumIsReverse => album.isReverse,
+            .albumIsGrid => album.isGrid,
+            .backupEnabled => backup.enabled,
+            .backupUseCellularForVideos => backup.useCellularForVideos,
+            .backupUseCellularForPhotos => backup.useCellularForPhotos,
+            .backupRequireCharging => backup.requireCharging,
+            .backupTriggerDelay => backup.triggerDelay,
+            .backupSyncAlbums => backup.syncAlbums,
+            .timelineTilesPerRow => timeline.tilesPerRow,
+            .timelineGroupAssetsBy => timeline.groupAssetsBy,
+            .timelineStorageIndicator => timeline.storageIndicator,
+            .mapShowFavoriteOnly => map.favoritesOnly,
+            .mapRelativeDate => map.relativeDays,
+            .mapIncludeArchived => map.includeArchived,
+            .mapThemeMode => map.themeMode,
+            .mapWithPartners => map.withPartners,
+            .cleanupKeepFavorites => cleanup.keepFavorites,
+            .cleanupKeepMediaType => cleanup.keepMediaType,
+            .cleanupKeepAlbumIds => cleanup.keepAlbumIds,
+            .cleanupCutoffDaysAgo => cleanup.cutoffDaysAgo,
+            .cleanupDefaultsInitialized => cleanup.defaultsInitialized,
+            .slideshowTransition => slideshow.transition,
+            .slideshowRepeat => slideshow.repeat,
+            .slideshowDuration => slideshow.duration,
+            .slideshowLook => slideshow.look,
+            .slideshowDirection => slideshow.direction,
+          })
+          as T;
+
+  factory AppConfig.fromEntries(Map<MetadataKey<Object>, Object> entries) {
+    var config = const AppConfig();
+    for (final MapEntry(key: key, value: value) in entries.entries) {
+      config = config.write(key, value);
+    }
+    return config;
+  }
+
+  AppConfig write<T extends Object>(MetadataKey<T> key, T value) {
+    return switch (key) {
+      .logLevel => copyWith(logLevel: value as LogLevel),
+      .themePrimaryColor => copyWith(theme: theme.copyWith(primaryColor: value as ImmichColorPreset)),
+      .themeMode => copyWith(theme: theme.copyWith(mode: value as ThemeMode)),
+      .themeDynamic => copyWith(theme: theme.copyWith(dynamicTheme: value as bool)),
+      .themeColorfulInterface => copyWith(theme: theme.copyWith(colorfulInterface: value as bool)),
+      .imagePreferRemote => copyWith(image: image.copyWith(preferRemote: value as bool)),
+      .imageLoadOriginal => copyWith(image: image.copyWith(loadOriginal: value as bool)),
+      .viewerLoopVideo => copyWith(viewer: viewer.copyWith(loopVideo: value as bool)),
+      .viewerLoadOriginalVideo => copyWith(viewer: viewer.copyWith(loadOriginalVideo: value as bool)),
+      .viewerAutoPlayVideo => copyWith(viewer: viewer.copyWith(autoPlayVideo: value as bool)),
+      .viewerTapToNavigate => copyWith(viewer: viewer.copyWith(tapToNavigate: value as bool)),
+      .networkAutoEndpointSwitching => copyWith(network: network.copyWith(autoEndpointSwitching: value as bool)),
+      .networkPreferredWifiName => copyWith(network: network.copyWith(preferredWifiName: (value as String))),
+      .networkLocalEndpoint => copyWith(network: network.copyWith(localEndpoint: (value as String))),
+      .networkExternalEndpointList => copyWith(network: network.copyWith(externalEndpointList: value as List<String>)),
+      .networkCustomHeaders => copyWith(network: network.copyWith(customHeaders: value as Map<String, String>)),
+      .albumSortMode => copyWith(album: album.copyWith(sortMode: value as AlbumSortMode)),
+      .albumIsReverse => copyWith(album: album.copyWith(isReverse: value as bool)),
+      .albumIsGrid => copyWith(album: album.copyWith(isGrid: value as bool)),
+      .backupEnabled => copyWith(backup: backup.copyWith(enabled: value as bool)),
+      .backupUseCellularForVideos => copyWith(backup: backup.copyWith(useCellularForVideos: value as bool)),
+      .backupUseCellularForPhotos => copyWith(backup: backup.copyWith(useCellularForPhotos: value as bool)),
+      .backupRequireCharging => copyWith(backup: backup.copyWith(requireCharging: value as bool)),
+      .backupTriggerDelay => copyWith(backup: backup.copyWith(triggerDelay: value as int)),
+      .backupSyncAlbums => copyWith(backup: backup.copyWith(syncAlbums: value as bool)),
+      .timelineTilesPerRow => copyWith(timeline: timeline.copyWith(tilesPerRow: value as int)),
+      .timelineGroupAssetsBy => copyWith(timeline: timeline.copyWith(groupAssetsBy: value as GroupAssetsBy)),
+      .timelineStorageIndicator => copyWith(timeline: timeline.copyWith(storageIndicator: value as bool)),
+      .mapShowFavoriteOnly => copyWith(map: map.copyWith(favoritesOnly: value as bool)),
+      .mapRelativeDate => copyWith(map: map.copyWith(relativeDays: value as int)),
+      .mapIncludeArchived => copyWith(map: map.copyWith(includeArchived: value as bool)),
+      .mapThemeMode => copyWith(map: map.copyWith(themeMode: value as ThemeMode)),
+      .mapWithPartners => copyWith(map: map.copyWith(withPartners: value as bool)),
+      .cleanupKeepFavorites => copyWith(cleanup: cleanup.copyWith(keepFavorites: value as bool)),
+      .cleanupKeepMediaType => copyWith(cleanup: cleanup.copyWith(keepMediaType: value as AssetKeepType)),
+      .cleanupKeepAlbumIds => copyWith(cleanup: cleanup.copyWith(keepAlbumIds: value as List<String>)),
+      .cleanupCutoffDaysAgo => copyWith(cleanup: cleanup.copyWith(cutoffDaysAgo: value as int)),
+      .cleanupDefaultsInitialized => copyWith(cleanup: cleanup.copyWith(defaultsInitialized: value as bool)),
+      .slideshowTransition => copyWith(slideshow: slideshow.copyWith(transition: value as bool)),
+      .slideshowRepeat => copyWith(slideshow: slideshow.copyWith(repeat: value as bool)),
+      .slideshowDuration => copyWith(slideshow: slideshow.copyWith(duration: value as int)),
+      .slideshowLook => copyWith(slideshow: slideshow.copyWith(look: value as SlideshowLook)),
+      .slideshowDirection => copyWith(slideshow: slideshow.copyWith(direction: value as SlideshowDirection)),
+    };
+  }
 }
@@ -2,15 +2,15 @@ import 'package:flutter/foundation.dart';

 class NetworkConfig {
  final bool autoEndpointSwitching;
-  final String? preferredWifiName;
-  final String? localEndpoint;
+  final String preferredWifiName;
+  final String localEndpoint;
  final List<String> externalEndpointList;
  final Map<String, String> customHeaders;

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

-import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:immich_mobile/constants/colors.dart';
 import 'package:immich_mobile/constants/enums.dart';
-import 'package:immich_mobile/domain/models/config/app_config.dart';
-import 'package:immich_mobile/domain/models/config/system_config.dart';
 import 'package:immich_mobile/domain/models/log.model.dart';
 import 'package:immich_mobile/domain/models/timeline.model.dart';
 import 'package:immich_mobile/providers/album/album_sort_by_options.provider.dart';

-enum MetadataDomain<T extends Object> {
-  appConfig<AppConfig>('config.app'),
-  systemConfig<SystemConfig>('config.system');
+enum MetadataScope {
+  user, // keys with this scope are deleted on logout
+  system;

-  final String prefix;
-  const MetadataDomain(this.prefix);
+  const MetadataScope();
 }

 enum MetadataKey<T extends Object> {
  // Theme
-  themePrimaryColor<ImmichColorPreset>(.appConfig, 'theme.primaryColor', .indigo, _EnumCodec(ImmichColorPreset.values)),
-  themeMode<ThemeMode>(.appConfig, 'theme.mode', .system, _EnumCodec(ThemeMode.values)),
-  themeDynamic<bool>(.appConfig, 'theme.dynamic', false),
-  themeColorfulInterface<bool>(.appConfig, 'theme.colorfulInterface', true),
+  themePrimaryColor<ImmichColorPreset>(codec: _EnumCodec(ImmichColorPreset.values)),
+  themeMode<ThemeMode>(codec: _EnumCodec(ThemeMode.values)),
+  themeDynamic<bool>(),
+  themeColorfulInterface<bool>(),

  // Image
-  imagePreferRemote<bool>(.appConfig, 'image.preferRemote', false),
-  imageLoadOriginal<bool>(.appConfig, 'image.loadOriginal', false),
+  imagePreferRemote<bool>(),
+  imageLoadOriginal<bool>(),

  // Viewer
-  viewerLoopVideo<bool>(.appConfig, 'viewer.loopVideo', true),
-  viewerLoadOriginalVideo<bool>(.appConfig, 'viewer.loadOriginalVideo', false),
-  viewerAutoPlayVideo<bool>(.appConfig, 'viewer.autoPlayVideo', true),
-  viewerTapToNavigate<bool>(.appConfig, 'viewer.tapToNavigate', false),
+  viewerLoopVideo<bool>(),
+  viewerLoadOriginalVideo<bool>(),
+  viewerAutoPlayVideo<bool>(),
+  viewerTapToNavigate<bool>(),

  // Network
-  networkAutoEndpointSwitching<bool>(.systemConfig, 'network.autoEndpointSwitching', false),
-  networkPreferredWifiName<String>(.systemConfig, 'network.preferredWifiName', ''),
-  networkLocalEndpoint<String>(.systemConfig, 'network.localEndpoint', ''),
-  networkExternalEndpointList<List<String>>(
-    .systemConfig,
-    'network.externalEndpointList',
-    [],
-    _ListCodec(_PrimitiveCodec.string),
-  ),
+  networkAutoEndpointSwitching<bool>(scope: .system),
+  networkPreferredWifiName<String>(scope: .system),
+  networkLocalEndpoint<String>(scope: .system),
+  networkExternalEndpointList<List<String>>(scope: .system, codec: _ListCodec(_PrimitiveCodec.string)),
  networkCustomHeaders<Map<String, String>>(
-    .systemConfig,
-    'network.customHeaders',
-    {},
-    _MapCodec(_PrimitiveCodec.string, _PrimitiveCodec.string),
+    scope: .system,
+    codec: _MapCodec(_PrimitiveCodec.string, _PrimitiveCodec.string),
  ),

  // Album
-  albumSortMode<AlbumSortMode>(
-    .appConfig,
-    'album.sortMode',
-    AlbumSortMode.mostRecent,
-    _EnumCodec(AlbumSortMode.values),
-  ),
-  albumIsReverse<bool>(.appConfig, 'album.isReverse', true),
-  albumIsGrid<bool>(.appConfig, 'album.isGrid', false),
+  albumSortMode<AlbumSortMode>(codec: _EnumCodec(AlbumSortMode.values)),
+  albumIsReverse<bool>(),
+  albumIsGrid<bool>(),

  // Backup
-  backupEnabled<bool>(.appConfig, 'backup.enabled', false),
-  backupUseCellularForVideos<bool>(.appConfig, 'backup.useCellularForVideos', false),
-  backupUseCellularForPhotos<bool>(.appConfig, 'backup.useCellularForPhotos', false),
-  backupRequireCharging<bool>(.appConfig, 'backup.requireCharging', false),
-  backupTriggerDelay<int>(.appConfig, 'backup.triggerDelay', 30),
-  backupSyncAlbums<bool>(.appConfig, 'backup.syncAlbums', false),
+  backupEnabled<bool>(),
+  backupUseCellularForVideos<bool>(),
+  backupUseCellularForPhotos<bool>(),
+  backupRequireCharging<bool>(),
+  backupTriggerDelay<int>(),
+  backupSyncAlbums<bool>(),

  // Timeline
-  timelineTilesPerRow<int>(.appConfig, 'timeline.tilesPerRow', 4),
-  timelineGroupAssetsBy<GroupAssetsBy>(
-    .appConfig,
-    'timeline.groupAssetsBy',
-    GroupAssetsBy.day,
-    _EnumCodec(GroupAssetsBy.values),
-  ),
-  timelineStorageIndicator<bool>(.appConfig, 'timeline.storageIndicator', true),
+  timelineTilesPerRow<int>(),
+  timelineGroupAssetsBy<GroupAssetsBy>(codec: _EnumCodec(GroupAssetsBy.values)),
+  timelineStorageIndicator<bool>(),

  // Log
-  logLevel<LogLevel>(.systemConfig, 'log.level', .info, _EnumCodec(LogLevel.values)),
+  logLevel<LogLevel>(scope: .system, codec: _EnumCodec(LogLevel.values)),

  // Map
-  mapShowFavoriteOnly<bool>(.appConfig, 'map.showFavoriteOnly', false),
-  mapRelativeDate<int>(.appConfig, 'map.relativeDate', 0),
-  mapIncludeArchived<bool>(.appConfig, 'map.includeArchived', false),
-  mapThemeMode<ThemeMode>(.appConfig, 'map.themeMode', .system, _EnumCodec(ThemeMode.values)),
-  mapWithPartners<bool>(.appConfig, 'map.withPartners', false),
+  mapShowFavoriteOnly<bool>(),
+  mapRelativeDate<int>(),
+  mapIncludeArchived<bool>(),
+  mapThemeMode<ThemeMode>(codec: _EnumCodec(ThemeMode.values)),
+  mapWithPartners<bool>(),

  // Cleanup
-  cleanupKeepFavorites<bool>(.appConfig, 'cleanup.keepFavorites', true),
-  cleanupKeepMediaType<AssetKeepType>(
-    .appConfig,
-    'cleanup.keepMediaType',
-    AssetKeepType.none,
-    _EnumCodec(AssetKeepType.values),
-  ),
-  cleanupKeepAlbumIds<List<String>>(.appConfig, 'cleanup.keepAlbumIds', [], _ListCodec(_PrimitiveCodec.string)),
-  cleanupCutoffDaysAgo<int>(.appConfig, 'cleanup.cutoffDaysAgo', -1),
-  cleanupDefaultsInitialized<bool>(.appConfig, 'cleanup.defaultsInitialized', false),
+  cleanupKeepFavorites<bool>(),
+  cleanupKeepMediaType<AssetKeepType>(codec: _EnumCodec(AssetKeepType.values)),
+  cleanupKeepAlbumIds<List<String>>(codec: _ListCodec(_PrimitiveCodec.string)),
+  cleanupCutoffDaysAgo<int>(),
+  cleanupDefaultsInitialized<bool>(),

  // Slideshow
-  slideshowTransition<bool>(.appConfig, 'slideshow.transition', true),
-  slideshowRepeat<bool>(.appConfig, 'slideshow.repeat', true),
-  slideshowDuration<int>(.appConfig, 'slideshow.duration', 5),
-  slideshowLook<SlideshowLook>(.appConfig, 'slideshow.look', SlideshowLook.contain, _EnumCodec(SlideshowLook.values)),
-  slideshowDirection<SlideshowDirection>(
-    .appConfig,
-    'slideshow.direction',
-    SlideshowDirection.forward,
-    _EnumCodec(SlideshowDirection.values),
-  );
+  slideshowTransition<bool>(),
+  slideshowRepeat<bool>(),
+  slideshowDuration<int>(),
+  slideshowLook<SlideshowLook>(codec: _EnumCodec(SlideshowLook.values)),
+  slideshowDirection<SlideshowDirection>(codec: _EnumCodec(SlideshowDirection.values));

-  final MetadataDomain domain;
-  final String name;
-  final T defaultValue;
+  final MetadataScope scope;
  final _MetadataCodec<T>? _codecOverride;

-  const MetadataKey(this.domain, this.name, this.defaultValue, [this._codecOverride]);
+  const MetadataKey({this.scope = .user, _MetadataCodec<T>? codec}) : _codecOverride = codec;

-  String get key => '${domain.prefix}.$name';
-
-  _MetadataCodec<T> get _codec => _codecOverride ?? _MetadataCodec.forPrimitive(defaultValue);
+  _MetadataCodec<T> get _codec => _codecOverride ?? _MetadataCodec.forType(T);

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

-  T decode(String raw) => _codec.decode(raw) ?? defaultValue;
-
-  static Map<String, MetadataKey<Object>> asKeyMap() => {for (var value in MetadataKey.values) value.key: value};
+  T decode(String raw) => _codec.decode(raw);
 }

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

  String encode(T value);
-  T? decode(String raw);
+  T decode(String raw);

  static const Map<Type, _MetadataCodec<Object>> _primitives = {
    int: _PrimitiveCodec.integer,
@@ -146,12 +109,10 @@ sealed class _MetadataCodec<T extends Object> {
    DateTime: _DateTimeCodec(),
  };

-  static _MetadataCodec<T> forPrimitive<T extends Object>(T sample) {
-    final codec = _primitives[sample.runtimeType];
+  static _MetadataCodec<T> forType<T extends Object>(Type runtimeType) {
+    final codec = _primitives[runtimeType];
    if (codec == null) {
-      throw StateError(
-        'No primitive codec for ${sample.runtimeType}. Provide an explicit codec when defining the MetadataKey.',
-      );
+      throw StateError('No primitive codec for $runtimeType. Provide an explicit codec when defining the MetadataKey.');
    }
    return codec as _MetadataCodec<T>;
  }
@@ -166,7 +127,7 @@ final class _EnumCodec<T extends Enum> extends _MetadataCodec<T> {
  String encode(T value) => value.name;

  @override
-  T? decode(String raw) => values.firstWhereOrNull((v) => v.name == raw);
+  T decode(String raw) => values.firstWhere((v) => v.name == raw);
 }

 final class _DateTimeCodec extends _MetadataCodec<DateTime> {
@@ -176,7 +137,7 @@ final class _DateTimeCodec extends _MetadataCodec<DateTime> {
  String encode(DateTime value) => value.toIso8601String();

  @override
-  DateTime? decode(String raw) => DateTime.tryParse(raw);
+  DateTime decode(String raw) => DateTime.parse(raw);
 }

 final class _MapCodec<K extends Object, V extends Object> extends _MetadataCodec<Map<K, V>> {
@@ -193,29 +154,26 @@ final class _MapCodec<K extends Object, V extends Object> extends _MetadataCodec
  }

  @override
-  Map<K, V>? decode(String raw) {
+  Map<K, V> decode(String raw) {
    try {
      final decoded = jsonDecode(raw);
      if (decoded is! Map) {
-        return null;
+        return {};
      }
      final result = <K, V>{};
      for (final entry in decoded.entries) {
        final rawKey = entry.key;
        final rawValue = entry.value;
        if (rawKey is! String || rawValue is! String) {
-          return null;
+          return {};
        }
        final k = _keyCodec.decode(rawKey);
        final v = _valueCodec.decode(rawValue);
-        if (k == null || v == null) {
-          return null;
-        }
        result[k] = v;
      }
      return result;
    } on FormatException {
-      return null;
+      return {};
    }
  }
 }
@@ -229,32 +187,29 @@ final class _ListCodec<T extends Object> extends _MetadataCodec<List<T>> {
  String encode(List<T> value) => jsonEncode(value.map(_elementCodec.encode).toList());

  @override
-  List<T>? decode(String raw) {
+  List<T> decode(String raw) {
    try {
      final decoded = jsonDecode(raw);
      if (decoded is! List) {
-        return null;
+        return [];
      }
      final result = <T>[];
      for (final item in decoded) {
        if (item is! String) {
-          return null;
+          return [];
        }
        final element = _elementCodec.decode(item);
-        if (element == null) {
-          return null;
-        }
        result.add(element);
      }
      return result;
    } on FormatException {
-      return null;
+      return [];
    }
  }
 }

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

  const _PrimitiveCodec._(this._parse);

@@ -262,12 +217,12 @@ final class _PrimitiveCodec<T extends Object> extends _MetadataCodec<T> {
  String encode(T value) => value.toString();

  @override
-  T? decode(String raw) => _parse(raw);
+  T decode(String raw) => _parse(raw);

-  static const integer = _PrimitiveCodec<int>._(int.tryParse);
-  static const real = _PrimitiveCodec<double>._(double.tryParse);
-  static const boolean = _PrimitiveCodec<bool>._(bool.tryParse);
+  static const integer = _PrimitiveCodec<int>._(int.parse);
+  static const real = _PrimitiveCodec<double>._(double.parse);
+  static const boolean = _PrimitiveCodec<bool>._(bool.parse);
  static const string = _PrimitiveCodec<String>._(_identity);

-  static String? _identity(String s) => s;
+  static String _identity(String s) => s;
 }
@@ -56,7 +56,7 @@ class LogService {
  }) async {
    final instance = LogService._(logRepository, metadataRepository, shouldBuffer);
    await logRepository.truncate(limit: kLogTruncateLimit);
-    final level = instance._metadataRepository.systemConfig.logLevel;
+    final level = instance._metadataRepository.appConfig.logLevel;
    Logger.root.level = Level.LEVELS.elementAtOrNull(level.index) ?? Level.INFO;
    return instance;
  }
@@ -234,24 +234,13 @@ class RemoteAlbumService {
    final pendingAdds = <Future<void>>[];
    final localById = {for (final a in localAssets) a.id: a};

+    final UploadCallbacks(:onProgress, :onSuccess, :onError, :onICloudProgress) = userCallbacks;
    final wrappedCallbacks = UploadCallbacks(
-      onProgress: (localId, filename, bytes, totalBytes) => _runUploadCallback(
-        'Upload progress callback failed for $localId',
-        () => userCallbacks.onProgress?.call(localId, filename, bytes, totalBytes),
-      ),
-      onICloudProgress: (localId, progress) => _runUploadCallback(
-        'iCloud progress callback failed for $localId',
-        () => userCallbacks.onICloudProgress?.call(localId, progress),
-      ),
-      onError: (localId, errorMessage) => _runUploadCallback(
-        'Upload error callback failed for $localId',
-        () => userCallbacks.onError?.call(localId, errorMessage),
-      ),
+      onProgress: onProgress,
+      onICloudProgress: onICloudProgress,
+      onError: onError,
      onSuccess: (localId, remoteId) {
-        _runUploadCallback(
-          'Upload success callback failed for $localId',
-          () => userCallbacks.onSuccess?.call(localId, remoteId),
-        );
+        onSuccess?.call(localId, remoteId);
        final source = localById[localId];
        if (source == null) {
          _logger.warning('Upload success for $localId but source LocalAsset missing; skipping album link');
@@ -259,29 +248,22 @@ class RemoteAlbumService {
        }
        pendingAdds.add(
          _linkUploadedAssetToAlbum(albumId, remoteId, uploader, source)
-              .then<void>((added) {
-                addedCount += added;
-              })
-              .catchError((Object error, StackTrace stack) {
-                _logger.warning('Failed to add uploaded asset $remoteId to album $albumId', error, stack);
-              }),
+              .then<void>((added) => addedCount += added)
+              .onError(
+                (error, stack) =>
+                    _logger.warning('Failed to add uploaded asset $remoteId to album $albumId', error, stack),
+              ),
        );
      },
    );

-    await _uploadService.uploadManual(localAssets, callbacks: wrappedCallbacks);
+    await _uploadService.uploadManual(localAssets, cancelToken: null, callbacks: wrappedCallbacks);
    await Future.wait(pendingAdds);
    return addedCount;
  }

-  void _runUploadCallback(String message, void Function() callback) {
-    try {
-      callback();
-    } catch (error, stack) {
-      _logger.warning(message, error, stack);
-    }
-  }
-
+  // TODO: this is a poorly designed flow; adding a "stub" just to satisfy FK constraints is hacky,
+  // it goes out of its way to insert one at a time, and it swallows errors that should be surfaced to the user.
  /// Links a freshly-uploaded asset to an album, ensuring the local DB
  /// reflects the change without waiting for the next sync. We call the API
  /// (server is the source of truth), then upsert a placeholder
@@ -1,14 +1,12 @@
+import 'package:collection/collection.dart';
 import 'package:drift/drift.dart';
 import 'package:immich_mobile/domain/models/config/app_config.dart';
-import 'package:immich_mobile/domain/models/config/system_config.dart';
 import 'package:immich_mobile/domain/models/metadata_key.dart';
-import 'package:immich_mobile/extensions/string_extensions.dart';
 import 'package:immich_mobile/infrastructure/entities/metadata.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';

 class MetadataRepository extends DriftDatabaseRepository {
  final Drift _db;
-  final Map<MetadataKey, Object> _cache = {};

  MetadataRepository._(this._db) : super(_db);

@@ -25,153 +23,50 @@ class MetadataRepository extends DriftDatabaseRepository {
  AppConfig _appConfig = const .new();
  AppConfig get appConfig => _appConfig;

-  SystemConfig _systemConfig = const .new();
-  SystemConfig get systemConfig => _systemConfig;
-
  static Future<MetadataRepository> ensureInitialized(Drift db) async {
    if (_instance == null) {
      final instance = MetadataRepository._(db);
-      await instance._hydrate();
+      await instance.refresh();
      _instance = instance;
    }
    return _instance!;
  }

-  static Future<void> refresh() async {
-    instance._cache.clear();
-    instance._appConfig = const .new();
-    instance._systemConfig = const .new();
-    await instance._hydrate();
-  }
-
-  Future<void> _hydrate() async => _hydrateCache(await _db.select(_db.metadataEntity).get());
-
-  T _read<T extends Object>(MetadataKey<T> key) => (_cache[key] as T?) ?? key.defaultValue;
+  Future<void> refresh() async => _applyOverrides(await _db.select(_db.metadataEntity).get());

  Future<void> write<T extends Object, U extends T>(MetadataKey<T> key, U value) async {
-    if (_read(key) == value) {
+    if (value == _appConfig.read(key)) {
      return;
    }

-    await _db
-        .into(_db.metadataEntity)
-        .insertOnConflictUpdate(
-          MetadataEntityCompanion.insert(key: key.key, value: key.encode(value), updatedAt: Value(DateTime.now())),
-        );
-    _updateCache(key, value);
-  }
-
-  Future<void> delete<T extends Object>(MetadataKey<T> key) async {
-    await (_db.delete(_db.metadataEntity)..where((t) => t.key.equals(key.key))).go();
-    _updateCache(key, key.defaultValue);
-  }
-
-  Stream<AppConfig> watchAppConfig() => _watchDomain(.appConfig).distinct();
-
-  Stream<SystemConfig> watchSystemConfig() => _watchDomain(.systemConfig).distinct();
-
-  Stream<T> _watchDomain<T extends Object>(MetadataDomain<T> domain) {
-    final query = _db.select(_db.metadataEntity)..where((t) => t.key.like('${domain.prefix}.%'));
-    return query.watch().map((rows) {
-      _hydrateCache(rows);
-      return domain.config(this);
-    });
-  }
-
-  void _hydrateCache(List<MetadataEntityData> rows) {
-    final keyMap = MetadataKey.asKeyMap();
-    for (final row in rows) {
-      final key = keyMap[row.key];
-      if (key == null) {
-        continue;
-      }
-      _updateCache(key, key.decode(row.value));
+    if (value == defaultConfig.read(key)) {
+      await (_db.delete(_db.metadataEntity)..where((t) => t.key.equals(key.name))).go();
+    } else {
+      await _db
+          .into(_db.metadataEntity)
+          .insertOnConflictUpdate(
+            MetadataEntityCompanion.insert(key: key.name, value: key.encode(value), updatedAt: Value(DateTime.now())),
+          );
    }
+
+    _appConfig = _appConfig.write(key, value);
  }

-  void _updateCache<T extends Object>(MetadataKey<T> key, T value) {
-    if (_cache[key] == value) {
-      return;
-    }
-    _cache[key] = value;
-    key.domain.rebuild(this);
-  }
-}
-
-extension<T extends Object> on MetadataDomain<T> {
-  T config(MetadataRepository repo) => switch (this) {
-    .appConfig => repo._appConfig as T,
-    .systemConfig => repo._systemConfig as T,
-  };
-
-  void rebuild(MetadataRepository repo) {
-    switch (this) {
-      case .appConfig:
-        repo._appConfig = .new(
-          theme: .new(
-            mode: repo._read(.themeMode),
-            primaryColor: repo._read(.themePrimaryColor),
-            dynamicTheme: repo._read(.themeDynamic),
-            colorfulInterface: repo._read(.themeColorfulInterface),
-          ),
-          cleanup: .new(
-            keepFavorites: repo._read(.cleanupKeepFavorites),
-            keepMediaType: repo._read(.cleanupKeepMediaType),
-            keepAlbumIds: repo._read(.cleanupKeepAlbumIds),
-            cutoffDaysAgo: repo._read(.cleanupCutoffDaysAgo),
-            defaultsInitialized: repo._read(.cleanupDefaultsInitialized),
-          ),
-          map: .new(
-            relativeDays: repo._read(.mapRelativeDate),
-            favoritesOnly: repo._read(.mapShowFavoriteOnly),
-            includeArchived: repo._read(.mapIncludeArchived),
-            themeMode: repo._read(.mapThemeMode),
-            withPartners: repo._read(.mapWithPartners),
-          ),
-          timeline: .new(
-            tilesPerRow: repo._read(.timelineTilesPerRow),
-            groupAssetsBy: repo._read(.timelineGroupAssetsBy),
-            storageIndicator: repo._read(.timelineStorageIndicator),
-          ),
-          image: .new(preferRemote: repo._read(.imagePreferRemote), loadOriginal: repo._read(.imageLoadOriginal)),
-          viewer: .new(
-            loopVideo: repo._read(.viewerLoopVideo),
-            loadOriginalVideo: repo._read(.viewerLoadOriginalVideo),
-            autoPlayVideo: repo._read(.viewerAutoPlayVideo),
-            tapToNavigate: repo._read(.viewerTapToNavigate),
-          ),
-          slideshow: .new(
-            transition: repo._read(.slideshowTransition),
-            repeat: repo._read(.slideshowRepeat),
-            duration: repo._read(.slideshowDuration),
-            look: repo._read(.slideshowLook),
-            direction: repo._read(.slideshowDirection),
-          ),
-          album: .new(
-            sortMode: repo._read(.albumSortMode),
-            isReverse: repo._read(.albumIsReverse),
-            isGrid: repo._read(.albumIsGrid),
-          ),
-          backup: .new(
-            enabled: repo._read(.backupEnabled),
-            useCellularForVideos: repo._read(.backupUseCellularForVideos),
-            useCellularForPhotos: repo._read(.backupUseCellularForPhotos),
-            requireCharging: repo._read(.backupRequireCharging),
-            triggerDelay: repo._read(.backupTriggerDelay),
-            syncAlbums: repo._read(.backupSyncAlbums),
-          ),
-        );
-      case .systemConfig:
-        repo._systemConfig = .new(
-          logLevel: repo._read(.logLevel),
-          network: .new(
-            autoEndpointSwitching: repo._read(.networkAutoEndpointSwitching),
-            preferredWifiName: repo._read(.networkPreferredWifiName).nullIfEmpty,
-            localEndpoint: repo._read(.networkLocalEndpoint).nullIfEmpty,
-            externalEndpointList: repo._read(.networkExternalEndpointList),
-            customHeaders: repo._read(.networkCustomHeaders),
-          ),
-        );
-    }
+  Stream<AppConfig> watchConfig() => _db.select(_db.metadataEntity).watch().map((rows) {
+    _applyOverrides(rows);
+    return _appConfig;
+  });
+
+  void _applyOverrides(List<MetadataEntityData> rows) {
+    _appConfig = AppConfig.fromEntries(
+      rows.fold({}, (overrides, row) {
+        final metadataKey = MetadataKey.values.firstWhereOrNull((key) => key.name == row.key);
+        if (metadataKey == null) {
+          return overrides;
+        }
+
+        return {...overrides, metadataKey: metadataKey.decode(row.value)};
+      }),
+    );
  }
 }
@@ -1,3 +1,4 @@
+import 'dart:async';
 import 'dart:io';

 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
@@ -5,66 +6,54 @@ import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:logging/logging.dart';
 import 'package:photo_manager/photo_manager.dart';

+typedef OnProgress = void Function(String id, double progress);
+
 class StorageRepository {
-  final log = Logger('StorageRepository');
+  static final log = Logger('StorageRepository');

-  StorageRepository();
+  const StorageRepository();

-  Future<File?> getFileForAsset(String assetId) async {
-    File? file;
-    final log = Logger('StorageRepository');
-
-    try {
-      final entity = await AssetEntity.fromId(assetId);
-      file = await entity?.originFile;
-      if (file == null) {
-        log.warning("Cannot get file for asset $assetId");
-        return null;
-      }
-
-      final exists = await file.exists();
-      if (!exists) {
-        log.warning("File for asset $assetId does not exist");
-        return null;
-      }
-    } catch (error, stackTrace) {
-      log.warning("Error getting file for asset $assetId", error, stackTrace);
-    }
-    return file;
+  Future<File?> getAssetFile(String assetId, {OnProgress? onProgress, Completer<void>? cancelToken}) {
+    return _getFileForAsset(assetId, isMotion: false, onProgress: onProgress, cancelToken: cancelToken);
  }

-  Future<File?> getMotionFileForAsset(LocalAsset asset) async {
-    File? file;
-    final log = Logger('StorageRepository');
+  Future<File?> getMotionFile(String assetId, {OnProgress? onProgress, Completer<void>? cancelToken}) {
+    return _getFileForAsset(assetId, isMotion: true, onProgress: onProgress, cancelToken: cancelToken);
+  }
+
+  Future<File?> _getFileForAsset(
+    String assetId, {
+    bool isMotion = false,
+    OnProgress? onProgress,
+    Completer<void>? cancelToken,
+  }) async {
+    final entity = await AssetEntity.fromId(assetId);
+    if (entity == null) {
+      log.warning("Cannot get AssetEntity for asset $assetId");
+      return null;
+    }
+
+    PMProgressHandler? progressHandler;
+    StreamSubscription<PMProgressState>? progressSubscription;
+    PMCancelToken? pmCancelToken;
+    if (cancelToken != null) {
+      progressHandler = PMProgressHandler();
+      progressSubscription = progressHandler.stream.listen((event) => onProgress?.call(assetId, event.progress));
+      pmCancelToken = PMCancelToken();
+      unawaited(cancelToken.future.then((_) => pmCancelToken!.cancelRequest()));
+    }

    try {
-      final entity = await AssetEntity.fromId(asset.id);
-      file = await entity?.originFileWithSubtype;
-      if (file == null) {
-        log.warning(
-          "Cannot get motion file for asset ${asset.id}, name: ${asset.name}, created on: ${asset.createdAt}",
-        );
-        return null;
-      }
-
-      final exists = await file.exists();
-      if (!exists) {
-        log.warning("Motion file for asset ${asset.id} does not exist");
-        return null;
-      }
+      return await entity.loadFile(withSubtype: isMotion, progressHandler: progressHandler, cancelToken: pmCancelToken);
    } catch (error, stackTrace) {
-      log.warning(
-        "Error getting motion file for asset ${asset.id}, name: ${asset.name}, created on: ${asset.createdAt}",
-        error,
-        stackTrace,
-      );
+      log.warning("Error loading file for asset $assetId", error, stackTrace);
+      return null;
+    } finally {
+      unawaited(progressSubscription?.cancel());
    }
-    return file;
  }

  Future<AssetEntity?> getAssetEntityForAsset(LocalAsset asset) async {
-    final log = Logger('StorageRepository');
-
    AssetEntity? entity;

    try {
@@ -99,39 +88,7 @@ class StorageRepository {
    }
  }

-  Future<File?> loadFileFromCloud(String assetId, {PMProgressHandler? progressHandler}) async {
-    try {
-      final entity = await AssetEntity.fromId(assetId);
-      if (entity == null) {
-        log.warning("Cannot get AssetEntity for asset $assetId");
-        return null;
-      }
-
-      return await entity.loadFile(progressHandler: progressHandler);
-    } catch (error, stackTrace) {
-      log.warning("Error loading file from cloud for asset $assetId", error, stackTrace);
-      return null;
-    }
-  }
-
-  Future<File?> loadMotionFileFromCloud(String assetId, {PMProgressHandler? progressHandler}) async {
-    try {
-      final entity = await AssetEntity.fromId(assetId);
-      if (entity == null) {
-        log.warning("Cannot get AssetEntity for asset $assetId");
-        return null;
-      }
-
-      return await entity.loadFile(withSubtype: true, progressHandler: progressHandler);
-    } catch (error, stackTrace) {
-      log.warning("Error loading motion file from cloud for asset $assetId", error, stackTrace);
-      return null;
-    }
-  }
-
  Future<void> clearCache() async {
-    final log = Logger('StorageRepository');
-
    try {
      await PhotoManager.clearFileCache();
    } catch (error, stackTrace) {
@@ -43,7 +43,7 @@ class _DriftBackupAlbumSelectionPageState extends ConsumerState<DriftBackupAlbum
    _searchController = TextEditingController();
    _searchFocusNode = FocusNode();

-    _enableSyncUploadAlbum.value = ref.read(metadataProvider).appConfig.backup.syncAlbums;
+    _enableSyncUploadAlbum.value = ref.read(appConfigProvider).backup.syncAlbums;
    ref.read(backupAlbumProvider.notifier).getAll();

    _initialTotalAssetCount = ref.read(driftBackupProvider.select((p) => p.totalCount));
@@ -55,7 +55,7 @@ class _DriftBackupAlbumSelectionPageState extends ConsumerState<DriftBackupAlbum
      return;
    }

-    final enableSyncUploadAlbum = ref.read(metadataProvider).appConfig.backup.syncAlbums;
+    final enableSyncUploadAlbum = ref.read(appConfigProvider).backup.syncAlbums;
    final selectedAlbums = ref
        .read(backupAlbumProvider)
        .where((a) => a.backupSelection == BackupSelection.selected)
@@ -19,7 +19,7 @@ class DriftBackupOptionsPage extends ConsumerWidget {
  @override
  Widget build(BuildContext context, WidgetRef ref) {
    bool hasPopped = false;
-    final previousBackup = ref.read(metadataProvider).appConfig.backup;
+    final previousBackup = ref.read(appConfigProvider).backup;
    final previousCellularForVideos = previousBackup.useCellularForVideos;
    final previousCellularForPhotos = previousBackup.useCellularForPhotos;
    return PopScope(
@@ -22,7 +22,7 @@ class HeaderSettingsPage extends HookConsumerWidget {
    final headers = useState<List<SettingsHeader>>([]);
    final setInitialHeaders = useState(false);

-    final storedHeaders = ref.read(metadataProvider).systemConfig.network.customHeaders;
+    final storedHeaders = ref.read(metadataProvider).appConfig.network.customHeaders;
    if (!setInitialHeaders.value) {
      storedHeaders.forEach((k, v) {
        final header = SettingsHeader();
@@ -7,7 +7,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/locales.dart';
-import 'package:immich_mobile/domain/models/metadata_key.dart';
+import 'package:immich_mobile/domain/models/config/app_config.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/generated/codegen_loader.g.dart';
@@ -36,7 +36,7 @@ class BootstrapErrorWidget extends StatelessWidget {

  @override
  Widget build(BuildContext _) {
-    final immichTheme = MetadataKey.themePrimaryColor.defaultValue.themeOfPreset;
+    final immichTheme = defaultConfig.theme.primaryColor.themeOfPreset;

    return EasyLocalization(
      supportedLocales: locales.values.toList(),
@@ -9,6 +9,7 @@ import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_bu
 import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 import 'package:immich_mobile/widgets/common/immich_toast.dart';
+import 'package:immich_mobile/providers/infrastructure/album.provider.dart';

 /// This delete action has the following behavior:
 /// - Prompt to delete the asset locally
@@ -39,6 +40,8 @@ class DeleteLocalActionButton extends ConsumerWidget {
      return;
    }

+    ref.invalidate(localAlbumProvider);
+
    final successMessage = 'delete_local_action_prompt'.t(context: context, args: {'count': result.count.toString()});

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

    final serverEndpoint = Store.get(StoreKey.serverEndpoint);
-    final headerMap = _ref.read(metadataProvider).systemConfig.network.customHeaders;
+    final headerMap = _ref.read(metadataProvider).appConfig.network.customHeaders;
    final customHeaders = headerMap.isEmpty ? null : jsonEncode(headerMap);
    await _widgetService.writeCredentials(serverEndpoint, accessToken, customHeaders);

@@ -187,11 +187,11 @@ class AuthNotifier extends StateNotifier<AuthState> {
  }

  String? getSavedWifiName() {
-    return _ref.read(metadataProvider).systemConfig.network.preferredWifiName;
+    return _ref.read(metadataProvider).appConfig.network.preferredWifiName;
  }

  String? getSavedLocalEndpoint() {
-    return _ref.read(metadataProvider).systemConfig.network.localEndpoint;
+    return _ref.read(metadataProvider).appConfig.network.localEndpoint;
  }

  /// Returns the current server endpoint (with /api) URL from the store
@@ -2,6 +2,7 @@ import 'dart:async';

 import 'package:collection/collection.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:logging/logging.dart';

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

  void _handleICloudProgress(String localAssetId, double progress) {
@@ -1,20 +1,12 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/config/app_config.dart';
-import 'package:immich_mobile/domain/models/config/system_config.dart';
 import 'package:immich_mobile/infrastructure/repositories/metadata.repository.dart';

 final metadataProvider = Provider.autoDispose<MetadataRepository>((_) => MetadataRepository.instance);

 final appConfigProvider = Provider.autoDispose<AppConfig>((ref) {
  final repo = ref.watch(metadataProvider);
-  final subscription = repo.watchAppConfig().listen((event) => ref.state = event);
+  final subscription = repo.watchConfig().listen((event) => ref.state = event);
  ref.onDispose(subscription.cancel);
  return repo.appConfig;
 });
-
-final systemConfigProvider = Provider.autoDispose<SystemConfig>((ref) {
-  final repo = ref.watch(metadataProvider);
-  final subscription = repo.watchSystemConfig().listen((event) => ref.state = event);
-  ref.onDispose(subscription.cancel);
-  return repo.systemConfig;
-});
@@ -1,4 +1,4 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/infrastructure/repositories/storage.repository.dart';

-final storageRepositoryProvider = Provider<StorageRepository>((ref) => StorageRepository());
+final storageRepositoryProvider = Provider<StorageRepository>((ref) => const StorageRepository());
@@ -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/metadata.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/sync_stream.repository.dart';
 import 'package:immich_mobile/models/auth/auxilary_endpoint.model.dart';
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';

 final authRepositoryProvider = Provider<AuthRepository>(
-  (ref) => AuthRepository(ref.watch(driftProvider), ref.watch(metadataProvider)),
+  (ref) => AuthRepository(ref.watch(driftProvider), ref.watch(appConfigProvider)),
 );

 class AuthRepository {
  final Drift _drift;
-  final MetadataRepository _metadata;
+  final AppConfig _config;

-  const AuthRepository(this._drift, this._metadata);
+  const AuthRepository(this._drift, this._config);

  Future<void> clearLocalData() async {
    await SyncStreamRepository(_drift).reset();
  }

  bool getEndpointSwitchingFeature() {
-    return _metadata.systemConfig.network.autoEndpointSwitching;
+    return _config.network.autoEndpointSwitching;
  }

  String? getPreferredWifiName() {
-    return _metadata.systemConfig.network.preferredWifiName;
+    return _config.network.preferredWifiName;
  }

  String? getLocalEndpoint() {
-    return _metadata.systemConfig.network.localEndpoint;
+    return _config.network.localEndpoint;
  }

  List<AuxilaryEndpoint> getExternalEndpointList() {
-    return _metadata.systemConfig.network.externalEndpointList
-        .map((url) => AuxilaryEndpoint(url: url, status: .valid))
-        .toList();
+    return _config.network.externalEndpointList.map((url) => AuxilaryEndpoint(url: url, status: .valid)).toList();
  }
 }
@@ -10,7 +10,6 @@ import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/infrastructure/repositories/network.repository.dart';
 import 'package:logging/logging.dart';
 import 'package:http/http.dart';
-import 'package:immich_mobile/utils/debug_print.dart';

 final uploadRepositoryProvider = Provider((ref) => UploadRepository());

@@ -20,21 +19,14 @@ class UploadRepository {
  void Function(TaskProgressUpdate)? onTaskProgress;

  UploadRepository() {
-    FileDownloader().registerCallbacks(
-      group: kBackupGroup,
-      taskStatusCallback: (update) => onUploadStatus?.call(update),
-      taskProgressCallback: (update) => onTaskProgress?.call(update),
-    );
-    FileDownloader().registerCallbacks(
-      group: kBackupLivePhotoGroup,
-      taskStatusCallback: (update) => onUploadStatus?.call(update),
-      taskProgressCallback: (update) => onTaskProgress?.call(update),
-    );
-    FileDownloader().registerCallbacks(
-      group: kManualUploadGroup,
-      taskStatusCallback: (update) => onUploadStatus?.call(update),
-      taskProgressCallback: (update) => onTaskProgress?.call(update),
-    );
+    final downloader = FileDownloader();
+    for (final group in const [kBackupGroup, kBackupLivePhotoGroup, kManualUploadGroup]) {
+      downloader.registerCallbacks(
+        group: group,
+        taskStatusCallback: onUploadStatus,
+        taskProgressCallback: onTaskProgress,
+      );
+    }
  }

  Future<void> enqueueBackground(UploadTask task) {
@@ -66,28 +58,6 @@ class UploadRepository {
    return FileDownloader().start();
  }

-  Future<void> getUploadInfo() async {
-    final [enqueuedTasks, runningTasks, canceledTasks, waitingTasks, pausedTasks] = await Future.wait([
-      FileDownloader().database.allRecordsWithStatus(TaskStatus.enqueued, group: kBackupGroup),
-      FileDownloader().database.allRecordsWithStatus(TaskStatus.running, group: kBackupGroup),
-      FileDownloader().database.allRecordsWithStatus(TaskStatus.canceled, group: kBackupGroup),
-      FileDownloader().database.allRecordsWithStatus(TaskStatus.waitingToRetry, group: kBackupGroup),
-      FileDownloader().database.allRecordsWithStatus(TaskStatus.paused, group: kBackupGroup),
-    ]);
-
-    dPrint(
-      () =>
-          """
-      Upload Info:
-      Enqueued: ${enqueuedTasks.length}
-      Running: ${runningTasks.length}
-      Canceled: ${canceledTasks.length}
-      Waiting: ${waitingTasks.length}
-      Paused: ${pausedTasks.length}
-    """,
-    );
-  }
-
  Future<UploadResult> uploadFile({
    required File file,
    required String originalFileName,
@@ -111,41 +81,30 @@ class UploadRepository {
      baseRequest.fields.addAll(fields);
      baseRequest.files.add(assetRawUploadData);

-      final response = await NetworkRepository.client.send(baseRequest);
-      final responseBodyString = await response.stream.bytesToString();
+      final StreamedResponse(:statusCode, :stream) = await NetworkRepository.client.send(baseRequest);
+      final responseBodyString = await stream.bytesToString();

-      if (![200, 201].contains(response.statusCode)) {
-        String? errorMessage;
-
-        if (response.statusCode == 413) {
-          errorMessage = 'Error(413) File is too large to upload';
-          return UploadResult.error(statusCode: response.statusCode, errorMessage: errorMessage);
-        }
-
-        try {
-          final error = jsonDecode(responseBodyString);
-          errorMessage = error['message'] ?? error['error'];
-        } catch (_) {
-          errorMessage = responseBodyString.isNotEmpty
-              ? responseBodyString
-              : 'Upload failed with status ${response.statusCode}';
-        }
-
-        return UploadResult.error(statusCode: response.statusCode, errorMessage: errorMessage);
-      }
-
-      try {
-        final responseBody = jsonDecode(responseBodyString);
-        return UploadResult.success(remoteAssetId: responseBody['id'] as String);
-      } catch (e) {
-        return UploadResult.error(errorMessage: 'Failed to parse server response');
-      }
+      return switch ((statusCode, _tryJsonDecode(responseBodyString))) {
+        (200 || 201, {'id': String id}) => UploadSuccess(remoteAssetId: id),
+        (413, _) => const UploadError(statusCode: 413, message: 'File is too large to upload'),
+        (_, {'message': String message}) => UploadError(statusCode: statusCode, message: message),
+        _ => UploadError(statusCode: statusCode, message: 'Upload failed with status $statusCode'),
+      };
    } on RequestAbortedException {
      logger.warning("Upload $logContext was cancelled");
-      return UploadResult.cancelled();
+      return const UploadCancelled();
    } catch (error, stackTrace) {
      logger.warning("Error uploading $logContext: ${error.toString()}: $stackTrace");
-      return UploadResult.error(errorMessage: error.toString());
+      return UploadError(message: error.toString());
+    }
+  }
+
+  @pragma('vm:prefer-inline')
+  Map? _tryJsonDecode(String s) {
+    try {
+      return (jsonDecode(s) as Map);
+    } catch (_) {
+      return null;
    }
  }
 }
@@ -180,30 +139,23 @@ class ProgressMultipartRequest extends MultipartRequest with Abortable {
  }
 }

-class UploadResult {
-  final bool isSuccess;
-  final bool isCancelled;
-  final String? remoteAssetId;
-  final String? errorMessage;
+sealed class UploadResult {
+  const UploadResult();
+}
+
+final class UploadSuccess extends UploadResult {
+  final String remoteAssetId;
+
+  const UploadSuccess({required this.remoteAssetId});
+}
+
+final class UploadError extends UploadResult {
+  final String message;
  final int? statusCode;

-  const UploadResult({
-    required this.isSuccess,
-    required this.isCancelled,
-    this.remoteAssetId,
-    this.errorMessage,
-    this.statusCode,
-  });
-
-  factory UploadResult.success({required String remoteAssetId}) {
-    return UploadResult(isSuccess: true, isCancelled: false, remoteAssetId: remoteAssetId);
-  }
-
-  factory UploadResult.error({String? errorMessage, int? statusCode}) {
-    return UploadResult(isSuccess: false, isCancelled: false, errorMessage: errorMessage, statusCode: statusCode);
-  }
-
-  factory UploadResult.cancelled() {
-    return const UploadResult(isSuccess: false, isCancelled: true);
-  }
+  const UploadError({required this.message, this.statusCode});
+}
+
+final class UploadCancelled extends UploadResult {
+  const UploadCancelled();
 }
@@ -177,9 +177,9 @@ class ApiService {
    if (serverEndpoint != null && serverEndpoint.isNotEmpty) {
      urls.add(serverEndpoint);
    }
-    final network = MetadataRepository.instance.systemConfig.network;
+    final network = MetadataRepository.instance.appConfig.network;
    final localEndpoint = network.localEndpoint;
-    if (localEndpoint != null) {
+    if (localEndpoint.isNotEmpty) {
      urls.add(localEndpoint);
    }
    for (final url in network.externalEndpointList) {
@@ -191,7 +191,7 @@ class ApiService {
  }

  static Map<String, String> getRequestHeaders() {
-    return MetadataRepository.instance.systemConfig.network.customHeaders;
+    return MetadataRepository.instance.appConfig.network.customHeaders;
  }

  ApiClient get apiClient => _apiClient;
@@ -266,8 +266,6 @@ class BackgroundUploadService {
      return null;
    }

-    File? file;
-
    /// iOS LivePhoto has two files: a photo and a video.
    /// They are uploaded separately, with video file being upload first, then returned with the assetId
    /// The assetId is then used as a metadata for the photo file upload task.
@@ -278,11 +276,9 @@ class BackgroundUploadService {
    /// The cancel operation will only cancel the video group (normal group), the photo group will not
    /// be touched, as the video file is already uploaded.

-    if (entity.isLivePhoto) {
-      file = await _storageRepository.getMotionFileForAsset(asset);
-    } else {
-      file = await _storageRepository.getFileForAsset(asset.id);
-    }
+    final file = await (entity.isLivePhoto
+        ? _storageRepository.getMotionFile(asset.id)
+        : _storageRepository.getAssetFile(asset.id));

    if (file == null) {
      _logger.warning("Failed to get file for asset ${asset.id} - ${asset.name}");
@@ -330,7 +326,7 @@ class BackgroundUploadService {
      return null;
    }

-    final file = await _storageRepository.getFileForAsset(asset.id);
+    final file = await _storageRepository.getAssetFile(asset.id);
    if (file == null) {
      return null;
    }
@@ -20,7 +20,6 @@ import 'package:immich_mobile/repositories/asset_media.repository.dart';
 import 'package:immich_mobile/repositories/upload.repository.dart';
 import 'package:logging/logging.dart';
 import 'package:path/path.dart' as p;
-import 'package:photo_manager/photo_manager.dart' show PMProgressHandler;

 /// Callbacks for upload progress and status updates
 class UploadCallbacks {
@@ -99,7 +98,7 @@ class ForegroundUploadService {
          final requireWifi = _shouldRequireWiFi(asset);
          return requireWifi && !hasWifi;
        },
-        processItem: (asset) => _uploadSingleAsset(asset, cancelToken, callbacks: callbacks),
+        processItem: (asset) => _uploadSingleAsset(asset, cancelToken: cancelToken, callbacks: callbacks),
      );
    }
  }
@@ -125,14 +124,14 @@ class ForegroundUploadService {
        continue;
      }

-      await _uploadSingleAsset(asset, cancelToken, callbacks: callbacks);
+      await _uploadSingleAsset(asset, cancelToken: cancelToken, callbacks: callbacks);
    }
  }

  /// Manually upload picked local assets
  Future<void> uploadManual(
    List<LocalAsset> localAssets, {
-    Completer<void>? cancelToken,
+    required Completer<void>? cancelToken,
    UploadCallbacks callbacks = const UploadCallbacks(),
  }) async {
    if (localAssets.isEmpty) {
@@ -142,7 +141,7 @@ class ForegroundUploadService {
    await _executeWithWorkerPool<LocalAsset>(
      items: localAssets,
      cancelToken: cancelToken,
-      processItem: (asset) => _uploadSingleAsset(asset, cancelToken, callbacks: callbacks),
+      processItem: (asset) => _uploadSingleAsset(asset, cancelToken: cancelToken, callbacks: callbacks),
    );
  }

@@ -170,11 +169,11 @@ class ForegroundUploadService {
          onProgress: (bytes, totalBytes) => onProgress?.call(fileId, bytes, totalBytes),
        );

-        if (result.isSuccess) {
-          onSuccess?.call(fileId);
-        } else if (!result.isCancelled && result.errorMessage != null) {
-          onError?.call(fileId, result.errorMessage!);
-        }
+        return switch (result) {
+          UploadSuccess() => onSuccess?.call(fileId),
+          UploadError(:final message) => onError?.call(fileId, message),
+          UploadCancelled() => null,
+        };
      },
    );
  }
@@ -216,7 +215,7 @@ class ForegroundUploadService {

        final item = items[index];

-        if (shouldSkip?.call(item) ?? false) {
+        if (shouldSkip != null && shouldSkip(item)) {
          continue;
        }

@@ -233,78 +232,48 @@ class ForegroundUploadService {
  }

  Future<void> _uploadSingleAsset(
-    LocalAsset asset,
-    Completer<void>? cancelToken, {
+    LocalAsset asset, {
+    required Completer<void>? cancelToken,
    required UploadCallbacks callbacks,
  }) async {
-    File? file;
+    final UploadCallbacks(:onProgress, :onSuccess, :onError, :onICloudProgress) = callbacks;
+    File? assetFile;
    File? livePhotoFile;

    try {
      final entity = await _storageRepository.getAssetEntityForAsset(asset);
      if (entity == null) {
-        callbacks.onError?.call(
+        onError?.call(
          asset.localId!,
          CurrentPlatform.isAndroid ? "asset_not_found_on_device_android".t() : "asset_not_found_on_device_ios".t(),
        );
        return;
      }

-      final isAvailableLocally = await _storageRepository.isAssetAvailableLocally(asset.id);
-
-      if (!isAvailableLocally && CurrentPlatform.isIOS) {
-        _logger.info("Loading iCloud asset ${asset.id} - ${asset.name}");
-
-        // Create progress handler for iCloud download
-        PMProgressHandler? progressHandler;
-        StreamSubscription? progressSubscription;
-
-        progressHandler = PMProgressHandler();
-        progressSubscription = progressHandler.stream.listen((event) {
-          callbacks.onICloudProgress?.call(asset.localId!, event.progress);
-        });
-
-        try {
-          file = await _storageRepository.loadFileFromCloud(asset.id, progressHandler: progressHandler);
-          if (entity.isLivePhoto) {
-            livePhotoFile = await _storageRepository.loadMotionFileFromCloud(
-              asset.id,
-              progressHandler: progressHandler,
-            );
-          }
-        } finally {
-          await progressSubscription.cancel();
-        }
-      } else {
-        // Get files locally
-        file = await _storageRepository.getFileForAsset(asset.id);
+      File? file;
+      if (entity.isLivePhoto) {
+        file = await _storageRepository.getMotionFile(asset.id, cancelToken: cancelToken, onProgress: onICloudProgress);
        if (file == null) {
-          _logger.warning("Failed to get file ${asset.id} - ${asset.name}");
-          callbacks.onError?.call(
+          _logger.warning("Failed to obtain motion part of the livePhoto - ${asset.name}");
+          onError?.call(
            asset.localId!,
            CurrentPlatform.isAndroid ? "asset_not_found_on_device_android".t() : "asset_not_found_on_device_ios".t(),
          );
          return;
        }
-
-        // For live photos, get the motion video file
-        if (entity.isLivePhoto) {
-          livePhotoFile = await _storageRepository.getMotionFileForAsset(asset);
-          if (livePhotoFile == null) {
-            _logger.warning("Failed to obtain motion part of the livePhoto - ${asset.name}");
-            callbacks.onError?.call(
-              asset.localId!,
-              CurrentPlatform.isAndroid ? "asset_not_found_on_device_android".t() : "asset_not_found_on_device_ios".t(),
-            );
-          }
-        }
+        livePhotoFile = file;
      }

+      file = await _storageRepository.getAssetFile(asset.id, cancelToken: cancelToken, onProgress: onICloudProgress);
      if (file == null) {
-        _logger.warning("Failed to obtain file from iCloud for asset ${asset.id} - ${asset.name}");
-        callbacks.onError?.call(asset.localId!, "asset_not_found_on_icloud".t());
+        _logger.warning("Failed to get file ${asset.id} - ${asset.name}");
+        onError?.call(
+          asset.localId!,
+          CurrentPlatform.isAndroid ? "asset_not_found_on_device_android".t() : "asset_not_found_on_device_ios".t(),
+        );
        return;
      }
+      assetFile = file;

      String fileName = await _assetMediaRepository.getOriginalFilename(asset.id) ?? asset.name;

@@ -330,11 +299,9 @@ class ForegroundUploadService {
      };

      // Upload live photo video first if available
-      String? livePhotoVideoId;
      if (entity.isLivePhoto && livePhotoFile != null) {
        final livePhotoTitle = p.setExtension(originalFileName, p.extension(livePhotoFile.path));

-        final onProgress = callbacks.onProgress;
        final livePhotoResult = await _uploadRepository.uploadFile(
          file: livePhotoFile,
          originalFileName: livePhotoTitle,
@@ -346,15 +313,16 @@ class ForegroundUploadService {
          logContext: 'livePhotoVideo[${asset.localId}]',
        );

-        if (livePhotoResult.isSuccess && livePhotoResult.remoteAssetId != null) {
-          livePhotoVideoId = livePhotoResult.remoteAssetId;
+        switch (livePhotoResult) {
+          case UploadSuccess(:final remoteAssetId):
+            fields['livePhotoVideoId'] = remoteAssetId;
+          case UploadError(:final message):
+            onError?.call(asset.localId!, "Failed to upload live photo video: $message");
+            return;
+          case UploadCancelled():
        }
      }

-      if (livePhotoVideoId != null) {
-        fields['livePhotoVideoId'] = livePhotoVideoId;
-      }
-
      // Add cloudId metadata only to the still image, not the motion video, becasue when the sync id happens, the motion video can get associated with the wrong still image.
      if (CurrentPlatform.isIOS && asset.cloudId != null) {
        fields['metadata'] = jsonEncode([
@@ -371,7 +339,6 @@ class ForegroundUploadService {
        ]);
      }

-      final onProgress = callbacks.onProgress;
      final result = await _uploadRepository.uploadFile(
        file: file,
        originalFileName: originalFileName,
@@ -383,34 +350,33 @@ class ForegroundUploadService {
        logContext: 'asset[${asset.localId}]',
      );

-      if (result.isSuccess && result.remoteAssetId != null) {
-        callbacks.onSuccess?.call(asset.localId!, result.remoteAssetId!);
-      } else if (result.isCancelled) {
-        _logger.warning(() => "Backup was cancelled by the user");
-        shouldAbortUpload = true;
-      } else if (result.errorMessage != null) {
-        _logger.severe(
-          () =>
-              "Error(${result.statusCode}) uploading ${asset.localId} | $originalFileName | Created on ${asset.createdAt} | ${result.errorMessage}",
-        );
-
-        callbacks.onError?.call(asset.localId!, result.errorMessage!);
-
-        if (result.errorMessage == "Quota has been exceeded!") {
+      switch (result) {
+        case UploadSuccess(:final remoteAssetId):
+          onSuccess?.call(asset.localId!, remoteAssetId);
+        case UploadCancelled():
          shouldAbortUpload = true;
-        }
+          _logger.warning("Upload was cancelled by the user for asset ${asset.localId}");
+        case UploadError(:final message, :final statusCode):
+          shouldAbortUpload |= message == "Quota has been exceeded!";
+          _logger.severe(
+            "Error(${statusCode ?? 'unknown'}) uploading ${asset.localId} | $originalFileName | Created on ${asset.createdAt} | $message",
+          );
+          onError?.call(asset.localId!, message);
      }
    } catch (error, stackTrace) {
-      _logger.severe(() => "Error backup asset: ${error.toString()}", stackTrace);
-      callbacks.onError?.call(asset.localId!, error.toString());
+      _logger.severe("Asset backup failed", error, stackTrace);
+      onError?.call(asset.localId!, error.toString());
    } finally {
      if (Platform.isIOS) {
-        try {
-          await file?.delete();
-          await livePhotoFile?.delete();
-        } catch (error, stackTrace) {
-          _logger.severe(() => "ERROR deleting file: ${error.toString()}", stackTrace);
-        }
+        unawaited(
+          Future.wait([
+            if (assetFile != null) assetFile.delete(),
+            if (livePhotoFile != null) livePhotoFile.delete(),
+          ]).onError((error, stackTrace) {
+            _logger.severe("Post-upload file cleanup failed", error, stackTrace);
+            return const [];
+          }),
+        );
      }
    }
  }
@@ -446,7 +412,7 @@ class ForegroundUploadService {
        logContext: 'shareIntent[$deviceAssetId]',
      );
    } catch (e) {
-      return UploadResult.error(errorMessage: e.toString());
+      return UploadError(message: e.toString());
    }
  }

@@ -1,10 +1,12 @@
 import 'dart:async';
 import 'dart:convert';

+import 'package:collection/collection.dart';
 import 'package:drift/drift.dart';
 import 'package:flutter/material.dart';
 import 'package:immich_mobile/constants/colors.dart';
 import 'package:immich_mobile/constants/enums.dart';
+import 'package:immich_mobile/domain/models/config/app_config.dart';
 import 'package:immich_mobile/domain/models/log.model.dart';
 import 'package:immich_mobile/domain/models/metadata_key.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
@@ -136,15 +138,11 @@ Future<void> _migrateTo26(Drift drift) async {

 Future<void> _migrateAlbumSortMode(_StoreMigrator migrator) async {
  final raw = await migrator.readLegacyStoreInt(StoreKey.legacySelectedAlbumSortOrder.id);
-  if (raw == null) {
+  final mode = AlbumSortMode.values.firstWhereOrNull((e) => raw != null && e.storeIndex == raw);
+  if (mode == null) {
    return;
  }

-  final mode = AlbumSortMode.values.firstWhere(
-    (e) => e.storeIndex == raw,
-    orElse: () => MetadataKey.albumSortMode.defaultValue,
-  );
-
  migrator.stage(StoreKey.legacySelectedAlbumSortOrder, MetadataKey.albumSortMode, mode);
 }

@@ -208,7 +206,11 @@ class _StoreMigrator {
      return;
    }

-    final enumValue = values.elementAtOrNull(index) ?? newKey.defaultValue;
+    final enumValue = values.elementAtOrNull(index);
+    if (enumValue == null) {
+      return;
+    }
+
    _cache[newKey] = enumValue;
    _migratedStoreIds.add(legacyKey.id);
  }
@@ -223,7 +225,11 @@ class _StoreMigrator {
      return;
    }

-    final enumValue = values.firstWhere((e) => e.name == name, orElse: () => newKey.defaultValue);
+    final enumValue = values.firstWhereOrNull((e) => e.name == name);
+    if (enumValue == null) {
+      return;
+    }
+
    _cache[newKey] = enumValue;
    _migratedStoreIds.add(legacyKey.id);
  }
@@ -267,9 +273,12 @@ class _StoreMigrator {
  Future<void> complete() async {
    await _db.batch((batch) {
      for (final entry in _cache.entries) {
+        if (entry.value == defaultConfig.read(entry.key)) {
+          continue;
+        }
        batch.insert(
          _db.metadataEntity,
-          MetadataEntityCompanion(key: Value(entry.key.key), value: Value(entry.key.encode(entry.value))),
+          MetadataEntityCompanion(key: Value(entry.key.name), value: Value(entry.key.encode(entry.value))),
          mode: InsertMode.insertOrReplace,
        );
      }
@@ -31,7 +31,7 @@ class AdvancedSettings extends HookConsumerWidget {
    final manageLocalMediaAndroid = useAppSettingsState(AppSettingsEnum.manageLocalMediaAndroid);
    final isManageMediaSupported = useState(false);
    final manageMediaAndroidPermission = useState(false);
-    final levelId = useState<int>(ref.read(systemConfigProvider).logLevel.index);
+    final levelId = useState<int>(ref.read(appConfigProvider).logLevel.index);
    final preferRemote = useState(ref.read(appConfigProvider).image.preferRemote);
    useValueChanged(
      preferRemote.value,
@@ -64,7 +64,7 @@ class ExternalNetworkPreference extends HookConsumerWidget {
    }

    useEffect(() {
-      final urls = ref.read(metadataProvider).systemConfig.network.externalEndpointList;
+      final urls = ref.read(appConfigProvider).network.externalEndpointList;

      if (urls.isEmpty) {
        return null;
@@ -19,7 +19,7 @@ class NetworkingSettings extends HookConsumerWidget {
  @override
  Widget build(BuildContext context, WidgetRef ref) {
    final currentEndpoint = getServerUrl();
-    final featureEnabled = useState(ref.read(systemConfigProvider).network.autoEndpointSwitching);
+    final featureEnabled = useState(ref.read(appConfigProvider).network.autoEndpointSwitching);
    useValueChanged<bool, void>(featureEnabled.value, (_, __) {
      ref.read(metadataProvider).write(.networkAutoEndpointSwitching, featureEnabled.value);
    });
@@ -10,9 +10,16 @@ class ImmichFormController extends ChangeNotifier {
  FutureOr<void> Function()? onSubmit;
  final formKey = GlobalKey<FormState>();

+  bool _isDisposed = false;
  bool _isLoading = false;
  bool get isLoading => _isLoading;

+  @override
+  void dispose() {
+    _isDisposed = true;
+    super.dispose();
+  }
+
  Future<void> submit() async {
    if (_isLoading) {
      return;
@@ -27,7 +34,9 @@ class ImmichFormController extends ChangeNotifier {
      await onSubmit?.call();
    } finally {
      _isLoading = false;
-      notifyListeners();
+      if (!_isDisposed) {
+        notifyListeners();
+      }
    }
  }
 }
@@ -38,13 +47,7 @@ class ImmichForm extends StatefulWidget {
  final String? submitText;
  final IconData? submitIcon;

-  const ImmichForm({
-    super.key,
-    this.onSubmit,
-    this.submitText,
-    this.submitIcon,
-    required this.builder,
-  });
+  const ImmichForm({super.key, this.onSubmit, this.submitText, this.submitIcon, required this.builder});

  @override
  State<ImmichForm> createState() => _ImmichFormState();
@@ -1,7 +1,7 @@
 import 'package:collection/collection.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:immich_mobile/constants/constants.dart';
-import 'package:immich_mobile/domain/models/config/system_config.dart';
+import 'package:immich_mobile/domain/models/config/app_config.dart';
 import 'package:immich_mobile/domain/models/log.model.dart';
 import 'package:immich_mobile/domain/models/metadata_key.dart';
 import 'package:immich_mobile/domain/services/log.service.dart';
@@ -39,7 +39,7 @@ void main() {
    registerFallbackValue(LogLevel.info);

    when(() => mockLogRepo.truncate(limit: any(named: 'limit'))).thenAnswer((_) async => {});
-    when(() => mockMetadataRepository.systemConfig).thenReturn(const SystemConfig(logLevel: LogLevel.fine));
+    when(() => mockMetadataRepository.appConfig).thenReturn(const AppConfig(logLevel: LogLevel.fine));
    when(() => mockMetadataRepository.write<LogLevel, LogLevel>(MetadataKey.logLevel, any())).thenAnswer((_) async {});
    when(() => mockLogRepo.getAll()).thenAnswer((_) async => []);
    when(() => mockLogRepo.insert(any())).thenAnswer((_) async => true);
@@ -59,7 +59,7 @@ void main() {
    });

    test('Sets log level based on the metadata repository', () {
-      verify(() => mockMetadataRepository.systemConfig).called(1);
+      verify(() => mockMetadataRepository.appConfig).called(1);
      expect(Logger.root.level, Level.FINE);
    });
  });
@@ -23,7 +23,7 @@ void main() {

  setUp(() async {
    await ctx.db.delete(ctx.db.metadataEntity).go();
-    await MetadataRepository.refresh();
+    await MetadataRepository.instance.refresh();
  });

  group('defaults', () {
@@ -31,8 +31,8 @@ void main() {
      expect(sut.appConfig.theme.mode, ThemeMode.system);
    });

-    test('systemConfig returns key defaults when DB is empty', () {
-      expect(sut.systemConfig.logLevel, LogLevel.info);
+    test('appConfig returns key defaults when DB is empty', () {
+      expect(sut.appConfig.logLevel, LogLevel.info);
    });
  });

@@ -46,16 +46,14 @@ void main() {
      await sut.write(.themeMode, ThemeMode.light);
      await sut.write(.logLevel, LogLevel.severe);
      expect(sut.appConfig.theme.mode, ThemeMode.light);
-      expect(sut.systemConfig.logLevel, LogLevel.severe);
+      expect(sut.appConfig.logLevel, LogLevel.severe);
    });
-  });

-  group('delete', () {
    test('removes the row and reverts to default', () async {
      await sut.write(.themeMode, ThemeMode.dark);
      expect(sut.appConfig.theme.mode, ThemeMode.dark);

-      await sut.delete(.themeMode);
+      await sut.write(.themeMode, ThemeMode.system);
      expect(sut.appConfig.theme.mode, ThemeMode.system);

      final rows = await ctx.db.select(ctx.db.metadataEntity).get();
@@ -63,13 +61,15 @@ void main() {
    });
  });

-  group('refresh', () {
+  group('delete', () {});
+
+  group('sync', () {
    test('picks up rows that were inserted directly into the DB', () async {
      await ctx.db
          .into(ctx.db.metadataEntity)
          .insert(
            MetadataEntityCompanion.insert(
-              key: MetadataKey.themeMode.key,
+              key: MetadataKey.themeMode.name,
              value: ThemeMode.dark.name,
              updatedAt: Value(DateTime.now()),
            ),
@@ -78,7 +78,7 @@ void main() {
      // Cache hasn't seen this row yet — view still returns the default.
      expect(sut.appConfig.theme.mode, ThemeMode.system);

-      await MetadataRepository.refresh();
+      await MetadataRepository.instance.refresh();
      expect(sut.appConfig.theme.mode, ThemeMode.dark);
    });

@@ -88,7 +88,7 @@ void main() {
      await ctx.db.delete(ctx.db.metadataEntity).go();
      expect(sut.appConfig.theme.mode, ThemeMode.dark);

-      await MetadataRepository.refresh();
+      await MetadataRepository.instance.refresh();
      expect(sut.appConfig.theme.mode, ThemeMode.system);
    });

@@ -103,32 +103,20 @@ void main() {
            ),
          );

-      await MetadataRepository.refresh();
+      await MetadataRepository.instance.refresh();
      expect(sut.appConfig.theme.mode, ThemeMode.system);
    });
  });

  group('watch', () {
    test('watchAppConfig emits the new value after a write', () async {
-      final expectation = expectLater(sut.watchAppConfig().map((c) => c.theme.mode), emitsThrough(ThemeMode.dark));
+      final expectation = expectLater(sut.watchConfig().map((c) => c.theme.mode), emitsThrough(ThemeMode.dark));
      await sut.write(MetadataKey.themeMode, ThemeMode.dark);
      await expectation;
    });

-    test('watchAppConfig does not emit when only system-config rows change', () async {
-      final emissions = <ThemeMode>[];
-      // skip(1) drops the on-subscribe replay so we only capture emissions caused by the write below.
-      final sub = sut.watchAppConfig().skip(1).listen((c) => emissions.add(c.theme.mode));
-
-      await sut.write(MetadataKey.logLevel, LogLevel.severe);
-      await pumpEventQueue();
-      await sub.cancel();
-
-      expect(emissions, isEmpty);
-    });
-
-    test('watchSystemConfig emits the new value after a write', () async {
-      final expectation = expectLater(sut.watchSystemConfig().map((c) => c.logLevel), emitsThrough(LogLevel.warning));
+    test('watchConfig emits the new value after a write', () async {
+      final expectation = expectLater(sut.watchConfig().map((c) => c.logLevel), emitsThrough(LogLevel.warning));
      await sut.write(MetadataKey.logLevel, LogLevel.warning);
      await expectation;
    });
@@ -75,7 +75,7 @@ void main() {

      when(() => mockEntity.isLivePhoto).thenReturn(false);
      when(() => mockStorageRepository.getAssetEntityForAsset(asset)).thenAnswer((_) async => mockEntity);
-      when(() => mockStorageRepository.getFileForAsset(asset.id)).thenAnswer((_) async => mockFile);
+      when(() => mockStorageRepository.getAssetFile(asset.id)).thenAnswer((_) async => mockFile);
      when(() => mockAssetMediaRepository.getOriginalFilename(asset.id)).thenAnswer((_) async => 'OriginalPhoto.jpg');

      final task = await sut.getUploadTask(asset);
@@ -92,7 +92,7 @@ void main() {

      when(() => mockEntity.isLivePhoto).thenReturn(false);
      when(() => mockStorageRepository.getAssetEntityForAsset(asset)).thenAnswer((_) async => mockEntity);
-      when(() => mockStorageRepository.getFileForAsset(asset.id)).thenAnswer((_) async => mockFile);
+      when(() => mockStorageRepository.getAssetFile(asset.id)).thenAnswer((_) async => mockFile);
      when(() => mockAssetMediaRepository.getOriginalFilename(asset.id)).thenAnswer((_) async => null);

      final task = await sut.getUploadTask(asset);
@@ -109,7 +109,7 @@ void main() {

      when(() => mockEntity.isLivePhoto).thenReturn(true);
      when(() => mockStorageRepository.getAssetEntityForAsset(asset)).thenAnswer((_) async => mockEntity);
-      when(() => mockStorageRepository.getMotionFileForAsset(asset)).thenAnswer((_) async => mockFile);
+      when(() => mockStorageRepository.getMotionFile(asset.id)).thenAnswer((_) async => mockFile);
      when(
        () => mockAssetMediaRepository.getOriginalFilename(asset.id),
      ).thenAnswer((_) async => 'OriginalLivePhoto.HEIC');
@@ -130,7 +130,7 @@ void main() {

      when(() => mockEntity.isLivePhoto).thenReturn(true);
      when(() => mockStorageRepository.getAssetEntityForAsset(asset)).thenAnswer((_) async => mockEntity);
-      when(() => mockStorageRepository.getFileForAsset(asset.id)).thenAnswer((_) async => mockFile);
+      when(() => mockStorageRepository.getAssetFile(asset.id)).thenAnswer((_) async => mockFile);
      when(
        () => mockAssetMediaRepository.getOriginalFilename(asset.id),
      ).thenAnswer((_) async => 'OriginalLivePhoto.HEIC');
@@ -150,7 +150,7 @@ void main() {

      when(() => mockEntity.isLivePhoto).thenReturn(true);
      when(() => mockStorageRepository.getAssetEntityForAsset(asset)).thenAnswer((_) async => mockEntity);
-      when(() => mockStorageRepository.getFileForAsset(asset.id)).thenAnswer((_) async => mockFile);
+      when(() => mockStorageRepository.getAssetFile(asset.id)).thenAnswer((_) async => mockFile);
      when(() => mockAssetMediaRepository.getOriginalFilename(asset.id)).thenAnswer((_) async => null);

      final task = await sut.getLivePhotoUploadTask(asset, 'video-id-456');
@@ -194,7 +194,7 @@ void main() {

      when(() => mockEntity.isLivePhoto).thenReturn(false);
      when(() => mockStorageRepository.getAssetEntityForAsset(assetWithCloudId)).thenAnswer((_) async => mockEntity);
-      when(() => mockStorageRepository.getFileForAsset(assetWithCloudId.id)).thenAnswer((_) async => mockFile);
+      when(() => mockStorageRepository.getAssetFile(assetWithCloudId.id)).thenAnswer((_) async => mockFile);
      when(() => mockAssetMediaRepository.getOriginalFilename(assetWithCloudId.id)).thenAnswer((_) async => 'test.jpg');

      final task = await sutWithV24.getUploadTask(assetWithCloudId);
@@ -243,7 +243,7 @@ void main() {

      when(() => mockEntity.isLivePhoto).thenReturn(false);
      when(() => mockStorageRepository.getAssetEntityForAsset(assetWithCloudId)).thenAnswer((_) async => mockEntity);
-      when(() => mockStorageRepository.getFileForAsset(assetWithCloudId.id)).thenAnswer((_) async => mockFile);
+      when(() => mockStorageRepository.getAssetFile(assetWithCloudId.id)).thenAnswer((_) async => mockFile);
      when(() => mockAssetMediaRepository.getOriginalFilename(assetWithCloudId.id)).thenAnswer((_) async => 'test.jpg');

      final task = await sutAndroid.getUploadTask(assetWithCloudId);
@@ -281,7 +281,7 @@ void main() {

      when(() => mockEntity.isLivePhoto).thenReturn(false);
      when(() => mockStorageRepository.getAssetEntityForAsset(assetWithoutCloudId)).thenAnswer((_) async => mockEntity);
-      when(() => mockStorageRepository.getFileForAsset(assetWithoutCloudId.id)).thenAnswer((_) async => mockFile);
+      when(() => mockStorageRepository.getAssetFile(assetWithoutCloudId.id)).thenAnswer((_) async => mockFile);
      when(
        () => mockAssetMediaRepository.getOriginalFilename(assetWithoutCloudId.id),
      ).thenAnswer((_) async => 'test.jpg');
@@ -323,7 +323,7 @@ void main() {

      when(() => mockEntity.isLivePhoto).thenReturn(true);
      when(() => mockStorageRepository.getAssetEntityForAsset(assetWithCloudId)).thenAnswer((_) async => mockEntity);
-      when(() => mockStorageRepository.getFileForAsset(assetWithCloudId.id)).thenAnswer((_) async => mockFile);
+      when(() => mockStorageRepository.getAssetFile(assetWithCloudId.id)).thenAnswer((_) async => mockFile);
      when(
        () => mockAssetMediaRepository.getOriginalFilename(assetWithCloudId.id),
      ).thenAnswer((_) async => 'livephoto.heic');
@@ -1,28 +1,16 @@
 import 'package:flutter_test/flutter_test.dart';
+import 'package:immich_mobile/domain/models/config/app_config.dart';
 import 'package:immich_mobile/domain/models/metadata_key.dart';

 void main() {
  group('MetadataKey', () {
-    test('every key round-trips its default value losslessly', () {
-      for (final key in MetadataKey.values) {
-        final encoded = key.encode(key.defaultValue);
+    for (final key in MetadataKey.values) {
+      test('verify codec for $key', () {
+        final defaultValue = defaultConfig.read(key);
+        final encoded = key.encode(defaultValue);
        final decoded = key.decode(encoded);
-        expect(decoded, key.defaultValue, reason: 'round-trip failed for ${key.name}');
-      }
-    });
-
-    test('decode falls back to the default value when the raw input is unparseable', () {
-      for (final key in MetadataKey.values) {
-        // String keys can decode any string. So skip them
-        if (key.defaultValue is String) {
-          continue;
-        }
-        expect(
-          key.decode('not a valid encoding for any key'),
-          key.defaultValue,
-          reason: 'fallback failed for ${key.name}',
-        );
-      }
-    });
+        expect(decoded, defaultValue, reason: 'round-trip failed for ${key.name}');
+      });
+    }
  });
 }
@@ -75,7 +75,7 @@ export class SearchService extends BaseService {

    const page = dto.page ?? 1;
    const size = dto.size || 250;
-    const userIds = await this.getUserIdsToSearch(auth);
+    const userIds = await this.getUserIdsToSearch(auth, dto.visibility);
    const { hasNextPage, items } = await this.searchRepository.searchMetadata(
      { page, size },
      {
@@ -103,7 +103,7 @@ export class SearchService extends BaseService {
      requireElevatedPermission(auth);
    }

-    const userIds = await this.getUserIdsToSearch(auth);
+    const userIds = await this.getUserIdsToSearch(auth, dto.visibility);
    const items = await this.searchRepository.searchRandom(dto.size || 250, { ...dto, userIds });
    return items.map((item) => mapAsset(item, { auth }));
  }
@@ -113,7 +113,7 @@ export class SearchService extends BaseService {
      requireElevatedPermission(auth);
    }

-    const userIds = await this.getUserIdsToSearch(auth);
+    const userIds = await this.getUserIdsToSearch(auth, dto.visibility);
    const items = await this.searchRepository.searchLargeAssets(dto.size || 250, { ...dto, userIds });
    return items.map((item) => mapAsset(item, { auth }));
  }
@@ -128,7 +128,7 @@ export class SearchService extends BaseService {
      throw new BadRequestException('Smart search is not enabled');
    }

-    const userIds = this.getUserIdsToSearch(auth);
+    const userIds = this.getUserIdsToSearch(auth, dto.visibility);
    let embedding;
    if (dto.query) {
      const key = machineLearning.clip.modelName + dto.query + dto.language;
@@ -202,7 +202,11 @@ export class SearchService extends BaseService {
    }
  }

-  private async getUserIdsToSearch(auth: AuthDto): Promise<string[]> {
+  private async getUserIdsToSearch(auth: AuthDto, visibility?: AssetVisibility): Promise<string[]> {
+    // Locked assets are personal. Never include partner IDs, regardless of A's elevated session.
+    if (visibility === AssetVisibility.Locked) {
+      return [auth.user.id];
+    }
    const partnerIds = await getMyPartnerIds({
      userId: auth.user.id,
      repository: this.partnerRepository,
@@ -204,5 +204,16 @@ describe(TimelineService.name, () => {
        }),
      ).rejects.toThrow(BadRequestException);
    });
+
+    it('should throw an error if withPartners is true and visibility is locked', async () => {
+      await expect(
+        sut.getTimeBucket(authStub.adminWithElevatedPermission, {
+          timeBucket: 'bucket',
+          visibility: AssetVisibility.Locked,
+          withPartners: true,
+          userId: authStub.adminWithElevatedPermission.user.id,
+        }),
+      ).rejects.toThrow(BadRequestException);
+    });
  });
 });
@@ -71,13 +71,14 @@ export class TimelineService extends BaseService {
    }

    if (dto.withPartners) {
+      const requestedLocked = dto.visibility === AssetVisibility.Locked;
      const requestedArchived = dto.visibility === AssetVisibility.Archive || dto.visibility === undefined;
      const requestedFavorite = dto.isFavorite === true || dto.isFavorite === false;
      const requestedTrash = dto.isTrashed === true;

-      if (requestedArchived || requestedFavorite || requestedTrash) {
+      if (requestedLocked || requestedArchived || requestedFavorite || requestedTrash) {
        throw new BadRequestException(
-          'withPartners is only supported for non-archived, non-trashed, non-favorited assets',
+          'withPartners is only supported for non-archived, non-trashed, non-favorited, non-locked assets',
        );
      }
    }
@@ -41,6 +41,13 @@ export const authStub = {
      id: 'token-id',
    } as AuthSession,
  }),
+  adminWithElevatedPermission: Object.freeze<AuthDto>({
+    user: authUser.admin,
+    session: {
+      id: 'token-id-elevated',
+      hasElevatedPermission: true,
+    } as AuthSession,
+  }),
  adminSharedLink: Object.freeze({
    user: authUser.admin,
    sharedLink: {
@@ -51,13 +51,13 @@ describe(TimelineService.name, () => {
      const response1 = sut.getTimeBuckets(auth, { withPartners: true, visibility: AssetVisibility.Archive });
      await expect(response1).rejects.toBeInstanceOf(BadRequestException);
      await expect(response1).rejects.toThrow(
-        'withPartners is only supported for non-archived, non-trashed, non-favorited assets',
+        'withPartners is only supported for non-archived, non-trashed, non-favorited, non-locked assets',
      );

      const response2 = sut.getTimeBuckets(auth, { withPartners: true });
      await expect(response2).rejects.toBeInstanceOf(BadRequestException);
      await expect(response2).rejects.toThrow(
-        'withPartners is only supported for non-archived, non-trashed, non-favorited assets',
+        'withPartners is only supported for non-archived, non-trashed, non-favorited, non-locked assets',
      );
    });

@@ -67,13 +67,13 @@ describe(TimelineService.name, () => {
      const response1 = sut.getTimeBuckets(auth, { withPartners: true, isFavorite: false });
      await expect(response1).rejects.toBeInstanceOf(BadRequestException);
      await expect(response1).rejects.toThrow(
-        'withPartners is only supported for non-archived, non-trashed, non-favorited assets',
+        'withPartners is only supported for non-archived, non-trashed, non-favorited, non-locked assets',
      );

      const response2 = sut.getTimeBuckets(auth, { withPartners: true, isFavorite: true });
      await expect(response2).rejects.toBeInstanceOf(BadRequestException);
      await expect(response2).rejects.toThrow(
-        'withPartners is only supported for non-archived, non-trashed, non-favorited assets',
+        'withPartners is only supported for non-archived, non-trashed, non-favorited, non-locked assets',
      );
    });

@@ -83,7 +83,7 @@ describe(TimelineService.name, () => {
      const response = sut.getTimeBuckets(auth, { withPartners: true, isTrashed: true });
      await expect(response).rejects.toBeInstanceOf(BadRequestException);
      await expect(response).rejects.toThrow(
-        'withPartners is only supported for non-archived, non-trashed, non-favorited assets',
+        'withPartners is only supported for non-archived, non-trashed, non-favorited, non-locked assets',
      );
    });

@@ -10,7 +10,7 @@
    mdiPlus,
    mdiTrashCanOutline,
  } from '@mdi/js';
-  import { flushSync, mount } from 'svelte';
+  import { mount } from 'svelte';
  import { t } from 'svelte-i18n';
  import WorkflowStepDragImage from './WorkflowStepDragImage.svelte';

@@ -30,7 +30,7 @@
  const configEntries = $derived(
    Object.entries(step.config ?? {}).filter(([, value]) => value !== null && value !== undefined && value !== ''),
  );
-  let isDragging = $state(false);
+  let dragImage = $state<Element>();
  let isDropTarget = $state(false);
  let hoverDrag = $state(false);

@@ -68,15 +68,11 @@
      return;
    }

-    isDragging = true;
    event.dataTransfer.effectAllowed = 'move';
    event.dataTransfer.setData('text/plain', String(index));

-    const dragElement = document.createElement('div');
-    document.body.append(dragElement);
-
    mount(WorkflowStepDragImage, {
-      target: dragElement,
+      target: document.body,
      props: {
        description: method?.description,
        isFilter: method?.uiHints?.includes('filter') ?? false,
@@ -84,9 +80,9 @@
        stepNumber: index + 1,
      },
    });
-    flushSync();

-    event.dataTransfer.setDragImage(dragElement, 16, 22);
+    dragImage = document.body.querySelector('#workflow-step-drag-image')!;
+    event.dataTransfer.setDragImage(dragImage, 16, 22);
  };

  const handleDrop = (index: number, event: DragEvent) => {
@@ -109,7 +105,8 @@
  };

  const handleDragEnd = () => {
-    isDragging = false;
+    dragImage?.remove();
+    dragImage = undefined;
    isDropTarget = false;
  };
 </script>
@@ -132,8 +129,8 @@

  <div
    class="w-full transition-all"
-    class:opacity-40={isDragging}
-    class:scale-[0.99]={isDragging}
+    class:opacity-40={!!dragImage}
+    class:scale-[0.99]={!!dragImage}
    ondragover={handleDragOver}
    ondragleave={() => (isDropTarget = false)}
    ondrop={(event) => handleDrop(index, event)}
@@ -13,6 +13,7 @@
 </script>

 <div
+  id="workflow-step-drag-image"
  aria-hidden="true"
  class="pointer-events-none fixed top-[-1000px] left-0 flex w-80 items-center gap-2.5 rounded-lg border border-light-200 bg-light px-3 py-2.5 text-sm/5 text-dark shadow-2xl"
 >
Author	SHA1	Message	Date
mertalev	4423a8f8a4	pass cancel token to icloud download	2026-05-28 01:57:39 -04:00
mertalev	77fd2ba919	more cleanup	2026-05-28 00:44:11 -04:00
mertalev	1318dafdc4	use pattern matching	2026-05-27 20:02:51 -04:00
Timon	26714f6bfe	fix(server): prevent locked assets from leaking to partners (#28652 ) * fix(server): prevent locked assets from leaking to partners * fix tests	2026-05-27 17:33:49 -04:00
Lauritz Tieste	a5ce3fc927	fix: Refresh local album overview page after asset deletion (#28586 ) fix: invalidate local album provider on asset delete	2026-05-28 01:20:32 +05:30
shenlong	3b23f71a3f	refactor: cleanup metadata (#28485 ) jason-ify metadata Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>	2026-05-28 01:19:25 +05:30
shenlong	dec33cadd9	fix: verify form disposal before notifyListeners (#28578 ) Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>	2026-05-27 19:45:48 +00:00
Daniel Dietzler	80c15a5e27	fix: workflow drag and drop (#28650 )	2026-05-27 14:05:38 -05:00