Permalink
Browse files

Do GenSocksDialogs on known outdated OSes.

  • Loading branch information...
nopara73 committed Oct 19, 2018
1 parent 2da5b5f commit ce5e7445c4323742eb7eb7eec89b00901412f331
@@ -2,7 +2,7 @@
<controls:GroupBox Title="Tor: General SOCKS Server Failure" Background="{DynamicResource ThemeControlBackgroundBrush}" TextBlock.FontSize="30" BorderThickness="0" Margin="0 80">
<Grid Classes="content">
<Panel Margin="10">
<TextBlock FontSize="15" Text="The Tor daemon you are running responded with General SOCKS Server Failure. This can happen for many reasons, but Wasabi will attempt to autocorrect Tor, so this dialog will disappear within a few minutes. If that doesn't happen your Tor may be out of date. Please upgrade your Tor version to at least v0.3.2.2, or shut down your Tor process and restart Wasabi. This will make sure Wasabi is using its built-in Tor." TextWrapping="Wrap" />
<TextBlock FontSize="15" Text="The Tor daemon you are running responded with General SOCKS Server Failure. This can happen for many reasons, but Wasabi will attempt to autocorrect Tor, so this dialog should disappear within a few minutes. If that doesn't happen your Tor may be out of date. Please upgrade your Tor version to at least v0.3.2.2, or shut down your Tor process and restart Wasabi. This will make sure Wasabi is using its built-in Tor." TextWrapping="Wrap" />
</Panel>
</Grid>
</controls:GroupBox>
@@ -16,6 +16,7 @@
using WalletWasabi.Gui.Tabs;
using System.Reactive.Linq;
using WalletWasabi.Gui.Dialogs;
using System.Runtime.InteropServices;
namespace WalletWasabi.Gui.ViewModels
{
@@ -235,8 +236,13 @@ private void IndexDownloader_ResponseArrivedIsGenSocksServFail(object sender, bo
}
else
{
// Show GenSocksServFail dialog.
MainWindowViewModel.Instance.ShowDialogAsync(new GenSocksServFailDialogViewModel()).GetAwaiter();
// Show GenSocksServFail dialog on OS-es we suspect Tor is outdated.
var osDesc = RuntimeInformation.OSDescription;
if (osDesc.Contains("16.04.1-Ubuntu", StringComparison.InvariantCultureIgnoreCase)
|| osDesc.Contains("16.04.0-Ubuntu", StringComparison.InvariantCultureIgnoreCase))
{
MainWindowViewModel.Instance.ShowDialogAsync(new GenSocksServFailDialogViewModel()).GetAwaiter();
}
}
}
else

0 comments on commit ce5e744

Please sign in to comment.