Silent update

- See #282
bitbeans · Jun 17, 2018 · 2d63ce1 · 2d63ce1
1 parent a8cfa4d
commit 2d63ce1
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 2 deletions.
diff --git a/SimpleDnsCrypt/App.config b/SimpleDnsCrypt/App.config
@@ -71,6 +71,9 @@
             <setting name="TrayMode" serializeAs="String">
                 <value>True</value>
             </setting>
+            <setting name="AutoUpdateSilent" serializeAs="String">
+                <value>False</value>
+            </setting>
         </SimpleDnsCrypt.Properties.Settings>
     </userSettings>
 </configuration>
diff --git a/SimpleDnsCrypt/Properties/Settings.Designer.cs b/SimpleDnsCrypt/Properties/Settings.Designer.cs
diff --git a/SimpleDnsCrypt/Properties/Settings.settings b/SimpleDnsCrypt/Properties/Settings.settings
@@ -47,5 +47,8 @@
     <Setting Name="TrayMode" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
+    <Setting Name="AutoUpdateSilent" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
diff --git a/SimpleDnsCrypt/ViewModels/LoaderViewModel.cs b/SimpleDnsCrypt/ViewModels/LoaderViewModel.cs
@@ -88,7 +88,21 @@ private async void InitializeApplication()
 						{
 							ProgressText = LocalizationEx.GetUiString("loader_starting_update", Thread.CurrentThread.CurrentCulture);
 							await Task.Delay(200).ConfigureAwait(false);
-							Process.Start(installer);
+							if (Properties.Settings.Default.AutoUpdate)
+							{
+								// auto install
+								const string arguments = "/qb /passive /norestart";
+								var startInfo = new ProcessStartInfo(installer)
+								{
+									Arguments = arguments,
+									UseShellExecute = false
+								};
+								Process.Start(startInfo);
+							}
+							else
+							{
+								Process.Start(installer);
+							}
 							Process.GetCurrentProcess().Kill();
 						}
 						else

diff --git a/SimpleDnsCrypt/ViewModels/SettingsViewModel.cs b/SimpleDnsCrypt/ViewModels/SettingsViewModel.cs
@@ -17,6 +17,7 @@ public class SettingsViewModel : Screen
 		private bool _isAddressBlacklistTabVisible;
 		private bool _isAddressBlockLogTabVisible;
 		private bool _isAutoUpdateEnabled;
+		private bool _isAutoUpdateSilentEnabled;
 
 		private UpdateType _selectedUpdateType;
 
@@ -37,6 +38,7 @@ public SettingsViewModel(IWindowManager windowManager, IEventAggregator events)
 			_isAddressBlacklistTabVisible = Properties.Settings.Default.IsAddressBlacklistTabVisible;
 			_isAddressBlockLogTabVisible = Properties.Settings.Default.IsAddressBlockLogTabVisible;
 			_isAutoUpdateEnabled = Properties.Settings.Default.AutoUpdate;
+			_isAutoUpdateSilentEnabled = Properties.Settings.Default.AutoUpdateSilent;
 			_selectedUpdateType = (UpdateType)Properties.Settings.Default.MinUpdateType;
 		}
 
@@ -140,5 +142,16 @@ public bool IsAutoUpdateEnabled
 				NotifyOfPropertyChange(() => IsAutoUpdateEnabled);
 			}
 		}
+
+		public bool IsAutoUpdateSilentEnabled
+		{
+			get => _isAutoUpdateSilentEnabled;
+			set
+			{
+				_isAutoUpdateSilentEnabled = value;
+				Properties.Settings.Default.AutoUpdateSilent = _isAutoUpdateSilentEnabled;
+				NotifyOfPropertyChange(() => IsAutoUpdateSilentEnabled);
+			}
+		}
 	}
 }
diff --git a/SimpleDnsCrypt/Views/SettingsView.xaml b/SimpleDnsCrypt/Views/SettingsView.xaml
@@ -84,6 +84,10 @@
                                   Margin="5"
                                   Content="{lex:Loc Key=settings_update_auto}"
                                   Cursor="Hand" Foreground="#FF575757" />
+                        <CheckBox IsChecked="{Binding IsAutoUpdateSilentEnabled}"
+                                  Margin="5"
+                                  Content="Silently install new versions"
+                                  Cursor="Hand" Foreground="#FF575757" />
                         <StackPanel Margin="5,0,0,0" Orientation="Horizontal">
                             <TextBlock Foreground="#FF575757" Text="{lex:Loc Key=settings_update_channel}" VerticalAlignment="Center" />
                             <ComboBox VerticalContentAlignment="Center" IsEnabled="False"