Codebase: Fixing UpdateService (#8812)

Author: puppetsw

src/Files.Backend/Services/Settings/IUpdateSettingsService.cs renamed to src/Files.Backend/Services/IUpdateService.cs

@@ -1,9 +1,9 @@
 using System.ComponentModel;
 using System.Threading.Tasks;
 
-namespace Files.Backend.Services.Settings
+namespace Files.Backend.Services
 {
-    public interface IUpdateSettingsService : IBaseSettingsService, INotifyPropertyChanged
+    public interface IUpdateService : INotifyPropertyChanged
     {
         /// <summary>
         /// Gets a value indicating whether updates are available.

src/Files.Uwp/App.xaml.cs

@@ -114,12 +114,12 @@ private IServiceProvider ConfigureServices()
                 // Settings not related to IUserSettingsService:
                 .AddSingleton<IFileTagsSettingsService, FileTagsSettingsService>()
                 .AddSingleton<IBundlesSettingsService, BundlesSettingsService>()
-                .AddSingleton<IUpdateSettingsService, UpdateSettingsService>()
 
                 // Other services
                 .AddSingleton<IDialogService, DialogService>()
                 .AddSingleton<IImagingService, ImagingService>()
                 .AddSingleton<ILocalizationService, LocalizationService>()
+                .AddSingleton<IUpdateService, UpdateService>()
 
                 // TODO(i): FileSystem operations:
                 // (IFilesystemHelpersService, IFilesystemOperationsService)
@@ -201,7 +201,7 @@ await Task.WhenAll(
             });
 
             // Check for required updates
-            var updateService = Ioc.Default.GetRequiredService<IUpdateSettingsService>();
+            var updateService = Ioc.Default.GetRequiredService<IUpdateService>();
             await updateService.CheckForUpdates();
             await updateService.DownloadMandatoryUpdates();
         }

src/Files.Uwp/Files.Uwp.csproj

@@ -250,7 +250,7 @@
     <Compile Include="ServicesImplementation\Settings\PaneSettingsService.cs" />
     <Compile Include="ServicesImplementation\Settings\UserSettingsService.cs" />
     <Compile Include="ServicesImplementation\Settings\WidgetsSettingsService.cs" />
-    <Compile Include="ServicesImplementation\Settings\UpdateSettingsService.cs" />
+    <Compile Include="ServicesImplementation\UpdateService.cs" />
     <Compile Include="UserControls\ColoredIcon.xaml.cs">
       <DependentUpon>ColoredIcon.xaml</DependentUpon>
     </Compile>

src/Files.Uwp/ServicesImplementation/Settings/UpdateSettingsService.cs renamed to src/Files.Uwp/ServicesImplementation/UpdateService.cs

@@ -3,15 +3,15 @@
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
-using Files.Backend.Services.Settings;
-using Files.Uwp.Serialization;
-using Microsoft.Toolkit.Uwp;
 using Windows.Services.Store;
 using Windows.UI.Xaml.Controls;
+using CommunityToolkit.Mvvm.ComponentModel;
+using Files.Backend.Services;
+using Microsoft.Toolkit.Uwp;
 
-namespace Files.Uwp.ServicesImplementation.Settings
+namespace Files.Uwp.ServicesImplementation
 {
-    internal sealed class UpdateSettingsService : BaseObservableJsonSettings, IUpdateSettingsService
+    internal sealed class UpdateService : ObservableObject, IUpdateService
     {
         private StoreContext _storeContext;
         private IList<StorePackageUpdate> _updatePackages;
@@ -42,7 +42,7 @@ private set
             }
         }
 
-        public UpdateSettingsService()
+        public UpdateService()
         {
             _updatePackages = new List<StorePackageUpdate>();
         }

src/Files.Uwp/UserControls/NavigationToolbar.xaml

@@ -573,12 +573,12 @@
                     Height="32"
                     HorizontalContentAlignment="Stretch"
                     VerticalContentAlignment="Stretch"
-                    x:Load="{x:Bind ViewModel.UpdateSettingsService.IsUpdateAvailable, Mode=OneWay}"
+                    x:Load="{x:Bind ViewModel.UpdateService.IsUpdateAvailable, Mode=OneWay}"
                     AccessKey="1"
                     AutomationProperties.Name="{helpers:ResourceString Name=UpdateFiles}"
                     Background="Transparent"
                     Command="{x:Bind ViewModel.UpdateCommand, Mode=OneWay}"
-                    IsEnabled="{x:Bind ViewModel.UpdateSettingsService.IsUpdating, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}"
+                    IsEnabled="{x:Bind ViewModel.UpdateService.IsUpdating, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}"
                     Style="{StaticResource ToolBarButtonStyle}"
                     ToolTipService.ToolTip="{helpers:ResourceString Name=UpdateFiles}">
                     <FontIcon FontSize="14" Glyph="&#xE896;" />

src/Files.Uwp/ViewModels/NavToolbarViewModel.cs

@@ -27,6 +27,7 @@
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Controls.Primitives;
 using Windows.UI.Xaml.Input;
+using Files.Backend.Services;
 using static Files.UserControls.INavigationToolbar;
 using SearchBox = Files.UserControls.SearchBox;
 using SortDirection = Files.Shared.Enums.SortDirection;
@@ -38,7 +39,7 @@ public class NavToolbarViewModel : ObservableObject, INavigationToolbar, IDispos
     {
         private IUserSettingsService UserSettingsService { get; } = Ioc.Default.GetService<IUserSettingsService>();
 
-        public IUpdateSettingsService UpdateSettingsService { get; } = Ioc.Default.GetService<IUpdateSettingsService>();
+        public IUpdateService UpdateService { get; } = Ioc.Default.GetService<IUpdateService>();
 
         public delegate void ToolbarPathItemInvokedEventHandler(object sender, PathNavigationEventArgs e);
 

src/Files.Uwp/Views/ColumnShellPage.xaml.cs

@@ -66,7 +66,7 @@ public sealed partial class ColumnShellPage : Page, IShellPage, INotifyPropertyC
 
         private IUserSettingsService UserSettingsService { get; } = Ioc.Default.GetService<IUserSettingsService>();
 
-        private IUpdateSettingsService UpdateSettingsService { get; } = Ioc.Default.GetService<IUpdateSettingsService>();
+        private IUpdateService UpdateSettingsService { get; } = Ioc.Default.GetService<IUpdateService>();
 
         private bool isCurrentInstance = false;
         public bool IsCurrentInstance

src/Files.Uwp/Views/ModernShellPage.xaml.cs

@@ -55,7 +55,7 @@ public sealed partial class ModernShellPage : Page, IShellPage, INotifyPropertyC
 
         private IUserSettingsService UserSettingsService { get; } = Ioc.Default.GetService<IUserSettingsService>();
 
-        private IUpdateSettingsService UpdateSettingsService { get; } = Ioc.Default.GetService<IUpdateSettingsService>();
+        private IUpdateService UpdateSettingsService { get; } = Ioc.Default.GetService<IUpdateService>();
 
         private bool isCurrentInstance = false;
         public bool IsCurrentInstance