Support Always Run As Administrator

Flow.Launcher.Infrastructure/UserSettings/Settings.cs

@@ -372,6 +372,8 @@ public bool HideNotifyIcon
         public bool LeaveCmdOpen { get; set; }
         public bool HideWhenDeactivated { get; set; } = true;
 
+        public bool AlwaysRunAsAdministrator { get; set; } = false;
+
         public bool SearchQueryResultsWithDelay { get; set; }
         public int SearchDelayTime { get; set; } = 150;
 

Flow.Launcher.Infrastructure/Win32Helper.cs

@@ -5,6 +5,7 @@
 using System.Globalization;
 using System.Linq;
 using System.Runtime.InteropServices;
+using System.Security.Principal;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
@@ -38,7 +39,7 @@
         {
             var cloaked = cloak ? 1 : 0;
 
             return PInvoke.DwmSetWindowAttribute(
                 GetWindowHandle(window),
                 DWMWINDOWATTRIBUTE.DWMWA_CLOAK,
                 &cloaked,
@@ -50,12 +51,12 @@
             var backdropType = backdrop switch
             {
                 BackdropTypes.Acrylic => DWM_SYSTEMBACKDROP_TYPE.DWMSBT_TRANSIENTWINDOW,
                 BackdropTypes.Mica => DWM_SYSTEMBACKDROP_TYPE.DWMSBT_MAINWINDOW,
                 BackdropTypes.MicaAlt => DWM_SYSTEMBACKDROP_TYPE.DWMSBT_TABBEDWINDOW,
                 _ => DWM_SYSTEMBACKDROP_TYPE.DWMSBT_AUTO
             };
 
             return PInvoke.DwmSetWindowAttribute(
                 GetWindowHandle(window),
                 DWMWINDOWATTRIBUTE.DWMWA_SYSTEMBACKDROP_TYPE,
                 &backdropType,
@@ -753,5 +754,16 @@
         }
 
         #endregion
+
+        #region Administrator Mode
+
+        public static bool IsAdministrator()
+        {
+            using var identity = WindowsIdentity.GetCurrent();
+            var principal = new WindowsPrincipal(identity);
+            return principal.IsInRole(WindowsBuiltInRole.Administrator);
+        }
+
+        #endregion
     }
 }

Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs

@@ -33,6 +33,12 @@ public interface IPublicAPI
         /// </summary>
         void RestartApp();
 
+        /// <summary>
+        /// Restart Flow Launcher with arguments
+        /// </summary>
+        /// <param name="arguments">Application start arguments</param>
+        void RestartApp(string arguments);
+
         /// <summary>
         /// Run a shell command
         /// </summary>

Flow.Launcher/App.xaml.cs

