Remove IApp & AppExtensions and use dependency injection instead

Jack251970 · Jack251970 · commit 3cb9d1dce4b6 · 2025-01-12T20:04:44.000+08:00
diff --git a/Flow.Launcher.Core/AppExtensions.cs b/Flow.Launcher.Core/AppExtensions.cs
diff --git a/Flow.Launcher.Core/Configuration/Portable.cs b/Flow.Launcher.Core/Configuration/Portable.cs
@@ -9,11 +9,15 @@
 using Flow.Launcher.Infrastructure.UserSettings;
 using Flow.Launcher.Plugin.SharedCommands;
 using System.Linq;
+using CommunityToolkit.Mvvm.DependencyInjection;
+using Flow.Launcher.Plugin;
 
 namespace Flow.Launcher.Core.Configuration
 {
     public class Portable : IPortable
     {
+        private readonly IPublicAPI API = Ioc.Default.GetRequiredService<IPublicAPI>();
+
         /// <summary>
         /// As at Squirrel.Windows version 1.5.2, UpdateManager needs to be disposed after finish
         /// </summary>
@@ -40,7 +44,7 @@ public void DisablePortableMode()
 #endif
                 IndicateDeletion(DataLocation.PortableDataPath);
 
-                AppExtensions.API.ShowMsgBox("Flow Launcher needs to restart to finish disabling portable mode, " +
+                API.ShowMsgBox("Flow Launcher needs to restart to finish disabling portable mode, " +
                     "after the restart your portable data profile will be deleted and roaming data profile kept");
 
                 UpdateManager.RestartApp(Constant.ApplicationFileName);
@@ -64,7 +68,7 @@ public void EnablePortableMode()
 #endif
                 IndicateDeletion(DataLocation.RoamingDataPath);
 
-                AppExtensions.API.ShowMsgBox("Flow Launcher needs to restart to finish enabling portable mode, " +
+                API.ShowMsgBox("Flow Launcher needs to restart to finish enabling portable mode, " +
                     "after the restart your roaming data profile will be deleted and portable data profile kept");
 
                 UpdateManager.RestartApp(Constant.ApplicationFileName);
@@ -95,13 +99,13 @@ public void RemoveUninstallerEntry()
 
         public void MoveUserDataFolder(string fromLocation, string toLocation)
         {
-            FilesFolders.CopyAll(fromLocation, toLocation, (s) => AppExtensions.API.ShowMsgBox(s));
+            FilesFolders.CopyAll(fromLocation, toLocation, (s) => API.ShowMsgBox(s));
             VerifyUserDataAfterMove(fromLocation, toLocation);
         }
 
         public void VerifyUserDataAfterMove(string fromLocation, string toLocation)
         {
-            FilesFolders.VerifyBothFolderFilesEqual(fromLocation, toLocation, (s) => AppExtensions.API.ShowMsgBox(s));
+            FilesFolders.VerifyBothFolderFilesEqual(fromLocation, toLocation, (s) => API.ShowMsgBox(s));
         }
 
         public void CreateShortcuts()
@@ -157,13 +161,13 @@ public void PreStartCleanUpAfterPortabilityUpdate()
             // delete it and prompt the user to pick the portable data location
             if (File.Exists(roamingDataDeleteFilePath))
             {
-                FilesFolders.RemoveFolderIfExists(roamingDataDir, (s) => AppExtensions.API.ShowMsgBox(s));
+                FilesFolders.RemoveFolderIfExists(roamingDataDir, (s) => API.ShowMsgBox(s));
 
-                if (AppExtensions.API.ShowMsgBox("Flow Launcher has detected you enabled portable mode, " +
+                if (API.ShowMsgBox("Flow Launcher has detected you enabled portable mode, " +
                                     "would you like to move it to a different location?", string.Empty,
                                     MessageBoxButton.YesNo) == MessageBoxResult.Yes)
                 {
-                    FilesFolders.OpenPath(Constant.RootDirectory, (s) => AppExtensions.API.ShowMsgBox(s));
+                    FilesFolders.OpenPath(Constant.RootDirectory, (s) => API.ShowMsgBox(s));
 
                     Environment.Exit(0);
                 }
@@ -172,9 +176,9 @@ public void PreStartCleanUpAfterPortabilityUpdate()
             // delete it and notify the user about it.
             else if (File.Exists(portableDataDeleteFilePath))
             {
-                FilesFolders.RemoveFolderIfExists(portableDataDir, (s) => AppExtensions.API.ShowMsgBox(s));
+                FilesFolders.RemoveFolderIfExists(portableDataDir, (s) => API.ShowMsgBox(s));
 
-                AppExtensions.API.ShowMsgBox("Flow Launcher has detected you disabled portable mode, " +
+                API.ShowMsgBox("Flow Launcher has detected you disabled portable mode, " +
                                     "the relevant shortcuts and uninstaller entry have been created");
             }
         }
@@ -186,7 +190,7 @@ public bool CanUpdatePortability()
 
             if (roamingLocationExists && portableLocationExists)
             {
-                AppExtensions.API.ShowMsgBox(string.Format("Flow Launcher detected your user data exists both in {0} and " +
+                API.ShowMsgBox(string.Format("Flow Launcher detected your user data exists both in {0} and " +
                                     "{1}. {2}{2}Please delete {1} in order to proceed. No changes have occurred.", 
                                     DataLocation.PortableDataPath, DataLocation.RoamingDataPath, Environment.NewLine));
 
diff --git a/Flow.Launcher.Core/ExternalPlugins/Environments/AbstractPluginEnvironment.cs b/Flow.Launcher.Core/ExternalPlugins/Environments/AbstractPluginEnvironment.cs
@@ -8,11 +8,14 @@
 using System.Windows;
 using System.Windows.Forms;
 using Flow.Launcher.Core.Resource;
+using CommunityToolkit.Mvvm.DependencyInjection;
 
 namespace Flow.Launcher.Core.ExternalPlugins.Environments
 {
     public abstract class AbstractPluginEnvironment
     {
+        protected readonly IPublicAPI API = Ioc.Default.GetRequiredService<IPublicAPI>();
+
         internal abstract string Language { get; }
 
         internal abstract string EnvName { get; }
@@ -25,7 +28,7 @@ public abstract class AbstractPluginEnvironment
 
         internal virtual string FileDialogFilter => string.Empty;
 
-        internal  abstract string PluginsSettingsFilePath { get; set; }
+        internal abstract string PluginsSettingsFilePath { get; set; }
 
         internal List<PluginMetadata> PluginMetadataList;
 
@@ -57,7 +60,7 @@ internal IEnumerable<PluginPair> Setup()
                 EnvName,
                 Environment.NewLine
             );
-            if (AppExtensions.API.ShowMsgBox(noRuntimeMessage, string.Empty, MessageBoxButton.YesNo) == MessageBoxResult.No)
+            if (API.ShowMsgBox(noRuntimeMessage, string.Empty, MessageBoxButton.YesNo) == MessageBoxResult.No)
             {
                 var msg = string.Format(InternationalizationManager.Instance.GetTranslation("runtimePluginChooseRuntimeExecutable"), EnvName);
                 string selectedFile;
@@ -82,7 +85,7 @@ internal IEnumerable<PluginPair> Setup()
             }
             else
             {
-                AppExtensions.API.ShowMsgBox(string.Format(InternationalizationManager.Instance.GetTranslation("runtimePluginUnableToSetExecutablePath"), Language));
+                API.ShowMsgBox(string.Format(InternationalizationManager.Instance.GetTranslation("runtimePluginUnableToSetExecutablePath"), Language));
                 Log.Error("PluginsLoader",
                     $"Not able to successfully set {EnvName} path, setting's plugin executable path variable is still an empty string.",
                     $"{Language}Environment");
@@ -98,7 +101,7 @@ private void EnsureLatestInstalled(string expectedPath, string currentPath, stri
             if (expectedPath == currentPath)
                 return;
 
-            FilesFolders.RemoveFolderIfExists(installedDirPath, (s) => AppExtensions.API.ShowMsgBox(s));
+            FilesFolders.RemoveFolderIfExists(installedDirPath, (s) => API.ShowMsgBox(s));
 
             InstallEnvironment();
 
diff --git a/Flow.Launcher.Core/ExternalPlugins/Environments/PythonEnvironment.cs b/Flow.Launcher.Core/ExternalPlugins/Environments/PythonEnvironment.cs
@@ -28,7 +28,7 @@ internal PythonEnvironment(List<PluginMetadata> pluginMetadataList, PluginsSetti
 
         internal override void InstallEnvironment()
         {
-            FilesFolders.RemoveFolderIfExists(InstallPath, (s) => AppExtensions.API.ShowMsgBox(s));
+            FilesFolders.RemoveFolderIfExists(InstallPath, (s) => API.ShowMsgBox(s));
 
             // Python 3.11.4 is no longer Windows 7 compatible. If user is on Win 7 and
             // uses Python plugin they need to custom install and use v3.8.9
diff --git a/Flow.Launcher.Core/ExternalPlugins/Environments/TypeScriptEnvironment.cs b/Flow.Launcher.Core/ExternalPlugins/Environments/TypeScriptEnvironment.cs
@@ -25,7 +25,7 @@ internal TypeScriptEnvironment(List<PluginMetadata> pluginMetadataList, PluginsS
 
         internal override void InstallEnvironment()
         {
-            FilesFolders.RemoveFolderIfExists(InstallPath, (s) => AppExtensions.API.ShowMsgBox(s));
+            FilesFolders.RemoveFolderIfExists(InstallPath, (s) => API.ShowMsgBox(s));
 
             DroplexPackage.Drop(App.nodejs_16_18_0, InstallPath).Wait();
 
diff --git a/Flow.Launcher.Core/ExternalPlugins/Environments/TypeScriptV2Environment.cs b/Flow.Launcher.Core/ExternalPlugins/Environments/TypeScriptV2Environment.cs
@@ -25,7 +25,7 @@ internal TypeScriptV2Environment(List<PluginMetadata> pluginMetadataList, Plugin
 
         internal override void InstallEnvironment()
         {
-            FilesFolders.RemoveFolderIfExists(InstallPath, (s) => AppExtensions.API.ShowMsgBox(s));
+            FilesFolders.RemoveFolderIfExists(InstallPath, (s) => API.ShowMsgBox(s));
 
             DroplexPackage.Drop(App.nodejs_16_18_0, InstallPath).Wait();
 
diff --git a/Flow.Launcher.Core/IApp.cs b/Flow.Launcher.Core/IApp.cs
diff --git a/Flow.Launcher.Core/Plugin/PluginManager.cs b/Flow.Launcher.Core/Plugin/PluginManager.cs
@@ -519,7 +519,7 @@ internal static void InstallPlugin(UserPlugin plugin, string zipFilePath, bool c
 
             var newPluginPath = Path.Combine(installDirectory, folderName);
 
-            FilesFolders.CopyAll(pluginFolderPath, newPluginPath, (s) => AppExtensions.API.ShowMsgBox(s));
+            FilesFolders.CopyAll(pluginFolderPath, newPluginPath, (s) => API.ShowMsgBox(s));
 
             Directory.Delete(tempFolderPluginPath, true);
 
diff --git a/Flow.Launcher.Core/Plugin/PluginsLoader.cs b/Flow.Launcher.Core/Plugin/PluginsLoader.cs
@@ -4,6 +4,7 @@
 using System.Reflection;
 using System.Threading.Tasks;
 using System.Windows;
+using CommunityToolkit.Mvvm.DependencyInjection;
 using Flow.Launcher.Core.ExternalPlugins.Environments;
 #pragma warning disable IDE0005
 using Flow.Launcher.Infrastructure.Logger;
@@ -119,7 +120,7 @@ public static IEnumerable<PluginPair> DotNetPlugins(List<PluginMetadata> source)
 
                 _ = Task.Run(() =>
                 {
-                    AppExtensions.API.ShowMsgBox($"{errorMessage}{Environment.NewLine}{Environment.NewLine}" +
+                    Ioc.Default.GetRequiredService<IPublicAPI>().ShowMsgBox($"{errorMessage}{Environment.NewLine}{Environment.NewLine}" +
                                     $"{errorPluginString}{Environment.NewLine}{Environment.NewLine}" +
                                     $"Please refer to the logs for more information", "",
                         MessageBoxButton.OK, MessageBoxImage.Warning);
diff --git a/Flow.Launcher.Core/Resource/Internationalization.cs b/Flow.Launcher.Core/Resource/Internationalization.cs
@@ -11,6 +11,7 @@
 using Flow.Launcher.Plugin;
 using System.Globalization;
 using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.DependencyInjection;
 
 namespace Flow.Launcher.Core.Resource
 {
@@ -124,7 +125,7 @@ public bool PromptShouldUsePinyin(string languageCodeToSet)
             // "Do you want to search with pinyin?"
             string text = languageToSet == AvailableLanguages.Chinese ? "是否启用拼音搜索？" : "是否啓用拼音搜索？" ;
 
-            if (AppExtensions.API.ShowMsgBox(text, string.Empty, MessageBoxButton.YesNo) == MessageBoxResult.No)
+            if (Ioc.Default.GetRequiredService<IPublicAPI>().ShowMsgBox(text, string.Empty, MessageBoxButton.YesNo) == MessageBoxResult.No)
                 return false;
 
             return true;
diff --git a/Flow.Launcher.Core/Resource/Theme.cs b/Flow.Launcher.Core/Resource/Theme.cs
@@ -11,6 +11,8 @@
 using Flow.Launcher.Infrastructure;
 using Flow.Launcher.Infrastructure.Logger;
 using Flow.Launcher.Infrastructure.UserSettings;
+using CommunityToolkit.Mvvm.DependencyInjection;
+using Flow.Launcher.Plugin;
 
 namespace Flow.Launcher.Core.Resource
 {
@@ -22,6 +24,7 @@ public class Theme
 
         private const int ShadowExtraMargin = 32;
 
+        private readonly IPublicAPI API = Ioc.Default.GetRequiredService<IPublicAPI>();
         private readonly List<string> _themeDirectories = new List<string>();
         private ResourceDictionary _oldResource;
         private string _oldTheme;
@@ -108,7 +111,7 @@ public bool ChangeTheme(string theme)
                 Log.Error($"|Theme.ChangeTheme|Theme <{theme}> path can't be found");
                 if (theme != defaultTheme)
                 {
-                    AppExtensions.API.ShowMsgBox(string.Format(InternationalizationManager.Instance.GetTranslation("theme_load_failure_path_not_exists"), theme));
+                    API.ShowMsgBox(string.Format(InternationalizationManager.Instance.GetTranslation("theme_load_failure_path_not_exists"), theme));
                     ChangeTheme(defaultTheme);
                 }
                 return false;
@@ -118,7 +121,7 @@ public bool ChangeTheme(string theme)
                 Log.Error($"|Theme.ChangeTheme|Theme <{theme}> fail to parse");
                 if (theme != defaultTheme)
                 {
-                    AppExtensions.API.ShowMsgBox(string.Format(InternationalizationManager.Instance.GetTranslation("theme_load_failure_parse_error"), theme));
+                    API.ShowMsgBox(string.Format(InternationalizationManager.Instance.GetTranslation("theme_load_failure_parse_error"), theme));
                     ChangeTheme(defaultTheme);
                 }
                 return false;
diff --git a/Flow.Launcher.Core/Updater.cs b/Flow.Launcher.Core/Updater.cs
@@ -17,14 +17,17 @@
 using Flow.Launcher.Plugin;
 using System.Text.Json.Serialization;
 using System.Threading;
+using CommunityToolkit.Mvvm.DependencyInjection;
 
 namespace Flow.Launcher.Core
 {
     public class Updater
     {
-        public string GitHubRepository { get; }
+        private readonly IPublicAPI API = Ioc.Default.GetRequiredService<IPublicAPI>();
 
-        public Updater(string gitHubRepository)
+        public string GitHubRepository { get; set; }
+
+        public void Initialize(string gitHubRepository)
         {
             GitHubRepository = gitHubRepository;
         }
@@ -53,7 +56,7 @@ public async Task UpdateAppAsync(IPublicAPI api, bool silentUpdate = true)
                 if (newReleaseVersion <= currentVersion)
                 {
                     if (!silentUpdate)
-                        AppExtensions.API.ShowMsgBox(api.GetTranslation("update_flowlauncher_already_on_latest"));
+                        API.ShowMsgBox(api.GetTranslation("update_flowlauncher_already_on_latest"));
                     return;
                 }
 
@@ -68,9 +71,9 @@ public async Task UpdateAppAsync(IPublicAPI api, bool silentUpdate = true)
                 if (DataLocation.PortableDataLocationInUse())
                 {
                     var targetDestination = updateManager.RootAppDirectory + $"\\app-{newReleaseVersion.ToString()}\\{DataLocation.PortableFolderName}";
-                    FilesFolders.CopyAll(DataLocation.PortableDataPath, targetDestination, (s) => AppExtensions.API.ShowMsgBox(s));
-                    if (!FilesFolders.VerifyBothFolderFilesEqual(DataLocation.PortableDataPath, targetDestination, (s) => AppExtensions.API.ShowMsgBox(s)))
-                        AppExtensions.API.ShowMsgBox(string.Format(api.GetTranslation("update_flowlauncher_fail_moving_portable_user_profile_data"),
+                    FilesFolders.CopyAll(DataLocation.PortableDataPath, targetDestination, (s) => API.ShowMsgBox(s));
+                    if (!FilesFolders.VerifyBothFolderFilesEqual(DataLocation.PortableDataPath, targetDestination, (s) => API.ShowMsgBox(s)))
+                        API.ShowMsgBox(string.Format(api.GetTranslation("update_flowlauncher_fail_moving_portable_user_profile_data"),
                             DataLocation.PortableDataPath,
                             targetDestination));
                 }
@@ -83,7 +86,7 @@ public async Task UpdateAppAsync(IPublicAPI api, bool silentUpdate = true)
 
                 Log.Info($"|Updater.UpdateApp|Update success:{newVersionTips}");
 
-                if (AppExtensions.API.ShowMsgBox(newVersionTips, api.GetTranslation("update_flowlauncher_new_update"), MessageBoxButton.YesNo) == MessageBoxResult.Yes)
+                if (API.ShowMsgBox(newVersionTips, api.GetTranslation("update_flowlauncher_new_update"), MessageBoxButton.YesNo) == MessageBoxResult.Yes)
                 {
                     UpdateManager.RestartApp(Constant.ApplicationFileName);
                 }
diff --git a/Flow.Launcher/App.xaml.cs b/Flow.Launcher/App.xaml.cs
@@ -74,6 +74,8 @@ await Stopwatch.NormalAsync("|App.OnStartup|Startup cost", async () =>
 
                 Ioc.Default.GetRequiredService<Portable>().PreStartCleanUpAfterPortabilityUpdate();
 
+                Ioc.Default.GetRequiredService<SettingWindowViewModel>().Initialize();
+
                 Log.Info("|App.OnStartup|Begin Flow Launcher startup ----------------------------------------------------");
                 Log.Info($"|App.OnStartup|Runtime info:{ErrorReporting.RuntimeInfo()}");
 
diff --git a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
@@ -8,15 +8,21 @@ namespace Flow.Launcher.ViewModel;
 
 public class SettingWindowViewModel : BaseModel
 {
-    public Updater Updater { get; }
+    public Updater Updater { get; private set; }
 
-    public IPortable Portable { get; }
+    public IPortable Portable { get; private set; }
 
     public Settings Settings { get; }
 
     public SettingWindowViewModel()
     {
         Settings = Ioc.Default.GetRequiredService<Settings>();
+    }
+
+    public void Initialize()
+    {
+        // We don not initialize Updater and Portable in the constructor because we want to avoid
+        // recrusive dependency injection
         Updater = Ioc.Default.GetRequiredService<Updater>();
         Portable = Ioc.Default.GetRequiredService<Portable>();
     }

Original file line number	Diff line number	Diff line change
`@@ -9,11 +9,15 @@`
`9`	`9`	`using Flow.Launcher.Infrastructure.UserSettings;`
`10`	`10`	`using Flow.Launcher.Plugin.SharedCommands;`
`11`	`11`	`using System.Linq;`
	`12`	`+using CommunityToolkit.Mvvm.DependencyInjection;`
	`13`	`+using Flow.Launcher.Plugin;`
`12`	`14`
`13`	`15`	`namespace Flow.Launcher.Core.Configuration`
`14`	`16`	`{`
`15`	`17`	`public class Portable : IPortable`
`16`	`18`	`{`
	`19`	`+ private readonly IPublicAPI API = Ioc.Default.GetRequiredService<IPublicAPI>();`
	`20`	`+`
`17`	`21`	`/// <summary>`
`18`	`22`	`/// As at Squirrel.Windows version 1.5.2, UpdateManager needs to be disposed after finish`
`19`	`23`	`/// </summary>`
`@@ -40,7 +44,7 @@ public void DisablePortableMode()`
`40`	`44`	`#endif`
`41`	`45`	`IndicateDeletion(DataLocation.PortableDataPath);`
`42`	`46`
`43`		`- AppExtensions.API.ShowMsgBox("Flow Launcher needs to restart to finish disabling portable mode, " +`
	`47`	`+ API.ShowMsgBox("Flow Launcher needs to restart to finish disabling portable mode, " +`
`44`	`48`	`"after the restart your portable data profile will be deleted and roaming data profile kept");`
`45`	`49`
`46`	`50`	`UpdateManager.RestartApp(Constant.ApplicationFileName);`
`@@ -64,7 +68,7 @@ public void EnablePortableMode()`
`64`	`68`	`#endif`
`65`	`69`	`IndicateDeletion(DataLocation.RoamingDataPath);`
`66`	`70`
`67`		`- AppExtensions.API.ShowMsgBox("Flow Launcher needs to restart to finish enabling portable mode, " +`
	`71`	`+ API.ShowMsgBox("Flow Launcher needs to restart to finish enabling portable mode, " +`
`68`	`72`	`"after the restart your roaming data profile will be deleted and portable data profile kept");`
`69`	`73`
`70`	`74`	`UpdateManager.RestartApp(Constant.ApplicationFileName);`
`@@ -95,13 +99,13 @@ public void RemoveUninstallerEntry()`
`95`	`99`
`96`	`100`	`public void MoveUserDataFolder(string fromLocation, string toLocation)`
`97`	`101`	`{`
`98`		`- FilesFolders.CopyAll(fromLocation, toLocation, (s) => AppExtensions.API.ShowMsgBox(s));`
	`102`	`+ FilesFolders.CopyAll(fromLocation, toLocation, (s) => API.ShowMsgBox(s));`
`99`	`103`	`VerifyUserDataAfterMove(fromLocation, toLocation);`
`100`	`104`	`}`
`101`	`105`
`102`	`106`	`public void VerifyUserDataAfterMove(string fromLocation, string toLocation)`
`103`	`107`	`{`
`104`		`- FilesFolders.VerifyBothFolderFilesEqual(fromLocation, toLocation, (s) => AppExtensions.API.ShowMsgBox(s));`
	`108`	`+ FilesFolders.VerifyBothFolderFilesEqual(fromLocation, toLocation, (s) => API.ShowMsgBox(s));`
`105`	`109`	`}`
`106`	`110`
`107`	`111`	`public void CreateShortcuts()`
`@@ -157,13 +161,13 @@ public void PreStartCleanUpAfterPortabilityUpdate()`
`157`	`161`	`// delete it and prompt the user to pick the portable data location`
`158`	`162`	`if (File.Exists(roamingDataDeleteFilePath))`
`159`	`163`	`{`
`160`		`- FilesFolders.RemoveFolderIfExists(roamingDataDir, (s) => AppExtensions.API.ShowMsgBox(s));`
	`164`	`+ FilesFolders.RemoveFolderIfExists(roamingDataDir, (s) => API.ShowMsgBox(s));`
`161`	`165`
`162`		`- if (AppExtensions.API.ShowMsgBox("Flow Launcher has detected you enabled portable mode, " +`
	`166`	`+ if (API.ShowMsgBox("Flow Launcher has detected you enabled portable mode, " +`
`163`	`167`	`"would you like to move it to a different location?", string.Empty,`
`164`	`168`	`MessageBoxButton.YesNo) == MessageBoxResult.Yes)`
`165`	`169`	`{`
`166`		`- FilesFolders.OpenPath(Constant.RootDirectory, (s) => AppExtensions.API.ShowMsgBox(s));`
	`170`	`+ FilesFolders.OpenPath(Constant.RootDirectory, (s) => API.ShowMsgBox(s));`
`167`	`171`
`168`	`172`	`Environment.Exit(0);`
`169`	`173`	`}`
`@@ -172,9 +176,9 @@ public void PreStartCleanUpAfterPortabilityUpdate()`
`172`	`176`	`// delete it and notify the user about it.`
`173`	`177`	`else if (File.Exists(portableDataDeleteFilePath))`
`174`	`178`	`{`
`175`		`- FilesFolders.RemoveFolderIfExists(portableDataDir, (s) => AppExtensions.API.ShowMsgBox(s));`
	`179`	`+ FilesFolders.RemoveFolderIfExists(portableDataDir, (s) => API.ShowMsgBox(s));`
`176`	`180`
`177`		`- AppExtensions.API.ShowMsgBox("Flow Launcher has detected you disabled portable mode, " +`
	`181`	`+ API.ShowMsgBox("Flow Launcher has detected you disabled portable mode, " +`
`178`	`182`	`"the relevant shortcuts and uninstaller entry have been created");`
`179`	`183`	`}`
`180`	`184`	`}`
`@@ -186,7 +190,7 @@ public bool CanUpdatePortability()`
`186`	`190`
`187`	`191`	`if (roamingLocationExists && portableLocationExists)`
`188`	`192`	`{`
`189`		`- AppExtensions.API.ShowMsgBox(string.Format("Flow Launcher detected your user data exists both in {0} and " +`
	`193`	`+ API.ShowMsgBox(string.Format("Flow Launcher detected your user data exists both in {0} and " +`
`190`	`194`	`"{1}. {2}{2}Please delete {1} in order to proceed. No changes have occurred.",`
`191`	`195`	`DataLocation.PortableDataPath, DataLocation.RoamingDataPath, Environment.NewLine));`
`192`	`196`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ internal PythonEnvironment(List<PluginMetadata> pluginMetadataList, PluginsSetti`
`28`	`28`
`29`	`29`	`internal override void InstallEnvironment()`
`30`	`30`	`{`
`31`		`- FilesFolders.RemoveFolderIfExists(InstallPath, (s) => AppExtensions.API.ShowMsgBox(s));`
	`31`	`+ FilesFolders.RemoveFolderIfExists(InstallPath, (s) => API.ShowMsgBox(s));`
`32`	`32`
`33`	`33`	`// Python 3.11.4 is no longer Windows 7 compatible. If user is on Win 7 and`
`34`	`34`	`// uses Python plugin they need to custom install and use v3.8.9`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ internal TypeScriptEnvironment(List<PluginMetadata> pluginMetadataList, PluginsS`
`25`	`25`
`26`	`26`	`internal override void InstallEnvironment()`
`27`	`27`	`{`
`28`		`- FilesFolders.RemoveFolderIfExists(InstallPath, (s) => AppExtensions.API.ShowMsgBox(s));`
	`28`	`+ FilesFolders.RemoveFolderIfExists(InstallPath, (s) => API.ShowMsgBox(s));`
`29`	`29`
`30`	`30`	`DroplexPackage.Drop(App.nodejs_16_18_0, InstallPath).Wait();`
`31`	`31`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ internal TypeScriptV2Environment(List<PluginMetadata> pluginMetadataList, Plugin`
`25`	`25`
`26`	`26`	`internal override void InstallEnvironment()`
`27`	`27`	`{`
`28`		`- FilesFolders.RemoveFolderIfExists(InstallPath, (s) => AppExtensions.API.ShowMsgBox(s));`
	`28`	`+ FilesFolders.RemoveFolderIfExists(InstallPath, (s) => API.ShowMsgBox(s));`
`29`	`29`
`30`	`30`	`DroplexPackage.Drop(App.nodejs_16_18_0, InstallPath).Wait();`
`31`	`31`