From 4caa23e2e17f94c0ec7bb97c49bb071d2c007cb1 Mon Sep 17 00:00:00 2001 From: sneurlax Date: Fri, 25 Apr 2025 11:33:49 -0500 Subject: [PATCH 1/2] feat(tor): when tor is enabled, also enable the killswitch --- .../global_settings_view/tor_settings/tor_settings_view.dart | 4 ++++ .../settings/settings_menu/tor_settings/tor_settings.dart | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/lib/pages/settings_views/global_settings_view/tor_settings/tor_settings_view.dart b/lib/pages/settings_views/global_settings_view/tor_settings/tor_settings_view.dart index 245937fdf..d88b9286a 100644 --- a/lib/pages/settings_views/global_settings_view/tor_settings/tor_settings_view.dart +++ b/lib/pages/settings_views/global_settings_view/tor_settings/tor_settings_view.dart @@ -603,6 +603,10 @@ Future connectTor(WidgetRef ref, BuildContext context) async { // Toggle the useTor preference on success. ref.read(prefsChangeNotifierProvider).useTor = true; + + // Toggle the torKillswitch preference on success. + ref.read(prefsChangeNotifierProvider).torKillSwitch = true; + // TODO [prio=pup]: Only toggle this the first time the user connects to Tor. } catch (e, s) { Logging.instance.e("Error starting tor: ", error: e, stackTrace: s); // TODO: show dialog with error message diff --git a/lib/pages_desktop_specific/settings/settings_menu/tor_settings/tor_settings.dart b/lib/pages_desktop_specific/settings/settings_menu/tor_settings/tor_settings.dart index 162ed9860..b75f27b50 100644 --- a/lib/pages_desktop_specific/settings/settings_menu/tor_settings/tor_settings.dart +++ b/lib/pages_desktop_specific/settings/settings_menu/tor_settings/tor_settings.dart @@ -70,6 +70,10 @@ class _TorSettingsState extends ConsumerState { // Toggle the useTor preference on success. ref.read(prefsChangeNotifierProvider).useTor = true; + + // Toggle the torKillswitch preference on success. + ref.read(prefsChangeNotifierProvider).torKillSwitch = true; + // TODO [prio=pup]: Only toggle this the first time the user connects to Tor. } catch (e, s) { Logging.instance.e("Error starting tor: ", error: e, stackTrace: s); // TODO: show dialog with error message From 082c21f4a33c17379ddcdf5721304adfe906f5cb Mon Sep 17 00:00:00 2001 From: sneurlax Date: Fri, 25 Apr 2025 11:36:53 -0500 Subject: [PATCH 2/2] feat(tor): do not enable tor killswitch by default TODO: enable in Privacy Mode? --- lib/utilities/prefs.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/utilities/prefs.dart b/lib/utilities/prefs.dart index 395e5ecd6..f13605a36 100644 --- a/lib/utilities/prefs.dart +++ b/lib/utilities/prefs.dart @@ -459,7 +459,7 @@ class Prefs extends ChangeNotifier { // tor - bool _torKillswitch = true; + bool _torKillswitch = false; bool get torKillSwitch => _torKillswitch;