Skip to content

Portable Tool for an Ideal Windows Setup

-refactoring

Greedeksf6d01e71d3de
diff --git a/.Source/GTweak/Core/ViewModel/DataSystemVM.cs b/.Source/GTweak/Core/ViewModel/DataSystemVM.cs
index a560f309..3fa1bbfa 100644
--- a/.Source/GTweak/Core/ViewModel/DataSystemVM.cs
+++ b/.Source/GTweak/Core/ViewModel/DataSystemVM.cs
@@ -44,17 +44,17 @@ namespace GTweak.Core.ViewModel
DisplayData = new ObservableCollection<DataSystemModel>
{
- new DataSystemModel { Name = "Windows", Data = SystemDiagnostics.СonfigurationData["Windows"] },
+ new DataSystemModel { Name = "Windows", Data = SystemDiagnostics.HardwareData["Windows"] },
new DataSystemModel { Name = "Processes", Data = new MonitoringSystem().GetNumberRunningProcesses },
- new DataSystemModel { Name = "Bios", Data = !string.IsNullOrEmpty(SystemDiagnostics.СonfigurationData["BIOS"]) ? SystemDiagnostics.СonfigurationData["BIOS"] : (string)Application.Current.Resources["no_device_information_systemInformatin"] },
- new DataSystemModel { Name = "Motherboard", Data = !string.IsNullOrEmpty(SystemDiagnostics.СonfigurationData["MotherBr"]) ? SystemDiagnostics.СonfigurationData["MotherBr"] : (string)Application.Current.Resources["no_device_information_systemInformatin"] },
- new DataSystemModel { Name = "Processor", Data = !string.IsNullOrEmpty(SystemDiagnostics.СonfigurationData["CPU"]) ? SystemDiagnostics.СonfigurationData["CPU"] : (string)Application.Current.Resources["no_device_information_systemInformatin"] },
- new DataSystemModel { Name = "Graphics", Data = !string.IsNullOrEmpty(SystemDiagnostics.СonfigurationData["GPU"]) ? SystemDiagnostics.СonfigurationData["GPU"] : (string)Application.Current.Resources["driver_not_installed_systemInformatin"] },
- new DataSystemModel { Name = "Memory", Data = !string.IsNullOrEmpty(SystemDiagnostics.СonfigurationData["RAM"]) ? SystemDiagnostics.СonfigurationData["RAM"] : (string)Application.Current.Resources["no_device_information_systemInformatin"] },
- new DataSystemModel { Name = "Storage", Data = !string.IsNullOrEmpty(SystemDiagnostics.СonfigurationData["Storage"]) ? SystemDiagnostics.СonfigurationData["Storage"] : (string)Application.Current.Resources["no_device_information_systemInformatin"] },
- new DataSystemModel { Name = "Audio", Data = !string.IsNullOrEmpty(SystemDiagnostics.СonfigurationData["Audio"]) ? SystemDiagnostics.СonfigurationData["Audio"] : (string)Application.Current.Resources["driver_not_installed_systemInformatin"] },
- new DataSystemModel { Name = "Network", Data = !string.IsNullOrEmpty(SystemDiagnostics.СonfigurationData["NetAdapter"]) ? SystemDiagnostics.СonfigurationData["NetAdapter"] : (string)Application.Current.Resources["driver_not_installed_systemInformatin"] },
- new DataSystemModel { Name = "IpAddress", Data = SystemDiagnostics.СonfigurationData["UserIpAddress"] }
+ new DataSystemModel { Name = "Bios", Data = !string.IsNullOrEmpty(SystemDiagnostics.HardwareData["BIOS"]) ? SystemDiagnostics.HardwareData["BIOS"] : (string)Application.Current.Resources["no_device_information_systemInformatin"] },
+ new DataSystemModel { Name = "Motherboard", Data = !string.IsNullOrEmpty(SystemDiagnostics.HardwareData["MotherBr"]) ? SystemDiagnostics.HardwareData["MotherBr"] : (string)Application.Current.Resources["no_device_information_systemInformatin"] },
+ new DataSystemModel { Name = "Processor", Data = !string.IsNullOrEmpty(SystemDiagnostics.HardwareData["CPU"]) ? SystemDiagnostics.HardwareData["CPU"] : (string)Application.Current.Resources["no_device_information_systemInformatin"] },
+ new DataSystemModel { Name = "Graphics", Data = !string.IsNullOrEmpty(SystemDiagnostics.HardwareData["GPU"]) ? SystemDiagnostics.HardwareData["GPU"] : (string)Application.Current.Resources["driver_not_installed_systemInformatin"] },
+ new DataSystemModel { Name = "Memory", Data = !string.IsNullOrEmpty(SystemDiagnostics.HardwareData["RAM"]) ? SystemDiagnostics.HardwareData["RAM"] : (string)Application.Current.Resources["no_device_information_systemInformatin"] },
+ new DataSystemModel { Name = "Storage", Data = !string.IsNullOrEmpty(SystemDiagnostics.HardwareData["Storage"]) ? SystemDiagnostics.HardwareData["Storage"] : (string)Application.Current.Resources["no_device_information_systemInformatin"] },
+ new DataSystemModel { Name = "Audio", Data = !string.IsNullOrEmpty(SystemDiagnostics.HardwareData["Audio"]) ? SystemDiagnostics.HardwareData["Audio"] : (string)Application.Current.Resources["driver_not_installed_systemInformatin"] },
+ new DataSystemModel { Name = "Network", Data = !string.IsNullOrEmpty(SystemDiagnostics.HardwareData["NetAdapter"]) ? SystemDiagnostics.HardwareData["NetAdapter"] : (string)Application.Current.Resources["driver_not_installed_systemInformatin"] },
+ new DataSystemModel { Name = "IpAddress", Data = SystemDiagnostics.HardwareData["UserIpAddress"] }
};
if (SystemDiagnostics.CurrentConnection == SystemDiagnostics.ConnectionStatus.Available)
diff --git a/.Source/GTweak/Utilities/Configuration/SystemDiagnostics.cs b/.Source/GTweak/Utilities/Configuration/SystemDiagnostics.cs
index 7ca9e4ec..575d5c9e 100644
--- a/.Source/GTweak/Utilities/Configuration/SystemDiagnostics.cs
+++ b/.Source/GTweak/Utilities/Configuration/SystemDiagnostics.cs
@@ -3,6 +3,7 @@ using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Globalization;
+using System.Linq;
using System.Management;
using System.Net;
using System.Net.Http;
@@ -16,29 +17,6 @@ namespace GTweak.Utilities.Configuration
{
internal sealed class SystemDiagnostics
{
- internal static ImageSource GetProfileImage()
- {
- try
- {
- RegistryKey regKey = default, ourKey = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Microsoft\Windows\CurrentVersion\AccountPicture\Users", true);
-
- foreach (string keyname in ourKey!.GetSubKeyNames())
- regKey = ourKey!.OpenSubKey(keyname);
-
- return new BitmapImage(new Uri(regKey?.GetValue("Image1080").ToString() ?? string.Empty));
- }
- catch { return null; }
- }
-
- internal static string GetProfileName()
- {
- string nameProfile = string.Empty;
- foreach (var managementObj in new ManagementObjectSearcher(@"root\cimv2", $"select FullName from Win32_UserAccount where domain='{Environment.UserDomainName}' and name='{Environment.UserName.ToLower()}'").Get())
- nameProfile = (string)managementObj["FullName"];
-
- return nameProfile != string.Empty ? nameProfile : Environment.UserName.ToLower();
- }
-
internal sealed class IPMetadata
{
[JsonProperty("query")]
@@ -60,7 +38,7 @@ namespace GTweak.Utilities.Configuration
internal static string WindowsClientVersion { get; set; } = string.Empty;
- internal static readonly Dictionary<string, string> СonfigurationData = new Dictionary<string, string>()
+ internal static readonly Dictionary<string, string> HardwareData = new Dictionary<string, string>()
{
{ "Windows", Registry.GetValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion", "ProductName", string.Empty)?.ToString() ?? string.Empty },
@@ -76,95 +54,129 @@ namespace GTweak.Utilities.Configuration
{ "UserIpAddress", Application.Current.Resources["connection_lose_systemInformation"].ToString() }
};
- internal void GetHardwareData()
+ internal static ImageSource GetProfileImage()
{
- Parallel.Invoke(delegate
- {
- foreach (var managementObj in new ManagementObjectSearcher(@"root\cimv2", "select Caption, OSArchitecture, Version from Win32_OperatingSystem", new EnumerationOptions { ReturnImmediately = true }).Get())
- СonfigurationData["Windows"] = $"{Convert.ToString(managementObj["Caption"]).Substring(Convert.ToString(managementObj["Caption"]).IndexOf('W'))}, {Regex.Replace((string)managementObj["OSArchitecture"], @"\-.+", "-bit")}, V{(string)managementObj["Version"]}\n";
- СonfigurationData["Windows"] = $"\n{СonfigurationData["Windows"].TrimEnd('\n')}";
- },
- delegate
- {
- foreach (var managementObj in new ManagementObjectSearcher(@"root\cimv2", "select Name, Caption, Description, SerialNumber from Win32_BIOS", new EnumerationOptions { ReturnImmediately = true }).Get())
- {
- if (!string.IsNullOrEmpty((string)managementObj["Name"]))
- СonfigurationData["BIOS"] += !string.IsNullOrEmpty((string)managementObj["SerialNumber"]) ? (string)managementObj["Name"] + ", S/N-" + (string)managementObj["SerialNumber"] + "\n" : (string)managementObj["Name"] + "\n";
- else if (!string.IsNullOrEmpty((string)managementObj["Caption"]))
- СonfigurationData["BIOS"] += !string.IsNullOrEmpty((string)managementObj["SerialNumber"]) ? (string)managementObj["Caption"] + ", S/N-" + (string)managementObj["SerialNumber"] + "\n" : (string)managementObj["Caption"] + "\n";
- else if (!string.IsNullOrEmpty((string)managementObj["Description"]))
- СonfigurationData["BIOS"] += !string.IsNullOrEmpty((string)managementObj["SerialNumber"]) ? (string)managementObj["Description"] + ", S/N-" + (string)managementObj["SerialNumber"] + "\n" : (string)managementObj["Description"] + "\n";
- }
- СonfigurationData["BIOS"] = СonfigurationData["BIOS"].TrimEnd('\n');
- },
- delegate
- {
- foreach (var managementObj in new ManagementObjectSearcher(@"root\cimv2", "select Manufacturer, Product, Version from Win32_BaseBoard", new EnumerationOptions { ReturnImmediately = true }).Get())
- СonfigurationData["MotherBr"] = (string)managementObj["Manufacturer"] + (string)managementObj["Product"] + ", V" + (string)managementObj["Version"] + "\n";
- СonfigurationData["MotherBr"] = СonfigurationData["MotherBr"].TrimEnd('\n');
- },
- delegate
- {
- foreach (var managementObj in new ManagementObjectSearcher(@"root\cimv2", "select Name from Win32_Processor", new EnumerationOptions { ReturnImmediately = true }).Get())
- СonfigurationData["CPU"] = (string)managementObj["Name"] + "\n";
- СonfigurationData["CPU"] = СonfigurationData["CPU"].TrimEnd('\n');
- },
- delegate
- {
- foreach (var managementObj in new ManagementObjectSearcher(@"root\cimv2", "select Name, AdapterRAM from Win32_VideoController", new EnumerationOptions { ReturnImmediately = true }).Get())
- СonfigurationData["GPU"] += ((string)managementObj["Name"] + ", " + Convert.ToString(((uint)managementObj["AdapterRAM"] / 1024000000)) + " GB\n");
- СonfigurationData["GPU"] = СonfigurationData["GPU"].TrimEnd('\n');
- },
- delegate
+ try
{
- foreach (var managementObj in new ManagementObjectSearcher(@"root\cimv2", "select Manufacturer, Capacity, ConfiguredClockSpeed from Win32_PhysicalMemory", new EnumerationOptions { ReturnImmediately = true }).Get())
- СonfigurationData["RAM"] += (string)managementObj["Manufacturer"] + ", " + Convert.ToString((ulong)managementObj["Capacity"] / 1024000000) + " GB, " + Convert.ToString((uint)managementObj["ConfiguredClockSpeed"]) + "MHz\n";
- СonfigurationData["RAM"] = СonfigurationData["RAM"].TrimEnd('\n');
- },
- GetUpdatingDevices,
- GetUserIpAddress);
+ RegistryKey regKey = default, ourKey = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Microsoft\Windows\CurrentVersion\AccountPicture\Users", true);
+
+ foreach (string keyname in ourKey!.GetSubKeyNames())
+ regKey = ourKey!.OpenSubKey(keyname);
+
+ return new BitmapImage(new Uri(regKey?.GetValue("Image1080").ToString() ?? string.Empty));
+ }
+ catch { return null; }
+ }
+
+ internal static string GetProfileName()
+ {
+ string nameProfile = string.Empty;
+ foreach (var managementObj in new ManagementObjectSearcher(@"root\cimv2", $"select FullName from Win32_UserAccount where domain='{Environment.UserDomainName}' and name='{Environment.UserName.ToLower()}'").Get())
+ nameProfile = (string)managementObj["FullName"];
+
+ return nameProfile != string.Empty ? nameProfile : Environment.UserName.ToLower();
+ }
+
+ internal void GetHardwareData()
+ {
+ Parallel.Invoke(
+ GetOperatingSystemInfo,
+ GetBiosInfo,
+ GetMotherboardInfo,
+ GetProcessorInfo,
+ GeVideoInfo,
+ GetMemoryInfo,
+ GetUpdatingDevices,
+ GetUserIpAddress
+ );
}
internal static void GetUpdatingDevices()
{
- Parallel.Invoke(delegate
+ Parallel.Invoke(
+ GetStorageDevices,
+ GetAudioDevices,
+ GetNetworkAdapters
+ );
+ }
+
+ private void GetOperatingSystemInfo()
+ {
+ foreach (var managementObj in new ManagementObjectSearcher(@"root\cimv2", "select Caption, OSArchitecture, Version from Win32_OperatingSystem", new EnumerationOptions { ReturnImmediately = true }).Get())
+ HardwareData["Windows"] = $"{Convert.ToString(managementObj["Caption"]).Substring(Convert.ToString(managementObj["Caption"]).IndexOf('W'))}, {Regex.Replace((string)managementObj["OSArchitecture"], @"\-.+", "-bit")}, V{(string)managementObj["Version"]}\n";
+ HardwareData["Windows"] = $"\n{HardwareData["Windows"].TrimEnd('\n')}";
+ }
+
+ private void GetBiosInfo()
+ {
+ foreach (var managementObj in new ManagementObjectSearcher(@"root\cimv2", "select Name, Caption, Description, SMBIOSBIOSVersion, SerialNumber from Win32_BIOS", new EnumerationOptions { ReturnImmediately = true }).Get())
{
- string storageType = СonfigurationData["Storage"] = string.Empty;
- foreach (var managementObj in new ManagementObjectSearcher(@"\\.\root\microsoft\windows\storage", "select FriendlyName,MediaType,Size,BusType from MSFT_PhysicalDisk", new EnumerationOptions { ReturnImmediately = true }).Get())
- {
- storageType = (ushort)(managementObj["MediaType"]) switch
- {
- 3 => "(HDD)",
- 4 => "(SSD)",
- 5 => "(SCM)",
- _ => "(Unspecified)",
- };
- if (storageType == "(Unspecified)" && ((ushort)(managementObj["BusType"])) == 7) storageType = "(Media-Type)";
- СonfigurationData["Storage"] += Convert.ToString((ulong)managementObj["Size"] / 1024000000) + " GB " + "[" + (string)managementObj["FriendlyName"] + "] " + storageType + "\n";
- }
- СonfigurationData["Storage"] = СonfigurationData["Storage"].TrimEnd('\n');
- },
- delegate
+ string data = new[] { "Name", "Caption", "Description", "SMBIOSBIOSVersion" }.Select(prop => (string)managementObj[prop]).FirstOrDefault(info => !string.IsNullOrEmpty(info)) ?? string.Empty;
+ HardwareData["BIOS"] += !string.IsNullOrEmpty((string)managementObj["SerialNumber"]) ? $"{data}, S/N-{(string)managementObj["SerialNumber"]}\n" : $"{data}\n";
+ }
+ HardwareData["BIOS"] = HardwareData["BIOS"].TrimEnd('\n');
+ }
+
+ private void GetMotherboardInfo()
+ {
+ foreach (var managementObj in new ManagementObjectSearcher(@"root\cimv2", "select Manufacturer, Product, Version from Win32_BaseBoard", new EnumerationOptions { ReturnImmediately = true }).Get())
+ HardwareData["MotherBr"] = (string)managementObj["Manufacturer"] + (string)managementObj["Product"] + ", V" + (string)managementObj["Version"] + "\n";
+ HardwareData["MotherBr"] = HardwareData["MotherBr"].TrimEnd('\n');
+ }
+
+ private void GetProcessorInfo()
+ {
+ foreach (var managementObj in new ManagementObjectSearcher(@"root\cimv2", "select Name from Win32_Processor", new EnumerationOptions { ReturnImmediately = true }).Get())
+ HardwareData["CPU"] = (string)managementObj["Name"] + "\n";
+ HardwareData["CPU"] = HardwareData["CPU"].TrimEnd('\n');
+ }
+
+ private void GeVideoInfo()
+ {
+ foreach (var managementObj in new ManagementObjectSearcher(@"root\cimv2", "select Name, AdapterRAM from Win32_VideoController", new EnumerationOptions { ReturnImmediately = true }).Get())
+ HardwareData["GPU"] += (string)managementObj["Name"] + ", " + Convert.ToString(((uint)managementObj["AdapterRAM"] / 1024000000)) + " GB\n";
+ HardwareData["GPU"] = HardwareData["GPU"].TrimEnd('\n');
+ }
+
+ private void GetMemoryInfo()
+ {
+ foreach (var managementObj in new ManagementObjectSearcher(@"root\cimv2", "select Manufacturer, Capacity, ConfiguredClockSpeed from Win32_PhysicalMemory", new EnumerationOptions { ReturnImmediately = true }).Get())
+ HardwareData["RAM"] += (string)managementObj["Manufacturer"] + ", " + Convert.ToString((ulong)managementObj["Capacity"] / 1024000000) + " GB, " + Convert.ToString((uint)managementObj["ConfiguredClockSpeed"]) + "MHz\n";
+ HardwareData["RAM"] = HardwareData["RAM"].TrimEnd('\n');
+ }
+
+ private static void GetStorageDevices()
+ {
+ HardwareData["Storage"] = string.Empty;
+ foreach (var managementObj in new ManagementObjectSearcher(@"\\.\root\microsoft\windows\storage", "select FriendlyName, MediaType, Size, BusType from MSFT_PhysicalDisk", new EnumerationOptions { ReturnImmediately = true }).Get())
{
- СonfigurationData["Audio"] = string.Empty;
- foreach (var managementObj in new ManagementObjectSearcher(@"root\cimv2", "select Name,Caption,Description from Win32_SoundDevice", new EnumerationOptions { ReturnImmediately = true }).Get())
+ string storageType = (ushort)managementObj["MediaType"] switch
{
- if (!string.IsNullOrEmpty((string)managementObj["Name"]))
- СonfigurationData["Audio"] += (string)managementObj["Name"] + "\n";
- else if (!string.IsNullOrEmpty((string)managementObj["Caption"]))
- СonfigurationData["Audio"] += (string)managementObj["Caption"] + "\n";
- else if (!string.IsNullOrEmpty((string)managementObj["Description"]))
- СonfigurationData["Audio"] += (string)managementObj["Description"] + "\n";
- }
- СonfigurationData["Audio"] = СonfigurationData["Audio"].TrimEnd('\n');
- },
- delegate
- {
- СonfigurationData["NetAdapter"] = string.Empty;
- foreach (var managementObj in new ManagementObjectSearcher(@"root\cimv2", "select Name from Win32_NetworkAdapter where NetConnectionStatus=2 or NetConnectionStatus=7", new EnumerationOptions { ReturnImmediately = true }).Get())
- СonfigurationData["NetAdapter"] += (string)managementObj["Name"] + "\n";
- СonfigurationData["NetAdapter"] = СonfigurationData["NetAdapter"].TrimEnd('\n');
- });
+ 3 => "(HDD)",
+ 4 => "(SSD)",
+ 5 => "(SCM)",
+ _ => "(Unspecified)",
+ };
+ if (storageType == "(Unspecified)" && ((ushort)(managementObj["BusType"])) == 7) storageType = "(Media-Type)";
+ HardwareData["Storage"] += Convert.ToString((ulong)managementObj["Size"] / 1024000000) + " GB " + "[" + (string)managementObj["FriendlyName"] + "] " + storageType + "\n";
+ }
+ HardwareData["Storage"] = HardwareData["Storage"].TrimEnd('\n');
+ }
+
+ private static void GetAudioDevices()
+ {
+ HardwareData["Audio"] = string.Empty;
+ foreach (var managementObj in new ManagementObjectSearcher(@"root\cimv2", "select Name, Caption, Description from Win32_SoundDevice", new EnumerationOptions { ReturnImmediately = true }).Get())
+ HardwareData["Audio"] += $"{new[] { "Name", "Caption", "Description" }.Select(prop => (string)managementObj[prop]).FirstOrDefault(info => !string.IsNullOrEmpty(info))}\n" ?? string.Empty;
+ HardwareData["Audio"] = HardwareData["Audio"].TrimEnd('\n');
+ }
+
+ private static void GetNetworkAdapters()
+ {
+ HardwareData["NetAdapter"] = string.Empty;
+ foreach (var managementObj in new ManagementObjectSearcher(@"root\cimv2", "select Name from Win32_NetworkAdapter where NetConnectionStatus=2 or NetConnectionStatus=7", new EnumerationOptions { ReturnImmediately = true }).Get())
+ HardwareData["NetAdapter"] += (string)managementObj["Name"] + "\n";
+ HardwareData["NetAdapter"] = HardwareData["NetAdapter"].TrimEnd('\n');
}
private static bool IsNetworkAvailable()
@@ -192,43 +204,38 @@ namespace GTweak.Utilities.Configuration
catch { return false; }
}
- internal static void GetUserIpAddress()
+ internal static async void GetUserIpAddress()
{
- Task.Run(delegate
+ await Task.Run(async () =>
{
if (IsNetworkAvailable())
{
- IPMetadata ipMetadata = new IPMetadata();
-
try
{
- HttpClient client = new HttpClient { Timeout = TimeSpan.FromSeconds(5.0) };
- ipMetadata = JsonConvert.DeserializeObject<IPMetadata>(client.GetStringAsync("http://ip-api.com/json/?fields=61439").Result);
- }
- catch
- {
- СonfigurationData["UserIpAddress"] = (string)Application.Current.Resources["limited_systemInformation"];
- CurrentConnection = ConnectionStatus.Limited;
- }
- finally
- {
+ 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);
+
if (IPAddress.TryParse(ipMetadata.Ip, out _) && !string.IsNullOrEmpty(ipMetadata.Ip) && !string.IsNullOrEmpty(ipMetadata.Country))
{
CurrentConnection = ConnectionStatus.Available;
- СonfigurationData["UserIpAddress"] = $"{ipMetadata.Ip} ({ipMetadata.Country})";
+ HardwareData["UserIpAddress"] = $"{ipMetadata.Ip} ({ipMetadata.Country})";
+ return;
}
else
- {
CurrentConnection = ConnectionStatus.Block;
- СonfigurationData["UserIpAddress"] = (string)Application.Current.Resources["connection_block_systemInformation"];
- }
}
+ catch { CurrentConnection = ConnectionStatus.Limited; }
}
else
- {
CurrentConnection = ConnectionStatus.Lose;
- СonfigurationData["UserIpAddress"] = (string)Application.Current.Resources["connection_lose_systemInformation"];
- }
+
+ if (new Dictionary<ConnectionStatus, string>
+ {
+ { ConnectionStatus.Lose, "connection_lose_systemInformation" },
+ { ConnectionStatus.Block, "connection_block_systemInformation" },
+ { ConnectionStatus.Limited, "limited_systemInformation" }
+ }.TryGetValue(CurrentConnection, out string resourceKey)) { HardwareData["UserIpAddress"] = (string)Application.Current.Resources[resourceKey]; }
});
}
}
diff --git a/.Source/GTweak/Utilities/Tweaks/ConfidentialityTweaks.cs b/.Source/GTweak/Utilities/Tweaks/ConfidentialityTweaks.cs
index 232ef553..4f53045a 100644
--- a/.Source/GTweak/Utilities/Tweaks/ConfidentialityTweaks.cs
+++ b/.Source/GTweak/Utilities/Tweaks/ConfidentialityTweaks.cs
@@ -108,7 +108,7 @@ namespace GTweak.Utilities.Tweaks
confidentialityV.TglButton16.StateNA =
RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\diagnosticshub.standardcollector.service", "Start", "4");
- confidentialityV.TglButton17.StateNA = SystemDiagnostics.СonfigurationData["GPU"].ToLower().Contains("nvidia")
+ confidentialityV.TglButton17.StateNA = SystemDiagnostics.HardwareData["GPU"].ToLower().Contains("nvidia")
&& (RegistryHelp.CheckValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\NvTelemetryContainer", "Start", "4") || IsTaskEnabled(NvidiaTasks));
confidentialityV.TglButton18.StateNA =
diff --git a/.Source/GTweak/View/DataSystemView.xaml.cs b/.Source/GTweak/View/DataSystemView.xaml.cs
index 879d4955..c9df2d03 100644
--- a/.Source/GTweak/View/DataSystemView.xaml.cs
+++ b/.Source/GTweak/View/DataSystemView.xaml.cs
@@ -34,7 +34,7 @@ namespace GTweak.View
{ SystemDiagnostics.ConnectionStatus.Limited, "limited_systemInformation" }
}.TryGetValue(SystemDiagnostics.CurrentConnection, out string resourceKey))
{
- SystemDiagnostics.СonfigurationData["UserIpAddress"] = (string)FindResource(resourceKey);
+ SystemDiagnostics.HardwareData["UserIpAddress"] = (string)FindResource(resourceKey);
DataContext = new DataSystemVM();
}
};