From fe241c4f2b5e44983f6acd870dc06fc0359f22d9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2024 04:47:58 +0000 Subject: [PATCH 01/15] Bump RestSharp from 112.0.0 to 112.1.0 in /InternetTest Bumps [RestSharp](https://github.com/restsharp/RestSharp) from 112.0.0 to 112.1.0. - [Release notes](https://github.com/restsharp/RestSharp/releases) - [Commits](https://github.com/restsharp/RestSharp/compare/112.0.0...112.1.0) --- updated-dependencies: - dependency-name: RestSharp dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- InternetTest/InternetTest/InternetTest.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/InternetTest/InternetTest/InternetTest.csproj b/InternetTest/InternetTest/InternetTest.csproj index c581d64..3871910 100644 --- a/InternetTest/InternetTest/InternetTest.csproj +++ b/InternetTest/InternetTest/InternetTest.csproj @@ -41,7 +41,7 @@ - + From 6ec1d41f9db71c5f5711ec68f283a1741249ab3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Peyronnet?= Date: Sun, 17 Nov 2024 15:34:59 +0100 Subject: [PATCH 02/15] Added new Default Storage path (#622) --- InternetTest/InternetTest/Classes/Global.cs | 8 +++++++- InternetTest/InternetTest/Classes/Settings.cs | 13 ++++++------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/InternetTest/InternetTest/Classes/Global.cs b/InternetTest/InternetTest/Classes/Global.cs index 724ab31..5124a70 100644 --- a/InternetTest/InternetTest/Classes/Global.cs +++ b/InternetTest/InternetTest/Classes/Global.cs @@ -54,7 +54,13 @@ public static class Global public static string Version => "8.6.1.2409"; #endif public static string LastVersionLink => "https://raw.githubusercontent.com/Leo-Corporation/LeoCorp-Docs/master/Liens/Update%20System/InternetTest/7.0/Version.txt"; - internal static string SynethiaPath => $@"{FileSys.AppDataPath}\Léo Corporation\InternetTest Pro\NewSynethiaConfig.json"; + +#if PORTABLE + public static string DefaultStoragePath => $@"{FileSys.CurrentAppDirectory}\InternetTest Pro\"; +#else + public static string DefaultStoragePath => $@"{FileSys.AppDataPath}\Léo Corporation\InternetTest Pro\"; +#endif + public static string SynethiaPath => $@"{DefaultStoragePath}\NewSynethiaConfig.json"; public static bool IsConfidentialModeEnabled { get; set; } = false; public static Settings Settings { get; set; } = SettingsManager.Load(); public static SynethiaConfig SynethiaConfig { get; set; } = LoadConfig(); diff --git a/InternetTest/InternetTest/Classes/Settings.cs b/InternetTest/InternetTest/Classes/Settings.cs index c4794e6..f06b657 100644 --- a/InternetTest/InternetTest/Classes/Settings.cs +++ b/InternetTest/InternetTest/Classes/Settings.cs @@ -82,21 +82,20 @@ public Settings() public static class SettingsManager { - private static string SettingsPath => $@"{FileSys.AppDataPath}\Léo Corporation\InternetTest Pro\Settings.xml"; public static Settings Load() { - if (!Directory.Exists($@"{FileSys.AppDataPath}\Léo Corporation\InternetTest Pro\")) + if (!Directory.Exists(Global.DefaultStoragePath)) { - Directory.CreateDirectory($@"{FileSys.AppDataPath}\Léo Corporation\InternetTest Pro\"); + Directory.CreateDirectory(Global.DefaultStoragePath); } - if (!File.Exists(SettingsPath)) + if (!File.Exists($@"{Global.DefaultStoragePath}\Settings.xml")) { Global.Settings = new(); // Serialize to XML XmlSerializer xmlSerializer = new(typeof(Settings)); - StreamWriter streamWriter = new(SettingsPath); + StreamWriter streamWriter = new($@"{Global.DefaultStoragePath}\Settings.xml"); xmlSerializer.Serialize(streamWriter, Global.Settings); streamWriter.Dispose(); return new(); @@ -106,7 +105,7 @@ public static Settings Load() // Deserialize from xml XmlSerializer xmlDeserializer = new(typeof(Settings)); - StreamReader streamReader = new(SettingsPath); + StreamReader streamReader = new($@"{Global.DefaultStoragePath}\Settings.xml"); var settings = (Settings?)xmlDeserializer.Deserialize(streamReader) ?? new(); // Upgrade the settings file if it comes from an older version @@ -130,7 +129,7 @@ public static void Save() { // Serialize to XML XmlSerializer xmlSerializer = new(typeof(Settings)); - StreamWriter streamWriter = new(SettingsPath); + StreamWriter streamWriter = new($@"{Global.DefaultStoragePath}\Settings.xml"); xmlSerializer.Serialize(streamWriter, Global.Settings); streamWriter.Dispose(); } From bec24e33f23435094391991caf7336b723440197 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Peyronnet?= Date: Sun, 17 Nov 2024 15:53:51 +0100 Subject: [PATCH 03/15] Fixed carret not visible in TextBoxes (#624) --- InternetTest/InternetTest/App.xaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/InternetTest/InternetTest/App.xaml b/InternetTest/InternetTest/App.xaml index 56aed5e..ba5a95b 100644 --- a/InternetTest/InternetTest/App.xaml +++ b/InternetTest/InternetTest/App.xaml @@ -1703,6 +1703,9 @@ + From a31d77728a529e424e57abe199cd48cc514d6fd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Peyronnet?= Date: Sun, 17 Nov 2024 15:59:04 +0100 Subject: [PATCH 04/15] Fixed theme selector not working on First Run (#625) --- InternetTest/InternetTest/Pages/FirstRun/ThemePage.xaml.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/InternetTest/InternetTest/Pages/FirstRun/ThemePage.xaml.cs b/InternetTest/InternetTest/Pages/FirstRun/ThemePage.xaml.cs index 627c8d8..3b2dc60 100644 --- a/InternetTest/InternetTest/Pages/FirstRun/ThemePage.xaml.cs +++ b/InternetTest/InternetTest/Pages/FirstRun/ThemePage.xaml.cs @@ -92,6 +92,7 @@ private void LightBorder_MouseLeftButtonUp(object sender, MouseButtonEventArgs e ThemeSelectedBorder = (Border)sender; ((Border)sender).BorderBrush = Global.GetBrushFromResource("Accent"); Global.Settings.Theme = Themes.Light; + Global.ChangeTheme(); SettingsManager.Save(); } @@ -101,6 +102,7 @@ private void DarkBorder_MouseLeftButtonUp(object sender, MouseButtonEventArgs e) ThemeSelectedBorder = (Border)sender; ((Border)sender).BorderBrush = Global.GetBrushFromResource("Accent"); Global.Settings.Theme = Themes.Dark; + Global.ChangeTheme(); SettingsManager.Save(); } @@ -110,6 +112,7 @@ private void SystemBorder_MouseLeftButtonUp(object sender, MouseButtonEventArgs ThemeSelectedBorder = (Border)sender; ((Border)sender).BorderBrush = Global.GetBrushFromResource("Accent"); Global.Settings.Theme = Themes.System; + Global.ChangeTheme(); SettingsManager.Save(); } } From 35ac52cf5648a1dd727a151ba2891c60852c0b3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Peyronnet?= Date: Sun, 17 Nov 2024 16:01:39 +0100 Subject: [PATCH 05/15] Code cleanup --- .../InternetTest/Classes/DnsCacheInfo.cs | 2 +- InternetTest/InternetTest/Classes/Settings.cs | 1 - .../InternetTest/Pages/DnsPage.xaml.cs | 5 ++-- .../InternetTest/Pages/HomePage.xaml.cs | 9 +------ .../InternetTest/Pages/LocateIpPage.xaml.cs | 2 +- .../UserControls/DnsCacheItem.xaml.cs | 24 +++++++++---------- 6 files changed, 17 insertions(+), 26 deletions(-) diff --git a/InternetTest/InternetTest/Classes/DnsCacheInfo.cs b/InternetTest/InternetTest/Classes/DnsCacheInfo.cs index 889d925..d28ff95 100644 --- a/InternetTest/InternetTest/Classes/DnsCacheInfo.cs +++ b/InternetTest/InternetTest/Classes/DnsCacheInfo.cs @@ -22,8 +22,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -using System.Text.Json.Serialization; using System.Text.Json; +using System.Text.Json.Serialization; namespace InternetTest.Classes; diff --git a/InternetTest/InternetTest/Classes/Settings.cs b/InternetTest/InternetTest/Classes/Settings.cs index f06b657..5ba4640 100644 --- a/InternetTest/InternetTest/Classes/Settings.cs +++ b/InternetTest/InternetTest/Classes/Settings.cs @@ -22,7 +22,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ using InternetTest.Enums; -using PeyrSharp.Env; using System; using System.Collections.Generic; using System.Diagnostics; diff --git a/InternetTest/InternetTest/Pages/DnsPage.xaml.cs b/InternetTest/InternetTest/Pages/DnsPage.xaml.cs index 4bd0441..b553fad 100644 --- a/InternetTest/InternetTest/Pages/DnsPage.xaml.cs +++ b/InternetTest/InternetTest/Pages/DnsPage.xaml.cs @@ -27,7 +27,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE using InternetTest.UserControls; using Microsoft.Win32; using Synethia; -using System; using System.Collections.Generic; using System.Diagnostics; using System.IO; @@ -239,7 +238,7 @@ private void FlushDnsBtn_Click(object sender, RoutedEventArgs e) if (MessageBox.Show(Properties.Resources.FlushDNSMessage, Properties.Resources.FlushDNS, MessageBoxButton.YesNoCancel, MessageBoxImage.Question) == MessageBoxResult.Yes) { ItemDisplayer.Children.Clear(); - ProcessStartInfo processInfo = new ProcessStartInfo + ProcessStartInfo processInfo = new() { FileName = "ipconfig", Arguments = "/flushdns", @@ -257,6 +256,6 @@ private void FlushDnsBtn_Click(object sender, RoutedEventArgs e) // Wait for the process to exit process.WaitForExit(); MessageBox.Show(Properties.Resources.FlushDNSSuccess, Properties.Resources.FlushDNS, MessageBoxButton.OK, MessageBoxImage.Information); - } + } } } diff --git a/InternetTest/InternetTest/Pages/HomePage.xaml.cs b/InternetTest/InternetTest/Pages/HomePage.xaml.cs index c588efc..a95f281 100644 --- a/InternetTest/InternetTest/Pages/HomePage.xaml.cs +++ b/InternetTest/InternetTest/Pages/HomePage.xaml.cs @@ -54,14 +54,7 @@ internal async void InitUI() { // Load "Get started" section List relevantPages = Enumerable.Empty().ToList(); - if (Global.SynethiaConfig is not null) - { - relevantPages = Global.GetMostRelevantPages(Global.SynethiaConfig); - } - else - { - relevantPages = Global.DefaultRelevantPages; - } + relevantPages = Global.SynethiaConfig is not null ? Global.GetMostRelevantPages(Global.SynethiaConfig) : Global.DefaultRelevantPages; for (int i = 0; i < 5; i++) { diff --git a/InternetTest/InternetTest/Pages/LocateIpPage.xaml.cs b/InternetTest/InternetTest/Pages/LocateIpPage.xaml.cs index cd205bd..fd195f2 100644 --- a/InternetTest/InternetTest/Pages/LocateIpPage.xaml.cs +++ b/InternetTest/InternetTest/Pages/LocateIpPage.xaml.cs @@ -197,5 +197,5 @@ private void ResetBtn_Click(object sender, RoutedEventArgs e) private void MyIPTxt_MouseLeftButtonUp(object sender, System.Windows.Input.MouseButtonEventArgs e) { Clipboard.SetText(MyIPTxt.Text); - } + } } diff --git a/InternetTest/InternetTest/UserControls/DnsCacheItem.xaml.cs b/InternetTest/InternetTest/UserControls/DnsCacheItem.xaml.cs index 5b47462..b0a1de3 100644 --- a/InternetTest/InternetTest/UserControls/DnsCacheItem.xaml.cs +++ b/InternetTest/InternetTest/UserControls/DnsCacheItem.xaml.cs @@ -51,23 +51,23 @@ private void InitUI() enum Types { - A=1, - NS=2, - CNAME=5, - SOA=6, - PTR=12, - MX=15, - TXT=16, - AAAA=28, + A = 1, + NS = 2, + CNAME = 5, + SOA = 6, + PTR = 12, + MX = 15, + TXT = 16, + AAAA = 28, } enum Status { Success, NoRecords, - FormatError= 9501, - ServerFailure=9502, - NotExist=9503, - Refused=9505 + FormatError = 9501, + ServerFailure = 9502, + NotExist = 9503, + Refused = 9505 } } From 520d56ee544455fb9ee7bc25f45744094a0a6c7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Peyronnet?= Date: Sun, 17 Nov 2024 16:03:46 +0100 Subject: [PATCH 06/15] Version 8.7.0.2411-pre1 --- InternetTest/InternetTest/Classes/Global.cs | 8 ++++---- InternetTest/InternetTest/InternetTest.csproj | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/InternetTest/InternetTest/Classes/Global.cs b/InternetTest/InternetTest/Classes/Global.cs index 5124a70..26a043c 100644 --- a/InternetTest/InternetTest/Classes/Global.cs +++ b/InternetTest/InternetTest/Classes/Global.cs @@ -48,10 +48,10 @@ public static class Global #if NIGHTLY private static DateTime Date => System.IO.File.GetLastWriteTime(System.Reflection.Assembly.GetEntryAssembly().Location); - public static string Version => $"8.6.1.2409-nightly{Date:yyMM.dd@HHmm}"; + public static string Version => $"8.7.0.2411-nightly{Date:yyMM.dd@HHmm}"; #else - public static string Version => "8.6.1.2409"; + public static string Version => "8.7.0.2411-pre1"; #endif public static string LastVersionLink => "https://raw.githubusercontent.com/Leo-Corporation/LeoCorp-Docs/master/Liens/Update%20System/InternetTest/7.0/Version.txt"; @@ -292,7 +292,7 @@ public static bool IsUrlValid(string url) && (uriResult.Scheme == Uri.UriSchemeHttp || uriResult.Scheme == Uri.UriSchemeHttps); } - public async static Task GetIPInfoAsync(string ip) + public static async Task GetIPInfoAsync(string ip) { try { @@ -655,7 +655,7 @@ public static async Task GetDnsCache() public static async Task RunPowerShellCommandAsync(string psCommand) { // Create a new process to run PowerShell - ProcessStartInfo processInfo = new ProcessStartInfo + ProcessStartInfo processInfo = new() { FileName = "powershell.exe", Arguments = $"-Command \"{psCommand}\"", diff --git a/InternetTest/InternetTest/InternetTest.csproj b/InternetTest/InternetTest/InternetTest.csproj index 3871910..071cd8b 100644 --- a/InternetTest/InternetTest/InternetTest.csproj +++ b/InternetTest/InternetTest/InternetTest.csproj @@ -6,7 +6,7 @@ enable true True - 8.6.1.2409 + 8.7.0.2411-pre1 © 2024 Léo Corporation Taking you to another level. InternetTest can locate IP addresses, send ping request, recover your WiFi passwords and more! From f97232a911dd31bddb9d5d06eee34751168cb784 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Peyronnet?= Date: Sun, 17 Nov 2024 16:25:35 +0100 Subject: [PATCH 07/15] Fixed crash issue with Portable mode --- .../Pages/FirstRun/JumpInPage.xaml.cs | 4 ++-- .../Pages/FirstRun/WelcomePage.xaml.cs | 18 +++++++++++++----- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/InternetTest/InternetTest/Pages/FirstRun/JumpInPage.xaml.cs b/InternetTest/InternetTest/Pages/FirstRun/JumpInPage.xaml.cs index c87bac4..9e2a81a 100644 --- a/InternetTest/InternetTest/Pages/FirstRun/JumpInPage.xaml.cs +++ b/InternetTest/InternetTest/Pages/FirstRun/JumpInPage.xaml.cs @@ -23,9 +23,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE */ using InternetTest.Classes; +using PeyrSharp.Env; using Synethia; using System.Diagnostics; -using System.IO; using System.Windows; using System.Windows.Controls; @@ -46,7 +46,7 @@ private void NextBtn_Click(object sender, RoutedEventArgs e) SettingsManager.Save(); SynethiaManager.Save(Global.SynethiaConfig, Global.SynethiaPath); - Process.Start(Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location) + @"\InternetTest.exe"); + Process.Start($@"{FileSys.CurrentDirectory}\InternetTest.exe"); Application.Current.Shutdown(); // Quit the app } } diff --git a/InternetTest/InternetTest/Pages/FirstRun/WelcomePage.xaml.cs b/InternetTest/InternetTest/Pages/FirstRun/WelcomePage.xaml.cs index 844fce8..13d3dde 100644 --- a/InternetTest/InternetTest/Pages/FirstRun/WelcomePage.xaml.cs +++ b/InternetTest/InternetTest/Pages/FirstRun/WelcomePage.xaml.cs @@ -25,8 +25,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE using InternetTest.Classes; using InternetTest.Enums; using InternetTest.Windows; +using PeyrSharp.Env; +using System; using System.Diagnostics; -using System.IO; using System.Windows; using System.Windows.Controls; @@ -51,11 +52,18 @@ private void NextBtn_Click(object sender, RoutedEventArgs e) private void SkipBtn_Click(object sender, RoutedEventArgs e) { - Global.Settings.IsFirstRun = false; - SettingsManager.Save(); + try + { + Global.Settings.IsFirstRun = false; + SettingsManager.Save(); - Process.Start(Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location) + @"\InternetTest.exe"); - Application.Current.Shutdown(); + Process.Start($@"{FileSys.CurrentDirectory}\InternetTest.exe"); + Application.Current.Shutdown(); + } + catch (Exception ex) + { + MessageBox.Show(ex.Message); + } } private void LangComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e) From 1a9119acd3222006525b2613600d83de2d19bc76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Peyronnet?= Date: Sun, 17 Nov 2024 16:25:58 +0100 Subject: [PATCH 08/15] Fixed wrong default directory issue (#622) --- InternetTest/InternetTest/Classes/Global.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/InternetTest/InternetTest/Classes/Global.cs b/InternetTest/InternetTest/Classes/Global.cs index 26a043c..2c44b91 100644 --- a/InternetTest/InternetTest/Classes/Global.cs +++ b/InternetTest/InternetTest/Classes/Global.cs @@ -56,7 +56,7 @@ public static class Global public static string LastVersionLink => "https://raw.githubusercontent.com/Leo-Corporation/LeoCorp-Docs/master/Liens/Update%20System/InternetTest/7.0/Version.txt"; #if PORTABLE - public static string DefaultStoragePath => $@"{FileSys.CurrentAppDirectory}\InternetTest Pro\"; + public static string DefaultStoragePath => $@"{FileSys.CurrentDirectory}\InternetTest Pro\"; #else public static string DefaultStoragePath => $@"{FileSys.AppDataPath}\Léo Corporation\InternetTest Pro\"; #endif From 0bdb10fb5209cf20c5e0b99fcb8de048b1f7167e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Peyronnet?= Date: Sat, 30 Nov 2024 14:45:05 +0100 Subject: [PATCH 09/15] Added Quick Information in header section (#623) --- InternetTest/InternetTest/MainWindow.xaml | 210 ++++++++++++++++-- InternetTest/InternetTest/MainWindow.xaml.cs | 90 +++++++- InternetTest/InternetTest/Pages/HomePage.xaml | 191 ---------------- .../InternetTest/Pages/HomePage.xaml.cs | 90 +------- 4 files changed, 288 insertions(+), 293 deletions(-) diff --git a/InternetTest/InternetTest/MainWindow.xaml b/InternetTest/InternetTest/MainWindow.xaml index d9b38c3..34e0504 100644 --- a/InternetTest/InternetTest/MainWindow.xaml +++ b/InternetTest/InternetTest/MainWindow.xaml @@ -257,20 +257,204 @@ - - - + + + + + + + + + - + VerticalAlignment="Center" + Orientation="Horizontal" Margin="0,0,10,0"> + + + + + + + + + + + + +