Allow whitelist from block log

Author: bitbeans

SimpleDnsCrypt/ViewModels/DomainBlacklistViewModel.cs

@@ -454,6 +454,16 @@ public async Task BuildBlacklist()
 				{
 					File.WriteAllLines(_domainBlacklistFile, rules);  
 				}
+
+				if (DnsCryptProxyManager.IsDnsCryptProxyInstalled())
+				{
+					if (DnsCryptProxyManager.IsDnsCryptProxyRunning())
+					{
+						DnsCryptProxyManager.Restart();
+						await Task.Delay(Global.ServiceRestartTime);
+					}
+				}
+
 				await metroWindow.HideMetroDialogAsync(dialog);
 			}
 			catch (Exception exception)

SimpleDnsCrypt/ViewModels/DomainBlockLogViewModel.cs

@@ -6,8 +6,13 @@
 using System.Collections.ObjectModel;
 using System.ComponentModel.Composition;
 using System.IO;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using System.Windows;
+using DnsCrypt.Blacklist;
+using MahApps.Metro.Controls;
+using MahApps.Metro.Controls.Dialogs;
 
 namespace SimpleDnsCrypt.ViewModels
 {
@@ -89,6 +94,39 @@ public bool IsDomainBlockLogLogging
 			}
 		}
 
+		public async void UnblockBlockLogEntry()
+		{
+			try
+			{
+				if (_selectedDomainBlockLogLine == null) return;
+				if (MainViewModel.Instance.DomainBlacklistViewModel == null) return;
+				var dialogSettings = new MetroDialogSettings
+				{
+					DefaultText = _selectedDomainBlockLogLine.Message.ToLower(),
+					AffirmativeButtonText = LocalizationEx.GetUiString("add", Thread.CurrentThread.CurrentCulture),
+					NegativeButtonText = LocalizationEx.GetUiString("cancel", Thread.CurrentThread.CurrentCulture),
+					ColorScheme = MetroDialogColorScheme.Theme
+				};
+
+				var metroWindow = Application.Current.Windows.OfType<MetroWindow>().FirstOrDefault();
+				//TODO: translate
+				var dialogResult = await metroWindow.ShowInputAsync(LocalizationEx.GetUiString("message_title_new_whitelist_rule", Thread.CurrentThread.CurrentCulture),
+					"Rule:", dialogSettings);
+
+				if (string.IsNullOrEmpty(dialogResult)) return;
+				var newCustomRule = dialogResult.ToLower().Trim();
+				var parsed = DomainBlacklist.ParseBlacklist(newCustomRule, true);
+				var enumerable = parsed as string[] ?? parsed.ToArray();
+				if (enumerable.Length != 1) return;
+				MainViewModel.Instance.DomainBlacklistViewModel.DomainWhitelistRules.Add(enumerable[0]);
+				MainViewModel.Instance.DomainBlacklistViewModel.SaveWhitelistRulesToFile();
+			}
+			catch (Exception exception)
+			{
+				Log.Error(exception);
+			}
+		}
+
 		private async void DomainBlockLog(DnscryptProxyConfiguration dnscryptProxyConfiguration)
 		{
 			const string defaultLogFormat = "ltsv";

SimpleDnsCrypt/ViewModels/QueryLogViewModel.cs

@@ -75,8 +75,9 @@ public async void BlockQueryLogEntry()
 				};
 
 				var metroWindow = Application.Current.Windows.OfType<MetroWindow>().FirstOrDefault();
-				var dialogResult = await metroWindow.ShowInputAsync("new",
-					"rule", dialogSettings);
+				//TODO: translate
+				var dialogResult = await metroWindow.ShowInputAsync(LocalizationEx.GetUiString("message_title_new_blacklist_rule", Thread.CurrentThread.CurrentCulture),
+					"Rule:", dialogSettings);
 
 				if (string.IsNullOrEmpty(dialogResult)) return;
 				var newCustomRule = dialogResult.ToLower().Trim();

SimpleDnsCrypt/Views/MainView.xaml

@@ -1059,7 +1059,7 @@
                                                 </Button>
                                                 <Button x:Name="UnblockBlockLogEntry"
                                                         cal:Message.Attach="UnblockBlockLogEntry"
-                                                        Background="White" IsEnabled="False"
+                                                        Background="White"
                                                         Width="30"
                                                         Height="30"
                                                         Cursor="Hand"