From 3260faba985a595b2df48c0541ebb9bef6aea88e Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Fri, 31 Jan 2025 22:01:29 +0800
Subject: [PATCH 01/28] Add support for changing startup to logon task for
 faster startup experience

---
 .../UserSettings/Settings.cs                  |   1 +
 Flow.Launcher/App.xaml.cs                     |   2 +-
 Flow.Launcher/Flow.Launcher.csproj            |   1 +
 Flow.Launcher/Helper/AutoStartup.cs           | 115 +++++++++++++++++-
 .../SettingsPaneGeneralViewModel.cs           |  34 +++++-
 .../Views/SettingsPaneGeneral.xaml            |   7 ++
 6 files changed, 151 insertions(+), 9 deletions(-)

diff --git a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
index c412fb32f..81895fdcc 100644
--- a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
+++ b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
@@ -238,6 +238,7 @@ namespace Flow.Launcher.Infrastructure.UserSettings
         public bool EnableUpdateLog { get; set; }
 
         public bool StartFlowLauncherOnSystemStartup { get; set; } = false;
+        public bool UseLogonTaskForStartup { get; set; } = false;
         public bool HideOnStartup { get; set; } = true;
         bool _hideNotifyIcon { get; set; }
         public bool HideNotifyIcon
diff --git a/Flow.Launcher/App.xaml.cs b/Flow.Launcher/App.xaml.cs
index 4d1adc6cd..38f846d92 100644
--- a/Flow.Launcher/App.xaml.cs
+++ b/Flow.Launcher/App.xaml.cs
@@ -119,7 +119,7 @@ namespace Flow.Launcher
             {
                 try
                 {
-                    Helper.AutoStartup.Enable();
+                    Helper.AutoStartup.Enable(_settings.UseLogonTaskForStartup);
                 }
                 catch (Exception e)
                 {
diff --git a/Flow.Launcher/Flow.Launcher.csproj b/Flow.Launcher/Flow.Launcher.csproj
index 788beddfb..570785be7 100644
--- a/Flow.Launcher/Flow.Launcher.csproj
+++ b/Flow.Launcher/Flow.Launcher.csproj
@@ -100,6 +100,7 @@
     <PackageReference Include="NHotkey.Wpf" Version="3.0.0" />
     <PackageReference Include="PropertyChanged.Fody" Version="3.4.0" />
     <PackageReference Include="SemanticVersioning" Version="3.0.0" />
+    <PackageReference Include="TaskScheduler" Version="2.11.0" />
     <PackageReference Include="VirtualizingWrapPanel" Version="2.1.0" />
   </ItemGroup>
 
diff --git a/Flow.Launcher/Helper/AutoStartup.cs b/Flow.Launcher/Helper/AutoStartup.cs
index 4bff30caf..116520ecf 100644
--- a/Flow.Launcher/Helper/AutoStartup.cs
+++ b/Flow.Launcher/Helper/AutoStartup.cs
@@ -1,18 +1,31 @@
 using System;
+using System.IO;
+using System.Linq;
+using System.Security.Principal;
 using Flow.Launcher.Infrastructure;
 using Flow.Launcher.Infrastructure.Logger;
 using Microsoft.Win32;
+using Microsoft.Win32.TaskScheduler;
 
 namespace Flow.Launcher.Helper;
 
 public class AutoStartup
 {
     private const string StartupPath = @"SOFTWARE\Microsoft\Windows\CurrentVersion\Run";
+    private const string LogonTaskName = $"{Constant.FlowLauncher} Startup";
+    private const string LogonTaskDesc = $"{Constant.FlowLauncher} Auto Startup";
 
     public static bool IsEnabled
     {
         get
         {
+            // Check if logon task is enabled
+            if (CheckLogonTask())
+            {
+                return true;
+            }
+
+            // Check if registry is enabled
             try
             {
                 using var key = Registry.CurrentUser.OpenSubKey(StartupPath, true);
@@ -28,12 +41,45 @@ public class AutoStartup
         }
     }
 
-    public static void Disable()
+    private static bool CheckLogonTask()
+    {
+        using var taskService = new TaskService();
+        var task = taskService.RootFolder.AllTasks.FirstOrDefault(t => t.Name == LogonTaskName);
+        if (task != null)
+        {
+            try
+            {
+                // Check if the action is the same as the current executable path
+                var action = task.Definition.Actions.FirstOrDefault()!.ToString().Trim();
+                if (!Constant.ExecutablePath.Equals(action, StringComparison.OrdinalIgnoreCase) && !File.Exists(action))
+                {
+                    UnscheduleLogonTask();
+                    ScheduleLogonTask();
+                }
+            }
+            catch (Exception)
+            {
+                Log.Error("AutoStartup", "Failed to check logon task");
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    public static void Disable(bool logonTask)
     {
         try
         {
-            using var key = Registry.CurrentUser.OpenSubKey(StartupPath, true);
-            key?.DeleteValue(Constant.FlowLauncher, false);
+            if (logonTask)
+            {
+                UnscheduleLogonTask();
+            }
+            else
+            {
+                using var key = Registry.CurrentUser.OpenSubKey(StartupPath, true);
+                key?.DeleteValue(Constant.FlowLauncher, false);
+            }
         }
         catch (Exception e)
         {
@@ -42,12 +88,19 @@ public class AutoStartup
         }
     }
 
-    internal static void Enable()
+    internal static void Enable(bool logonTask)
     {
         try
         {
-            using var key = Registry.CurrentUser.OpenSubKey(StartupPath, true);
-            key?.SetValue(Constant.FlowLauncher, $"\"{Constant.ExecutablePath}\"");
+            if (logonTask)
+            {
+                ScheduleLogonTask();
+            }
+            else
+            {
+                using var key = Registry.CurrentUser.OpenSubKey(StartupPath, true);
+                key?.SetValue(Constant.FlowLauncher, $"\"{Constant.ExecutablePath}\"");
+            }
         }
         catch (Exception e)
         {
@@ -55,4 +108,54 @@ public class AutoStartup
             throw;
         }
     }
+
+    private static bool ScheduleLogonTask()
+    {
+        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())
+        {
+            td.Principal.RunLevel = TaskRunLevel.Highest;
+        }
+
+        td.Settings.StopIfGoingOnBatteries = false;
+        td.Settings.DisallowStartIfOnBatteries = false;
+        td.Settings.ExecutionTimeLimit = TimeSpan.Zero;
+
+        try
+        {
+            TaskService.Instance.RootFolder.RegisterTaskDefinition(LogonTaskName, td);
+            return true;
+        }
+        catch (Exception)
+        {
+            Log.Error("AutoStartup", "Failed to schedule logon task");
+            return false;
+        }
+    }
+
+    private static bool UnscheduleLogonTask()
+    {
+        using var taskService = new TaskService();
+        try
+        {
+            taskService.RootFolder.DeleteTask(LogonTaskName);
+            return true;
+        }
+        catch (Exception)
+        {
+            Log.Error("AutoStartup", "Failed to unschedule logon task");
+            return false;
+        }
+    }
+
+    private static bool IsCurrentUserIsAdmin()
+    {
+        var identity = WindowsIdentity.GetCurrent();
+        var principal = new WindowsPrincipal(identity);
+        return principal.IsInRole(WindowsBuiltInRole.Administrator);
+    }
 }
diff --git a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs
index 3d94355e6..0aca761a0 100644
--- a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs
+++ b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs
@@ -42,9 +42,16 @@ public partial class SettingsPaneGeneralViewModel : BaseModel
             try
             {
                 if (value)
-                    AutoStartup.Enable();
+                {
+                    // Enable either registry or task scheduler
+                    AutoStartup.Enable(UseLogonTaskForStartup);
+                }
                 else
-                    AutoStartup.Disable();
+                {
+                    // Disable both registry and task scheduler
+                    AutoStartup.Disable(true);
+                    AutoStartup.Disable(false);
+                }  
             }
             catch (Exception e)
             {
@@ -54,6 +61,29 @@ public partial class SettingsPaneGeneralViewModel : BaseModel
         }
     }
 
+    public bool UseLogonTaskForStartup
+    {
+        get => Settings.UseLogonTaskForStartup;
+        set
+        {
+            Settings.UseLogonTaskForStartup = value;
+
+            if (StartFlowLauncherOnSystemStartup)
+            {
+                try
+                {
+                    // Disable and enable to update the startup method
+                    AutoStartup.Disable(!UseLogonTaskForStartup);
+                    AutoStartup.Enable(UseLogonTaskForStartup);
+                }
+                catch (Exception e)
+                {
+                    Notification.Show(InternationalizationManager.Instance.GetTranslation("setAutoStartFailed"),
+                        e.Message);
+                }
+            } 
+        }
+    }
 
     public List<SearchWindowScreenData> SearchWindowScreens { get; } =
         DropdownDataGeneric<SearchWindowScreens>.GetValues<SearchWindowScreenData>("SearchWindowScreen");
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
index 30e065b16..f57eba654 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
@@ -36,6 +36,13 @@
                     OnContent="{DynamicResource enable}" />
             </cc:Card>
 
+            <cc:Card Title="Use logon task instead of startup entry for faster startup experience" Icon="&#xe8fc;">
+                <ui:ToggleSwitch
+                    IsOn="{Binding UseLogonTaskForStartup}"
+                    OffContent="{DynamicResource disable}"
+                    OnContent="{DynamicResource enable}" />
+            </cc:Card>
+
             <cc:Card
                 Title="{DynamicResource hideOnStartup}"
                 Icon="&#xed1a;"

From 3f93d184c594cd7af40b28d000abad2f581387dc Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Fri, 31 Jan 2025 22:06:53 +0800
Subject: [PATCH 02/28] Move string to resources

---
 Flow.Launcher/Languages/en.xaml                           | 1 +
 Flow.Launcher/Languages/zh-cn.xaml                        | 8 ++++++--
 Flow.Launcher/Languages/zh-tw.xaml                        | 8 ++++++--
 Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml | 2 +-
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index 4c465d61f..8e8c9abef 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -46,6 +46,7 @@
     <system:String x:Key="portableMode">Portable Mode</system:String>
     <system:String x:Key="portableModeToolTIp">Store all settings and user data in one folder (Useful when used with removable drives or cloud services).</system:String>
     <system:String x:Key="startFlowLauncherOnSystemStartup">Start Flow Launcher on system startup</system:String>
+    <system:String x:Key="useLogonTaskForStartup">Use logon task instead of startup entry for faster startup experience</system:String>
     <system:String x:Key="setAutoStartFailed">Error setting launch on startup</system:String>
     <system:String x:Key="hideFlowLauncherWhenLoseFocus">Hide Flow Launcher when focus is lost</system:String>
     <system:String x:Key="dontPromptUpdateMsg">Do not show new version notifications</system:String>
diff --git a/Flow.Launcher/Languages/zh-cn.xaml b/Flow.Launcher/Languages/zh-cn.xaml
index 681c715fb..d2d1044af 100644
--- a/Flow.Launcher/Languages/zh-cn.xaml
+++ b/Flow.Launcher/Languages/zh-cn.xaml
@@ -1,5 +1,8 @@
-<?xml version="1.0"?>
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:system="clr-namespace:System;assembly=mscorlib">
+<?xml version="1.0" ?>
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:system="clr-namespace:System;assembly=mscorlib">
     <!--  Startup  -->
     <system:String x:Key="runtimePluginInstalledChooseRuntimePrompt">
         Flow 检测到您已安装 {0} 个插件，需要 {1} 才能运行。是否要下载 {1}？
@@ -44,6 +47,7 @@
     <system:String x:Key="portableMode">便携模式</system:String>
     <system:String x:Key="portableModeToolTIp">将所有设置和用户数据存储在一个文件夹中 (可用于可移除驱动器或云服务)。</system:String>
     <system:String x:Key="startFlowLauncherOnSystemStartup">开机自启</system:String>
+    <system:String x:Key="useLogonTaskForStartup">使用登录任务而非启动项以更快自启</system:String>
     <system:String x:Key="setAutoStartFailed">设置开机自启时出错</system:String>
     <system:String x:Key="hideFlowLauncherWhenLoseFocus">失去焦点时自动隐藏 Flow Launcher</system:String>
     <system:String x:Key="dontPromptUpdateMsg">不显示新版本提示</system:String>
diff --git a/Flow.Launcher/Languages/zh-tw.xaml b/Flow.Launcher/Languages/zh-tw.xaml
index 44be5257b..b5aa53377 100644
--- a/Flow.Launcher/Languages/zh-tw.xaml
+++ b/Flow.Launcher/Languages/zh-tw.xaml
@@ -1,5 +1,8 @@
-<?xml version="1.0"?>
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:system="clr-namespace:System;assembly=mscorlib">
+<?xml version="1.0" ?>
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:system="clr-namespace:System;assembly=mscorlib">
     <!--  Startup  -->
     <system:String x:Key="runtimePluginInstalledChooseRuntimePrompt">
         Flow detected you have installed {0} plugins, which will require {1} to run. Would you like to download {1}?
@@ -44,6 +47,7 @@
     <system:String x:Key="portableMode">便攜模式</system:String>
     <system:String x:Key="portableModeToolTIp">將所有設定和使用者資料存儲在一個資料夾中（當與可移動磁碟或雲服務一起使用時很有用）。</system:String>
     <system:String x:Key="startFlowLauncherOnSystemStartup">開機時啟動</system:String>
+    <system:String x:Key="useLogonTaskForStartup">使用登錄任務而非啟動項以更快自啟</system:String>
     <system:String x:Key="setAutoStartFailed">Error setting launch on startup</system:String>
     <system:String x:Key="hideFlowLauncherWhenLoseFocus">失去焦點時自動隱藏 Flow Launcher</system:String>
     <system:String x:Key="dontPromptUpdateMsg">不顯示新版本提示</system:String>
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
index f57eba654..e52614e74 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
@@ -36,7 +36,7 @@
                     OnContent="{DynamicResource enable}" />
             </cc:Card>
 
-            <cc:Card Title="Use logon task instead of startup entry for faster startup experience" Icon="&#xe8fc;">
+            <cc:Card Title="{DynamicResource useLogonTaskForStartup}">
                 <ui:ToggleSwitch
                     IsOn="{Binding UseLogonTaskForStartup}"
                     OffContent="{DynamicResource disable}"

From 3d9a6b28d0d5789594e4d5479c0beb921ea1fe19 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Fri, 31 Jan 2025 22:22:00 +0800
Subject: [PATCH 03/28] Fix issue when checking logon task

---
 Flow.Launcher/Helper/AutoStartup.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Flow.Launcher/Helper/AutoStartup.cs b/Flow.Launcher/Helper/AutoStartup.cs
index 116520ecf..79466f1fb 100644
--- a/Flow.Launcher/Helper/AutoStartup.cs
+++ b/Flow.Launcher/Helper/AutoStartup.cs
@@ -56,15 +56,16 @@ public class AutoStartup
                     UnscheduleLogonTask();
                     ScheduleLogonTask();
                 }
+
+                return true;
             }
             catch (Exception)
             {
                 Log.Error("AutoStartup", "Failed to check logon task");
-                return false;
             }
         }
 
-        return true;
+        return false;
     }
 
     public static void Disable(bool logonTask)

