Skip to content

Portable Tool for an Ideal Windows Setup

-self-determination of the method

Greedekscb01afbe2d1e
diff --git a/.Source/GTweak/Utilities/Helpers/RegistryHelp.cs b/.Source/GTweak/Utilities/Helpers/RegistryHelp.cs
index 73078e7e..2b1ff3ee 100644
--- a/.Source/GTweak/Utilities/Helpers/RegistryHelp.cs
+++ b/.Source/GTweak/Utilities/Helpers/RegistryHelp.cs
@@ -133,15 +133,22 @@ namespace GTweak.Utilities.Helpers
catch { return defaultValue; }
}
- internal static HashSet<string> GetSubKeyNames(RegistryKey baseKey, string subKeyPath)
+ internal static T GetSubKeyNames<T>(RegistryKey baseKey, string subKeyPath) where T : ICollection<string>, new()
{
try
{
using RegistryKey key = baseKey.OpenSubKey(subKeyPath);
- return key != null ? new HashSet<string>(key.GetSubKeyNames(), StringComparer.OrdinalIgnoreCase): new HashSet<string>();
+ if (key == null) return new T();
+
+ T result = new T();
+ foreach (var name in key.GetSubKeyNames())
+ result.Add(name);
+ return result;
+ }
+ catch
+ {
+ return new T();
}
- catch { return new HashSet<string>(); }
}
-
}
}
diff --git a/.Source/GTweak/Utilities/Tweaks/UninstallingPakages.cs b/.Source/GTweak/Utilities/Tweaks/UninstallingPakages.cs
index 3b7a62c1..7f206fe7 100644
--- a/.Source/GTweak/Utilities/Tweaks/UninstallingPakages.cs
+++ b/.Source/GTweak/Utilities/Tweaks/UninstallingPakages.cs
@@ -12,7 +12,7 @@ namespace GTweak.Utilities.Tweaks
{
internal sealed class UninstallingPakages : TaskSchedulerManager
{
- internal static HashSet<string> InstalledPackages = RegistryHelp.GetSubKeyNames(Registry.CurrentUser, @"Software\Classes\Local Settings\Software\Microsoft\Windows\CurrentVersion\AppModel\Repository\Packages");
+ internal static HashSet<string> InstalledPackages = new HashSet<string>();
internal static bool IsOneDriveInstalled => File.Exists(Environment.ExpandEnvironmentVariables(@"%userprofile%\AppData\Local\Microsoft\OneDrive\OneDrive.exe"));
private static bool isLocalAccount = false;
@@ -79,7 +79,7 @@ namespace GTweak.Utilities.Tweaks
return false;
}
- internal void LoadInstalledPackages() => InstalledPackages = RegistryHelp.GetSubKeyNames(Registry.CurrentUser, @"Software\Classes\Local Settings\Software\Microsoft\Windows\CurrentVersion\AppModel\Repository\Packages");
+ internal void LoadInstalledPackages() => InstalledPackages = RegistryHelp.GetSubKeyNames<HashSet<string>>(Registry.CurrentUser, @"Software\Classes\Local Settings\Software\Microsoft\Windows\CurrentVersion\AppModel\Repository\Packages");
internal static Task DeletingPackage(string packageName, bool removeWebViewFlag = false)
{