refactor: cleanup metadata

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

@@ -1,3 +1,4 @@
+import 'package:immich_mobile/domain/models/metadata_key.dart';
 import 'package:immich_mobile/providers/album/album_sort_by_options.provider.dart';
 
 class AlbumConfig {
@@ -5,7 +6,12 @@ class AlbumConfig {
   final bool isReverse;
   final bool isGrid;
 
-  const AlbumConfig({this.sortMode = AlbumSortMode.mostRecent, this.isReverse = true, this.isGrid = false});
+  const AlbumConfig({required this.sortMode, required this.isReverse, required this.isGrid});
+
+  AlbumConfig.defaults()
+    : sortMode = MetadataKey.albumSortMode.defaultValue,
+      isReverse = MetadataKey.albumIsReverse.defaultValue,
+      isGrid = MetadataKey.albumIsGrid.defaultValue;
 
   AlbumConfig copyWith({AlbumSortMode? sortMode, bool? isReverse, bool? isGrid}) => AlbumConfig(
     sortMode: sortMode ?? this.sortMode,

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

@@ -1,4 +1,5 @@
 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';
@@ -16,18 +17,31 @@ class AppConfig {
   final ViewerConfig viewer;
   final SlideshowConfig slideshow;
   final AlbumConfig album;
+  final BackupConfig backup;
 
   const AppConfig({
-    this.theme = const .new(),
-    this.cleanup = const .new(),
-    this.map = const .new(),
-    this.timeline = const .new(),
-    this.image = const .new(),
-    this.viewer = const .new(),
-    this.slideshow = const .new(),
-    this.album = const .new(),
+    required this.theme,
+    required this.cleanup,
+    required this.map,
+    required this.timeline,
+    required this.image,
+    required this.viewer,
+    required this.slideshow,
+    required this.album,
+    required this.backup,
   });
 
+  AppConfig.defaults()
+    : theme = .defaults(),
+      cleanup = .defaults(),
+      map = .defaults(),
+      timeline = .defaults(),
+      image = .defaults(),
+      viewer = .defaults(),
+      slideshow = .defaults(),
+      album = .defaults(),
+      backup = .defaults();
+
   AppConfig copyWith({
     ThemeConfig? theme,
     CleanupConfig? cleanup,
@@ -37,6 +51,7 @@ class AppConfig {
     ViewerConfig? viewer,
     SlideshowConfig? slideshow,
     AlbumConfig? album,
+    BackupConfig? backup,
   }) => .new(
     theme: theme ?? this.theme,
     cleanup: cleanup ?? this.cleanup,
@@ -46,6 +61,7 @@ class AppConfig {
     viewer: viewer ?? this.viewer,
     slideshow: slideshow ?? this.slideshow,
     album: album ?? this.album,
+    backup: backup ?? this.backup,
   );
 
   @override
@@ -59,12 +75,13 @@ class AppConfig {
           other.image == image &&
           other.viewer == viewer &&
           other.slideshow == slideshow &&
-          other.album == album);
+          other.album == album &&
+          other.backup == backup);
 
   @override
-  int get hashCode => Object.hash(theme, cleanup, map, timeline, image, viewer, slideshow, album);
+  int get hashCode => Object.hash(theme, cleanup, map, timeline, image, viewer, slideshow, album, backup);
 
   @override
   String toString() =>
-      'AppConfig(theme: $theme, cleanup: $cleanup, map: $map, timeline: $timeline, image: $image, viewer: $viewer, slideshow: $slideshow, album: $album)';
+      'AppConfig(theme: $theme, cleanup: $cleanup, map: $map, timeline: $timeline, image: $image, viewer: $viewer, slideshow: $slideshow, album: $album, backup: $backup)';
 }

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

@@ -0,0 +1,62 @@
+import 'package:immich_mobile/domain/models/metadata_key.dart';
+
+class BackupConfig {
+  final bool enabled;
+  final bool useCellularForVideos;
+  final bool useCellularForPhotos;
+  final bool requireCharging;
+  final int triggerDelay;
+  final bool syncAlbums;
+
+  const BackupConfig({
+    required this.enabled,
+    required this.useCellularForVideos,
+    required this.useCellularForPhotos,
+    required this.requireCharging,
+    required this.triggerDelay,
+    required this.syncAlbums,
+  });
+
+  BackupConfig.defaults()
+    : enabled = MetadataKey.backupEnabled.defaultValue,
+      useCellularForVideos = MetadataKey.backupUseCellularForVideos.defaultValue,
+      useCellularForPhotos = MetadataKey.backupUseCellularForPhotos.defaultValue,
+      requireCharging = MetadataKey.backupRequireCharging.defaultValue,
+      triggerDelay = MetadataKey.backupTriggerDelay.defaultValue,
+      syncAlbums = MetadataKey.backupSyncAlbums.defaultValue;
+
+  BackupConfig copyWith({
+    bool? enabled,
+    bool? useCellularForVideos,
+    bool? useCellularForPhotos,
+    bool? requireCharging,
+    int? triggerDelay,
+    bool? syncAlbums,
+  }) => BackupConfig(
+    enabled: enabled ?? this.enabled,
+    useCellularForVideos: useCellularForVideos ?? this.useCellularForVideos,
+    useCellularForPhotos: useCellularForPhotos ?? this.useCellularForPhotos,
+    requireCharging: requireCharging ?? this.requireCharging,
+    triggerDelay: triggerDelay ?? this.triggerDelay,
+    syncAlbums: syncAlbums ?? this.syncAlbums,
+  );
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is BackupConfig &&
+          other.enabled == enabled &&
+          other.useCellularForVideos == useCellularForVideos &&
+          other.useCellularForPhotos == useCellularForPhotos &&
+          other.requireCharging == requireCharging &&
+          other.triggerDelay == triggerDelay &&
+          other.syncAlbums == syncAlbums);
+
+  @override
+  int get hashCode =>
+      Object.hash(enabled, useCellularForVideos, useCellularForPhotos, requireCharging, triggerDelay, syncAlbums);
+
+  @override
+  String toString() =>
+      'BackupConfig(enabled: $enabled, useCellularForVideos: $useCellularForVideos, useCellularForPhotos: $useCellularForPhotos, requireCharging: $requireCharging, triggerDelay: $triggerDelay, syncAlbums: $syncAlbums)';
+}

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

@@ -1,4 +1,5 @@
 import 'package:immich_mobile/constants/enums.dart';
+import 'package:immich_mobile/domain/models/metadata_key.dart';
 
 class CleanupConfig {
   final bool keepFavorites;
@@ -8,13 +9,20 @@ class CleanupConfig {
   final bool defaultsInitialized;
 
   const CleanupConfig({
-    this.keepFavorites = true,
-    this.keepMediaType = AssetKeepType.none,
-    this.keepAlbumIds = const [],
-    this.cutoffDaysAgo = -1,
-    this.defaultsInitialized = false,
+    required this.keepFavorites,
+    required this.keepMediaType,
+    required this.keepAlbumIds,
+    required this.cutoffDaysAgo,
+    required this.defaultsInitialized,
   });
 
+  CleanupConfig.defaults()
+    : keepFavorites = MetadataKey.cleanupKeepFavorites.defaultValue,
+      keepMediaType = MetadataKey.cleanupKeepMediaType.defaultValue,
+      keepAlbumIds = MetadataKey.cleanupKeepAlbumIds.defaultValue,
+      cutoffDaysAgo = MetadataKey.cleanupCutoffDaysAgo.defaultValue,
+      defaultsInitialized = MetadataKey.cleanupDefaultsInitialized.defaultValue;
+
   CleanupConfig copyWith({
     bool? keepFavorites,
     AssetKeepType? keepMediaType,

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

@@ -1,8 +1,14 @@
+import 'package:immich_mobile/domain/models/metadata_key.dart';
+
 class ImageConfig {
   final bool preferRemote;
   final bool loadOriginal;
 
-  const ImageConfig({this.preferRemote = false, this.loadOriginal = false});
+  const ImageConfig({required this.preferRemote, required this.loadOriginal});
+
+  ImageConfig.defaults()
+    : preferRemote = MetadataKey.imagePreferRemote.defaultValue,
+      loadOriginal = MetadataKey.imageLoadOriginal.defaultValue;
 
   ImageConfig copyWith({bool? preferRemote, bool? loadOriginal}) =>
       ImageConfig(preferRemote: preferRemote ?? this.preferRemote, loadOriginal: loadOriginal ?? this.loadOriginal);

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

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:immich_mobile/domain/models/metadata_key.dart';
 
 class MapConfig {
   final int relativeDays;
@@ -8,13 +9,20 @@ class MapConfig {
   final bool withPartners;
 
   const MapConfig({
-    this.relativeDays = 0,
-    this.favoritesOnly = false,
-    this.includeArchived = false,
-    this.themeMode = ThemeMode.system,
-    this.withPartners = false,
+    required this.relativeDays,
+    required this.favoritesOnly,
+    required this.includeArchived,
+    required this.themeMode,
+    required this.withPartners,
   });
 
+  MapConfig.defaults()
+    : relativeDays = MetadataKey.mapRelativeDate.defaultValue,
+      favoritesOnly = MetadataKey.mapShowFavoriteOnly.defaultValue,
+      includeArchived = MetadataKey.mapIncludeArchived.defaultValue,
+      themeMode = MetadataKey.mapThemeMode.defaultValue,
+      withPartners = MetadataKey.mapWithPartners.defaultValue;
+
   MapConfig copyWith({
     int? relativeDays,
     bool? favoritesOnly,

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

@@ -1,4 +1,5 @@
 import 'package:flutter/foundation.dart';
+import 'package:immich_mobile/domain/models/metadata_key.dart';
 
 class NetworkConfig {
   final bool autoEndpointSwitching;
@@ -8,13 +9,20 @@ class NetworkConfig {
   final Map<String, String> customHeaders;
 
   const NetworkConfig({
-    this.autoEndpointSwitching = false,
+    required this.autoEndpointSwitching,
     this.preferredWifiName,
     this.localEndpoint,
-    this.externalEndpointList = const [],
-    this.customHeaders = const {},
+    required this.externalEndpointList,
+    required this.customHeaders,
   });
 
+  NetworkConfig.defaults()
+    : autoEndpointSwitching = MetadataKey.networkAutoEndpointSwitching.defaultValue,
+      preferredWifiName = MetadataKey.networkPreferredWifiName.defaultValue,
+      localEndpoint = MetadataKey.networkLocalEndpoint.defaultValue,
+      externalEndpointList = MetadataKey.networkExternalEndpointList.defaultValue,
+      customHeaders = MetadataKey.networkCustomHeaders.defaultValue;
+
   NetworkConfig copyWith({
     bool? autoEndpointSwitching,
     String? preferredWifiName,

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

@@ -1,4 +1,5 @@
 import 'package:immich_mobile/constants/enums.dart';
+import 'package:immich_mobile/domain/models/metadata_key.dart';
 
 class SlideshowConfig {
   final bool transition;
@@ -8,13 +9,20 @@ class SlideshowConfig {
   final SlideshowDirection direction;
 
   const SlideshowConfig({
-    this.transition = true,
-    this.repeat = true,
-    this.duration = 5,
-    this.look = SlideshowLook.contain,
-    this.direction = SlideshowDirection.forward,
+    required this.transition,
+    required this.repeat,
+    required this.duration,
+    required this.look,
+    required this.direction,
   });
 
+  SlideshowConfig.defaults()
+    : transition = MetadataKey.slideshowTransition.defaultValue,
+      repeat = MetadataKey.slideshowRepeat.defaultValue,
+      duration = MetadataKey.slideshowDuration.defaultValue,
+      look = MetadataKey.slideshowLook.defaultValue,
+      direction = MetadataKey.slideshowDirection.defaultValue;
+
   SlideshowConfig copyWith({
     bool? transition,
     bool? repeat,

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

@@ -1,11 +1,14 @@
 import 'package:immich_mobile/domain/models/config/network_config.dart';
 import 'package:immich_mobile/domain/models/log.model.dart';
+import 'package:immich_mobile/domain/models/metadata_key.dart';
 
 class SystemConfig {
   final LogLevel logLevel;
   final NetworkConfig network;
 
-  const SystemConfig({this.logLevel = .info, this.network = const .new()});
+  const SystemConfig({required this.logLevel, required this.network});
+
+  SystemConfig.defaults() : logLevel = MetadataKey.logLevel.defaultValue, network = NetworkConfig.defaults();
 
   SystemConfig copyWith({LogLevel? logLevel, NetworkConfig? network}) =>
       SystemConfig(logLevel: logLevel ?? this.logLevel, network: network ?? this.network);

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

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:immich_mobile/constants/colors.dart';
+import 'package:immich_mobile/domain/models/metadata_key.dart';
 
 class ThemeConfig {
   final ThemeMode mode;
@@ -8,12 +9,18 @@ class ThemeConfig {
   final bool colorfulInterface;
 
   const ThemeConfig({
-    this.mode = .system,
-    this.primaryColor = .indigo,
-    this.dynamicTheme = false,
-    this.colorfulInterface = true,
+    required this.mode,
+    required this.primaryColor,
+    required this.dynamicTheme,
+    required this.colorfulInterface,
   });
 
+  ThemeConfig.defaults()
+    : mode = MetadataKey.themeMode.defaultValue,
+      primaryColor = MetadataKey.themePrimaryColor.defaultValue,
+      dynamicTheme = MetadataKey.themeDynamic.defaultValue,
+      colorfulInterface = MetadataKey.themeColorfulInterface.defaultValue;
+
   ThemeConfig copyWith({
     ThemeMode? mode,
     ImmichColorPreset? primaryColor,

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

@@ -1,3 +1,4 @@
+import 'package:immich_mobile/domain/models/metadata_key.dart';
 import 'package:immich_mobile/domain/models/timeline.model.dart';
 
 class TimelineConfig {
@@ -5,7 +6,12 @@ class TimelineConfig {
   final GroupAssetsBy groupAssetsBy;
   final bool storageIndicator;
 
-  const TimelineConfig({this.tilesPerRow = 4, this.groupAssetsBy = GroupAssetsBy.day, this.storageIndicator = true});
+  const TimelineConfig({required this.tilesPerRow, required this.groupAssetsBy, required this.storageIndicator});
+
+  TimelineConfig.defaults()
+    : tilesPerRow = MetadataKey.timelineTilesPerRow.defaultValue,
+      groupAssetsBy = MetadataKey.timelineGroupAssetsBy.defaultValue,
+      storageIndicator = MetadataKey.timelineStorageIndicator.defaultValue;
 
   TimelineConfig copyWith({int? tilesPerRow, GroupAssetsBy? groupAssetsBy, bool? storageIndicator}) => TimelineConfig(
     tilesPerRow: tilesPerRow ?? this.tilesPerRow,

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

@@ -1,3 +1,5 @@
+import 'package:immich_mobile/domain/models/metadata_key.dart';
+
 class ViewerConfig {
   final bool loopVideo;
   final bool loadOriginalVideo;
@@ -5,12 +7,18 @@ class ViewerConfig {
   final bool tapToNavigate;
 
   const ViewerConfig({
-    this.loopVideo = true,
-    this.loadOriginalVideo = false,
-    this.autoPlayVideo = true,
-    this.tapToNavigate = false,
+    required this.loopVideo,
+    required this.loadOriginalVideo,
+    required this.autoPlayVideo,
+    required this.tapToNavigate,
   });
 
+  ViewerConfig.defaults()
+    : loopVideo = MetadataKey.viewerLoopVideo.defaultValue,
+      loadOriginalVideo = MetadataKey.viewerLoadOriginalVideo.defaultValue,
+      autoPlayVideo = MetadataKey.viewerAutoPlayVideo.defaultValue,
+      tapToNavigate = MetadataKey.viewerTapToNavigate.defaultValue;
+
   ViewerConfig copyWith({bool? loopVideo, bool? loadOriginalVideo, bool? autoPlayVideo, bool? tapToNavigate}) =>
       ViewerConfig(
         loopVideo: loopVideo ?? this.loopVideo,

mobile/lib/domain/models/metadata_key.dart

@@ -20,98 +20,79 @@ enum MetadataDomain<T extends Object> {
 
 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>(.appConfig, .indigo, _EnumCodec(ImmichColorPreset.values)),
+  themeMode<ThemeMode>(.appConfig, .system, _EnumCodec(ThemeMode.values)),
+  themeDynamic<bool>(.appConfig, false),
+  themeColorfulInterface<bool>(.appConfig, true),
 
   // Image
-  imagePreferRemote<bool>(.appConfig, 'image.preferRemote', false),
-  imageLoadOriginal<bool>(.appConfig, 'image.loadOriginal', false),
+  imagePreferRemote<bool>(.appConfig, false),
+  imageLoadOriginal<bool>(.appConfig, false),
 
   // 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>(.appConfig, true),
+  viewerLoadOriginalVideo<bool>(.appConfig, false),
+  viewerAutoPlayVideo<bool>(.appConfig, true),
+  viewerTapToNavigate<bool>(.appConfig, false),
 
   // 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>(.systemConfig, false),
+  networkPreferredWifiName<String>(.systemConfig, ''),
+  networkLocalEndpoint<String>(.systemConfig, ''),
+  networkExternalEndpointList<List<String>>(.systemConfig, [], _ListCodec(_PrimitiveCodec.string)),
   networkCustomHeaders<Map<String, String>>(
     .systemConfig,
-    'network.customHeaders',
     {},
     _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>(.appConfig, AlbumSortMode.mostRecent, _EnumCodec(AlbumSortMode.values)),
+  albumIsReverse<bool>(.appConfig, true),
+  albumIsGrid<bool>(.appConfig, false),
+
+  // Backup
+  backupEnabled<bool>(.appConfig, false),
+  backupUseCellularForVideos<bool>(.appConfig, false),
+  backupUseCellularForPhotos<bool>(.appConfig, false),
+  backupRequireCharging<bool>(.appConfig, false),
+  backupTriggerDelay<int>(.appConfig, 30),
+  backupSyncAlbums<bool>(.appConfig, false),
 
   // 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>(.appConfig, 4),
+  timelineGroupAssetsBy<GroupAssetsBy>(.appConfig, GroupAssetsBy.day, _EnumCodec(GroupAssetsBy.values)),
+  timelineStorageIndicator<bool>(.appConfig, true),
 
   // Log
-  logLevel<LogLevel>(.systemConfig, 'log.level', .info, _EnumCodec(LogLevel.values)),
+  logLevel<LogLevel>(.systemConfig, .info, _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>(.appConfig, false),
+  mapRelativeDate<int>(.appConfig, 0),
+  mapIncludeArchived<bool>(.appConfig, false),
+  mapThemeMode<ThemeMode>(.appConfig, .system, _EnumCodec(ThemeMode.values)),
+  mapWithPartners<bool>(.appConfig, false),
 
   // 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>(.appConfig, true),
+  cleanupKeepMediaType<AssetKeepType>(.appConfig, AssetKeepType.none, _EnumCodec(AssetKeepType.values)),
+  cleanupKeepAlbumIds<List<String>>(.appConfig, [], _ListCodec(_PrimitiveCodec.string)),
+  cleanupCutoffDaysAgo<int>(.appConfig, -1),
+  cleanupDefaultsInitialized<bool>(.appConfig, false),
 
   // 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>(.appConfig, true),
+  slideshowRepeat<bool>(.appConfig, true),
+  slideshowDuration<int>(.appConfig, 5),
+  slideshowLook<SlideshowLook>(.appConfig, SlideshowLook.contain, _EnumCodec(SlideshowLook.values)),
+  slideshowDirection<SlideshowDirection>(.appConfig, SlideshowDirection.forward, _EnumCodec(SlideshowDirection.values));
 
   final MetadataDomain domain;
-  final String name;
   final T defaultValue;
   final _MetadataCodec<T>? _codecOverride;
 
-  const MetadataKey(this.domain, this.name, this.defaultValue, [this._codecOverride]);
+  const MetadataKey(this.domain, this.defaultValue, [this._codecOverride]);
 
   String get key => '${domain.prefix}.$name';
 

mobile/lib/domain/models/setting.model.dart

@@ -1,8 +1,7 @@
 import 'package:immich_mobile/domain/models/store.model.dart';
 
 enum Setting<T> {
-  advancedTroubleshooting<bool>(StoreKey.advancedTroubleshooting, false),
-  enableBackup<bool>(StoreKey.enableBackup, false);
+  advancedTroubleshooting<bool>(StoreKey.advancedTroubleshooting, false);
 
   const Setting(this.storeKey, this.defaultValue);
 

mobile/lib/domain/models/store.model.dart

@@ -6,26 +6,25 @@ enum StoreKey<T> {
   version<int>._(0),
   currentUser<UserDto>._(2),
   deviceId<String>._(4),
-  backupRequireCharging<bool>._(7),
-  backupTriggerDelay<int>._(8),
   serverUrl<String>._(10),
   accessToken<String>._(11),
   serverEndpoint<String>._(12),
   advancedTroubleshooting<bool>._(114),
   enableHapticFeedback<bool>._(126),
-  syncAlbums<bool>._(131),
 
   manageLocalMediaAndroid<bool>._(137),
   // Read-only Mode settings
   readonlyModeEnabled<bool>._(138),
 
-  // Experimental stuff
-  enableBackup<bool>._(1003),
-  useWifiForUploadVideos<bool>._(1004),
-  useWifiForUploadPhotos<bool>._(1005),
   syncMigrationStatus<String>._(1013),
 
   // Legacy keys that have been migrated to the new metadata store
+  legacyBackupRequireCharging<bool>._(7),
+  legacyBackupTriggerDelay<int>._(8),
+  legacySyncAlbums<bool>._(131),
+  legacyEnableBackup<bool>._(1003),
+  legacyUseWifiForUploadVideos<bool>._(1004),
+  legacyUseWifiForUploadPhotos<bool>._(1005),
   legacySelectedAlbumSortOrder<int>._(113),
   legacySelectedAlbumSortReverse<bool>._(123),
   legacyAlbumGridView<bool>._(140),

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

@@ -11,15 +11,14 @@ import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/logger_db.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/metadata.repository.dart';
 import 'package:immich_mobile/platform/background_worker_api.g.dart';
 import 'package:immich_mobile/platform/background_worker_lock_api.g.dart';
-import 'package:immich_mobile/providers/app_settings.provider.dart';
 import 'package:immich_mobile/providers/background_sync.provider.dart';
 import 'package:immich_mobile/providers/backup/drift_backup.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/platform.provider.dart' show nativeSyncApiProvider;
 import 'package:immich_mobile/providers/user.provider.dart';
-import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:immich_mobile/services/auth.service.dart';
 import 'package:immich_mobile/services/foreground_upload.service.dart';
 import 'package:immich_mobile/services/localization.service.dart';
@@ -39,16 +38,15 @@ class BackgroundWorkerFgService {
   Future<void> saveNotificationMessage(String title, String body) =>
       _foregroundHostApi.saveNotificationMessage(title, body);
 
-  Future<void> configure({int? minimumDelaySeconds, bool? requireCharging}) => _foregroundHostApi.configure(
-    BackgroundWorkerSettings(
-      minimumDelaySeconds:
-          minimumDelaySeconds ??
-          Store.get(AppSettingsEnum.backupTriggerDelay.storeKey, AppSettingsEnum.backupTriggerDelay.defaultValue),
-      requiresCharging:
-          requireCharging ??
-          Store.get(AppSettingsEnum.backupRequireCharging.storeKey, AppSettingsEnum.backupRequireCharging.defaultValue),
-    ),
-  );
+  Future<void> configure({int? minimumDelaySeconds, bool? requireCharging}) {
+    final backup = MetadataStore.appConfig.backup;
+    return _foregroundHostApi.configure(
+      BackgroundWorkerSettings(
+        minimumDelaySeconds: minimumDelaySeconds ?? backup.triggerDelay,
+        requiresCharging: requireCharging ?? backup.requireCharging,
+      ),
+    );
+  }
 
   Future<void> disable() => _foregroundHostApi.disable();
 }
@@ -71,7 +69,7 @@ class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {
     BackgroundWorkerFlutterApi.setUp(this);
   }
 
-  bool get _isBackupEnabled => _ref?.read(appSettingsServiceProvider).getSetting(AppSettingsEnum.enableBackup) ?? false;
+  bool get _isBackupEnabled => MetadataStore.appConfig.backup.enabled;
 
   Future<void> init() async {
     try {

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

@@ -6,12 +6,7 @@ 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);
-
+abstract final class MetadataStore {
   static MetadataRepository? _instance;
 
   static MetadataRepository get instance {
@@ -22,26 +17,36 @@ class MetadataRepository extends DriftDatabaseRepository {
     return instance;
   }
 
-  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);
+      final instance = MetadataRepository(db);
       await instance._hydrate();
       _instance = instance;
     }
     return _instance!;
   }
 
-  static Future<void> refresh() async {
-    instance._cache.clear();
-    instance._appConfig = const .new();
-    instance._systemConfig = const .new();
-    await instance._hydrate();
+  static AppConfig get appConfig => instance.appConfig;
+  static SystemConfig get systemConfig => instance.systemConfig;
+}
+
+class MetadataRepository extends DriftDatabaseRepository {
+  final Drift _db;
+  final Map<MetadataKey, Object> _cache = {};
+
+  MetadataRepository(this._db) : super(_db);
+
+  AppConfig _appConfig = AppConfig.defaults();
+  AppConfig get appConfig => _appConfig;
+
+  SystemConfig _systemConfig = SystemConfig.defaults();
+  SystemConfig get systemConfig => _systemConfig;
+
+  Future<void> refresh() async {
+    _cache.clear();
+    _appConfig = AppConfig.defaults();
+    _systemConfig = SystemConfig.defaults();
+    await _hydrate();
   }
 
   Future<void> _hydrate() async => _hydrateCache(await _db.select(_db.metadataEntity).get());
@@ -52,6 +57,9 @@ class MetadataRepository extends DriftDatabaseRepository {
     if (_read(key) == value) {
       return;
     }
+    if (value == key.defaultValue) {
+      return delete(key);
+    }
 
     await _db
         .into(_db.metadataEntity)
@@ -74,7 +82,10 @@ class MetadataRepository extends DriftDatabaseRepository {
     final query = _db.select(_db.metadataEntity)..where((t) => t.key.like('${domain.prefix}.%'));
     return query.watch().map((rows) {
       _hydrateCache(rows);
-      return domain.config(this);
+      return switch (domain) {
+        .appConfig => _appConfig as T,
+        .systemConfig => _systemConfig as T,
+      };
     });
   }
 
@@ -94,76 +105,74 @@ class MetadataRepository extends DriftDatabaseRepository {
       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) {
+    switch (key.domain) {
       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),
-          ),
-        );
+        _appConfig = _buildAppConfig();
       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),
-          ),
-        );
+        _systemConfig = _buildSystemConfig();
     }
   }
+
+  AppConfig _buildAppConfig() => .new(
+    theme: .new(
+      mode: _read(.themeMode),
+      primaryColor: _read(.themePrimaryColor),
+      dynamicTheme: _read(.themeDynamic),
+      colorfulInterface: _read(.themeColorfulInterface),
+    ),
+    cleanup: .new(
+      keepFavorites: _read(.cleanupKeepFavorites),
+      keepMediaType: _read(.cleanupKeepMediaType),
+      keepAlbumIds: _read(.cleanupKeepAlbumIds),
+      cutoffDaysAgo: _read(.cleanupCutoffDaysAgo),
+      defaultsInitialized: _read(.cleanupDefaultsInitialized),
+    ),
+    map: .new(
+      relativeDays: _read(.mapRelativeDate),
+      favoritesOnly: _read(.mapShowFavoriteOnly),
+      includeArchived: _read(.mapIncludeArchived),
+      themeMode: _read(.mapThemeMode),
+      withPartners: _read(.mapWithPartners),
+    ),
+    timeline: .new(
+      tilesPerRow: _read(.timelineTilesPerRow),
+      groupAssetsBy: _read(.timelineGroupAssetsBy),
+      storageIndicator: _read(.timelineStorageIndicator),
+    ),
+    image: .new(preferRemote: _read(.imagePreferRemote), loadOriginal: _read(.imageLoadOriginal)),
+    viewer: .new(
+      loopVideo: _read(.viewerLoopVideo),
+      loadOriginalVideo: _read(.viewerLoadOriginalVideo),
+      autoPlayVideo: _read(.viewerAutoPlayVideo),
+      tapToNavigate: _read(.viewerTapToNavigate),
+    ),
+    slideshow: .new(
+      transition: _read(.slideshowTransition),
+      repeat: _read(.slideshowRepeat),
+      duration: _read(.slideshowDuration),
+      look: _read(.slideshowLook),
+      direction: _read(.slideshowDirection),
+    ),
+    album: .new(sortMode: _read(.albumSortMode), isReverse: _read(.albumIsReverse), isGrid: _read(.albumIsGrid)),
+    backup: .new(
+      enabled: _read(.backupEnabled),
+      useCellularForVideos: _read(.backupUseCellularForVideos),
+      useCellularForPhotos: _read(.backupUseCellularForPhotos),
+      requireCharging: _read(.backupRequireCharging),
+      triggerDelay: _read(.backupTriggerDelay),
+      syncAlbums: _read(.backupSyncAlbums),
+    ),
+  );
+
+  SystemConfig _buildSystemConfig() => .new(
+    logLevel: _read(.logLevel),
+    network: .new(
+      autoEndpointSwitching: _read(.networkAutoEndpointSwitching),
+      preferredWifiName: _read(.networkPreferredWifiName).nullIfEmpty,
+      localEndpoint: _read(.networkLocalEndpoint).nullIfEmpty,
+      externalEndpointList: _read(.networkExternalEndpointList),
+      customHeaders: _read(.networkCustomHeaders),
+    ),
+  );
 }

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

@@ -8,13 +8,13 @@ import 'package:immich_mobile/domain/models/album/local_album.model.dart';
 import 'package:immich_mobile/domain/services/sync_linked_album.service.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
-import 'package:immich_mobile/providers/app_settings.provider.dart';
+import 'package:immich_mobile/infrastructure/repositories/metadata.repository.dart';
 import 'package:immich_mobile/providers/background_sync.provider.dart';
 import 'package:immich_mobile/providers/backup/backup_album.provider.dart';
 import 'package:immich_mobile/providers/backup/drift_backup.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
-import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:immich_mobile/widgets/backup/drift_album_info_list_tile.dart';
 import 'package:immich_mobile/widgets/common/search_field.dart';
 import 'package:logging/logging.dart';
@@ -43,7 +43,7 @@ class _DriftBackupAlbumSelectionPageState extends ConsumerState<DriftBackupAlbum
     _searchController = TextEditingController();
     _searchFocusNode = FocusNode();
 
-    _enableSyncUploadAlbum.value = ref.read(appSettingsServiceProvider).getSetting(AppSettingsEnum.syncAlbums);
+    _enableSyncUploadAlbum.value = ref.read(metadataProvider).appConfig.backup.syncAlbums;
     ref.read(backupAlbumProvider.notifier).getAll();
 
     _initialTotalAssetCount = ref.read(driftBackupProvider.select((p) => p.totalCount));
@@ -55,7 +55,7 @@ class _DriftBackupAlbumSelectionPageState extends ConsumerState<DriftBackupAlbum
       return;
     }
 
-    final enableSyncUploadAlbum = ref.read(appSettingsServiceProvider).getSetting(AppSettingsEnum.syncAlbums);
+    final enableSyncUploadAlbum = ref.read(metadataProvider).appConfig.backup.syncAlbums;
     final selectedAlbums = ref
         .read(backupAlbumProvider)
         .where((a) => a.backupSelection == BackupSelection.selected)
@@ -103,7 +103,7 @@ class _DriftBackupAlbumSelectionPageState extends ConsumerState<DriftBackupAlbum
             return;
           }
 
-          final isBackupEnabled = ref.read(appSettingsServiceProvider).getSetting(AppSettingsEnum.enableBackup);
+          final isBackupEnabled = MetadataStore.appConfig.backup.enabled;
           await ref.read(driftBackupProvider.notifier).getBackupStatus(user.id);
           final currentTotalAssetCount = ref.read(driftBackupProvider.select((p) => p.totalCount));
           final totalChanged = currentTotalAssetCount != _initialTotalAssetCount;

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

@@ -3,14 +3,12 @@ import 'dart:async';
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/domain/models/store.model.dart';
-import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
-import 'package:immich_mobile/providers/app_settings.provider.dart';
+import 'package:immich_mobile/infrastructure/repositories/metadata.repository.dart';
 import 'package:immich_mobile/providers/background_sync.provider.dart';
 import 'package:immich_mobile/providers/backup/drift_backup.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
-import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:immich_mobile/widgets/settings/backup_settings/drift_backup_settings.dart';
 import 'package:logging/logging.dart';
 
@@ -21,18 +19,20 @@ class DriftBackupOptionsPage extends ConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     bool hasPopped = false;
-    final previousWifiReqForVideos = Store.tryGet(StoreKey.useWifiForUploadVideos) ?? false;
-    final previousWifiReqForPhotos = Store.tryGet(StoreKey.useWifiForUploadPhotos) ?? false;
+    final previousBackup = ref.read(metadataProvider).appConfig.backup;
+    final previousCellularForVideos = previousBackup.useCellularForVideos;
+    final previousCellularForPhotos = previousBackup.useCellularForPhotos;
     return PopScope(
       onPopInvokedWithResult: (didPop, result) async {
         // There is an issue with Flutter where the pop event
         // can be triggered multiple times, so we guard it with _hasPopped
 
-        final currentWifiReqForVideos = Store.tryGet(StoreKey.useWifiForUploadVideos) ?? false;
-        final currentWifiReqForPhotos = Store.tryGet(StoreKey.useWifiForUploadPhotos) ?? false;
+        final currentBackup = ref.read(metadataProvider).appConfig.backup;
+        final currentCellularForVideos = currentBackup.useCellularForVideos;
+        final currentCellularForPhotos = currentBackup.useCellularForPhotos;
 
-        if (currentWifiReqForVideos == previousWifiReqForVideos &&
-            currentWifiReqForPhotos == previousWifiReqForPhotos) {
+        if (currentCellularForVideos == previousCellularForVideos &&
+            currentCellularForPhotos == previousCellularForPhotos) {
           return;
         }
 
@@ -45,7 +45,7 @@ class DriftBackupOptionsPage extends ConsumerWidget {
           }
 
           await ref.read(driftBackupProvider.notifier).getBackupStatus(currentUser.id);
-          final isBackupEnabled = ref.read(appSettingsServiceProvider).getSetting(AppSettingsEnum.enableBackup);
+          final isBackupEnabled = MetadataStore.appConfig.backup.enabled;
           if (!isBackupEnabled) {
             return;
           }

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

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

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

@@ -9,10 +9,10 @@ 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/infrastructure/metadata.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/services/api.service.dart';
 import 'package:logging/logging.dart';
 import 'package:native_video_player/native_video_player.dart';

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

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

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

@@ -188,6 +188,4 @@ ImageProvider? getThumbnailImageProvider(BaseAsset asset, {Size size = kThumbnai
 }
 
 bool _shouldUseLocalAsset(BaseAsset asset) =>
-    asset.hasLocal &&
-    (!asset.hasRemote || !MetadataRepository.instance.appConfig.image.preferRemote) &&
-    !asset.isEdited;
+    asset.hasLocal && (!asset.hasRemote || !MetadataStore.appConfig.image.preferRemote) && !asset.isEdited;

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

@@ -104,7 +104,7 @@ class LocalFullImageProvider extends CancellableImageProvider<LocalFullImageProv
       return;
     }
 
-    final loadOriginal = MetadataRepository.instance.appConfig.image.loadOriginal;
+    final loadOriginal = MetadataStore.appConfig.image.loadOriginal;
     final devicePixelRatio = PlatformDispatcher.instance.views.first.devicePixelRatio;
     var request = this.request = LocalImageRequest(
       localId: key.id,

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

@@ -122,7 +122,7 @@ class RemoteFullImageProvider extends CancellableImageProvider<RemoteFullImagePr
         edited: key.edited,
       ),
     );
-    final loadOriginal = assetType == AssetType.image && MetadataRepository.instance.appConfig.image.loadOriginal;
+    final loadOriginal = assetType == AssetType.image && MetadataStore.appConfig.image.loadOriginal;
     yield* loadRequest(previewRequest, decode, isFinal: !loadOriginal);
 
     if (!loadOriginal) {

mobile/lib/providers/app_life_cycle.provider.dart

@@ -5,16 +5,15 @@ import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/domain/services/log.service.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/extensions/platform_extensions.dart';
-import 'package:immich_mobile/providers/app_settings.provider.dart';
 import 'package:immich_mobile/providers/auth.provider.dart';
 import 'package:immich_mobile/providers/background_sync.provider.dart';
 import 'package:immich_mobile/providers/backup/drift_backup.provider.dart';
 import 'package:immich_mobile/providers/gallery_permission.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
 import 'package:immich_mobile/providers/notification_permission.provider.dart';
 import 'package:immich_mobile/providers/server_info.provider.dart';
 import 'package:immich_mobile/providers/websocket.provider.dart';
-import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:logging/logging.dart';
 
 enum AppLifeCycleEnum { active, inactive, paused, resumed, detached, hidden }
@@ -108,7 +107,7 @@ class AppLifeCycleNotifier extends StateNotifier<AppLifeCycleEnum> {
     await Future.delayed(const Duration(milliseconds: 500));
 
     final backgroundManager = _ref.read(backgroundSyncProvider);
-    final isAlbumLinkedSyncEnable = _ref.read(appSettingsServiceProvider).getSetting(AppSettingsEnum.syncAlbums);
+    final isAlbumLinkedSyncEnable = _ref.read(metadataProvider).appConfig.backup.syncAlbums;
 
     try {
       bool syncSuccess = false;
@@ -138,7 +137,7 @@ class AppLifeCycleNotifier extends StateNotifier<AppLifeCycleEnum> {
   }
 
   Future<void> _resumeBackup() async {
-    final isEnableBackup = _ref.read(appSettingsServiceProvider).getSetting(AppSettingsEnum.enableBackup);
+    final isEnableBackup = _ref.read(metadataProvider).appConfig.backup.enabled;
 
     if (isEnableBackup) {
       final currentUser = Store.tryGet(StoreKey.currentUser);

mobile/lib/providers/auth.provider.dart

@@ -8,6 +8,7 @@ import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/domain/models/user.model.dart';
 import 'package:immich_mobile/domain/services/user.service.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
+import 'package:immich_mobile/infrastructure/repositories/metadata.repository.dart';
 import 'package:immich_mobile/models/auth/auth_state.model.dart';
 import 'package:immich_mobile/models/auth/login_response.model.dart';
 import 'package:immich_mobile/providers/api.provider.dart';
@@ -130,7 +131,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 = MetadataStore.systemConfig.network.customHeaders;
     final customHeaders = headerMap.isEmpty ? null : jsonEncode(headerMap);
     await _widgetService.writeCredentials(serverEndpoint, accessToken, customHeaders);
 

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

@@ -3,7 +3,7 @@ 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 metadataProvider = Provider.autoDispose<MetadataRepository>((_) => MetadataStore.instance);
 
 final appConfigProvider = Provider.autoDispose<AppConfig>((ref) {
   final repo = ref.watch(metadataProvider);

mobile/lib/providers/websocket.provider.dart

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

mobile/lib/services/api.service.dart

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

mobile/lib/services/app_settings.service.dart

@@ -5,13 +5,7 @@ enum AppSettingsEnum<T> {
   advancedTroubleshooting<bool>(StoreKey.advancedTroubleshooting, null, false),
   manageLocalMediaAndroid<bool>(StoreKey.manageLocalMediaAndroid, null, false),
   enableHapticFeedback<bool>(StoreKey.enableHapticFeedback, null, true),
-  syncAlbums<bool>(StoreKey.syncAlbums, null, false),
-  enableBackup<bool>(StoreKey.enableBackup, null, false),
-  useCellularForUploadVideos<bool>(StoreKey.useWifiForUploadVideos, null, false),
-  useCellularForUploadPhotos<bool>(StoreKey.useWifiForUploadPhotos, null, false),
-  readonlyModeEnabled<bool>(StoreKey.readonlyModeEnabled, "readonlyModeEnabled", false),
-  backupRequireCharging<bool>(StoreKey.backupRequireCharging, null, false),
-  backupTriggerDelay<int>(StoreKey.backupTriggerDelay, null, 30);
+  readonlyModeEnabled<bool>(StoreKey.readonlyModeEnabled, "readonlyModeEnabled", false);
 
   const AppSettingsEnum(this.storeKey, this.hiveKey, this.defaultValue);
 

mobile/lib/services/auth.service.dart

@@ -1,19 +1,19 @@
 import 'dart:async';
 
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/metadata_key.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/domain/utils/background_sync.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
+import 'package:immich_mobile/infrastructure/repositories/metadata.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/network.repository.dart';
 import 'package:immich_mobile/models/auth/auxilary_endpoint.model.dart';
 import 'package:immich_mobile/models/auth/login_response.model.dart';
 import 'package:immich_mobile/providers/api.provider.dart';
-import 'package:immich_mobile/providers/app_settings.provider.dart';
 import 'package:immich_mobile/providers/background_sync.provider.dart';
 import 'package:immich_mobile/repositories/auth.repository.dart';
 import 'package:immich_mobile/repositories/auth_api.repository.dart';
 import 'package:immich_mobile/services/api.service.dart';
-import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:immich_mobile/services/network.service.dart';
 import 'package:logging/logging.dart';
 import 'package:openapi/api.dart';
@@ -25,7 +25,6 @@ final authServiceProvider = Provider(
     ref.watch(apiServiceProvider),
     ref.watch(networkServiceProvider),
     ref.watch(backgroundSyncProvider),
-    ref.watch(appSettingsServiceProvider),
   ),
 );
 
@@ -35,7 +34,6 @@ class AuthService {
   final ApiService _apiService;
   final NetworkService _networkService;
   final BackgroundSyncManager _backgroundSyncManager;
-  final AppSettingsService _appSettingsService;
   final _log = Logger("AuthService");
 
   AuthService(
@@ -44,7 +42,6 @@ class AuthService {
     this._apiService,
     this._networkService,
     this._backgroundSyncManager,
-    this._appSettingsService,
   );
 
   /// Validates the provided server URL by resolving and setting the endpoint.
@@ -103,7 +100,7 @@ class AuthService {
         _log.severe("Error clearing local data", error, stackTrace);
       });
 
-      await _appSettingsService.setSetting(AppSettingsEnum.enableBackup, false);
+      await MetadataStore.instance.write(MetadataKey.backupEnabled, false);
     }
   }
 

mobile/lib/services/background_upload.service.dart

@@ -13,14 +13,13 @@ import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:immich_mobile/infrastructure/repositories/backup.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/local_asset.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/metadata.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/storage.repository.dart';
-import 'package:immich_mobile/providers/app_settings.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/storage.provider.dart';
 import 'package:immich_mobile/repositories/asset_media.repository.dart';
 import 'package:immich_mobile/repositories/upload.repository.dart';
 import 'package:immich_mobile/services/api.service.dart';
-import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:immich_mobile/utils/debug_print.dart';
 import 'package:logging/logging.dart';
 import 'package:path/path.dart' as p;
@@ -31,7 +30,6 @@ final backgroundUploadServiceProvider = Provider((ref) {
     ref.watch(storageRepositoryProvider),
     ref.watch(localAssetRepository),
     ref.watch(backupRepositoryProvider),
-    ref.watch(appSettingsServiceProvider),
     ref.watch(assetMediaRepositoryProvider),
   );
 
@@ -105,7 +103,6 @@ class BackgroundUploadService {
     this._storageRepository,
     this._localAssetRepository,
     this._backupRepository,
-    this._appSettingsService,
     this._assetMediaRepository,
   ) {
     _uploadRepository.onUploadStatus = _onUploadCallback;
@@ -116,7 +113,6 @@ class BackgroundUploadService {
   final StorageRepository _storageRepository;
   final DriftLocalAssetRepository _localAssetRepository;
   final DriftBackupRepository _backupRepository;
-  final AppSettingsService _appSettingsService;
   final AssetMediaRepository _assetMediaRepository;
   final Logger _logger = Logger('BackgroundUploadService');
 
@@ -363,15 +359,14 @@ class BackgroundUploadService {
   }
 
   bool _shouldRequireWiFi(LocalAsset asset) {
-    bool requiresWiFi = true;
-
-    if (asset.isVideo && _appSettingsService.getSetting(AppSettingsEnum.useCellularForUploadVideos)) {
-      requiresWiFi = false;
-    } else if (!asset.isVideo && _appSettingsService.getSetting(AppSettingsEnum.useCellularForUploadPhotos)) {
-      requiresWiFi = false;
+    final backup = MetadataStore.appConfig.backup;
+    if (asset.isVideo && backup.useCellularForVideos) {
+      return false;
     }
-
-    return requiresWiFi;
+    if (!asset.isVideo && backup.useCellularForPhotos) {
+      return false;
+    }
+    return true;
   }
 
   Future<UploadTask> buildUploadTask(

mobile/lib/services/foreground_upload.service.dart

@@ -7,18 +7,17 @@ import 'package:immich_mobile/domain/models/asset/asset_metadata.model.dart';
 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/extensions/network_capability_extensions.dart';
+import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/infrastructure/repositories/backup.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/metadata.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/storage.repository.dart';
 import 'package:immich_mobile/platform/connectivity_api.g.dart';
-import 'package:immich_mobile/providers/app_settings.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/storage.provider.dart';
 import 'package:immich_mobile/repositories/asset_media.repository.dart';
 import 'package:immich_mobile/repositories/upload.repository.dart';
-import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:logging/logging.dart';
 import 'package:path/path.dart' as p;
 import 'package:photo_manager/photo_manager.dart' show PMProgressHandler;
@@ -39,7 +38,6 @@ final foregroundUploadServiceProvider = Provider((ref) {
     ref.watch(storageRepositoryProvider),
     ref.watch(backupRepositoryProvider),
     ref.watch(connectivityApiProvider),
-    ref.watch(appSettingsServiceProvider),
     ref.watch(assetMediaRepositoryProvider),
   );
 });
@@ -55,7 +53,6 @@ class ForegroundUploadService {
     this._storageRepository,
     this._backupRepository,
     this._connectivityApi,
-    this._appSettingsService,
     this._assetMediaRepository,
   );
 
@@ -63,7 +60,6 @@ class ForegroundUploadService {
   final StorageRepository _storageRepository;
   final DriftBackupRepository _backupRepository;
   final ConnectivityApi _connectivityApi;
-  final AppSettingsService _appSettingsService;
   final AssetMediaRepository _assetMediaRepository;
   final Logger _logger = Logger('ForegroundUploadService');
 
@@ -455,14 +451,13 @@ class ForegroundUploadService {
   }
 
   bool _shouldRequireWiFi(LocalAsset asset) {
-    bool requiresWiFi = true;
-
-    if (asset.isVideo && _appSettingsService.getSetting(AppSettingsEnum.useCellularForUploadVideos)) {
-      requiresWiFi = false;
-    } else if (!asset.isVideo && _appSettingsService.getSetting(AppSettingsEnum.useCellularForUploadPhotos)) {
-      requiresWiFi = false;
+    final backup = MetadataStore.appConfig.backup;
+    if (asset.isVideo && backup.useCellularForVideos) {
+      return false;
     }
-
-    return requiresWiFi;
+    if (!asset.isVideo && backup.useCellularForPhotos) {
+      return false;
+    }
+    return true;
   }
 }

mobile/lib/utils/bootstrap.dart

@@ -49,7 +49,7 @@ abstract final class Bootstrap {
 
     await StoreService.init(storeRepository: storeRepo, listenUpdates: listenStoreUpdates);
 
-    final metadataRepo = await MetadataRepository.ensureInitialized(drift);
+    final metadataRepo = await MetadataStore.ensureInitialized(drift);
 
     await LogService.init(
       logRepository: LogRepository(logDb),

mobile/lib/utils/migration.dart

@@ -124,6 +124,13 @@ Future<void> _migrateTo26(Drift drift) async {
   await _migrateAlbumSortMode(migrator);
   await migrator.migrateBool(StoreKey.legacySelectedAlbumSortReverse, MetadataKey.albumIsReverse);
   await migrator.migrateBool(StoreKey.legacyAlbumGridView, MetadataKey.albumIsGrid);
+  // Backup
+  await migrator.migrateBool(StoreKey.legacyEnableBackup, MetadataKey.backupEnabled);
+  await migrator.migrateBool(StoreKey.legacyUseWifiForUploadVideos, MetadataKey.backupUseCellularForVideos);
+  await migrator.migrateBool(StoreKey.legacyUseWifiForUploadPhotos, MetadataKey.backupUseCellularForPhotos);
+  await migrator.migrateBool(StoreKey.legacyBackupRequireCharging, MetadataKey.backupRequireCharging);
+  await migrator.migrateInt(StoreKey.legacyBackupTriggerDelay, MetadataKey.backupTriggerDelay);
+  await migrator.migrateBool(StoreKey.legacySyncAlbums, MetadataKey.backupSyncAlbums);
   await migrator.complete();
 }
 
@@ -260,6 +267,9 @@ class _StoreMigrator {
   Future<void> complete() async {
     await _db.batch((batch) {
       for (final entry in _cache.entries) {
+        if (entry.value == entry.key.defaultValue) {
+          continue;
+        }
         batch.insert(
           _db.metadataEntity,
           MetadataEntityCompanion(key: Value(entry.key.key), value: Value(entry.key.encode(entry.value))),

mobile/lib/widgets/common/immich_sliver_app_bar.dart

@@ -6,13 +6,12 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/domain/models/setting.model.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/models/server_info/server_info.model.dart';
 import 'package:immich_mobile/providers/backup/drift_backup.provider.dart';
 import 'package:immich_mobile/providers/cast.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/readonly_mode.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/setting.provider.dart';
 import 'package:immich_mobile/providers/server_info.provider.dart';
 import 'package:immich_mobile/providers/sync_status.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
@@ -193,64 +192,51 @@ class _BackupIndicator extends ConsumerWidget {
   }
 
   Widget? _getBackupBadgeIcon(BuildContext context, WidgetRef ref) {
-    final backupStateStream = ref.watch(settingsProvider).watch(Setting.enableBackup);
+    final backupEnabled = ref.watch(appConfigProvider.select((c) => c.backup.enabled));
     final hasError = ref.watch(driftBackupProvider.select((state) => state.error != BackupError.none));
     final isDarkTheme = context.isDarkTheme;
     final iconColor = isDarkTheme ? Colors.white : Colors.black;
     final isUploading = ref.watch(driftBackupProvider.select((state) => state.uploadItems.isNotEmpty));
 
-    return StreamBuilder(
-      stream: backupStateStream,
-      initialData: false,
-      builder: (ctx, snapshot) {
-        final backupEnabled = snapshot.data ?? false;
+    if (!backupEnabled) {
+      return _BadgeLabel(
+        Icon(Icons.cloud_off_rounded, size: 9, color: iconColor, semanticLabel: 'backup_controller_page_backup'.tr()),
+      );
+    }
 
-        if (!backupEnabled) {
-          return _BadgeLabel(
-            Icon(
-              Icons.cloud_off_rounded,
-              size: 9,
-              color: iconColor,
-              semanticLabel: 'backup_controller_page_backup'.tr(),
+    if (hasError) {
+      return _BadgeLabel(
+        Icon(
+          Icons.warning_rounded,
+          size: 12,
+          color: context.colorScheme.error,
+          semanticLabel: 'backup_controller_page_backup'.tr(),
+        ),
+        backgroundColor: context.colorScheme.errorContainer,
+      );
+    }
+
+    if (isUploading) {
+      return _BadgeLabel(
+        Container(
+          padding: const EdgeInsets.all(3.5),
+          child: Theme(
+            data: context.themeData.copyWith(
+              progressIndicatorTheme: context.themeData.progressIndicatorTheme.copyWith(year2023: true),
             ),
-          );
-        }
-
-        if (hasError) {
-          return _BadgeLabel(
-            Icon(
-              Icons.warning_rounded,
-              size: 12,
-              color: context.colorScheme.error,
-              semanticLabel: 'backup_controller_page_backup'.tr(),
+            child: CircularProgressIndicator(
+              strokeWidth: 2,
+              strokeCap: StrokeCap.round,
+              valueColor: AlwaysStoppedAnimation<Color>(iconColor),
+              semanticsLabel: 'backup_controller_page_backup'.tr(),
             ),
-            backgroundColor: context.colorScheme.errorContainer,
-          );
-        }
+          ),
+        ),
+      );
+    }
 
-        if (isUploading) {
-          return _BadgeLabel(
-            Container(
-              padding: const EdgeInsets.all(3.5),
-              child: Theme(
-                data: context.themeData.copyWith(
-                  progressIndicatorTheme: context.themeData.progressIndicatorTheme.copyWith(year2023: true),
-                ),
-                child: CircularProgressIndicator(
-                  strokeWidth: 2,
-                  strokeCap: StrokeCap.round,
-                  valueColor: AlwaysStoppedAnimation<Color>(iconColor),
-                  semanticsLabel: 'backup_controller_page_backup'.tr(),
-                ),
-              ),
-            ),
-          );
-        }
-
-        return _BadgeLabel(
-          Icon(Icons.check_outlined, size: 9, color: iconColor, semanticLabel: 'backup_controller_page_backup'.tr()),
-        );
-      },
+    return _BadgeLabel(
+      Icon(Icons.check_outlined, size: 9, color: iconColor, semanticLabel: 'backup_controller_page_backup'.tr()),
     );
   }
 }

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

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

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

@@ -4,18 +4,17 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/album/local_album.model.dart';
-import 'package:immich_mobile/domain/models/store.model.dart';
+import 'package:immich_mobile/domain/models/config/app_config.dart';
+import 'package:immich_mobile/domain/models/metadata_key.dart';
 import 'package:immich_mobile/domain/services/sync_linked_album.service.dart';
-import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
-import 'package:immich_mobile/providers/app_settings.provider.dart';
 import 'package:immich_mobile/providers/background_sync.provider.dart';
 import 'package:immich_mobile/providers/backup/backup_album.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
-import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:immich_mobile/widgets/settings/setting_group_title.dart';
 import 'package:immich_mobile/widgets/settings/setting_list_tile.dart';
 import 'package:immich_mobile/widgets/settings/settings_sub_page_scaffold.dart';
@@ -31,8 +30,8 @@ class DriftBackupSettings extends ConsumerWidget {
           title: "network_requirements".t(context: context),
           icon: Icons.cell_tower,
         ),
-        const _UseWifiForUploadVideosButton(),
-        const _UseWifiForUploadPhotosButton(),
+        const _UseCellularForVideosButton(),
+        const _UseCellularForPhotosButton(),
         if (CurrentPlatform.isAndroid) ...[
           const Divider(),
           SettingGroupTitle(
@@ -99,64 +98,58 @@ class _AlbumSyncActionButtonState extends ConsumerState<_AlbumSyncActionButton>
 
   @override
   Widget build(BuildContext context) {
+    final albumSyncEnable = ref.watch(appConfigProvider.select((c) => c.backup.syncAlbums));
     return Padding(
       padding: const EdgeInsets.only(left: 8.0),
       child: ListView(
         shrinkWrap: true,
         children: [
-          StreamBuilder(
-            stream: Store.watch(StoreKey.syncAlbums),
-            initialData: Store.tryGet(StoreKey.syncAlbums) ?? false,
-            builder: (context, snapshot) {
-              final albumSyncEnable = snapshot.data ?? false;
-              return Column(
-                children: [
-                  SettingListTile(
-                    title: "sync_albums".t(context: context),
-                    subtitle: "sync_upload_album_setting_subtitle".t(context: context),
-                    trailing: Switch(
-                      value: albumSyncEnable,
-                      onChanged: (bool newValue) async {
-                        await ref.read(appSettingsServiceProvider).setSetting(AppSettingsEnum.syncAlbums, newValue);
+          Column(
+            children: [
+              SettingListTile(
+                title: "sync_albums".t(context: context),
+                subtitle: "sync_upload_album_setting_subtitle".t(context: context),
+                trailing: Switch(
+                  value: albumSyncEnable,
+                  onChanged: (bool newValue) async {
+                    await ref.read(metadataProvider).write(MetadataKey.backupSyncAlbums, newValue);
 
-                        if (newValue == true) {
-                          await _manageLinkedAlbums();
-                        }
-                      },
-                    ),
-                  ),
-                  AnimatedSize(
-                    duration: const Duration(milliseconds: 300),
-                    curve: Curves.easeInOut,
-                    child: AnimatedOpacity(
-                      duration: const Duration(milliseconds: 200),
-                      opacity: albumSyncEnable ? 1.0 : 0.0,
-                      child: albumSyncEnable
-                          ? SettingListTile(
-                              onTap: _manualSyncAlbums,
-                              contentPadding: const EdgeInsets.only(left: 32, right: 16),
-                              title: "organize_into_albums".t(context: context),
-                              subtitle: "organize_into_albums_description".t(context: context),
-                              trailing: isAlbumSyncInProgress
-                                  ? const SizedBox(
-                                      width: 32,
-                                      height: 32,
-                                      child: CircularProgressIndicator.adaptive(strokeWidth: 2),
-                                    )
-                                  : IconButton(
-                                      onPressed: _manualSyncAlbums,
-                                      icon: const Icon(Icons.sync_rounded),
-                                      color: context.colorScheme.onSurface.withValues(alpha: 0.7),
-                                      iconSize: 20,
-                                      constraints: const BoxConstraints(minWidth: 32, minHeight: 32),
-                                    ),
-                            )
-                          : const SizedBox.shrink(),
-                    ),
-                  ),
-                ],
-              );
-            },
+                    if (newValue == true) {
+                      await _manageLinkedAlbums();
+                    }
+                  },
+                ),
+              ),
+              AnimatedSize(
+                duration: const Duration(milliseconds: 300),
+                curve: Curves.easeInOut,
+                child: AnimatedOpacity(
+                  duration: const Duration(milliseconds: 200),
+                  opacity: albumSyncEnable ? 1.0 : 0.0,
+                  child: albumSyncEnable
+                      ? SettingListTile(
+                          onTap: _manualSyncAlbums,
+                          contentPadding: const EdgeInsets.only(left: 32, right: 16),
+                          title: "organize_into_albums".t(context: context),
+                          subtitle: "organize_into_albums_description".t(context: context),
+                          trailing: isAlbumSyncInProgress
+                              ? const SizedBox(
+                                  width: 32,
+                                  height: 32,
+                                  child: CircularProgressIndicator.adaptive(strokeWidth: 2),
+                                )
+                              : IconButton(
+                                  onPressed: _manualSyncAlbums,
+                                  icon: const Icon(Icons.sync_rounded),
+                                  color: context.colorScheme.onSurface.withValues(alpha: 0.7),
+                                  iconSize: 20,
+                                  constraints: const BoxConstraints(minWidth: 32, minHeight: 32),
+                                ),
+                        )
+                      : const SizedBox.shrink(),
+                ),
+              ),
+            ],
           ),
         ],
       ),
@@ -164,60 +157,34 @@ class _AlbumSyncActionButtonState extends ConsumerState<_AlbumSyncActionButton>
   }
 }
 
-class _SettingsSwitchTile extends ConsumerStatefulWidget {
-  final AppSettingsEnum<bool> appSettingsEnum;
+class _BackupSwitchTile extends ConsumerWidget {
+  final MetadataKey<bool> metadataKey;
+  final bool Function(AppConfig) selector;
   final String titleKey;
   final String subtitleKey;
-  final void Function(bool?)? onChanged;
+  final void Function(bool)? onChanged;
 
-  const _SettingsSwitchTile({
-    required this.appSettingsEnum,
+  const _BackupSwitchTile({
+    required this.metadataKey,
+    required this.selector,
     required this.titleKey,
     required this.subtitleKey,
     this.onChanged,
   });
 
   @override
-  ConsumerState createState() => _SettingsSwitchTileState();
-}
-
-class _SettingsSwitchTileState extends ConsumerState<_SettingsSwitchTile> {
-  late final Stream<bool?> valueStream;
-  late final StreamSubscription<bool?> subscription;
-
-  @override
-  void initState() {
-    super.initState();
-    valueStream = Store.watch(widget.appSettingsEnum.storeKey).asBroadcastStream();
-    subscription = valueStream.listen((value) {
-      widget.onChanged?.call(value);
-    });
-  }
-
-  @override
-  void dispose() {
-    subscription.cancel();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
+  Widget build(BuildContext context, WidgetRef ref) {
+    final value = ref.watch(appConfigProvider.select(selector));
     return Padding(
       padding: const EdgeInsets.only(left: 8.0),
       child: SettingListTile(
-        title: widget.titleKey.t(context: context),
-        subtitle: widget.subtitleKey.t(context: context),
-        trailing: StreamBuilder(
-          stream: valueStream,
-          initialData: Store.tryGet(widget.appSettingsEnum.storeKey) ?? widget.appSettingsEnum.defaultValue,
-          builder: (context, snapshot) {
-            final value = snapshot.data ?? false;
-            return Switch(
-              value: value,
-              onChanged: (bool newValue) async {
-                await ref.read(appSettingsServiceProvider).setSetting(widget.appSettingsEnum, newValue);
-              },
-            );
+        title: titleKey.t(context: context),
+        subtitle: subtitleKey.t(context: context),
+        trailing: Switch(
+          value: value,
+          onChanged: (bool newValue) async {
+            await ref.read(metadataProvider).write(metadataKey, newValue);
+            onChanged?.call(newValue);
           },
         ),
       ),
@@ -225,26 +192,28 @@ class _SettingsSwitchTileState extends ConsumerState<_SettingsSwitchTile> {
   }
 }
 
-class _UseWifiForUploadVideosButton extends ConsumerWidget {
-  const _UseWifiForUploadVideosButton();
+class _UseCellularForVideosButton extends StatelessWidget {
+  const _UseCellularForVideosButton();
 
   @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    return const _SettingsSwitchTile(
-      appSettingsEnum: AppSettingsEnum.useCellularForUploadVideos,
+  Widget build(BuildContext context) {
+    return _BackupSwitchTile(
+      metadataKey: MetadataKey.backupUseCellularForVideos,
+      selector: (c) => c.backup.useCellularForVideos,
       titleKey: "videos",
       subtitleKey: "network_requirement_videos_upload",
     );
   }
 }
 
-class _UseWifiForUploadPhotosButton extends ConsumerWidget {
-  const _UseWifiForUploadPhotosButton();
+class _UseCellularForPhotosButton extends StatelessWidget {
+  const _UseCellularForPhotosButton();
 
   @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    return const _SettingsSwitchTile(
-      appSettingsEnum: AppSettingsEnum.useCellularForUploadPhotos,
+  Widget build(BuildContext context) {
+    return _BackupSwitchTile(
+      metadataKey: MetadataKey.backupUseCellularForPhotos,
+      selector: (c) => c.backup.useCellularForPhotos,
       titleKey: "photos",
       subtitleKey: "network_requirement_photos_upload",
     );
@@ -256,29 +225,22 @@ class _BackupOnlyWhenChargingButton extends ConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    return _SettingsSwitchTile(
-      appSettingsEnum: AppSettingsEnum.backupRequireCharging,
+    final fgService = ref.read(backgroundWorkerFgServiceProvider);
+    return _BackupSwitchTile(
+      metadataKey: MetadataKey.backupRequireCharging,
+      selector: (c) => c.backup.requireCharging,
       titleKey: "charging",
       subtitleKey: "charging_requirement_mobile_backup",
       onChanged: (value) {
-        ref.read(backgroundWorkerFgServiceProvider).configure(requireCharging: value ?? false);
+        fgService.configure(requireCharging: value);
       },
     );
   }
 }
 
-class _BackupDelaySlider extends ConsumerStatefulWidget {
+class _BackupDelaySlider extends ConsumerWidget {
   const _BackupDelaySlider();
 
-  @override
-  ConsumerState<_BackupDelaySlider> createState() => _BackupDelaySliderState();
-}
-
-class _BackupDelaySliderState extends ConsumerState<_BackupDelaySlider> {
-  late final Stream<int?> valueStream;
-  late final StreamSubscription<int?> subscription;
-  late int currentValue;
-
   static int backupDelayToSliderValue(int ms) => switch (ms) {
     5 => 0,
     30 => 1,
@@ -301,30 +263,9 @@ class _BackupDelaySliderState extends ConsumerState<_BackupDelaySlider> {
   };
 
   @override
-  void initState() {
-    super.initState();
-    final initialValue =
-        Store.tryGet(AppSettingsEnum.backupTriggerDelay.storeKey) ?? AppSettingsEnum.backupTriggerDelay.defaultValue;
-    currentValue = backupDelayToSliderValue(initialValue);
-
-    valueStream = Store.watch(AppSettingsEnum.backupTriggerDelay.storeKey).asBroadcastStream();
-    subscription = valueStream.listen((value) {
-      if (mounted && value != null) {
-        setState(() {
-          currentValue = backupDelayToSliderValue(value);
-        });
-      }
-    });
-  }
-
-  @override
-  void dispose() {
-    subscription.cancel();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
+  Widget build(BuildContext context, WidgetRef ref) {
+    final triggerDelay = ref.watch(appConfigProvider.select((c) => c.backup.triggerDelay));
+    final currentValue = backupDelayToSliderValue(triggerDelay);
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
@@ -339,14 +280,13 @@ class _BackupDelaySliderState extends ConsumerState<_BackupDelaySlider> {
         ),
         Slider(
           value: currentValue.toDouble(),
-          onChanged: (double v) {
-            setState(() {
-              currentValue = v.toInt();
-            });
+          onChanged: (double v) async {
+            final seconds = backupDelayToSeconds(v.toInt());
+            await ref.read(metadataProvider).write(MetadataKey.backupTriggerDelay, seconds);
           },
           onChangeEnd: (double v) async {
-            final milliseconds = backupDelayToSeconds(v.toInt());
-            await ref.read(appSettingsServiceProvider).setSetting(AppSettingsEnum.backupTriggerDelay, milliseconds);
+            final seconds = backupDelayToSeconds(v.toInt());
+            await ref.read(metadataProvider).write(MetadataKey.backupTriggerDelay, seconds);
           },
           max: 3.0,
           min: 0.0,

mobile/test/domain/services/log_service_test.dart

@@ -39,7 +39,9 @@ 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.systemConfig,
+    ).thenReturn(SystemConfig(logLevel: LogLevel.fine, network: .defaults()));
     when(() => mockMetadataRepository.write<LogLevel, LogLevel>(MetadataKey.logLevel, any())).thenAnswer((_) async {});
     when(() => mockLogRepo.getAll()).thenAnswer((_) async => []);
     when(() => mockLogRepo.insert(any())).thenAnswer((_) async => true);

mobile/test/domain/services/store_service_test.dart

@@ -9,7 +9,7 @@ import 'package:mocktail/mocktail.dart';
 import '../../infrastructure/repository.mock.dart';
 
 const _kAccessToken = '#ThisIsAToken';
-const _kEnableBackup = false;
+const _kAdvancedTroubleshooting = false;
 const _kVersion = 2;
 
 void main() {
@@ -22,13 +22,13 @@ void main() {
     mockDriftStoreRepo = MockDriftStoreRepository();
     // For generics, we need to provide fallback to each concrete type to avoid runtime errors
     registerFallbackValue(StoreKey.accessToken);
-    registerFallbackValue(StoreKey.backupTriggerDelay);
-    registerFallbackValue(StoreKey.enableBackup);
+    registerFallbackValue(StoreKey.version);
+    registerFallbackValue(StoreKey.advancedTroubleshooting);
 
     when(() => mockDriftStoreRepo.getAll()).thenAnswer(
       (_) async => [
         const StoreDto(StoreKey.accessToken, _kAccessToken),
-        const StoreDto(StoreKey.enableBackup, _kEnableBackup),
+        const StoreDto(StoreKey.advancedTroubleshooting, _kAdvancedTroubleshooting),
         const StoreDto(StoreKey.version, _kVersion),
       ],
     );
@@ -46,7 +46,7 @@ void main() {
     test('Populates the internal cache on init', () {
       verify(() => mockDriftStoreRepo.getAll()).called(1);
       expect(sut.tryGet(StoreKey.accessToken), _kAccessToken);
-      expect(sut.tryGet(StoreKey.enableBackup), _kEnableBackup);
+      expect(sut.tryGet(StoreKey.advancedTroubleshooting), _kAdvancedTroubleshooting);
       expect(sut.tryGet(StoreKey.version), _kVersion);
       // Other keys should be null
       expect(sut.tryGet(StoreKey.currentUser), isNull);
@@ -147,7 +147,7 @@ void main() {
       await sut.clear();
       verify(() => mockDriftStoreRepo.deleteAll()).called(1);
       expect(sut.tryGet(StoreKey.accessToken), isNull);
-      expect(sut.tryGet(StoreKey.enableBackup), isNull);
+      expect(sut.tryGet(StoreKey.advancedTroubleshooting), isNull);
       expect(sut.tryGet(StoreKey.version), isNull);
     });
   });

mobile/test/infrastructure/repositories/store_repository_test.dart

@@ -13,7 +13,7 @@ import '../../fixtures/user.stub.dart';
 
 const _kTestAccessToken = "#TestToken";
 const _kTestVersion = 10;
-const _kTestBackupRequireCharging = false;
+const _kTestAdvancedTroubleshooting = false;
 final _kTestUser = UserStub.admin;
 
 Future<void> _populateStore(Drift db) async {
@@ -21,8 +21,8 @@ Future<void> _populateStore(Drift db) async {
     batch.insert(
       db.storeEntity,
       StoreEntityCompanion(
-        id: Value(StoreKey.backupRequireCharging.id),
-        intValue: const Value(_kTestBackupRequireCharging ? 1 : 0),
+        id: Value(StoreKey.advancedTroubleshooting.id),
+        intValue: const Value(_kTestAdvancedTroubleshooting ? 1 : 0),
         stringValue: const Value(null),
       ),
     );
@@ -76,11 +76,11 @@ void main() {
     });
 
     test('converts bool', () async {
-      bool? backupRequireCharging = await sut.tryGet(StoreKey.backupRequireCharging);
-      expect(backupRequireCharging, isNull);
-      await sut.upsert(StoreKey.backupRequireCharging, _kTestBackupRequireCharging);
-      backupRequireCharging = await sut.tryGet(StoreKey.backupRequireCharging);
-      expect(backupRequireCharging, _kTestBackupRequireCharging);
+      bool? advancedTroubleshooting = await sut.tryGet(StoreKey.advancedTroubleshooting);
+      expect(advancedTroubleshooting, isNull);
+      await sut.upsert(StoreKey.advancedTroubleshooting, _kTestAdvancedTroubleshooting);
+      advancedTroubleshooting = await sut.tryGet(StoreKey.advancedTroubleshooting);
+      expect(advancedTroubleshooting, _kTestAdvancedTroubleshooting);
     });
 
     test('converts user', () async {
@@ -98,11 +98,11 @@ void main() {
     });
 
     test('delete()', () async {
-      bool? backupRequireCharging = await sut.tryGet(StoreKey.backupRequireCharging);
-      expect(backupRequireCharging, isFalse);
-      await sut.delete(StoreKey.backupRequireCharging);
-      backupRequireCharging = await sut.tryGet(StoreKey.backupRequireCharging);
-      expect(backupRequireCharging, isNull);
+      bool? advancedTroubleshooting = await sut.tryGet(StoreKey.advancedTroubleshooting);
+      expect(advancedTroubleshooting, isFalse);
+      await sut.delete(StoreKey.advancedTroubleshooting);
+      advancedTroubleshooting = await sut.tryGet(StoreKey.advancedTroubleshooting);
+      expect(advancedTroubleshooting, isNull);
     });
 
     test('deleteAll()', () async {
@@ -147,13 +147,13 @@ void main() {
           emitsInOrder([
             [
               const StoreDto<Object>(StoreKey.version, _kTestVersion),
-              const StoreDto<Object>(StoreKey.backupRequireCharging, _kTestBackupRequireCharging),
               const StoreDto<Object>(StoreKey.accessToken, _kTestAccessToken),
+              const StoreDto<Object>(StoreKey.advancedTroubleshooting, _kTestAdvancedTroubleshooting),
             ],
             [
               const StoreDto<Object>(StoreKey.version, _kTestVersion + 10),
-              const StoreDto<Object>(StoreKey.backupRequireCharging, _kTestBackupRequireCharging),
               const StoreDto<Object>(StoreKey.accessToken, _kTestAccessToken),
+              const StoreDto<Object>(StoreKey.advancedTroubleshooting, _kTestAdvancedTroubleshooting),
             ],
           ]),
         ),

mobile/test/medium/repositories/metadata_repository_test.dart

@@ -14,7 +14,7 @@ void main() {
 
   setUpAll(() async {
     ctx = MediumRepositoryContext();
-    sut = await MetadataRepository.ensureInitialized(ctx.db);
+    sut = MetadataRepository(ctx.db);
   });
 
   tearDownAll(() async {
@@ -23,7 +23,7 @@ void main() {
 
   setUp(() async {
     await ctx.db.delete(ctx.db.metadataEntity).go();
-    await MetadataRepository.refresh();
+    await sut.refresh();
   });
 
   group('defaults', () {
@@ -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 sut.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 sut.refresh();
       expect(sut.appConfig.theme.mode, ThemeMode.system);
     });
 
@@ -103,7 +103,7 @@ void main() {
             ),
           );
 
-      await MetadataRepository.refresh();
+      await sut.refresh();
       expect(sut.appConfig.theme.mode, ThemeMode.system);
     });
   });

mobile/test/services/auth.service_test.dart

@@ -21,7 +21,6 @@ void main() {
   late MockApiService apiService;
   late MockNetworkService networkService;
   late MockBackgroundSyncManager backgroundSyncManager;
-  late MockAppSettingService appSettingsService;
   late Drift db;
 
   setUp(() async {
@@ -30,15 +29,12 @@ void main() {
     apiService = MockApiService();
     networkService = MockNetworkService();
     backgroundSyncManager = MockBackgroundSyncManager();
-    appSettingsService = MockAppSettingService();
-
     sut = AuthService(
       authApiRepository,
       authRepository,
       apiService,
       networkService,
       backgroundSyncManager,
-      appSettingsService,
     );
 
     registerFallbackValue(Uri());

mobile/test/services/background_upload.service_test.dart

@@ -13,11 +13,9 @@ import 'package:immich_mobile/entities/store.entity.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/store.repository.dart';
-import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:immich_mobile/services/background_upload.service.dart';
 import 'package:mocktail/mocktail.dart';
 
-import '../domain/service.mock.dart';
 import '../fixtures/asset.stub.dart';
 import '../infrastructure/repository.mock.dart';
 import '../mocks/asset_entity.mock.dart';
@@ -29,13 +27,10 @@ void main() {
   late MockStorageRepository mockStorageRepository;
   late MockDriftLocalAssetRepository mockLocalAssetRepository;
   late MockDriftBackupRepository mockBackupRepository;
-  late MockAppSettingsService mockAppSettingsService;
   late MockAssetMediaRepository mockAssetMediaRepository;
   late Drift db;
 
   setUpAll(() async {
-    registerFallbackValue(AppSettingsEnum.useCellularForUploadPhotos);
-
     TestWidgetsFlutterBinding.ensureInitialized();
     TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger.setMockMethodCallHandler(
       const MethodChannel('plugins.flutter.io/path_provider'),
@@ -43,7 +38,7 @@ void main() {
     );
     db = Drift(DatabaseConnection(NativeDatabase.memory(), closeStreamsSynchronously: true));
     await StoreService.init(storeRepository: DriftStoreRepository(db));
-    await MetadataRepository.ensureInitialized(db);
+    await MetadataStore.ensureInitialized(db);
 
     await Store.put(StoreKey.serverEndpoint, 'http://test-server.com');
     await Store.put(StoreKey.deviceId, 'test-device-id');
@@ -54,18 +49,13 @@ void main() {
     mockStorageRepository = MockStorageRepository();
     mockLocalAssetRepository = MockDriftLocalAssetRepository();
     mockBackupRepository = MockDriftBackupRepository();
-    mockAppSettingsService = MockAppSettingsService();
     mockAssetMediaRepository = MockAssetMediaRepository();
 
-    when(() => mockAppSettingsService.getSetting(AppSettingsEnum.useCellularForUploadVideos)).thenReturn(false);
-    when(() => mockAppSettingsService.getSetting(AppSettingsEnum.useCellularForUploadPhotos)).thenReturn(false);
-
     sut = BackgroundUploadService(
       mockUploadRepository,
       mockStorageRepository,
       mockLocalAssetRepository,
       mockBackupRepository,
-      mockAppSettingsService,
       mockAssetMediaRepository,
     );
 
@@ -181,7 +171,6 @@ void main() {
         mockStorageRepository,
         mockLocalAssetRepository,
         mockBackupRepository,
-        mockAppSettingsService,
         mockAssetMediaRepository,
       );
       addTearDown(() => sutWithV24.dispose());
@@ -232,7 +221,6 @@ void main() {
         mockStorageRepository,
         mockLocalAssetRepository,
         mockBackupRepository,
-        mockAppSettingsService,
         mockAssetMediaRepository,
       );
       addTearDown(() => sutAndroid.dispose());
@@ -273,7 +261,6 @@ void main() {
         mockStorageRepository,
         mockLocalAssetRepository,
         mockBackupRepository,
-        mockAppSettingsService,
         mockAssetMediaRepository,
       );
       addTearDown(() => sutWithV24.dispose());
@@ -314,7 +301,6 @@ void main() {
         mockStorageRepository,
         mockLocalAssetRepository,
         mockBackupRepository,
-        mockAppSettingsService,
         mockAssetMediaRepository,
       );
       addTearDown(() => sutWithV24.dispose());