Add global flag to disable tor

WalletWasabi · Nov 21, 2023 · 7f35992 · 7f35992
1 parent 0afd32b
commit 7f35992
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/WalletWasabi.Daemon/Global.cs b/WalletWasabi.Daemon/Global.cs
@@ -47,7 +47,9 @@ public Global(string dataDir, string configFilePath, Config config)
 		DataDir = dataDir;
 		ConfigFilePath = configFilePath;
 		Config = config;
-		TorSettings = IsTorEnabled() ? null : new TorSettings(DataDir, distributionFolderPath: EnvironmentHelpers.GetFullBaseDirectory(), Config.TerminateTorOnExit, Environment.ProcessId);
+		TorSettings = IsTorEnabled
+			? new TorSettings(DataDir, distributionFolderPath: EnvironmentHelpers.GetFullBaseDirectory(), Config.TerminateTorOnExit, Environment.ProcessId)
+			: null;
 		HostedServices = new HostedServices();
 
 		var networkWorkFolderPath = Path.Combine(DataDir, "BitcoinStore", Network.ToString());
@@ -121,6 +123,8 @@ public Global(string dataDir, string configFilePath, Config config)
 	/// <summary>Cancellation token to cancel <see cref="InitializeNoWalletAsync(TerminateService)"/> processing.</summary>
 	private CancellationTokenSource StoppingCts { get; } = new();
 
+	public static bool IsTorEnabled = true;
+
 	public string DataDir { get; }
 	public TorSettings? TorSettings { get; }
 	public BitcoinStore BitcoinStore { get; }
@@ -156,12 +160,6 @@ public Global(string dataDir, string configFilePath, Config config)
 	private AllTransactionStore AllTransactionStore { get; }
 	private IndexStore IndexStore { get; }
 
-	private bool IsTorEnabled()
-	{
-		return !OperatingSystem.IsAndroid()
-		       && !OperatingSystem.IsIOS();
-	}
-
 	private WasabiHttpClientFactory BuildHttpClientFactory(Func<Uri> backendUriGetter) =>
 		new(
 			Config.UseTor ? TorSettings?.SocksEndpoint : null,

diff --git a/WalletWasabi.Fluent.Android/MainActivity.cs b/WalletWasabi.Fluent.Android/MainActivity.cs
@@ -28,6 +28,8 @@ public class MainActivity : AvaloniaMainActivity<App>
 
 	private void Program_Main()
 	{
+		Global.IsTorEnabled = false;
+
 		_app = WasabiAppBuilder
 			.Create("Wasabi GUI", System.Array.Empty<string>())
 			// TODO:

diff --git a/WalletWasabi.Fluent.iOS/AppDelegate.cs b/WalletWasabi.Fluent.iOS/AppDelegate.cs
@@ -19,6 +19,8 @@ public class AppDelegate : AvaloniaAppDelegate<App>
 
 	private void Program_Main()
 	{
+		Global.IsTorEnabled = false;
+
 		_app = WasabiAppBuilder
 			.Create("Wasabi GUI", System.Array.Empty<string>())
 			// TODO:

diff --git a/WalletWasabi.Fluent/Services.cs b/WalletWasabi.Fluent/Services.cs
@@ -56,8 +56,12 @@ public static class Services
 	/// </summary>
 	public static void Initialize(Global global, UiConfig uiConfig, SingleInstanceChecker singleInstanceChecker, TerminateService terminateService)
 	{
+		if (Global.IsTorEnabled)
+		{
+			Guard.NotNull(nameof(global.TorSettings), global.TorSettings);
+		}
+
 		Guard.NotNull(nameof(global.DataDir), global.DataDir);
-		// Guard.NotNull(nameof(global.TorSettings), global.TorSettings);
 		Guard.NotNull(nameof(global.BitcoinStore), global.BitcoinStore);
 		Guard.NotNull(nameof(global.HttpClientFactory), global.HttpClientFactory);
 		Guard.NotNull(nameof(global.LegalChecker), global.LegalChecker);