From 1ff8c3620a030294a6d30d9ae2e93ac14438457a Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Thu, 6 Feb 2025 07:56:24 +0800
Subject: [PATCH 04/28] Revert changes in non-English language files

---
 Flow.Launcher/Languages/zh-cn.xaml | 8 ++------
 Flow.Launcher/Languages/zh-tw.xaml | 8 ++------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/Flow.Launcher/Languages/zh-cn.xaml b/Flow.Launcher/Languages/zh-cn.xaml
index d2d1044af..681c715fb 100644
--- a/Flow.Launcher/Languages/zh-cn.xaml
+++ b/Flow.Launcher/Languages/zh-cn.xaml
@@ -1,8 +1,5 @@
-<?xml version="1.0" ?>
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:system="clr-namespace:System;assembly=mscorlib">
+<?xml version="1.0"?>
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:system="clr-namespace:System;assembly=mscorlib">
     <!--  Startup  -->
     <system:String x:Key="runtimePluginInstalledChooseRuntimePrompt">
         Flow 检测到您已安装 {0} 个插件，需要 {1} 才能运行。是否要下载 {1}？
@@ -47,7 +44,6 @@
     <system:String x:Key="portableMode">便携模式</system:String>
     <system:String x:Key="portableModeToolTIp">将所有设置和用户数据存储在一个文件夹中 (可用于可移除驱动器或云服务)。</system:String>
     <system:String x:Key="startFlowLauncherOnSystemStartup">开机自启</system:String>
-    <system:String x:Key="useLogonTaskForStartup">使用登录任务而非启动项以更快自启</system:String>
     <system:String x:Key="setAutoStartFailed">设置开机自启时出错</system:String>
     <system:String x:Key="hideFlowLauncherWhenLoseFocus">失去焦点时自动隐藏 Flow Launcher</system:String>
     <system:String x:Key="dontPromptUpdateMsg">不显示新版本提示</system:String>
diff --git a/Flow.Launcher/Languages/zh-tw.xaml b/Flow.Launcher/Languages/zh-tw.xaml
index b5aa53377..44be5257b 100644
--- a/Flow.Launcher/Languages/zh-tw.xaml
+++ b/Flow.Launcher/Languages/zh-tw.xaml
@@ -1,8 +1,5 @@
-<?xml version="1.0" ?>
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:system="clr-namespace:System;assembly=mscorlib">
+<?xml version="1.0"?>
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:system="clr-namespace:System;assembly=mscorlib">
     <!--  Startup  -->
     <system:String x:Key="runtimePluginInstalledChooseRuntimePrompt">
         Flow detected you have installed {0} plugins, which will require {1} to run. Would you like to download {1}?
@@ -47,7 +44,6 @@
     <system:String x:Key="portableMode">便攜模式</system:String>
     <system:String x:Key="portableModeToolTIp">將所有設定和使用者資料存儲在一個資料夾中（當與可移動磁碟或雲服務一起使用時很有用）。</system:String>
     <system:String x:Key="startFlowLauncherOnSystemStartup">開機時啟動</system:String>
-    <system:String x:Key="useLogonTaskForStartup">使用登錄任務而非啟動項以更快自啟</system:String>
     <system:String x:Key="setAutoStartFailed">Error setting launch on startup</system:String>
     <system:String x:Key="hideFlowLauncherWhenLoseFocus">失去焦點時自動隱藏 Flow Launcher</system:String>
     <system:String x:Key="dontPromptUpdateMsg">不顯示新版本提示</system:String>

From 585b7015b6236ea7fdbe156c39d468a3ca579ed5 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Mon, 10 Feb 2025 18:20:50 +0800
Subject: [PATCH 05/28] Add uninstallation tooltip for logon task settings item

---
 Flow.Launcher/Languages/en.xaml                           | 1 +
 Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index 8e8c9abef..cd9d0b02a 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -47,6 +47,7 @@
     <system:String x:Key="portableModeToolTIp">Store all settings and user data in one folder (Useful when used with removable drives or cloud services).</system:String>
     <system:String x:Key="startFlowLauncherOnSystemStartup">Start Flow Launcher on system startup</system:String>
     <system:String x:Key="useLogonTaskForStartup">Use logon task instead of startup entry for faster startup experience</system:String>
+    <system:String x:Key="useLogonTaskForStartupTooltip">After uninstallation, you need to manually remove this task (Flow.Launcher Startup) via Task Scheduler</system:String>
     <system:String x:Key="setAutoStartFailed">Error setting launch on startup</system:String>
     <system:String x:Key="hideFlowLauncherWhenLoseFocus">Hide Flow Launcher when focus is lost</system:String>
     <system:String x:Key="dontPromptUpdateMsg">Do not show new version notifications</system:String>
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
index e52614e74..a80e618e8 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
@@ -36,7 +36,7 @@
                     OnContent="{DynamicResource enable}" />
             </cc:Card>
 
-            <cc:Card Title="{DynamicResource useLogonTaskForStartup}">
+            <cc:Card Title="{DynamicResource useLogonTaskForStartup}" Sub="{DynamicResource useLogonTaskForStartupTooltip}">
                 <ui:ToggleSwitch
                     IsOn="{Binding UseLogonTaskForStartup}"
                     OffContent="{DynamicResource disable}"

From 41733615fd75cd35bf3933a90e92b93ae217e09a Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Fri, 21 Feb 2025 20:45:42 +0800
Subject: [PATCH 06/28] Improve code quality

---
 Flow.Launcher/CustomQueryHotkeySetting.xaml | 5 +----
 Flow.Launcher/CustomShortcutSetting.xaml    | 5 +----
 Flow.Launcher/PriorityChangeWindow.xaml     | 5 +----
 Flow.Launcher/SelectBrowserWindow.xaml      | 5 +----
 Flow.Launcher/SelectFileManagerWindow.xaml  | 5 +----
 Flow.Launcher/WelcomeWindow.xaml            | 5 +----
 6 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/Flow.Launcher/CustomQueryHotkeySetting.xaml b/Flow.Launcher/CustomQueryHotkeySetting.xaml
index 068afda15..70ebb404b 100644
--- a/Flow.Launcher/CustomQueryHotkeySetting.xaml
+++ b/Flow.Launcher/CustomQueryHotkeySetting.xaml
@@ -32,14 +32,11 @@
             <StackPanel>
                 <Grid>
                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" />
                         <ColumnDefinition Width="*" />
                         <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
                     <Button
-                        Grid.Column="4"
+                        Grid.Column="1"
                         Click="BtnCancel_OnClick"
                         Style="{StaticResource TitleBarCloseButtonStyle}">
                         <Path
diff --git a/Flow.Launcher/CustomShortcutSetting.xaml b/Flow.Launcher/CustomShortcutSetting.xaml
index 8df569a0e..9256a2c52 100644
--- a/Flow.Launcher/CustomShortcutSetting.xaml
+++ b/Flow.Launcher/CustomShortcutSetting.xaml
@@ -30,14 +30,11 @@
             <StackPanel>
                 <Grid>
                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" />
                         <ColumnDefinition Width="*" />
                         <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
                     <Button
-                        Grid.Column="4"
+                        Grid.Column="1"
                         Click="BtnCancel_OnClick"
                         Style="{StaticResource TitleBarCloseButtonStyle}">
                         <Path
diff --git a/Flow.Launcher/PriorityChangeWindow.xaml b/Flow.Launcher/PriorityChangeWindow.xaml
index c917eeffc..33ed54bb4 100644
--- a/Flow.Launcher/PriorityChangeWindow.xaml
+++ b/Flow.Launcher/PriorityChangeWindow.xaml
@@ -29,14 +29,11 @@
             <StackPanel>
                 <Grid>
                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" />
                         <ColumnDefinition Width="*" />
                         <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
                     <Button
-                        Grid.Column="4"
+                        Grid.Column="1"
                         Click="BtnCancel_OnClick"
                         Style="{StaticResource TitleBarCloseButtonStyle}">
                         <Path
diff --git a/Flow.Launcher/SelectBrowserWindow.xaml b/Flow.Launcher/SelectBrowserWindow.xaml
index d8807dbef..c12879a04 100644
--- a/Flow.Launcher/SelectBrowserWindow.xaml
+++ b/Flow.Launcher/SelectBrowserWindow.xaml
@@ -28,14 +28,11 @@
             <StackPanel>
                 <Grid>
                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" />
                         <ColumnDefinition Width="*" />
                         <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
                     <Button
-                        Grid.Column="4"
+                        Grid.Column="1"
                         Click="btnCancel_Click"
                         Style="{StaticResource TitleBarCloseButtonStyle}">
                         <Path
