diff --git a/Bloxstrap/App.xaml.cs b/Bloxstrap/App.xaml.cs index 228d2cc..77f20f3 100644 --- a/Bloxstrap/App.xaml.cs +++ b/Bloxstrap/App.xaml.cs @@ -138,7 +138,7 @@ namespace Bloxstrap try { - await HttpClient.GetAsync($"https://bloxstrapabs.com/metrics/post?key={key}&value={value}"); + await HttpClient.GetAsync($"https://bloxstraplabs.com/metrics/post?key={key}&value={value}"); } catch (Exception ex) { diff --git a/Bloxstrap/Installer.cs b/Bloxstrap/Installer.cs index 0d23dd3..3451460 100644 --- a/Bloxstrap/Installer.cs +++ b/Bloxstrap/Installer.cs @@ -17,6 +17,8 @@ namespace Bloxstrap public bool CreateStartMenuShortcuts = true; + public bool EnableAnalytics = true; + public bool IsImplicitInstall = false; public string InstallLocationError { get; set; } = ""; @@ -88,9 +90,13 @@ namespace Bloxstrap App.State.Load(false); App.FastFlags.Load(false); + App.Settings.Prop.EnableAnalytics = EnableAnalytics; + if (!String.IsNullOrEmpty(App.State.Prop.Studio.VersionGuid)) WindowsRegistry.RegisterStudio(); + App.Settings.Save(); + App.Logger.WriteLine(LOG_IDENT, "Installation finished"); if (!IsImplicitInstall) diff --git a/Bloxstrap/Resources/Strings.Designer.cs b/Bloxstrap/Resources/Strings.Designer.cs index 1c5b5d4..5cf5b8b 100644 --- a/Bloxstrap/Resources/Strings.Designer.cs +++ b/Bloxstrap/Resources/Strings.Designer.cs @@ -2128,7 +2128,7 @@ namespace Bloxstrap.Resources { } /// - /// Looks up a localized string similar to All data sent is completely anonymous. To understand what data we use and how, see our [privacy policy]({0}).. + /// Looks up a localized string similar to It's anonymous and nothing evil, promise. For insight on what we collect and why, see our [privacy policy]({0}).. /// public static string Menu_Bloxstrap_Analytics_Description { get { diff --git a/Bloxstrap/Resources/Strings.resx b/Bloxstrap/Resources/Strings.resx index 4043b82..2a5c3c1 100644 --- a/Bloxstrap/Resources/Strings.resx +++ b/Bloxstrap/Resources/Strings.resx @@ -1226,7 +1226,7 @@ Please manually delete Bloxstrap.exe from the install location or try restarting Enable sending of analytics - All data sent is completely anonymous. To understand what data we use and how, see our [privacy policy]({0}). + It's anonymous and nothing evil, promise. For insight on what we collect and why, see our [privacy policy]({0}). Analytics diff --git a/Bloxstrap/UI/Elements/Installer/MainWindow.xaml b/Bloxstrap/UI/Elements/Installer/MainWindow.xaml index 13bbec2..2ceab03 100644 --- a/Bloxstrap/UI/Elements/Installer/MainWindow.xaml +++ b/Bloxstrap/UI/Elements/Installer/MainWindow.xaml @@ -10,7 +10,7 @@ xmlns:local="clr-namespace:Bloxstrap.UI.Elements.Installer" mc:Ignorable="d" Title="{x:Static resources:Strings.Installer_Title}" - Height="540" Width="840" + Height="540" Width="840" MinWidth="840" Background="{ui:ThemeResource ApplicationBackgroundBrush}" ExtendsContentIntoTitleBar="True" WindowBackdropType="Mica" diff --git a/Bloxstrap/UI/Elements/Installer/Pages/InstallPage.xaml b/Bloxstrap/UI/Elements/Installer/Pages/InstallPage.xaml index 9ef38c5..7281424 100644 --- a/Bloxstrap/UI/Elements/Installer/Pages/InstallPage.xaml +++ b/Bloxstrap/UI/Elements/Installer/Pages/InstallPage.xaml @@ -50,15 +50,22 @@ - - - + + + + + - + + + + - - + + + diff --git a/Bloxstrap/UI/ViewModels/Installer/InstallViewModel.cs b/Bloxstrap/UI/ViewModels/Installer/InstallViewModel.cs index 80d93c9..c92d021 100644 --- a/Bloxstrap/UI/ViewModels/Installer/InstallViewModel.cs +++ b/Bloxstrap/UI/ViewModels/Installer/InstallViewModel.cs @@ -48,8 +48,8 @@ namespace Bloxstrap.UI.ViewModels.Installer public bool AnalyticsEnabled { - get => App.Settings.Prop.EnableAnalytics; - set => App.Settings.Prop.EnableAnalytics = value; + get => installer.EnableAnalytics; + set => installer.EnableAnalytics = value; } public ICommand BrowseInstallLocationCommand => new RelayCommand(BrowseInstallLocation);