Portable Tool for an Ideal Windows Setup
C# activatorbloatware-removalcsharpdebloatdebloaterdisable-servicesmonitoring-systemportableprivacy-toolsregistry-tweakssystem-tuningsystem-utilitytelemetrytweakerwindows-10windows-11windows-debloatwindows-defenderwindows-optimizationwindows-tweaks
add backup IP service providers
Greedeks3f6b2fb78815
diff --git a/.Source/GTweak/Languages/en/Localize.xaml b/.Source/GTweak/Languages/en/Localize.xamlindex d2b63e95..86188102 100644--- a/.Source/GTweak/Languages/en/Localize.xaml+++ b/.Source/GTweak/Languages/en/Localize.xaml@@ -425,7 +425,7 @@<v:String x:Key="title_sound_systemInformation">Playback devices:</v:String><v:String x:Key="title_netadapter_systemInformation">Network adapters:</v:String><v:String x:Key="title_ip_systemInformation">Your IP address:</v:String>- <v:String x:Key="limited_systemInformation">Network access is limited</v:String>+ <v:String x:Key="connection_limited_systemInformation">Network access is limited</v:String><v:String x:Key="connection_block_systemInformation">Connecting without network access</v:String><v:String x:Key="connection_lose_systemInformation">There is no internet connection</v:String><v:String x:Key="text_copy_systemInformatin">Copied!</v:String>diff --git a/.Source/GTweak/Languages/ko/Localize.xaml b/.Source/GTweak/Languages/ko/Localize.xamlindex 1bc5bc66..0b7df49d 100644--- a/.Source/GTweak/Languages/ko/Localize.xaml+++ b/.Source/GTweak/Languages/ko/Localize.xaml@@ -425,7 +425,7 @@<v:String x:Key="title_sound_systemInformation">재생 장치:</v:String><v:String x:Key="title_netadapter_systemInformation">네트워크 어댑터:</v:String><v:String x:Key="title_ip_systemInformation">IP 주소:</v:String>- <v:String x:Key="limited_systemInformation">네트워크 액세스가 제한됩니다</v:String>+ <v:String x:Key="connection_limited_systemInformation">네트워크 액세스가 제한됩니다</v:String><v:String x:Key="connection_block_systemInformation">네트워크 액세스 없이 연결</v:String><v:String x:Key="connection_lose_systemInformation">인터넷에 연결되어 있지 않습니다</v:String><v:String x:Key="text_copy_systemInformatin">복사 완료!</v:String>diff --git a/.Source/GTweak/Languages/ru/Localize.xaml b/.Source/GTweak/Languages/ru/Localize.xamlindex f2bb6a18..90d579fc 100644--- a/.Source/GTweak/Languages/ru/Localize.xaml+++ b/.Source/GTweak/Languages/ru/Localize.xaml@@ -425,7 +425,7 @@<v:String x:Key="title_sound_systemInformation">Устройства воспроизведения:</v:String><v:String x:Key="title_netadapter_systemInformation">Сетевые адаптеры:</v:String><v:String x:Key="title_ip_systemInformation">Ваш IP адрес:</v:String>- <v:String x:Key="limited_systemInformation">Доступ к сети ограничен</v:String>+ <v:String x:Key="connection_limited_systemInformation">Доступ к сети ограничен</v:String><v:String x:Key="connection_block_systemInformation">Подключение без доступа к сети</v:String><v:String x:Key="connection_lose_systemInformation">Отсутствует подключения к интернету</v:String><v:String x:Key="text_copy_systemInformatin">Скопировано!</v:String>diff --git a/.Source/GTweak/Languages/uk/Localize.xaml b/.Source/GTweak/Languages/uk/Localize.xamlindex 6400133f..59d76777 100644--- a/.Source/GTweak/Languages/uk/Localize.xaml+++ b/.Source/GTweak/Languages/uk/Localize.xaml@@ -425,7 +425,7 @@<v:String x:Key="title_sound_systemInformation">Пристрої відтворення:</v:String><v:String x:Key="title_netadapter_systemInformation">Мережеві адаптери:</v:String><v:String x:Key="title_ip_systemInformation">Ваша IP-адреса:</v:String>- <v:String x:Key="limited_systemInformation">Доступ до мережі обмежено</v:String>+ <v:String x:Key="connection_limited_systemInformation">Доступ до мережі обмежено</v:String><v:String x:Key="connection_block_systemInformation">Підключення без доступу до мережі</v:String><v:String x:Key="connection_lose_systemInformation">Немає підключення до Інтернету</v:String><v:String x:Key="text_copy_systemInformatin">Скопійовано!</v:String>diff --git a/.Source/GTweak/Utilities/Configuration/SystemDiagnostics.cs b/.Source/GTweak/Utilities/Configuration/SystemDiagnostics.csindex e82c5875..2c75edbb 100644--- a/.Source/GTweak/Utilities/Configuration/SystemDiagnostics.cs+++ b/.Source/GTweak/Utilities/Configuration/SystemDiagnostics.cs@@ -2,6 +2,7 @@using GTweak.Utilities.Helpers;using Microsoft.Win32;using Newtonsoft.Json;+using Newtonsoft.Json.Linq;using System;using System.Collections.Generic;using System.Globalization;@@ -30,11 +31,16 @@ namespace GTweak.Utilities.Configurationprivate sealed class IPMetadata{- [JsonProperty("query")]internal string Ip { get; set; }-- [JsonProperty("countryCode")]internal string Country { get; set; }++ internal static IPMetadata ParseData(string response)+ {+ JObject jObject = JObject.Parse(response);+ string ip = (string)(jObject["ip"] ?? jObject["ipAddress"] ?? jObject["query"]);+ string country = (string)(jObject["country_code"] ?? jObject["countryCode"]);+ return new IPMetadata { Ip = ip, Country = country };+ }}internal struct HardwareData@@ -447,21 +453,26 @@ namespace GTweak.Utilities.Configuration{if (IsNetworkAvailable()){- try- {- using HttpClient client = new HttpClient { Timeout = TimeSpan.FromSeconds(5.0) };- string response = await client.GetStringAsync("http://ip-api.com/json/?fields=61439");- IPMetadata ipMetadata = JsonConvert.DeserializeObject<IPMetadata>(response);+ using HttpClient client = new HttpClient { Timeout = TimeSpan.FromSeconds(5) };- if (IPAddress.TryParse(ipMetadata.Ip, out _) && !string.IsNullOrEmpty(ipMetadata?.Ip) && !string.IsNullOrEmpty(ipMetadata?.Country))+ foreach (string url in new[] { "https://ipapi.co/json/", "https://api.db-ip.com/v2/free/self", "http://ip-api.com/json/?fields=61439" })+ {+ try{- CurrentConnection = ConnectionStatus.Available;- HardwareData.UserIPAddress = $"{ipMetadata.Ip} ({ipMetadata.Country})";+ string response = await client.GetStringAsync(url);+ IPMetadata ipMetadata = IPMetadata.ParseData(response);++ if (IPAddress.TryParse(ipMetadata.Ip, out _) && !string.IsNullOrWhiteSpace(ipMetadata?.Ip) && !string.IsNullOrWhiteSpace(ipMetadata?.Country))+ {+ CurrentConnection = ConnectionStatus.Available;+ HardwareData.UserIPAddress = $"{ipMetadata.Ip} ({ipMetadata.Country})";+ break;+ }+ else+ CurrentConnection = ConnectionStatus.Block;}- else- CurrentConnection = ConnectionStatus.Block;+ catch { CurrentConnection = ConnectionStatus.Limited; }}- catch { CurrentConnection = ConnectionStatus.Limited; }}elseCurrentConnection = ConnectionStatus.Lose;@@ -470,7 +481,7 @@ namespace GTweak.Utilities.Configuration{{ ConnectionStatus.Lose, "connection_lose_systemInformation" },{ ConnectionStatus.Block, "connection_block_systemInformation" },- { ConnectionStatus.Limited, "limited_systemInformation" }+ { ConnectionStatus.Limited, "connection_limited_systemInformation" }}.TryGetValue(CurrentConnection, out string resourceKey)) { HardwareData.UserIPAddress = (string)Application.Current.Resources[resourceKey]; }isIPAddressFormatValid = HardwareData.UserIPAddress.Any(char.IsDigit);@@ -495,7 +506,7 @@ namespace GTweak.Utilities.Configurationstring DataAsJson = sreader.ReadToEnd();GitMetadata gitVersionUtility = JsonConvert.DeserializeObject<GitMetadata>(DataAsJson);- if (!string.IsNullOrEmpty(gitVersionUtility.СurrentVersion) && gitVersionUtility.СurrentVersion.CompareTo(SettingsRepository.currentRelease) > 0)+ if (!string.IsNullOrWhiteSpace(gitVersionUtility.СurrentVersion) && gitVersionUtility.СurrentVersion.CompareTo(SettingsRepository.currentRelease) > 0){IsNeedUpdate = true;DownloadVersion = gitVersionUtility.СurrentVersion;diff --git a/.Source/GTweak/View/DataSystemView.xaml.cs b/.Source/GTweak/View/DataSystemView.xaml.csindex 4f1db654..0a9f5cf5 100644--- a/.Source/GTweak/View/DataSystemView.xaml.cs+++ b/.Source/GTweak/View/DataSystemView.xaml.cs@@ -31,7 +31,7 @@ namespace GTweak.View{{ SystemDiagnostics.ConnectionStatus.Lose, "connection_lose_systemInformation" },{ SystemDiagnostics.ConnectionStatus.Block, "connection_block_systemInformation" },- { SystemDiagnostics.ConnectionStatus.Limited, "limited_systemInformation" }+ { SystemDiagnostics.ConnectionStatus.Limited, "connection_limited_systemInformation" }}.TryGetValue(SystemDiagnostics.CurrentConnection, out string resourceKey)) { SystemDiagnostics.HardwareData.UserIPAddress = (string)FindResource(resourceKey); }DataContext = new DataSystemVM();};