diff --git a/Flow.Launcher/SelectFileManagerWindow.xaml b/Flow.Launcher/SelectFileManagerWindow.xaml
index 399ef679b..0287af9b0 100644
--- a/Flow.Launcher/SelectFileManagerWindow.xaml
+++ b/Flow.Launcher/SelectFileManagerWindow.xaml
@@ -28,14 +28,11 @@
                 <StackPanel>
                     <Grid Grid.Row="0">
                         <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="Auto" />
                             <ColumnDefinition Width="*" />
                             <ColumnDefinition Width="Auto" />
-                            <ColumnDefinition Width="Auto" />
-                            <ColumnDefinition Width="Auto" />
                         </Grid.ColumnDefinitions>
                         <Button
-                            Grid.Column="4"
+                            Grid.Column="1"
                             Click="btnCancel_Click"
                             Style="{StaticResource TitleBarCloseButtonStyle}">
                             <Path
diff --git a/Flow.Launcher/WelcomeWindow.xaml b/Flow.Launcher/WelcomeWindow.xaml
index 208fc807f..73f423d0b 100644
--- a/Flow.Launcher/WelcomeWindow.xaml
+++ b/Flow.Launcher/WelcomeWindow.xaml
@@ -36,8 +36,6 @@
                         <ColumnDefinition Width="Auto" />
                         <ColumnDefinition Width="*" />
                         <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
                     <Image
                         Grid.Column="0"
@@ -53,9 +51,8 @@
                         FontSize="12"
                         Foreground="{DynamicResource Color05B}"
                         Text="{DynamicResource Welcome_Page1_Title}" />
-
                     <Button
-                        Grid.Column="4"
+                        Grid.Column="2"
                         Click="BtnCancel_OnClick"
                         Style="{StaticResource TitleBarCloseButtonStyle}">
                         <Path

From 44aa17d7c9a2bf1f24f0f8cdec01dcdb9781af61 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Fri, 21 Feb 2025 21:17:00 +0800
Subject: [PATCH 07/28] Improve report window with dark theme & localization
 support

---
 Flow.Launcher/Languages/en.xaml    |   6 ++
 Flow.Launcher/ReportWindow.xaml    | 101 +++++++++++++++++++++++------
 Flow.Launcher/ReportWindow.xaml.cs |  64 +++++++++++++-----
 3 files changed, 134 insertions(+), 37 deletions(-)

diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index 4c465d61f..493528a89 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -383,6 +383,12 @@
     <system:String x:Key="reportWindow_report_succeed">Report sent successfully</system:String>
     <system:String x:Key="reportWindow_report_failed">Failed to send report</system:String>
     <system:String x:Key="reportWindow_flowlauncher_got_an_error">Flow Launcher got an error</system:String>
+    <system:String x:Key="reportWindow_please_open_issue">Please open new issue in</system:String>
+    <system:String x:Key="reportWindow_upload_log">1. Upload log file: {0}</system:String>
+    <system:String x:Key="reportWindow_copy_below">2. Copy below exception message</system:String>
+    <system:String x:Key="reportWindow_date">Date: {0}</system:String>
+    <system:String x:Key="reportWindow_exception">Exception:</system:String>
+    <system:String x:Key="reportWindow_length">Length</system:String>
 
     <!--  General Notice  -->
     <system:String x:Key="pleaseWait">Please wait...</system:String>
diff --git a/Flow.Launcher/ReportWindow.xaml b/Flow.Launcher/ReportWindow.xaml
index 50dace075..5e799e2a3 100644
--- a/Flow.Launcher/ReportWindow.xaml
+++ b/Flow.Launcher/ReportWindow.xaml
@@ -1,23 +1,82 @@
-<Window x:Class="Flow.Launcher.ReportWindow"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             mc:Ignorable="d" 
-             WindowStartupLocation="CenterScreen"
-             Icon="Images/app_error.png"
-             Topmost="True"
-             ResizeMode="NoResize"
-             Width="600"
-             Height="455"
-             Title="{DynamicResource reportWindow_flowlauncher_got_an_error}"
-             d:DesignHeight="300" d:DesignWidth="600" x:ClassModifier="internal">
-    <RichTextBox x:Name="ErrorTextbox" 
-                 IsDocumentEnabled="True"
-                 VerticalScrollBarVisibility="Auto" 
-                 HorizontalScrollBarVisibility="Auto" 
-                 FontSize="14" 
-                 Margin="10"
-                 BorderThickness="0"/>
+<Window
+    x:Class="Flow.Launcher.ReportWindow"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    Title="{DynamicResource reportWindow_flowlauncher_got_an_error}"
+    Width="600"
+    Height="455"
+    d:DesignHeight="300"
+    d:DesignWidth="600"
+    x:ClassModifier="internal"
+    Background="{DynamicResource PopuBGColor}"
+    Foreground="{DynamicResource PopupTextColor}"
+    Icon="/Images/app_error.png"
+    ResizeMode="NoResize"
+    Topmost="True"
+    WindowStartupLocation="CenterScreen"
+    mc:Ignorable="d">
+    <WindowChrome.WindowChrome>
+        <WindowChrome CaptionHeight="32" ResizeBorderThickness="{x:Static SystemParameters.WindowResizeBorderThickness}" />
+    </WindowChrome.WindowChrome>
+
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="Auto" />
+            </Grid.ColumnDefinitions>
+            <Image
+                Grid.Column="0"
+                Width="16"
+                Height="16"
+                Margin="10 4 4 4"
+                RenderOptions.BitmapScalingMode="HighQuality"
+                Source="/Images/app_error.png" />
+            <TextBlock
+                Grid.Column="1"
+                Margin="4 0 0 0"
+                VerticalAlignment="Center"
+                FontSize="12"
+                Foreground="{DynamicResource Color05B}"
+                Text="{DynamicResource reportWindow_flowlauncher_got_an_error}" />
+            <Button
+                Grid.Column="2"
+                Click="BtnCancel_OnClick"
+                Style="{StaticResource TitleBarCloseButtonStyle}">
+                <Path
+                    Width="46"
+                    Height="32"
+                    Data="M 18,11 27,20 M 18,20 27,11"
+                    Stroke="{Binding Path=Foreground, RelativeSource={RelativeSource AncestorType={x:Type Button}}}"
+                    StrokeThickness="1">
+                    <Path.Style>
+                        <Style TargetType="Path">
+                            <Style.Triggers>
+                                <DataTrigger Binding="{Binding Path=IsActive, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}" Value="False">
+                                    <Setter Property="Opacity" Value="0.5" />
+                                </DataTrigger>
+                            </Style.Triggers>
+                        </Style>
+                    </Path.Style>
+                </Path>
+            </Button>
+        </Grid>
+        <RichTextBox
+            x:Name="ErrorTextbox"
+            Grid.Row="1"
+            Margin="10"
+            BorderThickness="0"
+            FontSize="14"
+            HorizontalScrollBarVisibility="Auto"
+            IsDocumentEnabled="True"
+            VerticalScrollBarVisibility="Auto" />
+    </Grid>
 
 </Window>
diff --git a/Flow.Launcher/ReportWindow.xaml.cs b/Flow.Launcher/ReportWindow.xaml.cs
index a535dfb3e..12ffe3ffc 100644
--- a/Flow.Launcher/ReportWindow.xaml.cs
+++ b/Flow.Launcher/ReportWindow.xaml.cs
@@ -6,10 +6,10 @@ using System.Text;
 using System.Linq;
 using System.Windows;
 using System.Windows.Documents;
-using Flow.Launcher.Helper;
 using Flow.Launcher.Infrastructure;
 using Flow.Launcher.Infrastructure.Logger;
 using Flow.Launcher.Plugin.SharedCommands;
+using Flow.Launcher.Infrastructure.Exception;
 
 namespace Flow.Launcher
 {
@@ -43,32 +43,36 @@ namespace Flow.Launcher
             var log = directory.GetFiles().OrderByDescending(f => f.LastWriteTime).First();
 
             var websiteUrl = exception switch
-                {
-                    FlowPluginException pluginException =>GetIssuesUrl(pluginException.Metadata.Website),
-                    _ => Constant.IssuesUrl
-                };
-                
+            {
+                FlowPluginException pluginException =>GetIssuesUrl(pluginException.Metadata.Website),
+                _ => Constant.IssuesUrl
+            };
 
-            var paragraph = Hyperlink("Please open new issue in: ", websiteUrl);
-            paragraph.Inlines.Add($"1. upload log file: {log.FullName}\n");
-            paragraph.Inlines.Add($"2. copy below exception message");
+            var paragraph = Hyperlink(App.API.GetTranslation("reportWindow_please_open_issue"), websiteUrl);
+            paragraph.Inlines.Add(string.Format(App.API.GetTranslation("reportWindow_upload_log"), log.FullName));
+            paragraph.Inlines.Add("\n");
+            paragraph.Inlines.Add(App.API.GetTranslation("reportWindow_copy_below"));
             ErrorTextbox.Document.Blocks.Add(paragraph);
 
             StringBuilder content = new StringBuilder();
-            content.AppendLine(ErrorReporting.RuntimeInfo());
-            content.AppendLine(ErrorReporting.DependenciesInfo());
-            content.AppendLine($"Date: {DateTime.Now.ToString(CultureInfo.InvariantCulture)}");
-            content.AppendLine("Exception:");
+            content.AppendLine(RuntimeInfo());
+            content.AppendLine();
+            content.AppendLine(DependenciesInfo());
+            content.AppendLine();
+            content.AppendLine(string.Format(App.API.GetTranslation("reportWindow_date"), DateTime.Now.ToString(CultureInfo.InvariantCulture)));
+            content.AppendLine(App.API.GetTranslation("reportWindow_exception"));
             content.AppendLine(exception.ToString());
             paragraph = new Paragraph();
             paragraph.Inlines.Add(content.ToString());
             ErrorTextbox.Document.Blocks.Add(paragraph);
         }
 
-        private Paragraph Hyperlink(string textBeforeUrl, string url)
+        private static Paragraph Hyperlink(string textBeforeUrl, string url)
         {
-            var paragraph = new Paragraph();
-            paragraph.Margin = new Thickness(0);
+            var paragraph = new Paragraph
+            {
+                Margin = new Thickness(0)
+            };
 
             var link = new Hyperlink
             {
@@ -79,10 +83,38 @@ namespace Flow.Launcher
             link.Click += (s, e) => SearchWeb.OpenInBrowserTab(url);
 
             paragraph.Inlines.Add(textBeforeUrl);
+            paragraph.Inlines.Add(" ");
             paragraph.Inlines.Add(link);
             paragraph.Inlines.Add("\n");
 
             return paragraph;
         }
+
+        private void BtnCancel_OnClick(object sender, RoutedEventArgs e)
+        {
+            Close();
+        }
+
+        private static string RuntimeInfo()
+        {
+            var info =
+                $"""
+                Flow Launcher {App.API.GetTranslation("reportWindow_version")}: {Constant.Version}
+                OS {App.API.GetTranslation("reportWindow_version")}: {ExceptionFormatter.GetWindowsFullVersionFromRegistry()}
+                IntPtr {App.API.GetTranslation("reportWindow_length")}: {IntPtr.Size}
+                x64: {Environment.Is64BitOperatingSystem}
+                """;
+            return info;
+        }
+
+        private static string DependenciesInfo()
+        {
+            var info = 
+                $"""
+                {App.API.GetTranslation("pythonFilePath")}: {Constant.PythonPath}
+                {App.API.GetTranslation("nodeFilePath")}: {Constant.NodePath}
+                """;
+            return info;
+        }
     }
 }

From 156668e1098287328c691ed2fcb76dcc62490d10 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sat, 22 Feb 2025 16:12:41 +0800
Subject: [PATCH 08/28] Add minimize & background option for progress box ex

---
 Flow.Launcher/Languages/en.xaml     |  1 +
 Flow.Launcher/ProgressBoxEx.xaml    | 31 ++++++++++++++++++++++++++++-
 Flow.Launcher/ProgressBoxEx.xaml.cs | 11 +++++++---
 3 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index 4c465d61f..d36fd2e90 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -367,6 +367,7 @@
     <system:String x:Key="commonOK">OK</system:String>
     <system:String x:Key="commonYes">Yes</system:String>
     <system:String x:Key="commonNo">No</system:String>