@@ -236,7 +236,7 @@ private void AutoStartup()
             {
                 try
                 {
-                    Helper.AutoStartup.CheckIsEnabled(_settings.UseLogonTaskForStartup);
+                    Helper.AutoStartup.CheckIsEnabled(_settings.UseLogonTaskForStartup, _settings.AlwaysRunAsAdministrator);
                 }
                 catch (Exception e)
                 {

Flow.Launcher/Helper/AutoStartup.cs

@@ -17,18 +17,18 @@ public class AutoStartup
     private const string LogonTaskName = $"{Constant.FlowLauncher} Startup";
     private const string LogonTaskDesc = $"{Constant.FlowLauncher} Auto Startup";
 
-    public static void CheckIsEnabled(bool useLogonTaskForStartup)
+    public static void CheckIsEnabled(bool useLogonTaskForStartup, bool alwaysRunAsAdministrator)
     {
         // We need to check both because if both of them are enabled,
         // Hide Flow Launcher on startup will not work since the later one will trigger main window show event
-        var logonTaskEnabled = CheckLogonTask();
+        var logonTaskEnabled = CheckLogonTask(alwaysRunAsAdministrator);
         var registryEnabled = CheckRegistry();
         if (useLogonTaskForStartup)
         {
             // Enable logon task
             if (!logonTaskEnabled)
             {
-                Enable(true);
+                Enable(true, alwaysRunAsAdministrator);
             }
             // Disable registry
             if (registryEnabled)
@@ -41,7 +41,7 @@ public static void CheckIsEnabled(bool useLogonTaskForStartup)
             // Enable registry
             if (!registryEnabled)
             {
-                Enable(false);
+                Enable(false, alwaysRunAsAdministrator);
             }
             // Disable logon task
             if (logonTaskEnabled)
@@ -51,7 +51,7 @@ public static void CheckIsEnabled(bool useLogonTaskForStartup)
         }
     }
 
-    private static bool CheckLogonTask()
+    private static bool CheckLogonTask(bool alwaysRunAsAdministrator)
     {
         using var taskService = new TaskService();
         var task = taskService.RootFolder.AllTasks.FirstOrDefault(t => t.Name == LogonTaskName);
@@ -67,7 +67,7 @@ private static bool CheckLogonTask()
                     if (!action.Equals(Constant.ExecutablePath, StringComparison.OrdinalIgnoreCase))
                     {
                         UnscheduleLogonTask();
-                        ScheduleLogonTask();
+                        ScheduleLogonTask(alwaysRunAsAdministrator);
                     }
                 }
 
@@ -117,16 +117,17 @@ public static void DisableViaLogonTaskAndRegistry()
         Disable(false);
     }
 
-    public static void ChangeToViaLogonTask()
+    public static void ChangeToViaLogonTask(bool alwaysRunAsAdministrator)
     {
         Disable(false);
-        Enable(true);
+        Enable(true, alwaysRunAsAdministrator);
     }
 
     public static void ChangeToViaRegistry()
     {
         Disable(true);
-        Enable(false);
+        // We do not need to use alwaysRunAsAdministrator for registry, so we just set false here
+        Enable(false, false);
     }
 
     private static void Disable(bool logonTask)
@@ -149,13 +150,13 @@ private static void Disable(bool logonTask)
         }
     }
 
-    private static void Enable(bool logonTask)
+    private static void Enable(bool logonTask, bool alwaysRunAsAdministrator)
     {
         try
         {
             if (logonTask)
             {
-                ScheduleLogonTask();
+                ScheduleLogonTask(alwaysRunAsAdministrator);
             }
             else
             {
@@ -169,14 +170,15 @@ private static void Enable(bool logonTask)
         }
     }
 
-    private static bool ScheduleLogonTask()
+    private static bool ScheduleLogonTask(bool alwaysRunAsAdministrator)
     {
         using var td = TaskService.Instance.NewTask();
         td.RegistrationInfo.Description = LogonTaskDesc;
         td.Triggers.Add(new LogonTrigger { UserId = WindowsIdentity.GetCurrent().Name, Delay = TimeSpan.FromSeconds(2) });
         td.Actions.Add(Constant.ExecutablePath);
 
-        if (IsCurrentUserIsAdmin())
+        // Only if the app is running as administrator, we can set the run level to highest
+        if (Win32Helper.IsAdministrator() && alwaysRunAsAdministrator)
         {
             td.Principal.RunLevel = TaskRunLevel.Highest;
         }
@@ -212,13 +214,6 @@ private static bool UnscheduleLogonTask()
         }
     }
 
