wip

app/lib/features/user/domain/repositories/general_settings.dart

@@ -72,10 +72,6 @@ class GeneralSettingsRepository extends _$GeneralSettingsRepository {
         DriftSqlType.bool,
         db.typeMapping,
       ),
-      'proxyPrivateTabsTor': settings['proxyPrivateTabsTor']?.readAs(
-        DriftSqlType.bool,
-        db.typeMapping,
-      ),
       'showExtensionShortcut': settings['showExtensionShortcut']?.readAs(
         DriftSqlType.bool,
         db.typeMapping,

app/lib/features/user/domain/repositories/general_settings.g.dart

@@ -27,7 +27,7 @@ final generalSettingsWithDefaultsProvider =
 typedef GeneralSettingsWithDefaultsRef =
     AutoDisposeProviderRef<GeneralSettings>;
 String _$generalSettingsRepositoryHash() =>
-    r'e311760a7773109a90c28275262883fcca348bbb';
+    r'07eeaf811fac4b9c787cce7c29379a7329910ae5';
 
 /// See also [GeneralSettingsRepository].
 @ProviderFor(GeneralSettingsRepository)

app/lib/features/user/domain/repositories/tor_settings.dart

@@ -0,0 +1,80 @@
+import 'package:drift/drift.dart';
+import 'package:riverpod/riverpod.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:weblibre/features/user/data/models/tor_settings.dart';
+import 'package:weblibre/features/user/data/providers.dart';
+
+part 'tor_settings.g.dart';
+
+typedef UpdateTorSettingsFunc =
+    TorSettings Function(TorSettings currentSettings);
+
+@Riverpod(keepAlive: true)
+class TorSettingsRepository extends _$TorSettingsRepository {
+  final _partitionKey = 'tor';
+
+  TorSettings _deserializeSettings(List<MapEntry<String, DriftAny?>> entries) {
+    final settings = Map.fromEntries(entries);
+
+    final db = ref.read(userDatabaseProvider);
+
+    return TorSettings.fromJson({
+      'proxyPrivateTabsTor': settings['proxyPrivateTabsTor']?.readAs(
+        DriftSqlType.bool,
+        db.typeMapping,
+      ),
+      'autoConfig': settings['autoConfig']?.readAs(
+        DriftSqlType.bool,
+        db.typeMapping,
+      ),
+    });
+  }
+
+  //Eager fetch, when up to date settings are required
+  Future<TorSettings> fetchSettings() {
+    return ref
+        .read(userDatabaseProvider)
+        .settingDao
+        .getAllSettingsOfPartitionKey(_partitionKey)
+        .get()
+        .then(_deserializeSettings);
+  }
+
+  Future<void> updateSettings(UpdateTorSettingsFunc updateWithCurrent) async {
+    final current = await fetchSettings();
+
+    final oldJson = current.toJson();
+    final newJson = updateWithCurrent(current).toJson();
+
+    final db = ref.read(userDatabaseProvider);
+
+    return db.transaction(() async {
+      for (final MapEntry(:key, :value) in newJson.entries) {
+        if (oldJson[key] != value) {
+          await db.settingDao.updateSetting(key, _partitionKey, value);
+        }
+      }
+    });
+  }
+
+  @override
+  Stream<TorSettings> build() {
+    final db = ref.watch(userDatabaseProvider);
+
+    return db.settingDao
+        .getAllSettingsOfPartitionKey(_partitionKey)
+        .watch()
+        .map((event) {
+          return _deserializeSettings(event);
+        });
+  }
+}
+
+@Riverpod()
+TorSettings torSettingsWithDefaults(Ref ref) {
+  return ref.watch(
+    torSettingsRepositoryProvider.select(
+      (value) => value.valueOrNull ?? TorSettings.withDefaults(),
+    ),
+  );
+}

app/lib/features/user/domain/repositories/tor_settings.g.dart

@@ -0,0 +1,46 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'tor_settings.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+String _$torSettingsWithDefaultsHash() =>
+    r'b355678ae49e038f7e1b60f2d5da3f806349cba8';
+
+/// See also [torSettingsWithDefaults].
+@ProviderFor(torSettingsWithDefaults)
+final torSettingsWithDefaultsProvider =
+    AutoDisposeProvider<TorSettings>.internal(
+      torSettingsWithDefaults,
+      name: r'torSettingsWithDefaultsProvider',
+      debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
+          ? null
+          : _$torSettingsWithDefaultsHash,
+      dependencies: null,
+      allTransitiveDependencies: null,
+    );
+
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
+typedef TorSettingsWithDefaultsRef = AutoDisposeProviderRef<TorSettings>;
+String _$torSettingsRepositoryHash() =>
+    r'686e8576453f33a0d2d0eb2869e29ca88e00bc37';
+
+/// See also [TorSettingsRepository].
+@ProviderFor(TorSettingsRepository)
+final torSettingsRepositoryProvider =
+    StreamNotifierProvider<TorSettingsRepository, TorSettings>.internal(
+      TorSettingsRepository.new,
+      name: r'torSettingsRepositoryProvider',
+      debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
+          ? null
+          : _$torSettingsRepositoryHash,
+      dependencies: null,
+      allTransitiveDependencies: null,
+    );
+
+typedef _$TorSettingsRepository = StreamNotifier<TorSettings>;
+// ignore_for_file: type=lint
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package