Merge pull request #23 from zuckerthoben/master

Fixed unresponsive Programstart (async support)

Author: Elec0

CodeSwine-Solo_Public_Lobby/CodeSwine-Solo_Public_Lobby/Helpers/IPTool.cs

@@ -1,45 +1,41 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Net;
-using System.Text;
+using System.Net.Http;
 using System.Threading.Tasks;
 
 namespace CodeSwine_Solo_Public_Lobby.Helpers
 {
     public class IPTool
     {
-        private string _ipAddress;
+        private HttpClient httpClient;
 
-        public string IpAddress 
-        {
-            get 
-            {
-                if (_ipAddress == null) _ipAddress = GrabInternetAddress();
-                return _ipAddress;
-            }
+        public IPTool()
+        {
+            this.httpClient = new HttpClient();
         }
 
         /// <summary>
         /// Gets the hosts IP Address.
         /// </summary>
         /// <returns>String value of IP.</returns>
-        private string GrabInternetAddress()
+        public async Task<string> GrabInternetAddressAsync()
         {
             // Still needs check to see if we could retrieve the IP.
             // Try for ipv6 first, but if that fails get ipv4
-            string ip = "";
+            string ip;
             try
             {
-                ip = new WebClient().DownloadString("https://ipv6.icanhazip.com");
+                var response = await this.httpClient.GetAsync(new Uri("https://ipv6.icanhazip.com"));
+                ip = await response.Content.ReadAsStringAsync();
             }
             catch (Exception e)
             {
                 ErrorLogger.LogException(e);
 
                 try
                 {
-                    ip = new WebClient().DownloadString("https://ipv4.icanhazip.com");
+                    var response = await this.httpClient.GetAsync(new Uri("https://ipv4.icanhazip.com"));
+                    ip = await response.Content.ReadAsStringAsync();
                 }
                 catch (Exception e2)
                 {
@@ -52,7 +48,7 @@ private string GrabInternetAddress()
 
         public static bool ValidateIP(string ipString)
         {
-            if (String.IsNullOrWhiteSpace(ipString))
+            if (string.IsNullOrWhiteSpace(ipString))
             {
                 return false;
             }
@@ -63,8 +59,9 @@ public static bool ValidateIP(string ipString)
                 switch (address.AddressFamily)
                 {
                     case System.Net.Sockets.AddressFamily.InterNetwork:
-                        // we have IPv4 
+                        // we have IPv4
                         return true;
+
                     case System.Net.Sockets.AddressFamily.InterNetworkV6:
                         // we have IPv6
                         return true;
@@ -73,4 +70,4 @@ public static bool ValidateIP(string ipString)
             return false;
         }
     }
-}
+}

CodeSwine-Solo_Public_Lobby/CodeSwine-Solo_Public_Lobby/MainWindow.xaml.cs

@@ -6,25 +6,16 @@
 using System.Linq;
 using System.Net;
 using System.Runtime.InteropServices;
-using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
 using System.Windows.Interop;
-using System.Windows.Media;
 using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 
 namespace CodeSwine_Solo_Public_Lobby
 {
     public partial class MainWindow : Window
     {
         private IPTool iPTool = new IPTool();
-        private DaWhitelist whiteList = new DaWhitelist();
         private List<IPAddress> addresses = new List<IPAddress>();
         private MWhitelist mWhitelist = new MWhitelist();
 
@@ -37,15 +28,16 @@ public MainWindow()
             Loaded += MainWindow_Loaded;
         }
 
-        private void MainWindow_Loaded(object sender, RoutedEventArgs e)
+        private async void MainWindow_Loaded(object sender, RoutedEventArgs e)
         {
             FirewallRule.lblAdmin = lblAdmin;
-            Init();
+            await InitAsync();
         }
 
-        void Init()
+        private async Task InitAsync()
         {
-            lblYourIPAddress.Content += " " + iPTool.IpAddress + ".";
+            var ipAddress = await iPTool.GrabInternetAddressAsync();
+            lblYourIPAddress.Content += " " + ipAddress + ".";
             addresses = DaWhitelist.ReadIPsFromJSON();
             lsbAddresses.ItemsSource = addresses;
             foreach (IPAddress ip in addresses)
@@ -57,9 +49,9 @@ void Init()
 
         private void btnAdd_Click(object sender, RoutedEventArgs e)
         {
-            if(IPTool.ValidateIP(txbIpToAdd.Text))
+            if (IPTool.ValidateIP(txbIpToAdd.Text))
             {
-                if(!addresses.Contains(IPAddress.Parse(txbIpToAdd.Text)))
+                if (!addresses.Contains(IPAddress.Parse(txbIpToAdd.Text)))
                 {
                     addresses.Add(IPAddress.Parse(txbIpToAdd.Text));
                     lsbAddresses.Items.Refresh();
@@ -75,7 +67,7 @@ private void btnAdd_Click(object sender, RoutedEventArgs e)
 
         private void btnDelete_Click(object sender, RoutedEventArgs e)
         {
-            if(lsbAddresses.SelectedIndex != -1)
+            if (lsbAddresses.SelectedIndex != -1)
             {
                 mWhitelist.Ips.Remove(lsbAddresses.SelectedItem.ToString());
                 addresses.Remove(IPAddress.Parse(lsbAddresses.SelectedItem.ToString()));
@@ -98,7 +90,7 @@ private void btnEnableDisable_Click(object sender, RoutedEventArgs e)
             SetRules();
         }
 
-        void SetRules()
+        private void SetRules()
         {
             string remoteAddresses = RangeCalculator.GetRemoteAddresses(addresses);
 
@@ -124,7 +116,7 @@ void SetRules()
             }
 
             // If they are active and set.
-            if(active && set)
+            if (active && set)
             {
                 FirewallRule.CreateInbound(remoteAddresses, false, true);
                 FirewallRule.CreateOutbound(remoteAddresses, false, true);
@@ -133,22 +125,22 @@ void SetRules()
             }
         }
 
-        void UpdateNotActive()
+        private void UpdateNotActive()
         {
             btnEnableDisable.Background = ColorBrush.Red;
             image4.Source = new BitmapImage(new Uri("/CodeSwine-Solo_Public_Lobby;component/ImageResources/unlocked.png", UriKind.Relative));
             lblLock.Content = "Rules not active." + Environment.NewLine + "Click to activate!";
         }
 
-        void UpdateActive()
+        private void UpdateActive()
         {
             btnEnableDisable.Background = ColorBrush.Green;
             image4.Source = new BitmapImage(new Uri("/CodeSwine-Solo_Public_Lobby;component/ImageResources/locked.png", UriKind.Relative));
             lblLock.Content = "Rules active." + Environment.NewLine + "Click to deactivate!";
         }
 
         [DllImport("User32.dll")]
-            private static extern bool RegisterHotKey(
+        private static extern bool RegisterHotKey(
         [In] IntPtr hWnd,
         [In] int id,
         [In] uint fsModifiers,
@@ -187,7 +179,6 @@ private void RegisterHotKey()
             const uint MOD_CTRL = 0x0002;
             if (!RegisterHotKey(helper.Handle, HOTKEY_ID, MOD_CTRL, VK_F10))
             {
-                
             }
         }
 
@@ -221,4 +212,4 @@ private void OnHotKeyPressed()
             System.Media.SystemSounds.Hand.Play();
         }
     }
-}
+}