-    private static bool IsCurrentUserIsAdmin()
-    {
-        var identity = WindowsIdentity.GetCurrent();
-        var principal = new WindowsPrincipal(identity);
-        return principal.IsInRole(WindowsBuiltInRole.Administrator);
-    }
-
     private static bool UnscheduleRegistry()
     {
         using var key = Registry.CurrentUser.OpenSubKey(StartupPath, true);

Flow.Launcher/Languages/en.xaml

@@ -46,6 +46,7 @@
     <system:String x:Key="PositionReset">Position Reset</system:String>
     <system:String x:Key="PositionResetToolTip">Reset search window position</system:String>
     <system:String x:Key="queryTextBoxPlaceholder">Type here to search</system:String>
+    <system:String x:Key="admin">(Admin)</system:String>
 
     <!--  Setting General  -->
     <system:String x:Key="flowlauncher_settings">Settings</system:String>
@@ -131,6 +132,10 @@
     <system:String x:Key="historyResultsForHomePage">Show History Results in Home Page</system:String>
     <system:String x:Key="historyResultsCountForHomePage">Maximum History Results Shown in Home Page</system:String>
     <system:String x:Key="homeToggleBoxToolTip">This can only be edited if plugin supports Home feature and Home Page is enabled.</system:String>
+    <system:String x:Key="alwaysRunAsAdministrator">Always run as administrator</system:String>
+    <system:String x:Key="alwaysRunAsAdministratorToolTip">Run Flow Launcher as administrator on system startup</system:String>
+    <system:String x:Key="runAsAdministratorChange">Administrator Mode Change</system:String>
+    <system:String x:Key="runAsAdministratorChangeAndRestart">Do you want to restart to apply administrator mode change?</system:String>
 
     <!--  Setting Plugin  -->
     <system:String x:Key="searchplugin">Search Plugin</system:String>

Flow.Launcher/MainWindow.xaml.cs

@@ -595,9 +595,13 @@ private void SoundPlay()
 
         private void InitializeNotifyIcon()
         {
+            var text = Win32Helper.IsAdministrator() ?
+                Constant.FlowLauncherFullName + " " + App.API.GetTranslation("admin") :
+                Constant.FlowLauncherFullName;
+
             _notifyIcon = new NotifyIcon
             {
-                Text = Constant.FlowLauncherFullName,
+                Text = text,
                 Icon = Constant.Version == "1.0.0" ? Properties.Resources.dev : Properties.Resources.app,
                 Visible = !_settings.HideNotifyIcon
             };

Flow.Launcher/PublicAPIInstance.cs

@@ -11,7 +11,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
-using System.Windows.Input;
 using System.Windows.Media;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Flow.Launcher.Core;
@@ -73,8 +72,10 @@ public void ChangeQuery(string query, bool requery = false)
             _mainVM.ChangeQueryText(query, requery);
         }
 
+        public void RestartApp() => RestartApp(null);
+
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "VSTHRD100:Avoid async void methods", Justification = "<Pending>")]
-        public async void RestartApp()
+        public async void RestartApp(string arguments)
         {
             _mainVM.Hide();
 
@@ -89,7 +90,7 @@ public async void RestartApp()
             // Restart requires Squirrel's Update.exe to be present in the parent folder, 
             // it is only published from the project's release pipeline. When debugging without it,
             // the project may not restart or just terminates. This is expected.
-            UpdateManager.RestartApp(Constant.ApplicationFileName);
+            UpdateManager.RestartApp(Constant.ApplicationFileName, arguments);
         }
 
         public void ShowMainWindow() => _mainVM.Show();

Flow.Launcher/Resources/Pages/WelcomePage5.xaml.cs

