Improvements to UAC caching (relates to #3248)

Author: marticliment

src/UniGetUI.PackageEngine.Operations/PackageOperations.cs

@@ -96,11 +96,12 @@ protected sealed override void PrepareProcessStartInfo()
                 admin = true;
                 if (Settings.Get("DoCacheAdminRights") || Settings.Get("DoCacheAdminRightsForBatches"))
                 {
-                    CoreTools.CacheUACForCurrentProcess().GetAwaiter().GetResult();
+                    RequestCachingOfUACPrompt();
                 }
 
                 if (Package.Manager is WinGet)
                 {
+                    // Change WinGet's TEMP folder location, to prevent ACL corruption
                     string WinGetTemp = Path.Join(Path.GetTempPath(), "UniGetUI", "ElevatedWinGetTemp");
                     process.StartInfo.Environment["TEMP"] = WinGetTemp;
                     process.StartInfo.Environment["TMP"] = WinGetTemp;

src/UniGetUI.PackageEngine.Operations/ProcessOperation.cs

@@ -1,7 +1,9 @@
 using System.Diagnostics;
 using System.Text;
 using Windows.System;
+using UniGetUI.Core.Data;
 using UniGetUI.Core.Logging;
+using UniGetUI.Core.Tools;
 using UniGetUI.PackageEngine.Enums;
 
 namespace UniGetUI.PackageOperations;
@@ -57,6 +59,12 @@ protected AbstractProcessOperation(bool queue_enabled, AbstractOperation? req) :
         };
     }
 
+    private bool _requiresUACCache;
+    protected void RequestCachingOfUACPrompt()
+    {
+        _requiresUACCache = true;
+    }
+
     protected override async Task<OperationVeredict> PerformOperation()
     {
         if(process.StartInfo.UseShellExecute) throw new InvalidOperationException("UseShellExecute must be set to false");
@@ -71,6 +79,12 @@ protected override async Task<OperationVeredict> PerformOperation()
         Line($" - Arguments: \"{process.StartInfo.Arguments.Trim()}\"", LineType.VerboseDetails);
         Line($"Start Time: \"{DateTime.Now}\"", LineType.VerboseDetails);
 
+        if (_requiresUACCache)
+        {
+            _requiresUACCache = false;
+            await CoreTools.CacheUACForCurrentProcess();
+        }
+
         process.Start();
         // process.BeginOutputReadLine();
         try { process.BeginErrorReadLine(); }

src/UniGetUI/Controls/OperationWidgets/OperationControl.cs

@@ -111,24 +111,11 @@ private async void OnOperationSucceeded(object? sender, EventArgs e)
         // Success notification
         ShowSuccessToast();
 
-        // Handle UAC for batches
-        if (Settings.Get("DoCacheAdminRightsForBatches"))
-        {
-            bool isOpRunning = false;
-            foreach (var op in MainApp.Operations._operationList)
-            {
-                if (op.Operation.Status is OperationStatus.Running or OperationStatus.InQueue)
-                {
-                    isOpRunning = true;
-                    break;
-                }
-            }
-            if(!isOpRunning) await CoreTools.ResetUACForCurrentProcess();
-        }
-
         // Clean succesful operation from list
-        if(!Settings.Get("MaintainSuccessfulInstalls") && Operation is not DownloadOperation)
+        if (!Settings.Get("MaintainSuccessfulInstalls") && Operation is not DownloadOperation)
+        {
             await TimeoutAndClose();
+        }
     }
 
     private void OnOperationFailed(object? sender, EventArgs e)
@@ -160,6 +147,16 @@ private async void OnOperationFinished(object? sender, EventArgs e)
         rawOutput.Add("");
         rawOutput.Add("");
 
+        // Handle UAC for batches
+        if (Settings.Get("DoCacheAdminRightsForBatches"))
+        {
+            if (!MainApp.Operations.AreThereRunningOperations())
+            {
+                Logger.Info("Clearing UAC prompt since there are no remaining operations");
+                await CoreTools.ResetUACForCurrentProcess();
+            }
+        }
+
         // Handle newly created shortcuts
         if(Settings.Get("AskToDeleteNewDesktopShortcuts")
             && !MainApp.Operations.AreThereRunningOperations()