+    <system:String x:Key="commonBackground">Background</system:String>
 
     <!--  Crash Reporter  -->
     <system:String x:Key="reportWindow_version">Version</system:String>
diff --git a/Flow.Launcher/ProgressBoxEx.xaml b/Flow.Launcher/ProgressBoxEx.xaml
index 3102cfb72..32b0f64b4 100644
--- a/Flow.Launcher/ProgressBoxEx.xaml
+++ b/Flow.Launcher/ProgressBoxEx.xaml
@@ -35,9 +35,32 @@
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*" />
                         <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
                     <Button
                         Grid.Column="1"
+                        Click="Button_Minimize"
+                        RenderOptions.EdgeMode="Aliased"
+                        Style="{DynamicResource TitleBarCloseButtonStyle}">
+                        <Path
+                            Width="46"
+                            Height="32"
+                            Data="M 18,15 H 28"
+                            Stroke="{Binding Path=Foreground, RelativeSource={RelativeSource AncestorType={x:Type Button}}}"
+                            StrokeThickness="1">
+                            <Path.Style>
+                                <Style TargetType="Path">
+                                    <Style.Triggers>
+                                        <DataTrigger Binding="{Binding Path=IsActive, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}" Value="False">
+                                            <Setter Property="Opacity" Value="0.5" />
+                                        </DataTrigger>
+                                    </Style.Triggers>
+                                </Style>
+                            </Path.Style>
+                        </Path>
+                    </Button>
+                    <Button
+                        Grid.Column="2"
                         Click="Button_Cancel"
                         Style="{StaticResource TitleBarCloseButtonStyle}">
                         <Path
@@ -94,11 +117,17 @@
                 HorizontalAlignment="Center"
                 VerticalAlignment="Center"
                 Orientation="Horizontal">
+                <Button
+                    x:Name="btnBackground"
+                    MinWidth="120"
+                    Margin="5 0 5 0"
+                    Click="Button_Background"
+                    Content="{DynamicResource commonBackground}" />
                 <Button
                     x:Name="btnCancel"
                     MinWidth="120"
                     Margin="5 0 5 0"
-                    Click="Button_Click"
+                    Click="Button_Cancel"
                     Content="{DynamicResource commonCancel}" />
             </WrapPanel>
         </Border>
diff --git a/Flow.Launcher/ProgressBoxEx.xaml.cs b/Flow.Launcher/ProgressBoxEx.xaml.cs
index 7c55d62c0..755fc4a1f 100644
--- a/Flow.Launcher/ProgressBoxEx.xaml.cs
+++ b/Flow.Launcher/ProgressBoxEx.xaml.cs
@@ -95,14 +95,19 @@ namespace Flow.Launcher
             ForceClose();
         }
 
-        private void Button_Click(object sender, RoutedEventArgs e)
+        private void Button_Cancel(object sender, RoutedEventArgs e)
         {
             ForceClose();
         }
 
-        private void Button_Cancel(object sender, RoutedEventArgs e)
+        private void Button_Minimize(object sender, RoutedEventArgs e)
         {
-            ForceClose();
+            WindowState = WindowState.Minimized;
+        }
+
+        private void Button_Background(object sender, RoutedEventArgs e)
+        {
+            Hide();
         }
 
         private void ForceClose()

From abc13b7d670011d39f24ed719354dea746a9cddb Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sat, 22 Feb 2025 19:04:56 +0800
Subject: [PATCH 09/28] Adjust minimize button style

---
 Flow.Launcher/ProgressBoxEx.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Flow.Launcher/ProgressBoxEx.xaml b/Flow.Launcher/ProgressBoxEx.xaml
index 32b0f64b4..d201e50bd 100644
--- a/Flow.Launcher/ProgressBoxEx.xaml
+++ b/Flow.Launcher/ProgressBoxEx.xaml
@@ -41,7 +41,7 @@
                         Grid.Column="1"
                         Click="Button_Minimize"
                         RenderOptions.EdgeMode="Aliased"
-                        Style="{DynamicResource TitleBarCloseButtonStyle}">
+                        Style="{DynamicResource TitleBarButtonStyle}">
                         <Path
                             Width="46"
                             Height="32"

From 942ea3ec96bea08631e548029f1b3aed1b92afe6 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sat, 22 Feb 2025 19:14:12 +0800
Subject: [PATCH 10/28] Set progress box topmost

---
 Flow.Launcher/ProgressBoxEx.xaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Flow.Launcher/ProgressBoxEx.xaml b/Flow.Launcher/ProgressBoxEx.xaml
index d201e50bd..c17f8b61d 100644
--- a/Flow.Launcher/ProgressBoxEx.xaml
+++ b/Flow.Launcher/ProgressBoxEx.xaml
@@ -12,6 +12,7 @@
     Foreground="{DynamicResource PopupTextColor}"
     ResizeMode="NoResize"
     SizeToContent="Height"
+    Topmost="True"
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
     <WindowChrome.WindowChrome>

From 96305166e834864f7884e897c38c5fc1bec4e87f Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Mon, 24 Feb 2025 19:55:48 +0800
Subject: [PATCH 11/28] Improve function names for code quality

---
 Flow.Launcher/App.xaml.cs                     |  9 +++++-
 Flow.Launcher/Helper/AutoStartup.cs           | 32 +++++++++++++++++--
 .../SettingsPaneGeneralViewModel.cs           | 25 ++++++++++-----
 3 files changed, 55 insertions(+), 11 deletions(-)

diff --git a/Flow.Launcher/App.xaml.cs b/Flow.Launcher/App.xaml.cs
index 38f846d92..f74e9a388 100644
--- a/Flow.Launcher/App.xaml.cs
+++ b/Flow.Launcher/App.xaml.cs
@@ -119,7 +119,14 @@ namespace Flow.Launcher
             {
                 try
                 {
-                    Helper.AutoStartup.Enable(_settings.UseLogonTaskForStartup);
+                    if (_settings.UseLogonTaskForStartup)
+                    {
+                        Helper.AutoStartup.EnableViaLogonTask();
+                    }
+                    else
+                    {
+                        Helper.AutoStartup.EnableViaRegistry();
+                    }
                 }
                 catch (Exception e)
                 {
diff --git a/Flow.Launcher/Helper/AutoStartup.cs b/Flow.Launcher/Helper/AutoStartup.cs
index 79466f1fb..936951ee9 100644
--- a/Flow.Launcher/Helper/AutoStartup.cs
+++ b/Flow.Launcher/Helper/AutoStartup.cs
@@ -68,7 +68,35 @@ public class AutoStartup
         return false;
     }
 
-    public static void Disable(bool logonTask)
+    public static void DisableViaLogonTaskAndRegistry()
+    {
+        Disable(true);
+        Disable(false);
+    }
+
+    public static void EnableViaLogonTask()
+    {
+        Enable(true);
+    }
+
+    public static void EnableViaRegistry()
+    {
+        Enable(false);
+    }
+
+    public static void ChangeToViaLogonTask()
+    {
+        Disable(false);
+        Enable(true);
+    }
+
+    public static void ChangeToViaRegistry()
+    {
+        Disable(true);
+        Enable(false);
+    }
+
+    private static void Disable(bool logonTask)
     {
         try
         {
@@ -89,7 +117,7 @@ public class AutoStartup
         }
     }
 
-    internal static void Enable(bool logonTask)
+    private static void Enable(bool logonTask)
     {
         try
         {
diff --git a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs
index 0aca761a0..ab38cd514 100644
--- a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs
+++ b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs
@@ -43,14 +43,18 @@ public partial class SettingsPaneGeneralViewModel : BaseModel
             {
                 if (value)
                 {
-                    // Enable either registry or task scheduler
-                    AutoStartup.Enable(UseLogonTaskForStartup);
+                    if (UseLogonTaskForStartup)
+                    {
+                        AutoStartup.EnableViaLogonTask();
+                    }
+                    else
+                    {
+                        AutoStartup.EnableViaRegistry();
+                    }
                 }
                 else
                 {
-                    // Disable both registry and task scheduler
-                    AutoStartup.Disable(true);
-                    AutoStartup.Disable(false);
+                    AutoStartup.DisableViaLogonTaskAndRegistry();
                 }  
             }
             catch (Exception e)
@@ -72,9 +76,14 @@ public partial class SettingsPaneGeneralViewModel : BaseModel
             {
                 try
                 {
-                    // Disable and enable to update the startup method
-                    AutoStartup.Disable(!UseLogonTaskForStartup);
-                    AutoStartup.Enable(UseLogonTaskForStartup);
+                    if (UseLogonTaskForStartup)
+                    {
+                        AutoStartup.ChangeToViaLogonTask();
+                    }
+                    else
+                    {
+                        AutoStartup.ChangeToViaRegistry();
+                    }
                 }
                 catch (Exception e)
                 {

From e9688d1bcbd2f748ecea1d8dff55c1c1e22fb4f0 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Mon, 24 Feb 2025 22:26:07 +0800
Subject: [PATCH 12/28] Fix dependency injection issue in installer

---
 Flow.Launcher/Flow.Launcher.csproj | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Flow.Launcher/Flow.Launcher.csproj b/Flow.Launcher/Flow.Launcher.csproj
index 43c1dfd90..f8ace91f8 100644
--- a/Flow.Launcher/Flow.Launcher.csproj
+++ b/Flow.Launcher/Flow.Launcher.csproj
@@ -90,8 +90,9 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="InputSimulator" Version="1.0.4" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
+    <!-- Do not upgrade Microsoft.Extensions.DependencyInjection and Microsoft.Extensions.Hosting since we are .Net7.0 -->
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.0" />
     <PackageReference Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.3" />
     <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.106">
       <PrivateAssets>all</PrivateAssets>

From 928ca474ab25934f4872412254d51bc0144a1dad Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Tue, 25 Feb 2025 13:48:02 +0800
Subject: [PATCH 13/28] Add preview background in welcome page 2

---
 .../Resources/Pages/WelcomePage2.xaml.cs      | 27 +++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/Flow.Launcher/Resources/Pages/WelcomePage2.xaml.cs b/Flow.Launcher/Resources/Pages/WelcomePage2.xaml.cs
index 7dfb85a83..004e4d6d2 100644
--- a/Flow.Launcher/Resources/Pages/WelcomePage2.xaml.cs
+++ b/Flow.Launcher/Resources/Pages/WelcomePage2.xaml.cs
@@ -2,11 +2,12 @@
 using Flow.Launcher.Infrastructure.Hotkey;
 using Flow.Launcher.Infrastructure.UserSettings;
 using System;
-using System.Windows;
-using System.Windows.Media;
 using System.Windows.Navigation;
 using CommunityToolkit.Mvvm.Input;
 using Flow.Launcher.ViewModel;
+using System.IO;
+using System.Windows.Media.Imaging;
+using System.Windows.Media;
 
 namespace Flow.Launcher.Resources.Pages
 {
@@ -29,5 +30,27 @@ namespace Flow.Launcher.Resources.Pages
         {
             HotKeyMapper.SetHotkey(hotkey, HotKeyMapper.OnToggleHotkey);
         }
+
+        public Brush PreviewBackground
+        {
+            get
+            {
+                var wallpaper = WallpaperPathRetrieval.GetWallpaperPath();
+                if (wallpaper is not null && File.Exists(wallpaper))
+                {
+                    var memStream = new MemoryStream(File.ReadAllBytes(wallpaper));
+                    var bitmap = new BitmapImage();
+                    bitmap.BeginInit();
+                    bitmap.StreamSource = memStream;
+                    bitmap.DecodePixelWidth = 800;
+                    bitmap.DecodePixelHeight = 600;
+                    bitmap.EndInit();
+                    return new ImageBrush(bitmap) { Stretch = Stretch.UniformToFill };
+                }
+
+                var wallpaperColor = WallpaperPathRetrieval.GetWallpaperColor();
+                return new SolidColorBrush(wallpaperColor);
+            }
+        }
     }
 }

From fe48427252f5ce8c84e697da42a24406d9675a3f Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Tue, 25 Feb 2025 15:08:27 +0800
Subject: [PATCH 14/28] Log error for logon task

---
 Flow.Launcher/Helper/AutoStartup.cs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Flow.Launcher/Helper/AutoStartup.cs b/Flow.Launcher/Helper/AutoStartup.cs
index 936951ee9..c5e20504b 100644
--- a/Flow.Launcher/Helper/AutoStartup.cs
+++ b/Flow.Launcher/Helper/AutoStartup.cs
@@ -59,9 +59,9 @@ public class AutoStartup
 
                 return true;
             }
-            catch (Exception)
+            catch (Exception e)
             {
-                Log.Error("AutoStartup", "Failed to check logon task");
+                Log.Error("AutoStartup", $"Failed to check logon task: {e}");
             }
         }
 
@@ -159,9 +159,9 @@ public class AutoStartup
             TaskService.Instance.RootFolder.RegisterTaskDefinition(LogonTaskName, td);
             return true;
         }
-        catch (Exception)
+        catch (Exception e)
         {
-            Log.Error("AutoStartup", "Failed to schedule logon task");
+            Log.Error("AutoStartup", $"Failed to schedule logon task: {e}");
             return false;
         }
     }