@@ -45,7 +45,7 @@ private void ChangeAutoStartup(bool value)
                 {
                     if (Settings.UseLogonTaskForStartup)
                     {
-                        AutoStartup.ChangeToViaLogonTask();
+                        AutoStartup.ChangeToViaLogonTask(Settings.AlwaysRunAsAdministrator);
                     }
                     else
                     {

Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Windows;
 using System.Windows.Forms;
 using CommunityToolkit.Mvvm.Input;
 using Flow.Launcher.Core;
@@ -22,6 +23,8 @@ public partial class SettingsPaneGeneralViewModel : BaseModel
     private readonly Portable _portable;
     private readonly Internationalization _translater;
 
+    private static readonly bool _isAdministrator = Win32Helper.IsAdministrator();
+
     public SettingsPaneGeneralViewModel(Settings settings, Updater updater, Portable portable, Internationalization translater)
     {
         Settings = settings;
@@ -41,6 +44,8 @@ public bool StartFlowLauncherOnSystemStartup
         get => Settings.StartFlowLauncherOnSystemStartup;
         set
         {
+            if (Settings.StartFlowLauncherOnSystemStartup == value) return;
+
             Settings.StartFlowLauncherOnSystemStartup = value;
 
             try
@@ -49,7 +54,7 @@ public bool StartFlowLauncherOnSystemStartup
                 {
                     if (UseLogonTaskForStartup)
                     {
-                        AutoStartup.ChangeToViaLogonTask();
+                        AutoStartup.ChangeToViaLogonTask(AlwaysRunAsAdministrator);
                     }
                     else
                     {
@@ -65,6 +70,13 @@ public bool StartFlowLauncherOnSystemStartup
             {
                 App.API.ShowMsg(App.API.GetTranslation("setAutoStartFailed"), e.Message);
             }
+
+            // If we have enabled logon task startup, we need to check if we need to restart the app
+            // even if we encounter an error while setting the startup method
+            if (value && UseLogonTaskForStartup)
+            {
+                CheckAdminChangeAndAskForRestart();
+            }
         }
     }
 
@@ -73,6 +85,8 @@ public bool UseLogonTaskForStartup
         get => Settings.UseLogonTaskForStartup;
         set
         {
+            if (UseLogonTaskForStartup == value) return;
+
             Settings.UseLogonTaskForStartup = value;
 
             if (StartFlowLauncherOnSystemStartup)
@@ -81,7 +95,7 @@ public bool UseLogonTaskForStartup
                 {
                     if (value)
                     {
-                        AutoStartup.ChangeToViaLogonTask();
+                        AutoStartup.ChangeToViaLogonTask(AlwaysRunAsAdministrator);
                     }
                     else
                     {
@@ -92,10 +106,59 @@ public bool UseLogonTaskForStartup
                 {
                     App.API.ShowMsg(App.API.GetTranslation("setAutoStartFailed"), e.Message);
                 }
-            } 
+            }
+
+            // If we have enabled logon task startup, we need to check if we need to restart the app
+            // even if we encounter an error while setting the startup method
+            if (StartFlowLauncherOnSystemStartup && value)
+            {
+                CheckAdminChangeAndAskForRestart();
+            }
+        }
+    }
+
+    public bool AlwaysRunAsAdministrator
+    {
+        get => Settings.AlwaysRunAsAdministrator;
+        set
+        {
+            if (AlwaysRunAsAdministrator == value) return;
+
+            Settings.AlwaysRunAsAdministrator = value;
+
+            if (StartFlowLauncherOnSystemStartup && UseLogonTaskForStartup)
+            {
+                try
+                {
+                    AutoStartup.ChangeToViaLogonTask(value);
+                }
+                catch (Exception e)
+                {
+                    App.API.ShowMsg(App.API.GetTranslation("setAutoStartFailed"), e.Message);
+                }
+
+                // If we have enabled logon task startup, we need to check if we need to restart the app
+                // even if we encounter an error while setting the startup method
+                CheckAdminChangeAndAskForRestart();
+            }
         }
     }
 
+    private void CheckAdminChangeAndAskForRestart()
+    {
+        if ((AlwaysRunAsAdministrator && !_isAdministrator) || // Change from non-admin to admin
+            (!AlwaysRunAsAdministrator && _isAdministrator)) // Change from admin to non-admin
+        {
+            if (App.API.ShowMsgBox(
+                App.API.GetTranslation("runAsAdministratorChangeAndRestart"),
+                App.API.GetTranslation("runAsAdministratorChange"),
+                MessageBoxButton.YesNo) == MessageBoxResult.Yes)
+            {
+                App.API.RestartApp(AlwaysRunAsAdministrator ? "runas" : string.Empty);
+            }
+        }  
+    }
+
     public List<SearchWindowScreenData> SearchWindowScreens { get; } =
         DropdownDataGeneric<SearchWindowScreens>.GetValues<SearchWindowScreenData>("SearchWindowScreen");