From 8180c1cd40ea5410a3a3b6f5df8ddf34dc690470 Mon Sep 17 00:00:00 2001
From: Florian Grabmeier <flo.grabmeier@gmail.com>
Date: Wed, 22 Nov 2023 14:49:43 +0100
Subject: [PATCH] Display correct messages

Signed-off-by: Florian Grabmeier <flo.grabmeier@gmail.com>
---
 .../Languages/en.xaml                         |  2 +-
 .../PluginsManager.cs                         | 46 +++++++++----------
 2 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.PluginsManager/Languages/en.xaml
index cc2360edf..99daa40f3 100644
--- a/Plugins/Flow.Launcher.Plugin.PluginsManager/Languages/en.xaml
+++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/Languages/en.xaml
@@ -30,7 +30,7 @@
     <system:String x:Key="plugin_pluginsmanager_update_alreadyexists">This plugin is already installed</system:String>
     <system:String x:Key="plugin_pluginsmanager_update_failed_title">Plugin Manifest Download Failed</system:String>
     <system:String x:Key="plugin_pluginsmanager_update_failed_subtitle">Please check if you can connect to github.com. This error means you may not be able to install or update plugins.</system:String>
-    <system:String x:Key="plugin_pluginsmanager_update_all_title">Update All Plugins</system:String>
+    <system:String x:Key="plugin_pluginsmanager_update_all_title">Update all plugins</system:String>
     <system:String x:Key="plugin_pluginsmanager_update_all_subtitle">Would you like to update all plugins?</system:String>
     <system:String x:Key="plugin_pluginsmanager_update_success_restart">Plugin {0} successfully updated. Restarting Flow, please wait...</system:String>
     <system:String x:Key="plugin_pluginsmanager_install_unknown_source_warning_title">Installing from an unknown source</system:String>
diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
index 159950ac2..57f252e4c 100644
--- a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
+++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
@@ -308,25 +308,21 @@ namespace Flow.Launcher.Plugin.PluginsManager
                     Action = e =>
                     {
                         string message;
-                        //TODO: display all plugins to be updated in the message
-                        if (/*Settings.AutoRestartAfterChanging*/ false) // TODO: remove false
+                        if (Settings.AutoRestartAfterChanging)
                         {
-                            message = string.Format(Context.API.GetTranslation("plugin_pluginsmanager_update_all_subtitle"), "FlowLauncher will restart after updating all plugins.",
-                                                    Environment.NewLine, Environment.NewLine);
+                            message = "Would you like to update all plugins?\nFlowLauncher will restart after updating all plugins.\n";
                         }
                         else
                         {
-                            message = string.Format(Context.API.GetTranslation("plugin_pluginsmanager_update_all_subtitle"),
-                                                    Environment.NewLine);
+                            message = "Would you like to update all plugins?\nFlowLauncher will restart after updating all plugins.\n";
                         }
+
                         if (MessageBox.Show(message,
                             Context.API.GetTranslation("plugin_pluginsmanager_update_title"),
                             MessageBoxButton.YesNo) == MessageBoxResult.Yes)
                         {
-                            Debug.Print("Looping through plugins to update");
                             foreach (var plugin in resultsForUpdate)
                             {
-                                Debug.Print($"Updating {plugin.Name}");
                                 var downloadToFilePath = Path.Combine(Path.GetTempPath(),
                                     $"{plugin.Name}-{plugin.NewVersion}.zip");
 
@@ -342,20 +338,6 @@ namespace Flow.Launcher.Plugin.PluginsManager
 
                                         PluginManager.UpdatePlugin(plugin.PluginExistingMetadata, plugin.PluginNewUserPlugin, downloadToFilePath);
 
-                                        //TODO: fix
-                                        // if (Settings.AutoRestartAfterChanging)
-                                        // {
-                                        //     Context.API.ShowMsg(Context.API.GetTranslation("plugin_pluginsmanager_update_title"),
-                                        //                         string.Format(Context.API.GetTranslation("plugin_pluginsmanager_update_success_restart"),
-                                        //                         x.Name));
-                                        //     Context.API.RestartApp();
-                                        // }
-                                        // else
-                                        // {
-                                        //     Context.API.ShowMsg(Context.API.GetTranslation("plugin_pluginsmanager_update_title"),
-                                        //                         string.Format(Context.API.GetTranslation("plugin_pluginsmanager_update_success_no_restart"),
-                                        //                         x.Name));
-                                        // }
                                     }).ContinueWith(t =>
                                     {
                                         Log.Exception("PluginsManager", $"Update failed for {plugin.Name}",
@@ -367,10 +349,24 @@ namespace Flow.Launcher.Plugin.PluginsManager
                                                 plugin.Name));
                                     }, TaskContinuationOptions.OnlyOnFaulted);
                             }
-                            Debug.Print("Finished updating all plugins");
-                            return true; // User confirmed to update all plugins
+
+                            if (Settings.AutoRestartAfterChanging)
+                            {
+                                Context.API.ShowMsg(Context.API.GetTranslation("plugin_pluginsmanager_update_title"),
+                                                    string.Format(Context.API.GetTranslation("plugin_pluginsmanager_update_success_restart"),
+                                                    "all"));
+                                Context.API.RestartApp();
+                            }
+                            else
+                            {
+                                Context.API.ShowMsg(Context.API.GetTranslation("plugin_pluginsmanager_update_title"),
+                                                    string.Format(Context.API.GetTranslation("plugin_pluginsmanager_update_success_no_restart"),
+                                                    "all"));
+                            }
+
+                            return true;
                         }
-                        return false; //user cancelled
+                        return false;
                     },
                     ContextData = new UserPlugin()
                 };