@@ -174,9 +174,9 @@ public class AutoStartup
             taskService.RootFolder.DeleteTask(LogonTaskName);
             return true;
         }
-        catch (Exception)
+        catch (Exception e)
         {
-            Log.Error("AutoStartup", "Failed to unschedule logon task");
+            Log.Error("AutoStartup", $"Failed to unschedule logon task: {e}");
             return false;
         }
     }

From 1a6733e86d0c1eb772c6f5eec4542435373bc42f Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Tue, 25 Feb 2025 18:06:23 +0800
Subject: [PATCH 15/28] Improve background wallpaper fetch

---
 .../Helper/WallpaperPathRetrieval.cs          | 42 +++++++++++++++++--
 .../Resources/Pages/WelcomePage2.xaml.cs      | 21 +---------
 .../ViewModels/SettingsPaneThemeViewModel.cs  | 21 +---------
 3 files changed, 40 insertions(+), 44 deletions(-)

diff --git a/Flow.Launcher/Helper/WallpaperPathRetrieval.cs b/Flow.Launcher/Helper/WallpaperPathRetrieval.cs
index 8a42d480f..f79fea288 100644
--- a/Flow.Launcher/Helper/WallpaperPathRetrieval.cs
+++ b/Flow.Launcher/Helper/WallpaperPathRetrieval.cs
@@ -1,9 +1,10 @@
 using System;
+using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
-using System.Text;
-using System.Windows.Documents;
 using System.Windows.Media;
+using System.Windows.Media.Imaging;
 using Microsoft.Win32;
 using Windows.Win32;
 using Windows.Win32.UI.WindowsAndMessaging;
