clear resolver list

bitbeans · bitbeans · commit d57d6eedd2a7 · 2018-02-01T21:56:43.000+01:00
diff --git a/SimpleDnsCrypt/ViewModels/MainViewModel.cs b/SimpleDnsCrypt/ViewModels/MainViewModel.cs
@@ -121,10 +121,8 @@ public bool IsDnsCryptAutomaticModeEnabled
 			{
 				if (value.Equals(_isDnsCryptAutomaticModeEnabled)) return;
 				_isDnsCryptAutomaticModeEnabled = value;
-
 				if (_isDnsCryptAutomaticModeEnabled)
 				{
-
 					DnscryptProxyConfiguration.server_names = null;
 					SaveDnsCryptConfiguration();
 					LoadResolvers();
@@ -135,6 +133,7 @@ public bool IsDnsCryptAutomaticModeEnabled
 					if (DnscryptProxyConfiguration.server_names == null || DnscryptProxyConfiguration.server_names.Count == 0)
 					{
 						_isDnsCryptAutomaticModeEnabled = true;
+						//TODO: translate
 						_windowManager.ShowMetroMessageBox("At least one server must be selected. Otherwise, dnscrypt-proxy uses all servers corresponding to the selected filters.", "No server selected",
 							MessageBoxButton.OK, BoxType.Warning);
 					}
@@ -601,6 +600,7 @@ public async void NetworkCardClicked(LocalNetworkInterface localNetworkInterface
 				}
 				else
 				{
+					//TODO: translate
 					_windowManager.ShowMetroMessageBox("You should start the DnsCrypt service first!", "Service not running",
 						MessageBoxButton.OK, BoxType.Warning);
 				}
@@ -618,10 +618,10 @@ public void SaveLocalServers()
 			{
 				IsDnsCryptAutomaticModeEnabled = false;
 				SaveDnsCryptConfiguration();
-				HandleService();
 			}
 			else
 			{
+				//TODO: translate
 				_windowManager.ShowMetroMessageBox("At least one server must be selected. Otherwise, dnscrypt-proxy uses all servers corresponding to the selected filters.", "No server selected",
 					MessageBoxButton.OK, BoxType.Warning);
 			}
@@ -632,6 +632,7 @@ public void ResolverClicked(AvailableResolver resolver)
 			if (resolver == null) return;
 			if (resolver.IsInServerList)
 			{
+				if (DnscryptProxyConfiguration.server_names == null) return;
 				if (DnscryptProxyConfiguration.server_names.Contains(resolver.Name))
 				{
 					DnscryptProxyConfiguration.server_names.Remove(resolver.Name);
@@ -673,6 +674,14 @@ private void LoadResolvers()
 				if (first != null) first.IsInServerList = true;
 			}
 			_resolvers.Clear();
+
+			if (_isDnsCryptAutomaticModeEnabled)
+			{
+				foreach (var resolver in allResolvers)
+				{
+					resolver.IsInServerList = false;
+				}
+			}
 			_resolvers.AddRange(allResolvers);
 		}
 
diff --git a/SimpleDnsCrypt/Views/MainView.xaml b/SimpleDnsCrypt/Views/MainView.xaml
@@ -218,7 +218,8 @@
                                         </Grid>
                                     </StackPanel>
                                 </Border>
-                                <Border BorderThickness="1" Background="#198AB328" Padding="10" Margin="0,14,0,0">
+                                <Border BorderThickness="1" Background="#198AB328" Padding="10" Margin="0,14,0,0" 
+                                        IsEnabled="{Binding IsSavingConfiguration, Converter={StaticResource ReverseBoolToEnabledConverter}}">
                                     <Border.BorderBrush>
                                         <DrawingBrush Viewport="0,0,8,8" ViewportUnits="Absolute" TileMode="Tile"
                                                       Opacity="0.4">
@@ -313,7 +314,8 @@
                              Header="{lex:Loc Key=tabitem_resolvers}">
                         <TabItem.Content>
                             <StackPanel Orientation="Vertical" Margin="0,10,0,0">
-                                <Border BorderThickness="1" Background="#198AB328" Padding="10" Margin="0,14,0,0">
+                                <Border BorderThickness="1" Background="#198AB328" Padding="10" Margin="0,14,0,0" 
+                                        IsEnabled="{Binding IsSavingConfiguration, Converter={StaticResource ReverseBoolToEnabledConverter}}">
                                     <Border.BorderBrush>
                                         <DrawingBrush Viewport="0,0,8,8" ViewportUnits="Absolute" TileMode="Tile"
                                                       Opacity="0.4">
@@ -360,7 +362,8 @@
                                                                Margin="0,5,0,0" />
                                     </StackPanel>
                                 </Border>
-                                <Border BorderThickness="1" Background="#198AB328" Padding="10" Margin="0,14,0,0">
+                                <Border BorderThickness="1" Background="#198AB328" Padding="10" Margin="0,14,0,0"
+                                        IsEnabled="{Binding IsSavingConfiguration, Converter={StaticResource ReverseBoolToEnabledConverter}}">
                                     <Border.BorderBrush>
                                         <DrawingBrush Viewport="0,0,8,8" ViewportUnits="Absolute" TileMode="Tile"
                                                       Opacity="0.4">
@@ -493,7 +496,8 @@
                              Visibility="{Binding SettingsViewModel.IsAdvancedSettingsTabVisible, Converter={StaticResource BoolToVisibilityCollapsedConverter}}">
                         <TabItem.Content>
                             <StackPanel Orientation="Vertical" Margin="0,10,0,0">
-                                <Border BorderThickness="1" Background="#198AB328" Padding="10" Margin="0,14,0,0">
+                                <Border BorderThickness="1" Background="#198AB328" Padding="10" Margin="0,14,0,0"
+                                        IsEnabled="{Binding IsSavingConfiguration, Converter={StaticResource ReverseBoolToEnabledConverter}}">
                                     <Border.BorderBrush>
                                         <DrawingBrush Viewport="0,0,8,8" ViewportUnits="Absolute" TileMode="Tile"
                                                       Opacity="0.4">
@@ -533,7 +537,8 @@
                                         </Grid>
                                     </StackPanel>
                                 </Border>
-                                <Border BorderThickness="1" Background="#198AB328" Padding="10" Margin="0,14,0,0">
+                                <Border BorderThickness="1" Background="#198AB328" Padding="10" Margin="0,14,0,0"
+                                        IsEnabled="{Binding IsSavingConfiguration, Converter={StaticResource ReverseBoolToEnabledConverter}}">
                                     <Border.BorderBrush>
                                         <DrawingBrush Viewport="0,0,8,8" ViewportUnits="Absolute" TileMode="Tile"
                                                       Opacity="0.4">

Original file line number	Diff line number	Diff line change
`@@ -121,10 +121,8 @@ public bool IsDnsCryptAutomaticModeEnabled`
`121`	`121`	`{`
`122`	`122`	`if (value.Equals(_isDnsCryptAutomaticModeEnabled)) return;`
`123`	`123`	`_isDnsCryptAutomaticModeEnabled = value;`
`124`		`-`
`125`	`124`	`if (_isDnsCryptAutomaticModeEnabled)`
`126`	`125`	`{`
`127`		`-`
`128`	`126`	`DnscryptProxyConfiguration.server_names = null;`
`129`	`127`	`SaveDnsCryptConfiguration();`
`130`	`128`	`LoadResolvers();`
`@@ -135,6 +133,7 @@ public bool IsDnsCryptAutomaticModeEnabled`
`135`	`133`	`if (DnscryptProxyConfiguration.server_names == null \|\| DnscryptProxyConfiguration.server_names.Count == 0)`
`136`	`134`	`{`
`137`	`135`	`_isDnsCryptAutomaticModeEnabled = true;`
	`136`	`+ //TODO: translate`
`138`	`137`	`_windowManager.ShowMetroMessageBox("At least one server must be selected. Otherwise, dnscrypt-proxy uses all servers corresponding to the selected filters.", "No server selected",`
`139`	`138`	`MessageBoxButton.OK, BoxType.Warning);`
`140`	`139`	`}`
`@@ -601,6 +600,7 @@ public async void NetworkCardClicked(LocalNetworkInterface localNetworkInterface`
`601`	`600`	`}`
`602`	`601`	`else`
`603`	`602`	`{`
	`603`	`+ //TODO: translate`
`604`	`604`	`_windowManager.ShowMetroMessageBox("You should start the DnsCrypt service first!", "Service not running",`
`605`	`605`	`MessageBoxButton.OK, BoxType.Warning);`
`606`	`606`	`}`
`@@ -618,10 +618,10 @@ public void SaveLocalServers()`
`618`	`618`	`{`
`619`	`619`	`IsDnsCryptAutomaticModeEnabled = false;`
`620`	`620`	`SaveDnsCryptConfiguration();`
`621`		`- HandleService();`
`622`	`621`	`}`
`623`	`622`	`else`
`624`	`623`	`{`
	`624`	`+ //TODO: translate`
`625`	`625`	`_windowManager.ShowMetroMessageBox("At least one server must be selected. Otherwise, dnscrypt-proxy uses all servers corresponding to the selected filters.", "No server selected",`
`626`	`626`	`MessageBoxButton.OK, BoxType.Warning);`
`627`	`627`	`}`
`@@ -632,6 +632,7 @@ public void ResolverClicked(AvailableResolver resolver)`
`632`	`632`	`if (resolver == null) return;`
`633`	`633`	`if (resolver.IsInServerList)`
`634`	`634`	`{`
	`635`	`+ if (DnscryptProxyConfiguration.server_names == null) return;`
`635`	`636`	`if (DnscryptProxyConfiguration.server_names.Contains(resolver.Name))`
`636`	`637`	`{`
`637`	`638`	`DnscryptProxyConfiguration.server_names.Remove(resolver.Name);`
`@@ -673,6 +674,14 @@ private void LoadResolvers()`
`673`	`674`	`if (first != null) first.IsInServerList = true;`
`674`	`675`	`}`
`675`	`676`	`_resolvers.Clear();`
	`677`	`+`
	`678`	`+ if (_isDnsCryptAutomaticModeEnabled)`
	`679`	`+ {`
	`680`	`+ foreach (var resolver in allResolvers)`
	`681`	`+ {`
	`682`	`+ resolver.IsInServerList = false;`
	`683`	`+ }`
	`684`	`+ }`
`676`	`685`	`_resolvers.AddRange(allResolvers);`
`677`	`686`	`}`
`678`	`687`