Allow checking for UniGetUI updates without having automatic check en…

…abled (fix #3091)
marticliment · Jan 18, 2025 · 0e0e3d2 · 0e0e3d2
1 parent 870e13c
commit 0e0e3d2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/src/UniGetUI/AutoUpdater.cs b/src/UniGetUI/AutoUpdater.cs
@@ -58,7 +58,7 @@ public static async Task UpdateCheckLoop(Window window, InfoBar banner)
     /// <summary>
     /// Performs the entire update process, and returns true/false whether the process finished successfully;
     /// </summary>
-    public static async Task<bool> CheckAndInstallUpdates(Window window, InfoBar banner, bool Verbose, bool AutoLaunch = false)
+    public static async Task<bool> CheckAndInstallUpdates(Window window, InfoBar banner, bool Verbose, bool AutoLaunch = false, bool ManualCheck = false)
     {
         Window = window;
         Banner = banner;
@@ -90,7 +90,7 @@ public static async Task<bool> CheckAndInstallUpdates(Window window, InfoBar ban
                     && await CheckInstallerHash(InstallerPath, InstallerHash))
                 {
                     Logger.Info($"A cached valid installer was found, launching update process...");
-                    return await PrepairToLaunchInstaller(InstallerPath, LatestVersion, AutoLaunch);
+                    return await PrepairToLaunchInstaller(InstallerPath, LatestVersion, AutoLaunch, ManualCheck);
                 }
                 else
                 {
@@ -109,7 +109,7 @@ public static async Task<bool> CheckAndInstallUpdates(Window window, InfoBar ban
                 if (await CheckInstallerHash(InstallerPath, InstallerHash))
                 {
                     Logger.Info("The downloaded installer is valid, launching update process...");
-                    return await PrepairToLaunchInstaller(InstallerPath, LatestVersion, AutoLaunch);
+                    return await PrepairToLaunchInstaller(InstallerPath, LatestVersion, AutoLaunch, ManualCheck);
                 }
                 else
                 {
@@ -218,7 +218,7 @@ private static async Task DownloadInstaller(string downloadUrl, string installer
     /// <summary>
     /// Waits for the window to be closed if it is open and launches the updater
     /// </summary>
-    private static async Task<bool> PrepairToLaunchInstaller(string installerLocation, string NewVersion, bool AutoLaunch)
+    private static async Task<bool> PrepairToLaunchInstaller(string installerLocation, string NewVersion, bool AutoLaunch, bool ManualCheck)
     {
         Logger.Debug("Starting the process to launch the installer.");
         UpdateReadyToBeInstalled = true;
@@ -227,7 +227,7 @@ private static async Task<bool> PrepairToLaunchInstaller(string installerLocatio
         ReleaseLockForAutoupdate_UpdateBanner = false;
 
         // Check if the user has disabled updates
-        if (Settings.Get("DisableAutoUpdateWingetUI"))
+        if (!ManualCheck && Settings.Get("DisableAutoUpdateWingetUI"))
         {
             Banner.IsOpen = false;
             Logger.Warn("User disabled updates!");
@@ -279,7 +279,7 @@ private static async Task<bool> PrepairToLaunchInstaller(string installerLocatio
             Logger.Debug("Autoupdater lock released, launching installer...");
         }
 
-        if (Settings.Get("DisableAutoUpdateWingetUI"))
+        if (!ManualCheck && Settings.Get("DisableAutoUpdateWingetUI"))
         {
             Logger.Warn("User has disabled updates");
             return true;

diff --git a/src/UniGetUI/Pages/SettingsPage.xaml b/src/UniGetUI/Pages/SettingsPage.xaml
@@ -62,8 +62,7 @@
                                         <widgets:TranslatedTextBlock Text="Is your language missing or incomplete?" Opacity=".8" VerticalAlignment="Center"/>
                                         <HyperlinkButton
                                         Padding="0"
-                                            NavigateUri="https://github.com/marticliment/WingetUI/wiki#translating-wingetui"
-                                        >
+                                            NavigateUri="https://github.com/marticliment/WingetUI/wiki#translating-wingetui">
                                             <widgets:TranslatedTextBlock Text="Become a translator"/>
                                         </HyperlinkButton>
                                     </StackPanel>
@@ -79,6 +78,7 @@
                                 CheckboxText="Update WingetUI automatically"
                                 ButtonText="Check for updates"
                                 SettingName="DisableAutoUpdateWingetUI"
+                                ButtonAlwaysOn="true"
                                 Click="ForceUpdateUniGetUI_OnClick"
                                 />
                             <widgets:CheckboxCard

diff --git a/src/UniGetUI/Pages/SettingsPage.xaml.cs b/src/UniGetUI/Pages/SettingsPage.xaml.cs
@@ -817,8 +817,8 @@ private void DisableSelectingUpdatesByDefault_OnClick(object sender, EventArgs e
 
         private void ForceUpdateUniGetUI_OnClick(object? sender, RoutedEventArgs e)
         {
-            _ = AutoUpdater.CheckAndInstallUpdates(MainApp.Instance.MainWindow, MainApp.Instance.MainWindow.UpdatesBanner,
-                true);
+            var mainWindow = MainApp.Instance.MainWindow;
+            _ = AutoUpdater.CheckAndInstallUpdates(mainWindow, mainWindow.UpdatesBanner, true, false, true);
         }
 
         private void CheckboxButtonCard_OnClick(object? sender, RoutedEventArgs e)