refactor setting providers; include content blocking settings;
This commit is contained in:
@@ -90,10 +90,6 @@
|
||||
"value": "",
|
||||
"title": "Disable GIO as a potential proxy bypass vector"
|
||||
},
|
||||
"media.peerconnection.ice.proxy_only_if_behind_proxy": {
|
||||
"value": true,
|
||||
"title": "Force WebRTC inside the proxy"
|
||||
},
|
||||
"media.peerconnection.enabled": {
|
||||
"value": false,
|
||||
"title": "Disable WebRTC PeerConnection",
|
||||
@@ -199,18 +195,6 @@
|
||||
"title": "Disable automatic User Agent updates",
|
||||
"description": "This preference controls whether Firefox automatically updates its User-Agent string. When set to false, it prevents Firefox from automatically updating the browser's User-Agent string, which is a text identifier that tells websites which browser and version you're using."
|
||||
},
|
||||
"privacy.query_stripping.enabled": {
|
||||
"value": true,
|
||||
"title": "Strip known tracking query parameters from URLs"
|
||||
},
|
||||
"privacy.query_stripping.enabled.pbmode": {
|
||||
"value": true,
|
||||
"title": "Strip known tracking query parameters from URLs (Private browsing)"
|
||||
},
|
||||
"privacy.query_stripping.strip_list": {
|
||||
"value": "__hsfp __hssc __hstc __s _bhlid _branch_match_id _branch_referrer _gl _hsenc _kx _openstat at_recipient_id at_recipient_list bbeml bsft_clkid bsft_uid dclid et_rid fb_action_ids fb_comment_id fbclid gbraid gclid guce_referrer guce_referrer_sig hsCtaTracking igshid irclickid mc_eid mkt_tok ml_subscriber ml_subscriber_hash msclkid mtm_cid oft_c oft_ck oft_d oft_id oft_ids oft_k oft_lk oft_sk oly_anon_id oly_enc_id pk_cid rb_clickid s_cid sc_customer sc_eh sc_uid srsltid ss_email_id twclid unicorn_click_id vero_conv vero_id vgo_ee wbraid wickedid yclid ymclid ysclid",
|
||||
"title": "Improve built-in query stripping"
|
||||
},
|
||||
"dom.private-attribution.submission.enabled": {
|
||||
"value": false,
|
||||
"title": "Disable Private Attribution Submission Control",
|
||||
|
||||
@@ -31,7 +31,7 @@ part 'bangs.g.dart';
|
||||
@Riverpod(keepAlive: true)
|
||||
Stream<BangData?> defaultSearchBangData(Ref ref) {
|
||||
final trigger = ref.watch(
|
||||
generalSettingsRepositoryProvider.select(
|
||||
generalSettingsWithDefaultsProvider.select(
|
||||
(value) => value.defaultSearchProvider,
|
||||
),
|
||||
);
|
||||
|
||||
@@ -7,7 +7,7 @@ part of 'bangs.dart';
|
||||
// **************************************************************************
|
||||
|
||||
String _$defaultSearchBangDataHash() =>
|
||||
r'acce519559903505f9623f3631b6f4177a396d39';
|
||||
r'5fa3f588b57a82dd8fffb2082e495108a242ef72';
|
||||
|
||||
/// See also [defaultSearchBangData].
|
||||
@ProviderFor(defaultSearchBangData)
|
||||
|
||||
@@ -63,7 +63,7 @@ class BangListScreen extends HookConsumerWidget {
|
||||
.setTrigger(bang.trigger);
|
||||
|
||||
final settings = ref.read(
|
||||
generalSettingsRepositoryProvider,
|
||||
generalSettingsWithDefaultsProvider,
|
||||
);
|
||||
|
||||
SearchRoute(
|
||||
|
||||
@@ -89,7 +89,7 @@ class BangDetails extends HookConsumerWidget {
|
||||
final url = Uri.parse(bangData.getTemplateUrl('').origin);
|
||||
final isPrivate =
|
||||
ref
|
||||
.read(generalSettingsRepositoryProvider)
|
||||
.read(generalSettingsWithDefaultsProvider)
|
||||
.defaultCreateTabType ==
|
||||
TabType.private;
|
||||
|
||||
|
||||
@@ -86,7 +86,7 @@ class SiteSearch extends HookConsumerWidget {
|
||||
final isPrivate =
|
||||
ref.read(selectedTabStateProvider)?.isPrivate ??
|
||||
ref
|
||||
.read(generalSettingsRepositoryProvider)
|
||||
.read(generalSettingsWithDefaultsProvider)
|
||||
.defaultCreateTabType ==
|
||||
TabType.private;
|
||||
|
||||
|
||||
@@ -44,7 +44,7 @@ GeckoSelectionActionService selectionActionService(Ref ref) {
|
||||
service.setActions([
|
||||
SearchAction((text) async {
|
||||
final router = await ref.read(routerProvider.future);
|
||||
final settings = ref.read(generalSettingsRepositoryProvider);
|
||||
final settings = ref.read(generalSettingsWithDefaultsProvider);
|
||||
final route = SearchRoute(
|
||||
tabType:
|
||||
ref.read(selectedTabTypeProvider) ??
|
||||
@@ -64,7 +64,7 @@ GeckoSelectionActionService selectionActionService(Ref ref) {
|
||||
final isPrivate =
|
||||
currentTab?.isPrivate ??
|
||||
ref
|
||||
.read(generalSettingsRepositoryProvider)
|
||||
.read(generalSettingsWithDefaultsProvider)
|
||||
.defaultCreateTabType ==
|
||||
TabType.private;
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@ part of 'providers.dart';
|
||||
// **************************************************************************
|
||||
|
||||
String _$selectionActionServiceHash() =>
|
||||
r'f356434878b46fd443c8e3a8a48cf07c34a63b70';
|
||||
r'b1deac5e0566443b4729656c7082903b529bc269';
|
||||
|
||||
/// See also [selectionActionService].
|
||||
@ProviderFor(selectionActionService)
|
||||
|
||||
@@ -349,7 +349,7 @@ class TabRepository extends _$TabRepository {
|
||||
next.whenData((value) async {
|
||||
final isPrivate =
|
||||
ref
|
||||
.read(generalSettingsRepositoryProvider)
|
||||
.read(generalSettingsWithDefaultsProvider)
|
||||
.defaultIntentTabType ==
|
||||
TabType.private;
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@ part of 'tab.dart';
|
||||
// RiverpodGenerator
|
||||
// **************************************************************************
|
||||
|
||||
String _$tabRepositoryHash() => r'fccaa6521e1bad7e8b3f82e6d611469348dc8667';
|
||||
String _$tabRepositoryHash() => r'3465f351f1d36e0f21b4e8ef4ebe7fdc4fbc0b75';
|
||||
|
||||
/// See also [TabRepository].
|
||||
@ProviderFor(TabRepository)
|
||||
|
||||
+69
-55
@@ -37,7 +37,7 @@ class EngineSettingsReplicationService
|
||||
|
||||
ref.listen(
|
||||
fireImmediately: true,
|
||||
generalSettingsRepositoryProvider.select(
|
||||
generalSettingsWithDefaultsProvider.select(
|
||||
(settings) => settings.themeMode,
|
||||
),
|
||||
(previous, next) async {
|
||||
@@ -62,61 +62,75 @@ class EngineSettingsReplicationService
|
||||
fireImmediately: true,
|
||||
engineSettingsRepositoryProvider,
|
||||
(previous, next) async {
|
||||
if (initialSettingsSent && previous != null) {
|
||||
if (previous.javascriptEnabled != next.javascriptEnabled) {
|
||||
await _service.javascriptEnabled(next.javascriptEnabled);
|
||||
final settings = next.valueOrNull;
|
||||
|
||||
if (settings != null) {
|
||||
if (initialSettingsSent && previous != null) {
|
||||
if (previous.valueOrNull?.javascriptEnabled !=
|
||||
settings.javascriptEnabled) {
|
||||
await _service.javascriptEnabled(settings.javascriptEnabled);
|
||||
}
|
||||
if (previous.valueOrNull?.trackingProtectionPolicy !=
|
||||
settings.trackingProtectionPolicy) {
|
||||
await _service.trackingProtectionPolicy(
|
||||
settings.trackingProtectionPolicy,
|
||||
);
|
||||
}
|
||||
if (previous.valueOrNull?.httpsOnlyMode != settings.httpsOnlyMode) {
|
||||
await _service.httpsOnlyMode(settings.httpsOnlyMode);
|
||||
}
|
||||
if (previous.valueOrNull?.globalPrivacyControlEnabled !=
|
||||
settings.globalPrivacyControlEnabled) {
|
||||
await _service.globalPrivacyControlEnabled(
|
||||
settings.globalPrivacyControlEnabled,
|
||||
);
|
||||
}
|
||||
if (previous.valueOrNull?.preferredColorScheme !=
|
||||
settings.preferredColorScheme) {
|
||||
await _service.preferredColorScheme(
|
||||
settings.preferredColorScheme,
|
||||
);
|
||||
}
|
||||
if (previous.valueOrNull?.cookieBannerHandlingMode !=
|
||||
settings.cookieBannerHandlingMode) {
|
||||
await _service.cookieBannerHandlingMode(
|
||||
settings.cookieBannerHandlingMode,
|
||||
);
|
||||
}
|
||||
if (previous.valueOrNull?.cookieBannerHandlingModePrivateBrowsing !=
|
||||
settings.cookieBannerHandlingModePrivateBrowsing) {
|
||||
await _service.cookieBannerHandlingModePrivateBrowsing(
|
||||
settings.cookieBannerHandlingModePrivateBrowsing,
|
||||
);
|
||||
}
|
||||
if (previous.valueOrNull?.cookieBannerHandlingGlobalRules !=
|
||||
settings.cookieBannerHandlingGlobalRules) {
|
||||
await _service.cookieBannerHandlingGlobalRules(
|
||||
settings.cookieBannerHandlingGlobalRules,
|
||||
);
|
||||
}
|
||||
if (previous
|
||||
.valueOrNull
|
||||
?.cookieBannerHandlingGlobalRulesSubFrames !=
|
||||
settings.cookieBannerHandlingGlobalRulesSubFrames) {
|
||||
await _service.cookieBannerHandlingGlobalRulesSubFrames(
|
||||
settings.cookieBannerHandlingGlobalRulesSubFrames,
|
||||
);
|
||||
}
|
||||
if (previous.valueOrNull?.webContentIsolationStrategy !=
|
||||
settings.webContentIsolationStrategy) {
|
||||
await _service.webContentIsolationStrategy(
|
||||
settings.webContentIsolationStrategy,
|
||||
);
|
||||
}
|
||||
if (previous.valueOrNull?.contentBlocking !=
|
||||
settings.contentBlocking) {
|
||||
await _service.contentBlocking(settings.contentBlocking);
|
||||
}
|
||||
} else {
|
||||
await _service.setDefaultSettings(settings);
|
||||
initialSettingsSent = true;
|
||||
}
|
||||
if (previous.trackingProtectionPolicy !=
|
||||
next.trackingProtectionPolicy) {
|
||||
await _service.trackingProtectionPolicy(
|
||||
next.trackingProtectionPolicy,
|
||||
);
|
||||
}
|
||||
if (previous.httpsOnlyMode != next.httpsOnlyMode) {
|
||||
await _service.httpsOnlyMode(next.httpsOnlyMode);
|
||||
}
|
||||
if (previous.globalPrivacyControlEnabled !=
|
||||
next.globalPrivacyControlEnabled) {
|
||||
await _service.globalPrivacyControlEnabled(
|
||||
next.globalPrivacyControlEnabled,
|
||||
);
|
||||
}
|
||||
if (previous.preferredColorScheme != next.preferredColorScheme) {
|
||||
await _service.preferredColorScheme(next.preferredColorScheme);
|
||||
}
|
||||
if (previous.cookieBannerHandlingMode !=
|
||||
next.cookieBannerHandlingMode) {
|
||||
await _service.cookieBannerHandlingMode(
|
||||
next.cookieBannerHandlingMode,
|
||||
);
|
||||
}
|
||||
if (previous.cookieBannerHandlingModePrivateBrowsing !=
|
||||
next.cookieBannerHandlingModePrivateBrowsing) {
|
||||
await _service.cookieBannerHandlingModePrivateBrowsing(
|
||||
next.cookieBannerHandlingModePrivateBrowsing,
|
||||
);
|
||||
}
|
||||
if (previous.cookieBannerHandlingGlobalRules !=
|
||||
next.cookieBannerHandlingGlobalRules) {
|
||||
await _service.cookieBannerHandlingGlobalRules(
|
||||
next.cookieBannerHandlingGlobalRules,
|
||||
);
|
||||
}
|
||||
if (previous.cookieBannerHandlingGlobalRulesSubFrames !=
|
||||
next.cookieBannerHandlingGlobalRulesSubFrames) {
|
||||
await _service.cookieBannerHandlingGlobalRulesSubFrames(
|
||||
next.cookieBannerHandlingGlobalRulesSubFrames,
|
||||
);
|
||||
}
|
||||
if (previous.webContentIsolationStrategy !=
|
||||
next.webContentIsolationStrategy) {
|
||||
await _service.webContentIsolationStrategy(
|
||||
next.webContentIsolationStrategy,
|
||||
);
|
||||
}
|
||||
} else {
|
||||
await _service.setDefaultSettings(next);
|
||||
initialSettingsSent = true;
|
||||
}
|
||||
},
|
||||
onError: (error, stackTrace) {
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@ part of 'engine_settings_replication.dart';
|
||||
// **************************************************************************
|
||||
|
||||
String _$engineSettingsReplicationServiceHash() =>
|
||||
r'31b5b79e429bfedb9c6b57050cd2d99407914228';
|
||||
r'be3001c952dac6c7c6be3927f6834dae57280601';
|
||||
|
||||
/// See also [EngineSettingsReplicationService].
|
||||
@ProviderFor(EngineSettingsReplicationService)
|
||||
|
||||
+1
-1
@@ -84,7 +84,7 @@ class ProxySettingsReplication extends _$ProxySettingsReplication {
|
||||
|
||||
ref.listen(
|
||||
fireImmediately: true,
|
||||
generalSettingsRepositoryProvider.select(
|
||||
generalSettingsWithDefaultsProvider.select(
|
||||
(value) => value.proxyPrivateTabsTor,
|
||||
),
|
||||
(previous, next) async {
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@ part of 'proxy_settings_replication.dart';
|
||||
// **************************************************************************
|
||||
|
||||
String _$proxySettingsReplicationHash() =>
|
||||
r'4476bab659f09de0866d0b3ae10d54ccb996335d';
|
||||
r'e9f3adc73349c6d33fc7009412984b1daa4cc8da';
|
||||
|
||||
/// See also [ProxySettingsReplication].
|
||||
@ProviderFor(ProxySettingsReplication)
|
||||
|
||||
+3
-3
@@ -65,7 +65,7 @@ class BrowserBottomAppBar extends HookConsumerWidget {
|
||||
);
|
||||
|
||||
final showExtensionShortcut = ref.watch(
|
||||
generalSettingsRepositoryProvider.select(
|
||||
generalSettingsWithDefaultsProvider.select(
|
||||
(value) => value.showExtensionShortcut,
|
||||
),
|
||||
);
|
||||
@@ -209,7 +209,7 @@ class BrowserBottomAppBar extends HookConsumerWidget {
|
||||
onPressed: () async {
|
||||
final isPrivate =
|
||||
ref
|
||||
.read(generalSettingsRepositoryProvider)
|
||||
.read(generalSettingsWithDefaultsProvider)
|
||||
.defaultCreateTabType ==
|
||||
TabType.private;
|
||||
|
||||
@@ -268,7 +268,7 @@ class BrowserBottomAppBar extends HookConsumerWidget {
|
||||
onPressed: () async {
|
||||
final isPrivate =
|
||||
ref
|
||||
.read(generalSettingsRepositoryProvider)
|
||||
.read(generalSettingsWithDefaultsProvider)
|
||||
.defaultCreateTabType ==
|
||||
TabType.private;
|
||||
|
||||
|
||||
+9
-8
@@ -85,13 +85,14 @@ class _BrowserViewState extends ConsumerState<BrowserView>
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
useOnInitialization(() async {
|
||||
await ref.read(generalSettingsRepositoryProvider.notifier).fetch().then((
|
||||
settings,
|
||||
) async {
|
||||
await ref
|
||||
.read(browserDataServiceProvider.notifier)
|
||||
.deleteDataOnEngineStart(settings.deleteBrowsingDataOnQuit);
|
||||
});
|
||||
await ref
|
||||
.read(generalSettingsRepositoryProvider.notifier)
|
||||
.fetchSettings()
|
||||
.then((settings) async {
|
||||
await ref
|
||||
.read(browserDataServiceProvider.notifier)
|
||||
.deleteDataOnEngineStart(settings.deleteBrowsingDataOnQuit);
|
||||
});
|
||||
});
|
||||
|
||||
final hasTab = ref.watch(
|
||||
@@ -313,7 +314,7 @@ class _BrowserViewState extends ConsumerState<BrowserView>
|
||||
widget.suggestionTimeout) {
|
||||
//Don't do anything if a child route is active
|
||||
if (GoRouterState.of(context).topRoute?.name == BrowserRoute.name) {
|
||||
final settings = ref.read(generalSettingsRepositoryProvider);
|
||||
final settings = ref.read(generalSettingsWithDefaultsProvider);
|
||||
|
||||
unawaited(
|
||||
showSuggestNewTabMessage(
|
||||
|
||||
+4
-4
@@ -129,7 +129,7 @@ class _TabSheetHeader extends HookConsumerWidget {
|
||||
);
|
||||
|
||||
final enableAiFeatures = ref.watch(
|
||||
generalSettingsRepositoryProvider.select(
|
||||
generalSettingsWithDefaultsProvider.select(
|
||||
(settings) => settings.enableLocalAiFeatures,
|
||||
),
|
||||
);
|
||||
@@ -415,7 +415,7 @@ class ViewTabsSheetWidget extends HookConsumerWidget {
|
||||
tabSuggestionsControllerProvider,
|
||||
);
|
||||
final enableAiFeatures = ref.watch(
|
||||
generalSettingsRepositoryProvider.select(
|
||||
generalSettingsWithDefaultsProvider.select(
|
||||
(settings) => settings.enableLocalAiFeatures,
|
||||
),
|
||||
);
|
||||
@@ -605,7 +605,7 @@ class ViewTabsSheetWidget extends HookConsumerWidget {
|
||||
),
|
||||
child: FloatingActionButton.small(
|
||||
onPressed: () async {
|
||||
final settings = ref.read(generalSettingsRepositoryProvider);
|
||||
final settings = ref.read(generalSettingsWithDefaultsProvider);
|
||||
|
||||
await SearchRoute(
|
||||
tabType:
|
||||
@@ -786,7 +786,7 @@ class ViewTabTreesSheetWidget extends HookConsumerWidget {
|
||||
),
|
||||
child: FloatingActionButton.small(
|
||||
onPressed: () async {
|
||||
final settings = ref.read(generalSettingsRepositoryProvider);
|
||||
final settings = ref.read(generalSettingsWithDefaultsProvider);
|
||||
|
||||
await SearchRoute(
|
||||
tabType:
|
||||
|
||||
+1
-1
@@ -39,7 +39,7 @@ class TabCreationMenu extends HookConsumerWidget {
|
||||
@override
|
||||
Widget build(BuildContext context, WidgetRef ref) {
|
||||
final createChildTabsOption = ref.watch(
|
||||
generalSettingsRepositoryProvider.select(
|
||||
generalSettingsWithDefaultsProvider.select(
|
||||
(value) => value.createChildTabsOption,
|
||||
),
|
||||
);
|
||||
|
||||
+3
-1
@@ -47,7 +47,9 @@ class OpenImageInNewTab extends HookConsumerWidget {
|
||||
final currentTab = ref.read(selectedTabStateProvider);
|
||||
final isPrivate =
|
||||
currentTab?.isPrivate ??
|
||||
ref.read(generalSettingsRepositoryProvider).defaultCreateTabType ==
|
||||
ref
|
||||
.read(generalSettingsWithDefaultsProvider)
|
||||
.defaultCreateTabType ==
|
||||
TabType.private;
|
||||
|
||||
final tabId = await ref
|
||||
|
||||
+3
-1
@@ -47,7 +47,9 @@ class OpenInNewTab extends HookConsumerWidget {
|
||||
final currentTab = ref.read(selectedTabStateProvider);
|
||||
final isPrivate =
|
||||
currentTab?.isPrivate ??
|
||||
ref.read(generalSettingsRepositoryProvider).defaultCreateTabType ==
|
||||
ref
|
||||
.read(generalSettingsWithDefaultsProvider)
|
||||
.defaultCreateTabType ==
|
||||
TabType.private;
|
||||
|
||||
final tabId = await ref
|
||||
|
||||
+2
-2
@@ -34,13 +34,13 @@ class ReaderButton extends HookConsumerWidget {
|
||||
final readerChanging = ref.watch(readerableScreenControllerProvider);
|
||||
|
||||
final enableReadability = ref.watch(
|
||||
generalSettingsRepositoryProvider.select(
|
||||
generalSettingsWithDefaultsProvider.select(
|
||||
(value) => value.enableReadability,
|
||||
),
|
||||
);
|
||||
|
||||
final enforceReadability = ref.watch(
|
||||
generalSettingsRepositoryProvider.select(
|
||||
generalSettingsWithDefaultsProvider.select(
|
||||
(value) => value.enforceReadability,
|
||||
),
|
||||
);
|
||||
|
||||
@@ -33,7 +33,7 @@ part 'search_suggestions.g.dart';
|
||||
@Riverpod(keepAlive: true)
|
||||
ISearchSuggestionProvider defaultSearchSuggestions(Ref ref) {
|
||||
final provider = ref.watch(
|
||||
generalSettingsRepositoryProvider.select(
|
||||
generalSettingsWithDefaultsProvider.select(
|
||||
(value) => value.defaultSearchSuggestionsProvider,
|
||||
),
|
||||
);
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@ part of 'search_suggestions.dart';
|
||||
// **************************************************************************
|
||||
|
||||
String _$defaultSearchSuggestionsHash() =>
|
||||
r'eb96a5db465422558a26e22abb3f843a82c17452';
|
||||
r'6d7a387c7daeb790a4c9a5cdc105d2a2bdbacd2b';
|
||||
|
||||
/// See also [defaultSearchSuggestions].
|
||||
@ProviderFor(defaultSearchSuggestions)
|
||||
|
||||
@@ -52,7 +52,7 @@ class SearchScreen extends HookConsumerWidget {
|
||||
final formKey = useMemoized(() => GlobalKey<FormState>());
|
||||
|
||||
final createChildTabsOption = ref.watch(
|
||||
generalSettingsRepositoryProvider.select(
|
||||
generalSettingsWithDefaultsProvider.select(
|
||||
(value) => value.createChildTabsOption,
|
||||
),
|
||||
);
|
||||
|
||||
@@ -61,7 +61,7 @@ class GeckoInferenceRepository extends _$GeckoInferenceRepository {
|
||||
|
||||
Future<String?> predictDocumentTopic(Set<String> titles) async {
|
||||
if (!ref.read(
|
||||
generalSettingsRepositoryProvider.select(
|
||||
generalSettingsWithDefaultsProvider.select(
|
||||
(settings) => settings.enableLocalAiFeatures,
|
||||
),
|
||||
)) {
|
||||
@@ -97,7 +97,7 @@ class GeckoInferenceRepository extends _$GeckoInferenceRepository {
|
||||
required List<String> unassignedDocumentsInput,
|
||||
}) async {
|
||||
if (!ref.read(
|
||||
generalSettingsRepositoryProvider.select(
|
||||
generalSettingsWithDefaultsProvider.select(
|
||||
(settings) => settings.enableLocalAiFeatures,
|
||||
),
|
||||
)) {
|
||||
|
||||
@@ -276,7 +276,7 @@ class _ContainerTabSuggestionsProviderElement
|
||||
}
|
||||
|
||||
String _$geckoInferenceRepositoryHash() =>
|
||||
r'170bd0b67e5f1edc43ed97d4535f41353fb8796e';
|
||||
r'6099998a3f49fc4faf650878ab4afd6268c593e2';
|
||||
|
||||
/// See also [GeckoInferenceRepository].
|
||||
@ProviderFor(GeckoInferenceRepository)
|
||||
|
||||
@@ -32,7 +32,7 @@ class AiConfigurationPage extends HookConsumerWidget {
|
||||
final theme = Theme.of(context);
|
||||
|
||||
final enableLocalAiFeatures = ref.watch(
|
||||
generalSettingsRepositoryProvider.select(
|
||||
generalSettingsWithDefaultsProvider.select(
|
||||
(settings) => settings.enableLocalAiFeatures,
|
||||
),
|
||||
);
|
||||
|
||||
@@ -45,7 +45,7 @@ class DefaultSearchPage extends HookConsumerWidget {
|
||||
defaultSearchBangDataProvider.select((value) => value.valueOrNull),
|
||||
);
|
||||
final activeAutosuggest = ref.watch(
|
||||
generalSettingsRepositoryProvider.select(
|
||||
generalSettingsWithDefaultsProvider.select(
|
||||
(value) => value.defaultSearchSuggestionsProvider,
|
||||
),
|
||||
);
|
||||
|
||||
@@ -37,7 +37,7 @@ class DeveloperSettingsScreen extends HookConsumerWidget {
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context, WidgetRef ref) {
|
||||
final engineSettings = ref.watch(engineSettingsRepositoryProvider);
|
||||
final engineSettings = ref.watch(engineSettingsWithDefaultsProvider);
|
||||
|
||||
final userAgentTextController = useTextEditingController(
|
||||
text: engineSettings.userAgent,
|
||||
|
||||
@@ -39,7 +39,7 @@ class GeneralSettingsScreen extends HookConsumerWidget {
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context, WidgetRef ref) {
|
||||
final generalSettings = ref.watch(generalSettingsRepositoryProvider);
|
||||
final generalSettings = ref.watch(generalSettingsWithDefaultsProvider);
|
||||
|
||||
return Scaffold(
|
||||
appBar: AppBar(title: const Text('General Settings')),
|
||||
|
||||
@@ -35,8 +35,8 @@ class WebEngineSettingsScreen extends HookConsumerWidget {
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context, WidgetRef ref) {
|
||||
final generalSettings = ref.watch(generalSettingsRepositoryProvider);
|
||||
final engineSettings = ref.watch(engineSettingsRepositoryProvider);
|
||||
final generalSettings = ref.watch(generalSettingsWithDefaultsProvider);
|
||||
final engineSettings = ref.watch(engineSettingsWithDefaultsProvider);
|
||||
|
||||
return Scaffold(
|
||||
appBar: AppBar(title: const Text('Web Engine Settings')),
|
||||
@@ -115,7 +115,7 @@ class WebEngineSettingsScreen extends HookConsumerWidget {
|
||||
),
|
||||
),
|
||||
SwitchListTile.adaptive(
|
||||
title: const Text('Enable Global Privacy Control (GPC)'),
|
||||
title: const Text('Global Privacy Control (GPC)'),
|
||||
secondary: const Icon(MdiIcons.incognitoCircleOff),
|
||||
value: engineSettings.globalPrivacyControlEnabled,
|
||||
onChanged: (value) async {
|
||||
@@ -300,6 +300,76 @@ class WebEngineSettingsScreen extends HookConsumerWidget {
|
||||
// ],
|
||||
// ),
|
||||
// ),
|
||||
SwitchListTile.adaptive(
|
||||
title: const Text('Bounce Tracking Protection'),
|
||||
secondary: const Icon(MdiIcons.securityNetwork),
|
||||
value: switch (engineSettings
|
||||
.contentBlocking
|
||||
.bounceTrackingProtectionMode) {
|
||||
BounceTrackingProtectionMode.disabled => false,
|
||||
BounceTrackingProtectionMode.enabled => true,
|
||||
BounceTrackingProtectionMode.enabledStandby => false,
|
||||
BounceTrackingProtectionMode.enabledDryRun => false,
|
||||
},
|
||||
onChanged: (value) async {
|
||||
await ref
|
||||
.read(saveEngineSettingsControllerProvider.notifier)
|
||||
.save(
|
||||
(currentSettings) => currentSettings.copyWith
|
||||
.bounceTrackingProtectionMode(
|
||||
value
|
||||
? BounceTrackingProtectionMode.enabled
|
||||
: BounceTrackingProtectionMode.disabled,
|
||||
),
|
||||
);
|
||||
},
|
||||
),
|
||||
Padding(
|
||||
padding: const EdgeInsets.symmetric(
|
||||
horizontal: 16.0,
|
||||
vertical: 8,
|
||||
),
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
const ListTile(
|
||||
title: Text('Query Parameter Stripping'),
|
||||
leading: Icon(MdiIcons.closeNetwork),
|
||||
contentPadding: EdgeInsets.zero,
|
||||
),
|
||||
Center(
|
||||
child: SegmentedButton<QueryParameterStripping>(
|
||||
segments: const [
|
||||
ButtonSegment(
|
||||
value: QueryParameterStripping.disabled,
|
||||
label: Text('Disabled'),
|
||||
),
|
||||
ButtonSegment(
|
||||
value: QueryParameterStripping.enabled,
|
||||
label: Text('Enabled'),
|
||||
),
|
||||
ButtonSegment(
|
||||
value: QueryParameterStripping.privateOnly,
|
||||
label: Text('Private mode only'),
|
||||
),
|
||||
],
|
||||
selected: {engineSettings.queryParameterStripping},
|
||||
onSelectionChanged: (value) async {
|
||||
await ref
|
||||
.read(
|
||||
saveEngineSettingsControllerProvider.notifier,
|
||||
)
|
||||
.save(
|
||||
(currentSettings) => currentSettings.copyWith
|
||||
.queryParameterStripping(value.first),
|
||||
);
|
||||
},
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
ListTile(
|
||||
title: const Text('Web Engine Hardening'),
|
||||
contentPadding: const EdgeInsets.symmetric(
|
||||
|
||||
@@ -34,7 +34,7 @@ class TorProxyScreen extends HookConsumerWidget {
|
||||
Widget build(BuildContext context, WidgetRef ref) {
|
||||
final torProxyPort = ref.watch(torProxyServiceProvider);
|
||||
final proxyPrivateTabsTor = ref.watch(
|
||||
generalSettingsRepositoryProvider.select(
|
||||
generalSettingsWithDefaultsProvider.select(
|
||||
(value) => value.proxyPrivateTabsTor,
|
||||
),
|
||||
);
|
||||
|
||||
@@ -54,6 +54,20 @@ class EngineSettings extends GeckoEngineSettings with FastEquatable {
|
||||
WebContentIsolationStrategy get webContentIsolationStrategy =>
|
||||
super.webContentIsolationStrategy!;
|
||||
|
||||
final QueryParameterStripping queryParameterStripping;
|
||||
|
||||
final BounceTrackingProtectionMode bounceTrackingProtectionMode;
|
||||
|
||||
@override
|
||||
@JsonKey(includeFromJson: false, includeToJson: false)
|
||||
ContentBlocking get contentBlocking => ContentBlocking(
|
||||
queryParameterStripping: queryParameterStripping,
|
||||
queryParameterStrippingAllowList: '',
|
||||
queryParameterStrippingStripList:
|
||||
'__hsfp __hssc __hstc __s _bhlid _branch_match_id _branch_referrer _gl _hsenc _kx _openstat at_recipient_id at_recipient_list bbeml bsft_clkid bsft_uid dclid et_rid fb_action_ids fb_comment_id fbclid gbraid gclid guce_referrer guce_referrer_sig hsCtaTracking igshid irclickid mc_eid mkt_tok ml_subscriber ml_subscriber_hash msclkid mtm_cid oft_c oft_ck oft_d oft_id oft_ids oft_k oft_lk oft_sk oly_anon_id oly_enc_id pk_cid rb_clickid s_cid sc_customer sc_eh sc_uid srsltid ss_email_id twclid unicorn_click_id vero_conv vero_id vgo_ee wbraid wickedid yclid ymclid ysclid',
|
||||
bounceTrackingProtectionMode: bounceTrackingProtectionMode,
|
||||
);
|
||||
|
||||
EngineSettings({
|
||||
required super.javascriptEnabled,
|
||||
required super.trackingProtectionPolicy,
|
||||
@@ -66,6 +80,8 @@ class EngineSettings extends GeckoEngineSettings with FastEquatable {
|
||||
required super.cookieBannerHandlingGlobalRulesSubFrames,
|
||||
required super.webContentIsolationStrategy,
|
||||
required super.userAgent,
|
||||
required this.queryParameterStripping,
|
||||
required this.bounceTrackingProtectionMode,
|
||||
});
|
||||
|
||||
EngineSettings.withDefaults({
|
||||
@@ -79,8 +95,15 @@ class EngineSettings extends GeckoEngineSettings with FastEquatable {
|
||||
bool? cookieBannerHandlingGlobalRules,
|
||||
bool? cookieBannerHandlingGlobalRulesSubFrames,
|
||||
WebContentIsolationStrategy? webContentIsolationStrategy,
|
||||
QueryParameterStripping? queryParameterStripping,
|
||||
BounceTrackingProtectionMode? bounceTrackingProtectionMode,
|
||||
super.userAgent,
|
||||
}) : super(
|
||||
}) : queryParameterStripping =
|
||||
queryParameterStripping ?? QueryParameterStripping.disabled,
|
||||
bounceTrackingProtectionMode =
|
||||
bounceTrackingProtectionMode ??
|
||||
BounceTrackingProtectionMode.disabled,
|
||||
super(
|
||||
javascriptEnabled: javascriptEnabled ?? true,
|
||||
trackingProtectionPolicy:
|
||||
trackingProtectionPolicy ?? TrackingProtectionPolicy.strict,
|
||||
@@ -119,5 +142,7 @@ class EngineSettings extends GeckoEngineSettings with FastEquatable {
|
||||
super.cookieBannerHandlingGlobalRulesSubFrames,
|
||||
super.webContentIsolationStrategy,
|
||||
super.userAgent,
|
||||
queryParameterStripping,
|
||||
bounceTrackingProtectionMode,
|
||||
];
|
||||
}
|
||||
|
||||
@@ -41,6 +41,14 @@ abstract class _$EngineSettingsCWProxy {
|
||||
|
||||
EngineSettings userAgent(String? userAgent);
|
||||
|
||||
EngineSettings queryParameterStripping(
|
||||
QueryParameterStripping queryParameterStripping,
|
||||
);
|
||||
|
||||
EngineSettings bounceTrackingProtectionMode(
|
||||
BounceTrackingProtectionMode bounceTrackingProtectionMode,
|
||||
);
|
||||
|
||||
/// This function **does support** nullification of nullable fields. All `null` values passed to `non-nullable` fields will be ignored. You can also use `EngineSettings(...).copyWith.fieldName(...)` to override fields one at a time with nullification support.
|
||||
///
|
||||
/// Usage
|
||||
@@ -59,6 +67,8 @@ abstract class _$EngineSettingsCWProxy {
|
||||
bool? cookieBannerHandlingGlobalRulesSubFrames,
|
||||
WebContentIsolationStrategy? webContentIsolationStrategy,
|
||||
String? userAgent,
|
||||
QueryParameterStripping queryParameterStripping,
|
||||
BounceTrackingProtectionMode bounceTrackingProtectionMode,
|
||||
});
|
||||
}
|
||||
|
||||
@@ -124,6 +134,16 @@ class _$EngineSettingsCWProxyImpl implements _$EngineSettingsCWProxy {
|
||||
@override
|
||||
EngineSettings userAgent(String? userAgent) => this(userAgent: userAgent);
|
||||
|
||||
@override
|
||||
EngineSettings queryParameterStripping(
|
||||
QueryParameterStripping queryParameterStripping,
|
||||
) => this(queryParameterStripping: queryParameterStripping);
|
||||
|
||||
@override
|
||||
EngineSettings bounceTrackingProtectionMode(
|
||||
BounceTrackingProtectionMode bounceTrackingProtectionMode,
|
||||
) => this(bounceTrackingProtectionMode: bounceTrackingProtectionMode);
|
||||
|
||||
@override
|
||||
/// This function **does support** nullification of nullable fields. All `null` values passed to `non-nullable` fields will be ignored. You can also use `EngineSettings(...).copyWith.fieldName(...)` to override fields one at a time with nullification support.
|
||||
///
|
||||
@@ -145,6 +165,8 @@ class _$EngineSettingsCWProxyImpl implements _$EngineSettingsCWProxy {
|
||||
const $CopyWithPlaceholder(),
|
||||
Object? webContentIsolationStrategy = const $CopyWithPlaceholder(),
|
||||
Object? userAgent = const $CopyWithPlaceholder(),
|
||||
Object? queryParameterStripping = const $CopyWithPlaceholder(),
|
||||
Object? bounceTrackingProtectionMode = const $CopyWithPlaceholder(),
|
||||
}) {
|
||||
return EngineSettings(
|
||||
javascriptEnabled: javascriptEnabled == const $CopyWithPlaceholder()
|
||||
@@ -201,6 +223,16 @@ class _$EngineSettingsCWProxyImpl implements _$EngineSettingsCWProxy {
|
||||
? _value.userAgent
|
||||
// ignore: cast_nullable_to_non_nullable
|
||||
: userAgent as String?,
|
||||
queryParameterStripping:
|
||||
queryParameterStripping == const $CopyWithPlaceholder()
|
||||
? _value.queryParameterStripping
|
||||
// ignore: cast_nullable_to_non_nullable
|
||||
: queryParameterStripping as QueryParameterStripping,
|
||||
bounceTrackingProtectionMode:
|
||||
bounceTrackingProtectionMode == const $CopyWithPlaceholder()
|
||||
? _value.bounceTrackingProtectionMode
|
||||
// ignore: cast_nullable_to_non_nullable
|
||||
: bounceTrackingProtectionMode as BounceTrackingProtectionMode,
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -247,6 +279,14 @@ EngineSettings _$EngineSettingsFromJson(Map<String, dynamic> json) =>
|
||||
_$WebContentIsolationStrategyEnumMap,
|
||||
json['webContentIsolationStrategy'],
|
||||
),
|
||||
queryParameterStripping: $enumDecodeNullable(
|
||||
_$QueryParameterStrippingEnumMap,
|
||||
json['queryParameterStripping'],
|
||||
),
|
||||
bounceTrackingProtectionMode: $enumDecodeNullable(
|
||||
_$BounceTrackingProtectionModeEnumMap,
|
||||
json['bounceTrackingProtectionMode'],
|
||||
),
|
||||
userAgent: json['userAgent'] as String?,
|
||||
);
|
||||
|
||||
@@ -271,6 +311,11 @@ Map<String, dynamic> _$EngineSettingsToJson(
|
||||
'webContentIsolationStrategy':
|
||||
_$WebContentIsolationStrategyEnumMap[instance
|
||||
.webContentIsolationStrategy]!,
|
||||
'queryParameterStripping':
|
||||
_$QueryParameterStrippingEnumMap[instance.queryParameterStripping]!,
|
||||
'bounceTrackingProtectionMode':
|
||||
_$BounceTrackingProtectionModeEnumMap[instance
|
||||
.bounceTrackingProtectionMode]!,
|
||||
};
|
||||
|
||||
const _$TrackingProtectionPolicyEnumMap = {
|
||||
@@ -303,3 +348,16 @@ const _$WebContentIsolationStrategyEnumMap = {
|
||||
WebContentIsolationStrategy.isolateEverything: 'isolateEverything',
|
||||
WebContentIsolationStrategy.isolateHighValue: 'isolateHighValue',
|
||||
};
|
||||
|
||||
const _$QueryParameterStrippingEnumMap = {
|
||||
QueryParameterStripping.disabled: 'disabled',
|
||||
QueryParameterStripping.privateOnly: 'privateOnly',
|
||||
QueryParameterStripping.enabled: 'enabled',
|
||||
};
|
||||
|
||||
const _$BounceTrackingProtectionModeEnumMap = {
|
||||
BounceTrackingProtectionMode.disabled: 'disabled',
|
||||
BounceTrackingProtectionMode.enabled: 'enabled',
|
||||
BounceTrackingProtectionMode.enabledStandby: 'enabledStandby',
|
||||
BounceTrackingProtectionMode.enabledDryRun: 'enabledDryRun',
|
||||
};
|
||||
|
||||
@@ -42,7 +42,7 @@ Stream<double> iconCacheSizeMegabytes(Ref ref) {
|
||||
@Riverpod()
|
||||
bool incognitoModeEnabled(Ref ref) {
|
||||
return ref.watch(
|
||||
generalSettingsRepositoryProvider.select(
|
||||
generalSettingsWithDefaultsProvider.select(
|
||||
(value) => value.deleteBrowsingDataOnQuit != null,
|
||||
),
|
||||
);
|
||||
|
||||
@@ -43,7 +43,7 @@ final iconCacheSizeMegabytesProvider =
|
||||
// ignore: unused_element
|
||||
typedef IconCacheSizeMegabytesRef = AutoDisposeStreamProviderRef<double>;
|
||||
String _$incognitoModeEnabledHash() =>
|
||||
r'3968c2d4945be09a0bc08ce0d70b0390187c44e8';
|
||||
r'36957b70a5261f9d3ad228e07cc8dd5c8f616082';
|
||||
|
||||
/// See also [incognitoModeEnabled].
|
||||
@ProviderFor(incognitoModeEnabled)
|
||||
|
||||
@@ -20,6 +20,7 @@
|
||||
import 'dart:async';
|
||||
|
||||
import 'package:drift/drift.dart';
|
||||
import 'package:riverpod/riverpod.dart';
|
||||
import 'package:riverpod_annotation/riverpod_annotation.dart';
|
||||
import 'package:weblibre/features/user/data/models/engine_settings.dart';
|
||||
import 'package:weblibre/features/user/data/providers.dart';
|
||||
@@ -33,9 +34,72 @@ typedef UpdateEngineSettingsFunc =
|
||||
class EngineSettingsRepository extends _$EngineSettingsRepository {
|
||||
final _partitionKey = 'engine';
|
||||
|
||||
Future<void> updateSettings(UpdateEngineSettingsFunc updateWithCurrent) {
|
||||
final oldJson = state.toJson();
|
||||
final newJson = updateWithCurrent(state).toJson();
|
||||
EngineSettings _deserializeSettings(
|
||||
List<MapEntry<String, DriftAny?>> entries,
|
||||
) {
|
||||
final db = ref.read(userDatabaseProvider);
|
||||
final settings = Map.fromEntries(entries);
|
||||
|
||||
return EngineSettings.fromJson({
|
||||
'incognitoMode': settings['incognitoMode']?.readAs(
|
||||
DriftSqlType.bool,
|
||||
db.typeMapping,
|
||||
),
|
||||
'javascriptEnabled': settings['javascriptEnabled']?.readAs(
|
||||
DriftSqlType.bool,
|
||||
db.typeMapping,
|
||||
),
|
||||
'trackingProtectionPolicy': settings['trackingProtectionPolicy']?.readAs(
|
||||
DriftSqlType.string,
|
||||
db.typeMapping,
|
||||
),
|
||||
'httpsOnlyMode': settings['httpsOnlyMode']?.readAs(
|
||||
DriftSqlType.string,
|
||||
db.typeMapping,
|
||||
),
|
||||
'globalPrivacyControlEnabled': settings['globalPrivacyControlEnabled']
|
||||
?.readAs(DriftSqlType.bool, db.typeMapping),
|
||||
'cookieBannerHandlingMode': settings['cookieBannerHandlingMode']?.readAs(
|
||||
DriftSqlType.string,
|
||||
db.typeMapping,
|
||||
),
|
||||
'cookieBannerHandlingModePrivateBrowsing':
|
||||
settings['cookieBannerHandlingModePrivateBrowsing']?.readAs(
|
||||
DriftSqlType.string,
|
||||
db.typeMapping,
|
||||
),
|
||||
'cookieBannerHandlingGlobalRules':
|
||||
settings['cookieBannerHandlingGlobalRules']?.readAs(
|
||||
DriftSqlType.bool,
|
||||
db.typeMapping,
|
||||
),
|
||||
'cookieBannerHandlingGlobalRulesSubFrames':
|
||||
settings['cookieBannerHandlingGlobalRulesSubFrames']?.readAs(
|
||||
DriftSqlType.bool,
|
||||
db.typeMapping,
|
||||
),
|
||||
'webContentIsolationStrategy': settings['webContentIsolationStrategy']
|
||||
?.readAs(DriftSqlType.string, db.typeMapping),
|
||||
'userAgent': settings['userAgent']?.readAs(
|
||||
DriftSqlType.string,
|
||||
db.typeMapping,
|
||||
),
|
||||
'queryParameterStripping': settings['queryParameterStripping']?.readAs(
|
||||
DriftSqlType.string,
|
||||
db.typeMapping,
|
||||
),
|
||||
'bounceTrackingProtectionMode': settings['bounceTrackingProtectionMode']
|
||||
?.readAs(DriftSqlType.string, db.typeMapping),
|
||||
});
|
||||
}
|
||||
|
||||
Future<void> updateSettings(
|
||||
UpdateEngineSettingsFunc updateWithCurrent,
|
||||
) async {
|
||||
final current = await fetchSettings();
|
||||
|
||||
final oldJson = current.toJson();
|
||||
final newJson = updateWithCurrent(current).toJson();
|
||||
|
||||
return ref.read(userDatabaseProvider).transaction(() async {
|
||||
for (final MapEntry(:key, :value) in newJson.entries) {
|
||||
@@ -49,69 +113,33 @@ class EngineSettingsRepository extends _$EngineSettingsRepository {
|
||||
});
|
||||
}
|
||||
|
||||
Future<EngineSettings> fetchSettings() {
|
||||
return ref
|
||||
.read(userDatabaseProvider)
|
||||
.settingDao
|
||||
.getAllSettingsOfPartitionKey(_partitionKey)
|
||||
.get()
|
||||
.then(_deserializeSettings);
|
||||
}
|
||||
|
||||
@override
|
||||
EngineSettings build() {
|
||||
Stream<EngineSettings> build() {
|
||||
final db = ref.watch(userDatabaseProvider);
|
||||
|
||||
final watchSub = db.settingDao
|
||||
return db.settingDao
|
||||
.getAllSettingsOfPartitionKey(_partitionKey)
|
||||
.watch()
|
||||
.listen((entries) {
|
||||
final settings = Map.fromEntries(entries);
|
||||
|
||||
state = EngineSettings.fromJson({
|
||||
'incognitoMode': settings['incognitoMode']?.readAs(
|
||||
DriftSqlType.bool,
|
||||
db.typeMapping,
|
||||
),
|
||||
'javascriptEnabled': settings['javascriptEnabled']?.readAs(
|
||||
DriftSqlType.bool,
|
||||
db.typeMapping,
|
||||
),
|
||||
'trackingProtectionPolicy': settings['trackingProtectionPolicy']
|
||||
?.readAs(DriftSqlType.string, db.typeMapping),
|
||||
'httpsOnlyMode': settings['httpsOnlyMode']?.readAs(
|
||||
DriftSqlType.string,
|
||||
db.typeMapping,
|
||||
),
|
||||
'globalPrivacyControlEnabled':
|
||||
settings['globalPrivacyControlEnabled']?.readAs(
|
||||
DriftSqlType.bool,
|
||||
db.typeMapping,
|
||||
),
|
||||
'cookieBannerHandlingMode': settings['cookieBannerHandlingMode']
|
||||
?.readAs(DriftSqlType.string, db.typeMapping),
|
||||
'cookieBannerHandlingModePrivateBrowsing':
|
||||
settings['cookieBannerHandlingModePrivateBrowsing']?.readAs(
|
||||
DriftSqlType.string,
|
||||
db.typeMapping,
|
||||
),
|
||||
'cookieBannerHandlingGlobalRules':
|
||||
settings['cookieBannerHandlingGlobalRules']?.readAs(
|
||||
DriftSqlType.bool,
|
||||
db.typeMapping,
|
||||
),
|
||||
'cookieBannerHandlingGlobalRulesSubFrames':
|
||||
settings['cookieBannerHandlingGlobalRulesSubFrames']?.readAs(
|
||||
DriftSqlType.bool,
|
||||
db.typeMapping,
|
||||
),
|
||||
'webContentIsolationStrategy':
|
||||
settings['webContentIsolationStrategy']?.readAs(
|
||||
DriftSqlType.string,
|
||||
db.typeMapping,
|
||||
),
|
||||
'userAgent': settings['userAgent']?.readAs(
|
||||
DriftSqlType.string,
|
||||
db.typeMapping,
|
||||
),
|
||||
});
|
||||
.map((entries) {
|
||||
return _deserializeSettings(entries);
|
||||
});
|
||||
|
||||
ref.onDispose(() async {
|
||||
await watchSub.cancel();
|
||||
});
|
||||
|
||||
return EngineSettings.withDefaults();
|
||||
}
|
||||
}
|
||||
|
||||
@Riverpod()
|
||||
EngineSettings engineSettingsWithDefaults(Ref ref) {
|
||||
return ref.watch(
|
||||
engineSettingsRepositoryProvider.select(
|
||||
(value) => value.valueOrNull ?? EngineSettings.withDefaults(),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -6,13 +6,32 @@ part of 'engine_settings.dart';
|
||||
// RiverpodGenerator
|
||||
// **************************************************************************
|
||||
|
||||
String _$engineSettingsWithDefaultsHash() =>
|
||||
r'018e37f31f893e203b86038e84b0ddf5e72454d4';
|
||||
|
||||
/// See also [engineSettingsWithDefaults].
|
||||
@ProviderFor(engineSettingsWithDefaults)
|
||||
final engineSettingsWithDefaultsProvider =
|
||||
AutoDisposeProvider<EngineSettings>.internal(
|
||||
engineSettingsWithDefaults,
|
||||
name: r'engineSettingsWithDefaultsProvider',
|
||||
debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
|
||||
? null
|
||||
: _$engineSettingsWithDefaultsHash,
|
||||
dependencies: null,
|
||||
allTransitiveDependencies: null,
|
||||
);
|
||||
|
||||
@Deprecated('Will be removed in 3.0. Use Ref instead')
|
||||
// ignore: unused_element
|
||||
typedef EngineSettingsWithDefaultsRef = AutoDisposeProviderRef<EngineSettings>;
|
||||
String _$engineSettingsRepositoryHash() =>
|
||||
r'87e308c8bd4390d1d5c401532a0c35cd96f6176e';
|
||||
r'aa522c35377280c451f6ac9e5f7063eab7ba6efc';
|
||||
|
||||
/// See also [EngineSettingsRepository].
|
||||
@ProviderFor(EngineSettingsRepository)
|
||||
final engineSettingsRepositoryProvider =
|
||||
NotifierProvider<EngineSettingsRepository, EngineSettings>.internal(
|
||||
StreamNotifierProvider<EngineSettingsRepository, EngineSettings>.internal(
|
||||
EngineSettingsRepository.new,
|
||||
name: r'engineSettingsRepositoryProvider',
|
||||
debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
|
||||
@@ -22,6 +41,6 @@ final engineSettingsRepositoryProvider =
|
||||
allTransitiveDependencies: null,
|
||||
);
|
||||
|
||||
typedef _$EngineSettingsRepository = Notifier<EngineSettings>;
|
||||
typedef _$EngineSettingsRepository = StreamNotifier<EngineSettings>;
|
||||
// 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
|
||||
|
||||
@@ -22,6 +22,7 @@ import 'dart:convert';
|
||||
|
||||
import 'package:drift/drift.dart';
|
||||
import 'package:nullability/nullability.dart';
|
||||
import 'package:riverpod/riverpod.dart';
|
||||
import 'package:riverpod_annotation/riverpod_annotation.dart';
|
||||
import 'package:weblibre/features/user/data/models/general_settings.dart';
|
||||
import 'package:weblibre/features/user/data/providers.dart';
|
||||
@@ -95,7 +96,7 @@ class GeneralSettingsRepository extends _$GeneralSettingsRepository {
|
||||
}
|
||||
|
||||
//Eager fetch, when up to date settings are required
|
||||
Future<GeneralSettings> fetch() {
|
||||
Future<GeneralSettings> fetchSettings() {
|
||||
return ref
|
||||
.read(userDatabaseProvider)
|
||||
.settingDao
|
||||
@@ -104,9 +105,13 @@ class GeneralSettingsRepository extends _$GeneralSettingsRepository {
|
||||
.then(_deserializeSettings);
|
||||
}
|
||||
|
||||
Future<void> updateSettings(UpdateGeneralSettingsFunc updateWithCurrent) {
|
||||
final oldJson = state.toJson();
|
||||
final newJson = updateWithCurrent(state).toJson();
|
||||
Future<void> updateSettings(
|
||||
UpdateGeneralSettingsFunc updateWithCurrent,
|
||||
) async {
|
||||
final current = await fetchSettings();
|
||||
|
||||
final oldJson = current.toJson();
|
||||
final newJson = updateWithCurrent(current).toJson();
|
||||
|
||||
final db = ref.read(userDatabaseProvider);
|
||||
|
||||
@@ -120,20 +125,23 @@ class GeneralSettingsRepository extends _$GeneralSettingsRepository {
|
||||
}
|
||||
|
||||
@override
|
||||
GeneralSettings build() {
|
||||
Stream<GeneralSettings> build() {
|
||||
final db = ref.watch(userDatabaseProvider);
|
||||
|
||||
final watchSub = db.settingDao
|
||||
return db.settingDao
|
||||
.getAllSettingsOfPartitionKey(_partitionKey)
|
||||
.watch()
|
||||
.listen((event) {
|
||||
state = _deserializeSettings(event);
|
||||
.map((event) {
|
||||
return _deserializeSettings(event);
|
||||
});
|
||||
|
||||
ref.onDispose(() async {
|
||||
await watchSub.cancel();
|
||||
});
|
||||
|
||||
return GeneralSettings.withDefaults();
|
||||
}
|
||||
}
|
||||
|
||||
@Riverpod()
|
||||
GeneralSettings generalSettingsWithDefaults(Ref ref) {
|
||||
return ref.watch(
|
||||
generalSettingsRepositoryProvider.select(
|
||||
(value) => value.valueOrNull ?? GeneralSettings.withDefaults(),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -6,13 +6,33 @@ part of 'general_settings.dart';
|
||||
// RiverpodGenerator
|
||||
// **************************************************************************
|
||||
|
||||
String _$generalSettingsWithDefaultsHash() =>
|
||||
r'd2a20cb527f8bf5a16e273933cf7ccc9d0851dc4';
|
||||
|
||||
/// See also [generalSettingsWithDefaults].
|
||||
@ProviderFor(generalSettingsWithDefaults)
|
||||
final generalSettingsWithDefaultsProvider =
|
||||
AutoDisposeProvider<GeneralSettings>.internal(
|
||||
generalSettingsWithDefaults,
|
||||
name: r'generalSettingsWithDefaultsProvider',
|
||||
debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
|
||||
? null
|
||||
: _$generalSettingsWithDefaultsHash,
|
||||
dependencies: null,
|
||||
allTransitiveDependencies: null,
|
||||
);
|
||||
|
||||
@Deprecated('Will be removed in 3.0. Use Ref instead')
|
||||
// ignore: unused_element
|
||||
typedef GeneralSettingsWithDefaultsRef =
|
||||
AutoDisposeProviderRef<GeneralSettings>;
|
||||
String _$generalSettingsRepositoryHash() =>
|
||||
r'538e03e9eff8beefc0918614c86d8919224c3039';
|
||||
r'7e1c4d6051c4c3972b6998dee89d13b49be32e48';
|
||||
|
||||
/// See also [GeneralSettingsRepository].
|
||||
@ProviderFor(GeneralSettingsRepository)
|
||||
final generalSettingsRepositoryProvider =
|
||||
NotifierProvider<GeneralSettingsRepository, GeneralSettings>.internal(
|
||||
StreamNotifierProvider<GeneralSettingsRepository, GeneralSettings>.internal(
|
||||
GeneralSettingsRepository.new,
|
||||
name: r'generalSettingsRepositoryProvider',
|
||||
debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
|
||||
@@ -22,6 +42,6 @@ final generalSettingsRepositoryProvider =
|
||||
allTransitiveDependencies: null,
|
||||
);
|
||||
|
||||
typedef _$GeneralSettingsRepository = Notifier<GeneralSettings>;
|
||||
typedef _$GeneralSettingsRepository = StreamNotifier<GeneralSettings>;
|
||||
// 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
|
||||
|
||||
@@ -196,7 +196,7 @@ class FeedArticleScreen extends HookConsumerWidget {
|
||||
onPressed: () async {
|
||||
final isPrivate =
|
||||
ref
|
||||
.read(generalSettingsRepositoryProvider)
|
||||
.read(generalSettingsWithDefaultsProvider)
|
||||
.defaultCreateTabType ==
|
||||
TabType.private;
|
||||
|
||||
@@ -243,7 +243,7 @@ class FeedArticleScreen extends HookConsumerWidget {
|
||||
case final Uri url) {
|
||||
final isPrivate =
|
||||
ref
|
||||
.read(generalSettingsRepositoryProvider)
|
||||
.read(generalSettingsWithDefaultsProvider)
|
||||
.defaultCreateTabType ==
|
||||
TabType.private;
|
||||
|
||||
|
||||
+11
-5
@@ -32,6 +32,7 @@ import 'package:weblibre/core/error_observer.dart';
|
||||
import 'package:weblibre/core/logger.dart';
|
||||
import 'package:weblibre/core/providers/defaults.dart';
|
||||
import 'package:weblibre/domain/services/app_initialization.dart';
|
||||
import 'package:weblibre/features/user/domain/repositories/engine_settings.dart';
|
||||
import 'package:weblibre/features/user/domain/repositories/general_settings.dart';
|
||||
import 'package:weblibre/features/web_feed/presentation/controllers/fetch_articles.dart';
|
||||
import 'package:weblibre/features/web_feed/utils/fetch_entrypoint.dart';
|
||||
@@ -69,10 +70,6 @@ void main() async {
|
||||
}, message);
|
||||
});
|
||||
|
||||
await GeckoBrowserService().initialize(
|
||||
kDebugMode ? LogLevel.debug : LogLevel.warn,
|
||||
);
|
||||
|
||||
await HomeWidget.setAppGroupId('weblibre');
|
||||
|
||||
runApp(
|
||||
@@ -81,12 +78,21 @@ void main() async {
|
||||
child: HookConsumer(
|
||||
builder: (context, ref, child) {
|
||||
final themeMode = ref.watch(
|
||||
generalSettingsRepositoryProvider.select(
|
||||
generalSettingsWithDefaultsProvider.select(
|
||||
(value) => value.themeMode,
|
||||
),
|
||||
);
|
||||
|
||||
useOnInitialization(() async {
|
||||
final engineSettings = await ref
|
||||
.read(engineSettingsRepositoryProvider.notifier)
|
||||
.fetchSettings();
|
||||
|
||||
await GeckoBrowserService().initialize(
|
||||
kDebugMode ? LogLevel.debug : LogLevel.warn,
|
||||
engineSettings.contentBlocking,
|
||||
);
|
||||
|
||||
await ref
|
||||
.read(appInitializationServiceProvider.notifier)
|
||||
.initialize();
|
||||
|
||||
Reference in New Issue
Block a user