Some code cleanup

Author: bitbeans

SimpleDnsCrypt/Config/Global.cs

@@ -42,6 +42,16 @@ public static class Global
         /// </summary>
         public const string SecondaryResolverAddress = "127.0.0.2";
 
+        /// <summary>
+        ///     Local address the primary resolver will listen on.
+        /// </summary>
+        public const string PrimaryResolverAddress6 = "::FFFF:127.0.0.1";
+
+        /// <summary>
+        ///     Local address the secondary resolver will listen on.
+        /// </summary>
+        public const string SecondaryResolverAddress6 = "::FFFF:127.0.0.2";
+
         /// <summary>
         ///     Address for the global gateway.
         /// </summary>

SimpleDnsCrypt/Tools/LocalNetworkInterfaceManager.cs

@@ -70,10 +70,15 @@ internal static List<LocalNetworkInterface> GetLocalNetworkInterfaces(bool showH
         internal static bool IsUsingDnsCrypt(LocalNetworkInterface localNetworkInterface)
         {
             var dns = new List<string> {Global.PrimaryResolverAddress, Global.SecondaryResolverAddress};
+            var dns6 = new List<string> { Global.PrimaryResolverAddress6, Global.SecondaryResolverAddress6 };
             if ((localNetworkInterface.Ipv4Dns.Contains(dns[0])) || (localNetworkInterface.Ipv4Dns.Contains(dns[1])))
             {
                 return true;
             }
+            if ((localNetworkInterface.Ipv6Dns.Contains(dns6[0])) || (localNetworkInterface.Ipv6Dns.Contains(dns6[1])))
+            {
+                return true;
+            }
             return false;
         }
 
@@ -110,7 +115,7 @@ internal static List<string> GetDnsServerList(string localNetworkInterface,
         }
 
         /// <summary>
-        ///     Set's the IPv4 DNS Servers of an interface.
+        ///     Set's the IPv4 or IPv6 DNS Servers of an interface.
         /// </summary>
         /// <param name="localNetworkInterface">The interface to work with.</param>
         /// <param name="dnsServers">List of dns servers to set.</param>

SimpleDnsCrypt/ViewModels/MainViewModel.cs

@@ -59,16 +59,17 @@ public MainViewModel()
         /// </summary>
         /// <param name="windowManager">The current window manager.</param>
         /// <param name="eventAggregator">The event aggregator.</param>
-        /// <param name="dnsCrypt"></param>
         [ImportingConstructor]
         private MainViewModel(IWindowManager windowManager, IEventAggregator eventAggregator)
         {
             _windowManager = windowManager;
             eventAggregator.Subscribe(this);
 
+            // automatically use the correct translations if available (fallback: en)
             LocalizeDictionary.Instance.SetCurrentThreadCulture = true;
             LocalizeDictionary.Instance.Culture = Thread.CurrentThread.CurrentCulture;
 
+            // this is already defined in the app.manifest, but to be sure check it again
             if (!IsAdministrator())
             {
                 _windowManager.ShowMetroMessageBox(
@@ -261,6 +262,9 @@ public List<DnsCryptProxyEntry> Resolvers
             }
         }
 
+        /// <summary>
+        ///     The selected primary resolver.
+        /// </summary>
         public DnsCryptProxyEntry PrimaryResolver
         {
             get { return _primaryResolver; }
@@ -273,6 +277,9 @@ public DnsCryptProxyEntry PrimaryResolver
             }
         }
 
+        /// <summary>
+        ///     The selected secondary resolver.
+        /// </summary>
         public DnsCryptProxyEntry SecondaryResolver
         {
             get { return _secondaryResolver; }
@@ -285,6 +292,9 @@ public DnsCryptProxyEntry SecondaryResolver
             }
         }
 
+        /// <summary>
+        ///     Show or hide the filtered network cards.
+        /// </summary>
         public bool ShowHiddenCards
         {
             get { return _showHiddenCards; }
@@ -296,6 +306,9 @@ public bool ShowHiddenCards
             }
         }
 
+        /// <summary>
+        ///     Formatted name of the primary resolver.
+        /// </summary>
         public string PrimaryResolverTitle
         {
             get { return _primaryResolverTitle; }
@@ -306,6 +319,9 @@ public string PrimaryResolverTitle
             }
         }
 
+        /// <summary>
+        ///     Formatted name of the secondary resolver.
+        /// </summary>
         public string SecondaryResolverTitle
         {
             get { return _secondaryResolverTitle; }
@@ -316,6 +332,9 @@ public string SecondaryResolverTitle
             }
         }
 
+        /// <summary>
+        ///     Controls the primary resolver.
+        /// </summary>
         public bool IsPrimaryResolverRunning
         {
             get { return _isPrimaryResolverRunning; }
@@ -326,6 +345,9 @@ public bool IsPrimaryResolverRunning
             }
         }
 
+        /// <summary>
+        ///     Controls the secondary resolver.
+        /// </summary>
         public bool IsSecondaryResolverRunning
         {
             get { return _isSecondaryResolverRunning; }
@@ -336,6 +358,9 @@ public bool IsSecondaryResolverRunning
             }
         }
 
+        /// <summary>
+        ///     Show or hide the progress bar for the primary resolver.
+        /// </summary>
         public bool IsWorkingOnPrimaryService
         {
             get { return _isWorkingOnPrimaryService; }
@@ -346,6 +371,9 @@ public bool IsWorkingOnPrimaryService
             }
         }
 
+        /// <summary>
+        ///     Show or hide the progress bar for the secondary resolver.
+        /// </summary>
         public bool IsWorkingOnSecondaryService
         {
             get { return _isWorkingOnSecondaryService; }