@@ -14,7 +15,40 @@ public static class WallpaperPathRetrieval
 {
     private static readonly int MAX_PATH = 260;
 
-    public static unsafe string GetWallpaperPath()
+    private static readonly Dictionary<DateTime, BitmapImage> wallpaperCache = new();
+
+    public static Brush GetWallpaperBrush()
+    {
+        var wallpaper = GetWallpaperPath();
+        if (wallpaper is not null && File.Exists(wallpaper))
+        {
+            // Since the wallpaper file name is the same (TranscodedWallpaper),
+            // we need to use the last modified date to differentiate them
+            var dateModified = File.GetLastWriteTime(wallpaper);
+            wallpaperCache.TryGetValue(dateModified, out var cachedWallpaper);
+            if (cachedWallpaper != null)
+            {
+                return new ImageBrush(cachedWallpaper) { Stretch = Stretch.UniformToFill };
+            }
+
+            // We should not dispose the memory stream since the bitmap is still in use
+            var memStream = new MemoryStream(File.ReadAllBytes(wallpaper));
+            var bitmap = new BitmapImage();
+            bitmap.BeginInit();
+            bitmap.StreamSource = memStream;
+            bitmap.DecodePixelWidth = 800;
+            bitmap.DecodePixelHeight = 600;
+            bitmap.EndInit();
+            bitmap.Freeze(); // Make the bitmap thread-safe
+            wallpaperCache[dateModified] = bitmap;
+            return new ImageBrush(bitmap) { Stretch = Stretch.UniformToFill };
+        }
+
+        var wallpaperColor = GetWallpaperColor();
+        return new SolidColorBrush(wallpaperColor);
+    }
+
+    private static unsafe string GetWallpaperPath()
     {
         var wallpaperPtr = stackalloc char[MAX_PATH];
         PInvoke.SystemParametersInfo(SYSTEM_PARAMETERS_INFO_ACTION.SPI_GETDESKWALLPAPER, (uint)MAX_PATH,
@@ -25,7 +59,7 @@ public static class WallpaperPathRetrieval
         return wallpaper.ToString();
     }
 
-    public static Color GetWallpaperColor()
+    private static Color GetWallpaperColor()
     {
         RegistryKey key = Registry.CurrentUser.OpenSubKey(@"Control Panel\Colors", true);
         var result = key?.GetValue("Background", null);
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage2.xaml.cs b/Flow.Launcher/Resources/Pages/WelcomePage2.xaml.cs
index 004e4d6d2..1ed5747cd 100644
--- a/Flow.Launcher/Resources/Pages/WelcomePage2.xaml.cs
+++ b/Flow.Launcher/Resources/Pages/WelcomePage2.xaml.cs
@@ -5,8 +5,6 @@ using System;
 using System.Windows.Navigation;
 using CommunityToolkit.Mvvm.Input;
 using Flow.Launcher.ViewModel;
-using System.IO;
-using System.Windows.Media.Imaging;
 using System.Windows.Media;
 
 namespace Flow.Launcher.Resources.Pages
@@ -33,24 +31,7 @@ namespace Flow.Launcher.Resources.Pages
 
         public Brush PreviewBackground
         {
-            get
-            {
-                var wallpaper = WallpaperPathRetrieval.GetWallpaperPath();
-                if (wallpaper is not null && File.Exists(wallpaper))
-                {
-                    var memStream = new MemoryStream(File.ReadAllBytes(wallpaper));
-                    var bitmap = new BitmapImage();
-                    bitmap.BeginInit();
-                    bitmap.StreamSource = memStream;
-                    bitmap.DecodePixelWidth = 800;
-                    bitmap.DecodePixelHeight = 600;
-                    bitmap.EndInit();
-                    return new ImageBrush(bitmap) { Stretch = Stretch.UniformToFill };
-                }
-
-                var wallpaperColor = WallpaperPathRetrieval.GetWallpaperColor();
-                return new SolidColorBrush(wallpaperColor);
-            }
+            get => WallpaperPathRetrieval.GetWallpaperBrush();
         }
     }
 }
diff --git a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs
index 980b2a811..ed933678d 100644
--- a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs
+++ b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs
@@ -5,7 +5,6 @@ using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Windows.Media;
-using System.Windows.Media.Imaging;
 using CommunityToolkit.Mvvm.Input;
 using Flow.Launcher.Core.Resource;
 using Flow.Launcher.Helper;
@@ -14,7 +13,6 @@ using Flow.Launcher.Infrastructure.UserSettings;
 using Flow.Launcher.Plugin;
 using Flow.Launcher.ViewModel;
 using ModernWpf;
-using Flow.Launcher.Core;
 using ThemeManager = Flow.Launcher.Core.Resource.ThemeManager;
 using ThemeManagerForColorSchemeSwitch = ModernWpf.ThemeManager;
 
@@ -212,24 +210,7 @@ public partial class SettingsPaneThemeViewModel : BaseModel
 
     public Brush PreviewBackground
     {
-        get
-        {
-            var wallpaper = WallpaperPathRetrieval.GetWallpaperPath();
-            if (wallpaper is not null && File.Exists(wallpaper))
-            {
-                var memStream = new MemoryStream(File.ReadAllBytes(wallpaper));
-                var bitmap = new BitmapImage();
-                bitmap.BeginInit();
-                bitmap.StreamSource = memStream;
-                bitmap.DecodePixelWidth = 800;
-                bitmap.DecodePixelHeight = 600;
-                bitmap.EndInit();
-                return new ImageBrush(bitmap) { Stretch = Stretch.UniformToFill };
-            }
-
-            var wallpaperColor = WallpaperPathRetrieval.GetWallpaperColor();
-            return new SolidColorBrush(wallpaperColor);
-        }
+        get => WallpaperPathRetrieval.GetWallpaperBrush();
     }
 
     public ResultsViewModel PreviewResults

From ff45f5f7f5215dc30de11333ff6c42b1aeb7b554 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Tue, 25 Feb 2025 18:14:42 +0800
Subject: [PATCH 16/28] Cache image brush & Invoke on UI thread

---
 Flow.Launcher/Helper/WallpaperPathRetrieval.cs | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/Flow.Launcher/Helper/WallpaperPathRetrieval.cs b/Flow.Launcher/Helper/WallpaperPathRetrieval.cs
index f79fea288..7c74552be 100644
--- a/Flow.Launcher/Helper/WallpaperPathRetrieval.cs
+++ b/Flow.Launcher/Helper/WallpaperPathRetrieval.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
+using System.Windows;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using Microsoft.Win32;
@@ -15,10 +16,16 @@ public static class WallpaperPathRetrieval
 {
     private static readonly int MAX_PATH = 260;
 
-    private static readonly Dictionary<DateTime, BitmapImage> wallpaperCache = new();
+    private static readonly Dictionary<DateTime, ImageBrush> wallpaperCache = new();
 
     public static Brush GetWallpaperBrush()
     {
+        // Invoke the method on the UI thread
+        if (!Application.Current.Dispatcher.CheckAccess())
+        {
+            return Application.Current.Dispatcher.Invoke(GetWallpaperBrush);
+        }
+
         var wallpaper = GetWallpaperPath();
         if (wallpaper is not null && File.Exists(wallpaper))
         {
@@ -28,7 +35,7 @@ public static class WallpaperPathRetrieval
             wallpaperCache.TryGetValue(dateModified, out var cachedWallpaper);
             if (cachedWallpaper != null)
             {
-                return new ImageBrush(cachedWallpaper) { Stretch = Stretch.UniformToFill };
+                return cachedWallpaper;
             }
 
             // We should not dispose the memory stream since the bitmap is still in use
@@ -40,8 +47,10 @@ public static class WallpaperPathRetrieval
             bitmap.DecodePixelHeight = 600;
             bitmap.EndInit();
             bitmap.Freeze(); // Make the bitmap thread-safe
-            wallpaperCache[dateModified] = bitmap;
-            return new ImageBrush(bitmap) { Stretch = Stretch.UniformToFill };
+            var wallpaperBrush = new ImageBrush(bitmap) { Stretch = Stretch.UniformToFill };
+            wallpaperBrush.Freeze(); // Make the brush thread-safe
+            wallpaperCache.Add(dateModified, wallpaperBrush);
+            return wallpaperBrush;
         }
 
         var wallpaperColor = GetWallpaperColor();

From 0fddb84735638940a9f3041a38800fd3e6de2c15 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Tue, 25 Feb 2025 19:41:41 +0800
Subject: [PATCH 17/28] Add wallpaper path in cache dictionary

---
 Flow.Launcher/Helper/WallpaperPathRetrieval.cs | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Flow.Launcher/Helper/WallpaperPathRetrieval.cs b/Flow.Launcher/Helper/WallpaperPathRetrieval.cs
index 7c74552be..9f66a270c 100644
--- a/Flow.Launcher/Helper/WallpaperPathRetrieval.cs
+++ b/Flow.Launcher/Helper/WallpaperPathRetrieval.cs
@@ -16,7 +16,7 @@ public static class WallpaperPathRetrieval
 {
     private static readonly int MAX_PATH = 260;
 
-    private static readonly Dictionary<DateTime, ImageBrush> wallpaperCache = new();
+    private static readonly Dictionary<(string, DateTime), ImageBrush> wallpaperCache = new();
 
     public static Brush GetWallpaperBrush()
     {
@@ -26,20 +26,20 @@ public static class WallpaperPathRetrieval
             return Application.Current.Dispatcher.Invoke(GetWallpaperBrush);
         }
 
-        var wallpaper = GetWallpaperPath();
-        if (wallpaper is not null && File.Exists(wallpaper))
+        var wallpaperPath = GetWallpaperPath();
+        if (wallpaperPath is not null && File.Exists(wallpaperPath))
         {
-            // Since the wallpaper file name is the same (TranscodedWallpaper),
-            // we need to use the last modified date to differentiate them
-            var dateModified = File.GetLastWriteTime(wallpaper);
-            wallpaperCache.TryGetValue(dateModified, out var cachedWallpaper);
+            // Since the wallpaper file name can be the same (TranscodedWallpaper),
+            // we need to add the last modified date to differentiate them
+            var dateModified = File.GetLastWriteTime(wallpaperPath);
+            wallpaperCache.TryGetValue((wallpaperPath, dateModified), out var cachedWallpaper);
             if (cachedWallpaper != null)
             {
                 return cachedWallpaper;
             }
 
             // We should not dispose the memory stream since the bitmap is still in use
-            var memStream = new MemoryStream(File.ReadAllBytes(wallpaper));
+            var memStream = new MemoryStream(File.ReadAllBytes(wallpaperPath));
             var bitmap = new BitmapImage();
             bitmap.BeginInit();
             bitmap.StreamSource = memStream;
@@ -49,7 +49,7 @@ public static class WallpaperPathRetrieval
             bitmap.Freeze(); // Make the bitmap thread-safe
             var wallpaperBrush = new ImageBrush(bitmap) { Stretch = Stretch.UniformToFill };
             wallpaperBrush.Freeze(); // Make the brush thread-safe
-            wallpaperCache.Add(dateModified, wallpaperBrush);
+            wallpaperCache.Add((wallpaperPath, dateModified), wallpaperBrush);
             return wallpaperBrush;
         }
 

From bf8f5d1e60463d41738860bdc293803396316570 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Wed, 26 Feb 2025 15:26:20 +0800
Subject: [PATCH 18/28] Downgrade dependency injection version

---
 Flow.Launcher/Flow.Launcher.csproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Flow.Launcher/Flow.Launcher.csproj b/Flow.Launcher/Flow.Launcher.csproj
index f8ace91f8..6c2378f78 100644
--- a/Flow.Launcher/Flow.Launcher.csproj
+++ b/Flow.Launcher/Flow.Launcher.csproj
@@ -91,8 +91,8 @@
     </PackageReference>
     <PackageReference Include="InputSimulator" Version="1.0.4" />
     <!-- Do not upgrade Microsoft.Extensions.DependencyInjection and Microsoft.Extensions.Hosting since we are .Net7.0 -->
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
     <PackageReference Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.3" />
     <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.106">
       <PrivateAssets>all</PrivateAssets>

From 397c6ee639679c078c12db751178159c8a2988f3 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Wed, 26 Feb 2025 15:32:59 +0800
Subject: [PATCH 19/28] Add message box to show exception

---
 Flow.Launcher/App.xaml.cs          | 81 +++++++++++++++++++++---------
 Flow.Launcher/Flow.Launcher.csproj |  1 +
 2 files changed, 58 insertions(+), 24 deletions(-)

diff --git a/Flow.Launcher/App.xaml.cs b/Flow.Launcher/App.xaml.cs
index 8374fc9fe..277e5dc0c 100644
--- a/Flow.Launcher/App.xaml.cs
+++ b/Flow.Launcher/App.xaml.cs
@@ -35,31 +35,64 @@ namespace Flow.Launcher
         public App()
         {
             // Initialize settings
-            var storage = new FlowLauncherJsonStorage<Settings>();
-            _settings = storage.Load();
-            _settings.SetStorage(storage);
-            _settings.WMPInstalled = WindowsMediaPlayerHelper.IsWindowsMediaPlayerInstalled();
+            try
+            {
+                var storage = new FlowLauncherJsonStorage<Settings>();
+                _settings = storage.Load();
+                _settings.SetStorage(storage);
+                _settings.WMPInstalled = WindowsMediaPlayerHelper.IsWindowsMediaPlayerInstalled();
+            }
+            catch (Exception e)
+            {
+                ShowErrorMsgBoxAndFailFast("Cannot load setting storage, please check local data directory", e);
+                return;
+            }
 
             // Configure the dependency injection container
-            var host = Host.CreateDefaultBuilder()
-                .UseContentRoot(AppContext.BaseDirectory)
-                .ConfigureServices(services => services
-                    .AddSingleton(_ => _settings)
-                    .AddSingleton(sp => new Updater(sp.GetRequiredService<IPublicAPI>(), Launcher.Properties.Settings.Default.GithubRepo))
-                    .AddSingleton<Portable>()
-                    .AddSingleton<SettingWindowViewModel>()
-                    .AddSingleton<IAlphabet, PinyinAlphabet>()
-                    .AddSingleton<StringMatcher>()
-                    .AddSingleton<Internationalization>()
-                    .AddSingleton<IPublicAPI, PublicAPIInstance>()
-                    .AddSingleton<MainViewModel>()
-                    .AddSingleton<Theme>()
-                ).Build();
-            Ioc.Default.ConfigureServices(host.Services);
+            try
+            {
+                var host = Host.CreateDefaultBuilder()
+                    .UseContentRoot(AppContext.BaseDirectory)
+                    .ConfigureServices(services => services
+                        .AddSingleton(_ => _settings)
+                        .AddSingleton(sp => new Updater(sp.GetRequiredService<IPublicAPI>(), Launcher.Properties.Settings.Default.GithubRepo))
+                        .AddSingleton<Portable>()
+                        .AddSingleton<SettingWindowViewModel>()
+                        .AddSingleton<IAlphabet, PinyinAlphabet>()
+                        .AddSingleton<StringMatcher>()
+                        .AddSingleton<Internationalization>()
+                        .AddSingleton<IPublicAPI, PublicAPIInstance>()
+                        .AddSingleton<MainViewModel>()
+                        .AddSingleton<Theme>()
+                    ).Build();
+                Ioc.Default.ConfigureServices(host.Services);
+            }
+            catch (Exception e)
+            {
+                ShowErrorMsgBoxAndFailFast("Cannot configure dependency injection container, please open new issue in Flow.Launcher", e);
+                return;
+            }
 
             // Initialize the public API and Settings first
-            API = Ioc.Default.GetRequiredService<IPublicAPI>();
-            _settings.Initialize();
+            try
+            {
+                API = Ioc.Default.GetRequiredService<IPublicAPI>();
+                _settings.Initialize();
+            }
+            catch (Exception e)
+            {
+                ShowErrorMsgBoxAndFailFast("Cannot initialize api and settings, please open new issue in Flow.Launcher", e);
+                return;
+            }
+        }
+
+        private static void ShowErrorMsgBoxAndFailFast(string message, Exception e)
+        {
+            // Firstly show users the message
+            MessageBox.Show(e.ToString(), message, MessageBoxButton.OK, MessageBoxImage.Error);
+
+            // Flow cannot construct its App instance, so ensure Flow crashes w/ the exception info.
+            Environment.FailFast(message, e);
         }
 
         [STAThread]
@@ -132,17 +165,17 @@ namespace Flow.Launcher
         {
             // we try to enable auto-startup on first launch, or reenable if it was removed
             // but the user still has the setting set
-            if (_settings.StartFlowLauncherOnSystemStartup && !Helper.AutoStartup.IsEnabled)
+            if (_settings.StartFlowLauncherOnSystemStartup && !Infrastructure.AutoStartup.IsEnabled)
             {
                 try
                 {
                     if (_settings.UseLogonTaskForStartup)
                     {
-                        Helper.AutoStartup.EnableViaLogonTask();
+                        Infrastructure.AutoStartup.EnableViaLogonTask();
                     }
                     else
                     {
-                        Helper.AutoStartup.EnableViaRegistry();
+                        Infrastructure.AutoStartup.EnableViaRegistry();
                     }
                 }
                 catch (Exception e)
diff --git a/Flow.Launcher/Flow.Launcher.csproj b/Flow.Launcher/Flow.Launcher.csproj
index f2be60f7a..c2e515844 100644
--- a/Flow.Launcher/Flow.Launcher.csproj
+++ b/Flow.Launcher/Flow.Launcher.csproj
@@ -91,6 +91,7 @@
     </PackageReference>
     <PackageReference Include="InputSimulator" Version="1.0.4" />
     <!-- Do not upgrade Microsoft.Extensions.DependencyInjection and Microsoft.Extensions.Hosting since we are .Net7.0 -->
+    <!-- TaskScheduler seems to be incompatible with 7.0.x version, so we use 6.0.x -->
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.2" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
     <PackageReference Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.3" />

From 7cc32f3021549c39eb0943a8c1cc7c6908885f71 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Wed, 26 Feb 2025 15:40:18 +0800
Subject: [PATCH 20/28] Fix build issue

---
 Flow.Launcher/App.xaml.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Flow.Launcher/App.xaml.cs b/Flow.Launcher/App.xaml.cs
index 277e5dc0c..447eca792 100644
--- a/Flow.Launcher/App.xaml.cs
+++ b/Flow.Launcher/App.xaml.cs
@@ -165,17 +165,17 @@ namespace Flow.Launcher
         {
             // we try to enable auto-startup on first launch, or reenable if it was removed
             // but the user still has the setting set
-            if (_settings.StartFlowLauncherOnSystemStartup && !Infrastructure.AutoStartup.IsEnabled)
+            if (_settings.StartFlowLauncherOnSystemStartup && !Helper.AutoStartup.IsEnabled)
             {
                 try
                 {
                     if (_settings.UseLogonTaskForStartup)
                     {
-                        Infrastructure.AutoStartup.EnableViaLogonTask();
+                        Helper.AutoStartup.EnableViaLogonTask();
                     }
                     else
                     {
-                        Infrastructure.AutoStartup.EnableViaRegistry();
+                        Helper.AutoStartup.EnableViaRegistry();
                     }
                 }
                 catch (Exception e)

From 3fa88064bd572741c8590ce7a1064fb65324b65a Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Wed, 26 Feb 2025 18:30:33 +0800
Subject: [PATCH 21/28] Remove useless localization

---
 Flow.Launcher/Languages/en.xaml    |  3 ---
 Flow.Launcher/ReportWindow.xaml.cs | 33 +++++-------------------------
 2 files changed, 5 insertions(+), 31 deletions(-)

diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index 493528a89..5d2cb2d9e 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -386,9 +386,6 @@
     <system:String x:Key="reportWindow_please_open_issue">Please open new issue in</system:String>
     <system:String x:Key="reportWindow_upload_log">1. Upload log file: {0}</system:String>
     <system:String x:Key="reportWindow_copy_below">2. Copy below exception message</system:String>
-    <system:String x:Key="reportWindow_date">Date: {0}</system:String>
-    <system:String x:Key="reportWindow_exception">Exception:</system:String>
-    <system:String x:Key="reportWindow_length">Length</system:String>
 
     <!--  General Notice  -->
     <system:String x:Key="pleaseWait">Please wait...</system:String>
diff --git a/Flow.Launcher/ReportWindow.xaml.cs b/Flow.Launcher/ReportWindow.xaml.cs
index 12ffe3ffc..6fe90783e 100644
--- a/Flow.Launcher/ReportWindow.xaml.cs
+++ b/Flow.Launcher/ReportWindow.xaml.cs
@@ -6,10 +6,10 @@ using System.Text;
 using System.Linq;
 using System.Windows;
 using System.Windows.Documents;
+using Flow.Launcher.Helper;
 using Flow.Launcher.Infrastructure;
 using Flow.Launcher.Infrastructure.Logger;
 using Flow.Launcher.Plugin.SharedCommands;
-using Flow.Launcher.Infrastructure.Exception;
 
 namespace Flow.Launcher
 {
@@ -55,12 +55,11 @@ namespace Flow.Launcher
             ErrorTextbox.Document.Blocks.Add(paragraph);
 
             StringBuilder content = new StringBuilder();
-            content.AppendLine(RuntimeInfo());
+            content.AppendLine(ErrorReporting.RuntimeInfo());
+            content.AppendLine(ErrorReporting.DependenciesInfo());
             content.AppendLine();
-            content.AppendLine(DependenciesInfo());
-            content.AppendLine();
-            content.AppendLine(string.Format(App.API.GetTranslation("reportWindow_date"), DateTime.Now.ToString(CultureInfo.InvariantCulture)));
-            content.AppendLine(App.API.GetTranslation("reportWindow_exception"));
+            content.AppendLine($"Date: {DateTime.Now.ToString(CultureInfo.InvariantCulture)}");
+            content.AppendLine("Exception:");
             content.AppendLine(exception.ToString());
             paragraph = new Paragraph();
             paragraph.Inlines.Add(content.ToString());
@@ -94,27 +93,5 @@ namespace Flow.Launcher
         {
             Close();
         }
-
-        private static string RuntimeInfo()
-        {
-            var info =
-                $"""
-                Flow Launcher {App.API.GetTranslation("reportWindow_version")}: {Constant.Version}
-                OS {App.API.GetTranslation("reportWindow_version")}: {ExceptionFormatter.GetWindowsFullVersionFromRegistry()}
-                IntPtr {App.API.GetTranslation("reportWindow_length")}: {IntPtr.Size}
-                x64: {Environment.Is64BitOperatingSystem}
-                """;
-            return info;
-        }
-
-        private static string DependenciesInfo()
-        {
-            var info = 
-                $"""
-                {App.API.GetTranslation("pythonFilePath")}: {Constant.PythonPath}
-                {App.API.GetTranslation("nodeFilePath")}: {Constant.NodePath}
-                """;
-            return info;
-        }
     }
 }

From ed5e0bb2d9a8c908f301d794ce2f4bcda8d2b8ca Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Wed, 26 Feb 2025 20:11:27 +0800
Subject: [PATCH 22/28] Improve documents

---
 Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs | 11 +++++------
 Flow.Launcher/ProgressBoxEx.xaml.cs           | 14 +++++++-------
 Flow.Launcher/PublicAPIInstance.cs            |  2 +-
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
index 8376fd07b..ef22b697e 100644
--- a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
+++ b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
@@ -322,17 +322,16 @@ namespace Flow.Launcher.Plugin
         public MessageBoxResult ShowMsgBox(string messageBoxText, string caption = "", MessageBoxButton button = MessageBoxButton.OK, MessageBoxImage icon = MessageBoxImage.None, MessageBoxResult defaultResult = MessageBoxResult.OK);
 
         /// <summary>
-        /// Displays a standardised Flow message box.
-        /// If there is issue when showing the message box, it will return null.
+        /// Displays a standardised Flow progress box.
         /// </summary>
-        /// <param name="caption">The caption of the message box.</param>
+        /// <param name="caption">The caption of the progress box.</param>
         /// <param name="reportProgressAsync">
         /// Time-consuming task function, whose input is the action to report progress.
         /// The input of the action is the progress value which is a double value between 0 and 100.
         /// If there are any exceptions, this action will be null.
         /// </param>
-        /// <param name="forceClosed">When user closes the progress box manually by button or esc key, this action will be called.</param>
-        /// <returns>A progress box interface.</returns>
-        public Task ShowProgressBoxAsync(string caption, Func<Action<double>, Task> reportProgressAsync, Action forceClosed = null);
+        /// <param name="cancelProgress">When user cancel the progress, this action will be called.</param>
+        /// <returns></returns>
+        public Task ShowProgressBoxAsync(string caption, Func<Action<double>, Task> reportProgressAsync, Action cancelProgress = null);
     }
 }
diff --git a/Flow.Launcher/ProgressBoxEx.xaml.cs b/Flow.Launcher/ProgressBoxEx.xaml.cs
index 755fc4a1f..2395bdf34 100644
--- a/Flow.Launcher/ProgressBoxEx.xaml.cs
+++ b/Flow.Launcher/ProgressBoxEx.xaml.cs
@@ -8,15 +8,15 @@ namespace Flow.Launcher
 {
     public partial class ProgressBoxEx : Window
     {
-        private readonly Action _forceClosed;
+        private readonly Action _cancelProgress;
 
-        private ProgressBoxEx(Action forceClosed)
+        private ProgressBoxEx(Action cancelProgress)
         {
-            _forceClosed = forceClosed;
+            _cancelProgress = cancelProgress;
             InitializeComponent();
         }
 
-        public static async Task ShowAsync(string caption, Func<Action<double>, Task> reportProgressAsync, Action forceClosed = null)
+        public static async Task ShowAsync(string caption, Func<Action<double>, Task> reportProgressAsync, Action cancelProgress = null)
         {
             ProgressBoxEx prgBox = null;
             try
@@ -25,7 +25,7 @@ namespace Flow.Launcher
                 {
                     await Application.Current.Dispatcher.InvokeAsync(() =>
                     {
-                        prgBox = new ProgressBoxEx(forceClosed)
+                        prgBox = new ProgressBoxEx(cancelProgress)
                         {
                             Title = caption
                         };
@@ -35,7 +35,7 @@ namespace Flow.Launcher
                 }
                 else
                 {
-                    prgBox = new ProgressBoxEx(forceClosed)
+                    prgBox = new ProgressBoxEx(cancelProgress)
                     {
                         Title = caption
                     };
@@ -113,7 +113,7 @@ namespace Flow.Launcher
         private void ForceClose()
         {
             Close();
-            _forceClosed?.Invoke();
+            _cancelProgress?.Invoke();
         }
     }
 }
diff --git a/Flow.Launcher/PublicAPIInstance.cs b/Flow.Launcher/PublicAPIInstance.cs
index 7706a64ba..848d7f14c 100644
--- a/Flow.Launcher/PublicAPIInstance.cs
+++ b/Flow.Launcher/PublicAPIInstance.cs
@@ -324,7 +324,7 @@ namespace Flow.Launcher
         public MessageBoxResult ShowMsgBox(string messageBoxText, string caption = "", MessageBoxButton button = MessageBoxButton.OK, MessageBoxImage icon = MessageBoxImage.None, MessageBoxResult defaultResult = MessageBoxResult.OK) =>
             MessageBoxEx.Show(messageBoxText, caption, button, icon, defaultResult);
 
-        public Task ShowProgressBoxAsync(string caption, Func<Action<double>, Task> reportProgressAsync, Action forceClosed = null) => ProgressBoxEx.ShowAsync(caption, reportProgressAsync, forceClosed);
+        public Task ShowProgressBoxAsync(string caption, Func<Action<double>, Task> reportProgressAsync, Action cancelProgress = null) => ProgressBoxEx.ShowAsync(caption, reportProgressAsync, cancelProgress);
 
         #endregion
 

From fb9980e90a87add97d37d6a48bdf276e171e094c Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Thu, 27 Feb 2025 10:39:57 +0800
Subject: [PATCH 23/28] Upgrade nuget packages

---
 Flow.Launcher/Flow.Launcher.csproj | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Flow.Launcher/Flow.Launcher.csproj b/Flow.Launcher/Flow.Launcher.csproj
index c2e515844..cc43bd2ac 100644
--- a/Flow.Launcher/Flow.Launcher.csproj
+++ b/Flow.Launcher/Flow.Launcher.csproj
@@ -91,9 +91,8 @@
     </PackageReference>
     <PackageReference Include="InputSimulator" Version="1.0.4" />
     <!-- Do not upgrade Microsoft.Extensions.DependencyInjection and Microsoft.Extensions.Hosting since we are .Net7.0 -->
-    <!-- TaskScheduler seems to be incompatible with 7.0.x version, so we use 6.0.x -->
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.2" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
     <PackageReference Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.3" />
     <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.106">
       <PrivateAssets>all</PrivateAssets>
@@ -105,7 +104,7 @@
     <PackageReference Include="NHotkey.Wpf" Version="3.0.0" />
     <PackageReference Include="PropertyChanged.Fody" Version="3.4.0" />
     <PackageReference Include="SemanticVersioning" Version="3.0.0" />
-    <PackageReference Include="TaskScheduler" Version="2.11.0" />
+    <PackageReference Include="TaskScheduler" Version="2.12.0" />
     <PackageReference Include="VirtualizingWrapPanel" Version="2.1.1" />
   </ItemGroup>
 

From a153bb6baef1fe0a5c9ab5e4bfe25ed771ceed44 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Thu, 27 Feb 2025 12:38:45 +0800
Subject: [PATCH 24/28] Test Jack251970.TaskScheduler package

---
 Flow.Launcher/Flow.Launcher.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Flow.Launcher/Flow.Launcher.csproj b/Flow.Launcher/Flow.Launcher.csproj
index cc43bd2ac..d77847bef 100644
--- a/Flow.Launcher/Flow.Launcher.csproj
+++ b/Flow.Launcher/Flow.Launcher.csproj
@@ -104,7 +104,7 @@
     <PackageReference Include="NHotkey.Wpf" Version="3.0.0" />
     <PackageReference Include="PropertyChanged.Fody" Version="3.4.0" />
     <PackageReference Include="SemanticVersioning" Version="3.0.0" />
-    <PackageReference Include="TaskScheduler" Version="2.12.0" />
+    <PackageReference Include="Jack251970.TaskScheduler" Version="2.12.0" />
     <PackageReference Include="VirtualizingWrapPanel" Version="2.1.1" />
   </ItemGroup>
 

From 406b1961b2b837512bec4ce74c0cc7ea4b07e7ea Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Thu, 27 Feb 2025 13:25:21 +0800
Subject: [PATCH 25/28] Test updated Jack251970.TaskScheduler package

---
 Flow.Launcher/Flow.Launcher.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Flow.Launcher/Flow.Launcher.csproj b/Flow.Launcher/Flow.Launcher.csproj
index d77847bef..33d13614f 100644
--- a/Flow.Launcher/Flow.Launcher.csproj
+++ b/Flow.Launcher/Flow.Launcher.csproj
@@ -104,7 +104,7 @@
     <PackageReference Include="NHotkey.Wpf" Version="3.0.0" />
     <PackageReference Include="PropertyChanged.Fody" Version="3.4.0" />
     <PackageReference Include="SemanticVersioning" Version="3.0.0" />
-    <PackageReference Include="Jack251970.TaskScheduler" Version="2.12.0" />
+    <PackageReference Include="Jack251970.TaskScheduler" Version="2.12.1" />
     <PackageReference Include="VirtualizingWrapPanel" Version="2.1.1" />
   </ItemGroup>
 

From 9dbc174994e77124c2b42b2864ab6ab1f4d8ab10 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Fri, 28 Feb 2025 15:34:59 +0800
Subject: [PATCH 26/28] Add cache size management & Add error handling

---
 .../Helper/WallpaperPathRetrieval.cs          | 69 ++++++++++++-------
 1 file changed, 45 insertions(+), 24 deletions(-)

diff --git a/Flow.Launcher/Helper/WallpaperPathRetrieval.cs b/Flow.Launcher/Helper/WallpaperPathRetrieval.cs
index 9f66a270c..eedc78eca 100644
--- a/Flow.Launcher/Helper/WallpaperPathRetrieval.cs
+++ b/Flow.Launcher/Helper/WallpaperPathRetrieval.cs
@@ -17,6 +17,7 @@ public static class WallpaperPathRetrieval
     private static readonly int MAX_PATH = 260;
 
     private static readonly Dictionary<(string, DateTime), ImageBrush> wallpaperCache = new();
+    private const int MaxCacheSize = 3;
 
     public static Brush GetWallpaperBrush()
     {
@@ -26,35 +27,55 @@ public static class WallpaperPathRetrieval
             return Application.Current.Dispatcher.Invoke(GetWallpaperBrush);
         }
 
-        var wallpaperPath = GetWallpaperPath();
-        if (wallpaperPath is not null && File.Exists(wallpaperPath))
+        try
         {
-            // Since the wallpaper file name can be the same (TranscodedWallpaper),
-            // we need to add the last modified date to differentiate them
-            var dateModified = File.GetLastWriteTime(wallpaperPath);
-            wallpaperCache.TryGetValue((wallpaperPath, dateModified), out var cachedWallpaper);
-            if (cachedWallpaper != null)
+            var wallpaperPath = GetWallpaperPath();
+            if (wallpaperPath is not null && File.Exists(wallpaperPath))
             {
-                return cachedWallpaper;
+                // Since the wallpaper file name can be the same (TranscodedWallpaper),
+                // we need to add the last modified date to differentiate them
+                var dateModified = File.GetLastWriteTime(wallpaperPath);
+                wallpaperCache.TryGetValue((wallpaperPath, dateModified), out var cachedWallpaper);
+                if (cachedWallpaper != null)
+                {
+                    return cachedWallpaper;
+                }
+
+                // We should not dispose the memory stream since the bitmap is still in use
+                var memStream = new MemoryStream(File.ReadAllBytes(wallpaperPath));
+                var bitmap = new BitmapImage();
+                bitmap.BeginInit();
+                bitmap.StreamSource = memStream;
+                bitmap.DecodePixelWidth = 800;
+                bitmap.DecodePixelHeight = 600;
+                bitmap.EndInit();
+                bitmap.Freeze(); // Make the bitmap thread-safe
+                var wallpaperBrush = new ImageBrush(bitmap) { Stretch = Stretch.UniformToFill };
+                wallpaperBrush.Freeze(); // Make the brush thread-safe
+
+                // Manage cache size
+                if (wallpaperCache.Count >= MaxCacheSize)
+                {
+                    // Remove the oldest wallpaper from the cache
+                    var oldestCache = wallpaperCache.Keys.OrderBy(k => k.Item2).FirstOrDefault();
+                    if (oldestCache != default)
+                    {
+                        wallpaperCache.Remove(oldestCache);
+                    }
+                }
+
+                wallpaperCache.Add((wallpaperPath, dateModified), wallpaperBrush);
+                return wallpaperBrush;
             }
 
-            // We should not dispose the memory stream since the bitmap is still in use
-            var memStream = new MemoryStream(File.ReadAllBytes(wallpaperPath));
-            var bitmap = new BitmapImage();
-            bitmap.BeginInit();
-            bitmap.StreamSource = memStream;
-            bitmap.DecodePixelWidth = 800;
-            bitmap.DecodePixelHeight = 600;
-            bitmap.EndInit();
-            bitmap.Freeze(); // Make the bitmap thread-safe
-            var wallpaperBrush = new ImageBrush(bitmap) { Stretch = Stretch.UniformToFill };
-            wallpaperBrush.Freeze(); // Make the brush thread-safe
-            wallpaperCache.Add((wallpaperPath, dateModified), wallpaperBrush);
-            return wallpaperBrush;
+            var wallpaperColor = GetWallpaperColor();
+            return new SolidColorBrush(wallpaperColor);
+        }
+        catch (Exception ex)
+        {
+            App.API.LogException(nameof(WallpaperPathRetrieval), "Error retrieving wallpaper", ex);
+            return new SolidColorBrush(Colors.Transparent);
         }
-
-        var wallpaperColor = GetWallpaperColor();
-        return new SolidColorBrush(wallpaperColor);
     }
 
     private static unsafe string GetWallpaperPath()

From c06042f96bee6f65fe1b4b761643a2e2bd495978 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Fri, 28 Feb 2025 17:03:53 +0800
Subject: [PATCH 27/28] Fix API instance create twice issue & Make
 PluginManager.API private

---
 Flow.Launcher.Core/Plugin/PluginManager.cs                | 4 +++-
 Flow.Launcher/MainWindow.xaml.cs                          | 2 +-
 .../SettingPages/ViewModels/SettingsPaneAboutViewModel.cs | 5 ++---
 .../SettingPages/Views/SettingsPanePluginStore.xaml.cs    | 3 +--
 Flow.Launcher/ViewModel/MainViewModel.cs                  | 2 +-
 Flow.Launcher/ViewModel/PluginViewModel.cs                | 8 ++++----
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Flow.Launcher.Core/Plugin/PluginManager.cs b/Flow.Launcher.Core/Plugin/PluginManager.cs
index 6e7b5ec60..09711051e 100644
--- a/Flow.Launcher.Core/Plugin/PluginManager.cs
+++ b/Flow.Launcher.Core/Plugin/PluginManager.cs
@@ -29,7 +29,9 @@ namespace Flow.Launcher.Core.Plugin
         public static readonly HashSet<PluginPair> GlobalPlugins = new();
         public static readonly Dictionary<string, PluginPair> NonGlobalPlugins = new();
 
-        public static IPublicAPI API { get; private set; } = Ioc.Default.GetRequiredService<IPublicAPI>();
+        // We should not initialize API in static constructor because it will create another API instance
+        private static IPublicAPI api = null;
+        private static IPublicAPI API => api ??= Ioc.Default.GetRequiredService<IPublicAPI>();
 
         private static PluginsSettings Settings;
         private static List<PluginMetadata> _metadatas;
diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
index 41dc68fd9..3f1bae090 100644
--- a/Flow.Launcher/MainWindow.xaml.cs
+++ b/Flow.Launcher/MainWindow.xaml.cs
@@ -438,7 +438,7 @@ namespace Flow.Launcher
             if (_settings.FirstLaunch)
             {
                 _settings.FirstLaunch = false;
-                PluginManager.API.SaveAppAllSettings();
+                App.API.SaveAppAllSettings();
                 OpenWelcomeWindow();
             }
         }
diff --git a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneAboutViewModel.cs b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneAboutViewModel.cs
index cb434f399..ade650284 100644
--- a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneAboutViewModel.cs
+++ b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneAboutViewModel.cs
@@ -6,7 +6,6 @@ using System.Threading.Tasks;
 using System.Windows;
 using CommunityToolkit.Mvvm.Input;
 using Flow.Launcher.Core;
-using Flow.Launcher.Core.Plugin;
 using Flow.Launcher.Core.Resource;
 using Flow.Launcher.Infrastructure;
 using Flow.Launcher.Infrastructure.UserSettings;
@@ -77,7 +76,7 @@ public partial class SettingsPaneAboutViewModel : BaseModel
     [RelayCommand]
     private void OpenSettingsFolder()
     {
-        PluginManager.API.OpenDirectory(Path.Combine(DataLocation.DataDirectory(), Constant.Settings));
+        App.API.OpenDirectory(Path.Combine(DataLocation.DataDirectory(), Constant.Settings));
     }
 
     [RelayCommand]
@@ -85,7 +84,7 @@ public partial class SettingsPaneAboutViewModel : BaseModel
     {
         string settingsFolderPath = Path.Combine(DataLocation.DataDirectory(), Constant.Settings);
         string parentFolderPath = Path.GetDirectoryName(settingsFolderPath);
-        PluginManager.API.OpenDirectory(parentFolderPath);
+        App.API.OpenDirectory(parentFolderPath);
     }
 
 
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPanePluginStore.xaml.cs b/Flow.Launcher/SettingPages/Views/SettingsPanePluginStore.xaml.cs
index dfb4a7eaf..db4763319 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPanePluginStore.xaml.cs
+++ b/Flow.Launcher/SettingPages/Views/SettingsPanePluginStore.xaml.cs
@@ -3,7 +3,6 @@ using System.ComponentModel;
 using System.Windows.Data;
 using System.Windows.Input;
 using System.Windows.Navigation;
-using Flow.Launcher.Core.Plugin;
 using Flow.Launcher.SettingPages.ViewModels;
 using Flow.Launcher.ViewModel;
 
@@ -49,7 +48,7 @@ public partial class SettingsPanePluginStore
 
     private void Hyperlink_OnRequestNavigate(object sender, RequestNavigateEventArgs e)
     {
-        PluginManager.API.OpenUrl(e.Uri.AbsoluteUri);
+        App.API.OpenUrl(e.Uri.AbsoluteUri);
         e.Handled = true;
     }
 
diff --git a/Flow.Launcher/ViewModel/MainViewModel.cs b/Flow.Launcher/ViewModel/MainViewModel.cs
index 650a27610..6b0144a03 100644
--- a/Flow.Launcher/ViewModel/MainViewModel.cs
+++ b/Flow.Launcher/ViewModel/MainViewModel.cs
@@ -442,7 +442,7 @@ namespace Flow.Launcher.ViewModel
         [RelayCommand]
         private void SelectHelp()
         {
-            PluginManager.API.OpenUrl("https://www.flowlauncher.com/docs/#/usage-tips");
+            App.API.OpenUrl("https://www.flowlauncher.com/docs/#/usage-tips");
         }
 
         [RelayCommand]
diff --git a/Flow.Launcher/ViewModel/PluginViewModel.cs b/Flow.Launcher/ViewModel/PluginViewModel.cs
index bae9292bf..46f8e00a2 100644
--- a/Flow.Launcher/ViewModel/PluginViewModel.cs
+++ b/Flow.Launcher/ViewModel/PluginViewModel.cs
@@ -134,20 +134,20 @@ namespace Flow.Launcher.ViewModel
         {
             var directory = PluginPair.Metadata.PluginDirectory;
             if (!string.IsNullOrEmpty(directory))
-                PluginManager.API.OpenDirectory(directory);
+                App.API.OpenDirectory(directory);
         }
 
         [RelayCommand]
         private void OpenSourceCodeLink()
         {
-            PluginManager.API.OpenUrl(PluginPair.Metadata.Website);
+            App.API.OpenUrl(PluginPair.Metadata.Website);
         }
 
         [RelayCommand]
         private void OpenDeletePluginWindow()
         {
-            PluginManager.API.ChangeQuery($"{PluginManagerActionKeyword} uninstall {PluginPair.Metadata.Name}".Trim(), true);
-            PluginManager.API.ShowMainWindow();
+            App.API.ChangeQuery($"{PluginManagerActionKeyword} uninstall {PluginPair.Metadata.Name}".Trim(), true);
+            App.API.ShowMainWindow();
         }
 
         public static bool IsActionKeywordRegistered(string newActionKeyword) => PluginManager.ActionKeywordRegistered(newActionKeyword);

From d8c547f7ef3a640b613778713508a9b111c90ab6 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Fri, 28 Feb 2025 18:10:58 +0800
Subject: [PATCH 28/28] Improve code quality

---
 Flow.Launcher/Helper/WallpaperPathRetrieval.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Flow.Launcher/Helper/WallpaperPathRetrieval.cs b/Flow.Launcher/Helper/WallpaperPathRetrieval.cs
index eedc78eca..a3bd83a97 100644
--- a/Flow.Launcher/Helper/WallpaperPathRetrieval.cs
+++ b/Flow.Launcher/Helper/WallpaperPathRetrieval.cs
@@ -15,9 +15,9 @@ namespace Flow.Launcher.Helper;
 public static class WallpaperPathRetrieval
 {
     private static readonly int MAX_PATH = 260;
+    private static readonly int MAX_CACHE_SIZE = 3;
 
     private static readonly Dictionary<(string, DateTime), ImageBrush> wallpaperCache = new();
-    private const int MaxCacheSize = 3;
 
     public static Brush GetWallpaperBrush()
     {
@@ -54,7 +54,7 @@ public static class WallpaperPathRetrieval
                 wallpaperBrush.Freeze(); // Make the brush thread-safe
 
                 // Manage cache size
-                if (wallpaperCache.Count >= MaxCacheSize)
+                if (wallpaperCache.Count >= MAX_CACHE_SIZE)
                 {
                     // Remove the oldest wallpaper from the cache
                     var oldestCache = wallpaperCache.Keys.OrderBy(k => k.Item2).FirstOrDefault();