diff --git a/AM2RLauncher/AM2RLauncher/MainForm/HelperMethods.cs b/AM2RLauncher/AM2RLauncher/MainForm/HelperMethods.cs index e55f0af..9587174 100644 --- a/AM2RLauncher/AM2RLauncher/MainForm/HelperMethods.cs +++ b/AM2RLauncher/AM2RLauncher/MainForm/HelperMethods.cs @@ -1,6 +1,8 @@ -using System; +using log4net; +using System; using System.Collections.Generic; using System.IO; +using System.Net; using System.Security.Cryptography; using System.Text; @@ -8,6 +10,12 @@ namespace AM2RLauncher.Helpers { static class HelperMethods { + // Load reference to logger + /// + /// Our log object, that handles logging the current execution to a file. + /// + private static readonly ILog log = LogManager.GetLogger(typeof(MainForm)); + // Thank you, Microsoft docs: https://docs.microsoft.com/en-us/dotnet/standard/io/how-to-copy-directories // Slightly modified by adding overwriteFiles bool, as we need to replace readme, music, etc. /// @@ -136,5 +144,27 @@ namespace AM2RLauncher.Helpers else // Otherwise, delete the file. File.Delete(logFile); } + + /// + /// Checks if we currently have an internet connection, by pinging github. + /// + /// if we have internet, if not. + public static bool IsConnectedToInternet() + { + log.Info("Checking internet connection..."); + HttpWebRequest request = (HttpWebRequest)WebRequest.Create("https://github.com"); + HttpWebResponse response = null; + try + { + response = (HttpWebResponse)request.GetResponse(); + } + catch (WebException) + { + log.Info("Internet connection failed."); + return false; + } + log.Info("Internet connection established!"); + return true; + } } } diff --git a/AM2RLauncher/AM2RLauncher/MainForm/MainForm.Methods.cs b/AM2RLauncher/AM2RLauncher/MainForm/MainForm.Methods.cs index fd83e45..4707c65 100644 --- a/AM2RLauncher/AM2RLauncher/MainForm/MainForm.Methods.cs +++ b/AM2RLauncher/AM2RLauncher/MainForm/MainForm.Methods.cs @@ -1124,28 +1124,5 @@ namespace AM2RLauncher // if we didn't exit before, everything is fine return IsZipAM2R11ReturnCodes.Successful; } - - - /// - /// Checks if we currently have an internet connection, by pinging github. - /// - /// - private static bool IsConnectedToInternet() - { - log.Info("Checking internet connection..."); - HttpWebRequest request = (HttpWebRequest)WebRequest.Create("https://github.com"); - HttpWebResponse response = null; - try - { - response = (HttpWebResponse)request.GetResponse(); - } - catch (WebException) - { - log.Info("Internet connection failed."); - return false; - } - log.Info("Internet connection established!"); - return true; - } } } diff --git a/AM2RLauncher/AM2RLauncher/MainForm/MainForm.UI.cs b/AM2RLauncher/AM2RLauncher/MainForm/MainForm.UI.cs index e540e48..14d4b9d 100644 --- a/AM2RLauncher/AM2RLauncher/MainForm/MainForm.UI.cs +++ b/AM2RLauncher/AM2RLauncher/MainForm/MainForm.UI.cs @@ -101,7 +101,7 @@ namespace AM2RLauncher /// /// Indicates whether or not we have established an internet connection. /// - readonly static private bool isInternetThere = IsConnectedToInternet(); + readonly static private bool isInternetThere = Helpers.HelperMethods.IsConnectedToInternet(); public MainForm() { diff --git a/AM2RLauncher/AM2RLauncher/Resources/AM2Rlogo.png b/AM2RLauncher/AM2RLauncher/Resources/AM2Rlogo.png deleted file mode 100644 index e1a7a12..0000000 Binary files a/AM2RLauncher/AM2RLauncher/Resources/AM2Rlogo.png and /dev/null differ diff --git a/AM2RLauncher/AM2RLauncher/Resources/Discord-Logo-Color 48.png b/AM2RLauncher/AM2RLauncher/Resources/Discord-Logo-Color 48.png deleted file mode 100644 index e781fd9..0000000 Binary files a/AM2RLauncher/AM2RLauncher/Resources/Discord-Logo-Color 48.png and /dev/null differ diff --git a/AM2RLauncher/AM2RLauncher/Resources/GitHub-Mark 48.png b/AM2RLauncher/AM2RLauncher/Resources/GitHub-Mark 48.png deleted file mode 100644 index bc36ddc..0000000 Binary files a/AM2RLauncher/AM2RLauncher/Resources/GitHub-Mark 48.png and /dev/null differ diff --git a/AM2RLauncher/AM2RLauncher/Resources/GitHub-Mark-Light-48px.png b/AM2RLauncher/AM2RLauncher/Resources/GitHub-Mark-Light-48px.png deleted file mode 100644 index 5d10398..0000000 Binary files a/AM2RLauncher/AM2RLauncher/Resources/GitHub-Mark-Light-48px.png and /dev/null differ diff --git a/AM2RLauncher/AM2RLauncher/Resources/GitHub-Mark-Light-64px.png b/AM2RLauncher/AM2RLauncher/Resources/GitHub-Mark-Light-64px.png deleted file mode 100644 index 73db1f6..0000000 Binary files a/AM2RLauncher/AM2RLauncher/Resources/GitHub-Mark-Light-64px.png and /dev/null differ diff --git a/AM2RLauncher/AM2RLauncher/Resources/bgCentered.bmp b/AM2RLauncher/AM2RLauncher/Resources/bgCentered.bmp deleted file mode 100644 index 55516c7..0000000 Binary files a/AM2RLauncher/AM2RLauncher/Resources/bgCentered.bmp and /dev/null differ diff --git a/AM2RLauncher/AM2RLauncher/Resources/discordIcon48.bmp b/AM2RLauncher/AM2RLauncher/Resources/discordIcon48.bmp deleted file mode 100644 index 55516c7..0000000 Binary files a/AM2RLauncher/AM2RLauncher/Resources/discordIcon48.bmp and /dev/null differ diff --git a/AM2RLauncher/AM2RLauncher/Resources/redditIcon.bmp b/AM2RLauncher/AM2RLauncher/Resources/redditIcon.bmp deleted file mode 100644 index 55516c7..0000000 Binary files a/AM2RLauncher/AM2RLauncher/Resources/redditIcon.bmp and /dev/null differ diff --git a/AM2RLauncher/AM2RLauncher/Resources/reddit_share_circle_128.png b/AM2RLauncher/AM2RLauncher/Resources/reddit_share_circle_128.png deleted file mode 100644 index a8dce13..0000000 Binary files a/AM2RLauncher/AM2RLauncher/Resources/reddit_share_circle_128.png and /dev/null differ diff --git a/AM2RLauncher/AM2RLauncher/Resources/reddit_share_circle_64.png b/AM2RLauncher/AM2RLauncher/Resources/reddit_share_circle_64.png deleted file mode 100644 index 1310168..0000000 Binary files a/AM2RLauncher/AM2RLauncher/Resources/reddit_share_circle_64.png and /dev/null differ