Properties: Fix some properties loading on older systems (#1145)

Optimize code

Author: tsvietOK

Files/View Models/SelectedItemsPropertiesViewModel.cs

@@ -173,10 +173,9 @@ public Visibility ItemMD5HashProgressVisibility
         }
         #endregion
         #region Properties
-        public Microsoft.UI.Xaml.Controls.ProgressBar ItemMD5HashProgress
-        {
-            get; set;
-        }
+
+        public Microsoft.UI.Xaml.Controls.ProgressBar ItemMD5HashProgress { get; set; }
+
         public ListedItem Item { get; }
 
         public CoreDispatcher Dispatcher { get; set; }
@@ -332,7 +331,6 @@ public async Task GetPropertiesAsync(CancellationTokenSource _tokenSource)
                 catch (Exception ex)
                 {
                     NLog.LogManager.GetCurrentClassLogger().Error(ex, ex.Message);
-                    ItemMD5HashProgress.Value = ItemMD5HashProgress.Maximum;
                     ItemMD5HashCalcError = true;
                 }
             }

Files/Views/Pages/Properties.xaml

@@ -9,6 +9,8 @@
     xmlns:local1="using:Files.Helpers"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
+    Loaded="Properties_Loaded"
+    Unloaded="Properties_Unloaded"
     d:DesignHeight="475"
     d:DesignWidth="400"
     RequestedTheme="{x:Bind local1:ThemeHelper.RootTheme}"

Files/Views/Pages/Properties.xaml.cs

@@ -2,64 +2,43 @@
 using Files.Helpers;
 using Files.Interacts;
 using Files.View_Models;
-using GalaSoft.MvvmLight;
 using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
 using System.Threading;
-using System.Threading.Tasks;
 using Windows.Foundation.Metadata;
-using Windows.Security.Cryptography.Core;
-using Windows.Storage;
-using Windows.Storage.FileProperties;
-using Windows.Storage.Search;
 using Windows.UI;
-using Windows.UI.Core;
 using Windows.UI.WindowManagement;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Media;
-using Windows.UI.Xaml.Media.Imaging;
 using Windows.UI.Xaml.Navigation;
-using static Files.Helpers.NativeFindStorageItemHelper;
-using FileAttributes = System.IO.FileAttributes;
 
 namespace Files
 {
     public sealed partial class Properties : Page
     {
         private static AppWindowTitleBar _TitleBar;
-        private CancellationTokenSource _tokenSource;
+
+        private CancellationTokenSource _tokenSource = new CancellationTokenSource();
 
         public AppWindow propWindow;
+
         public SelectedItemsPropertiesViewModel ViewModel { get; set; }
 
         public Properties()
         {
             this.InitializeComponent();
         }
+
         protected override void OnNavigatedTo(NavigationEventArgs e)
         {
             ViewModel = new SelectedItemsPropertiesViewModel(e.Parameter as ListedItem);
-            if (ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 8))
-            {
-                Loaded += Properties_Loaded;
-            }
-            else
-            {
-                this.OKButton.Visibility = Visibility.Collapsed;
-            }
             ViewModel.ItemMD5HashProgress = ItemMD5HashProgress;
             ViewModel.Dispatcher = Dispatcher;
             App.AppSettings.ThemeModeChanged += AppSettings_ThemeModeChanged;
             base.OnNavigatedTo(e);
         }
+
         private async void Properties_Loaded(object sender, RoutedEventArgs e)
         {
-            _tokenSource?.Dispose();
-            _tokenSource = new CancellationTokenSource();
-            Unloaded += Properties_Unloaded;
             if (ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 8))
             {
                 // Collect AppWindow-specific info
@@ -73,6 +52,7 @@ private async void Properties_Loaded(object sender, RoutedEventArgs e)
 
             await ViewModel.GetPropertiesAsync(_tokenSource);
         }
+
         private void Properties_Unloaded(object sender, RoutedEventArgs e)
         {
             if (_tokenSource != null && !_tokenSource.IsCancellationRequested)
@@ -81,8 +61,8 @@ private void Properties_Unloaded(object sender, RoutedEventArgs e)
                 _tokenSource.Dispose();
                 _tokenSource = null;
             }
-            Unloaded -= Properties_Unloaded;
         }
+
         private void AppSettings_ThemeModeChanged(object sender, EventArgs e)
         {
             RequestedTheme = ThemeHelper.RootTheme;
@@ -118,9 +98,6 @@ private async void Button_Click(object sender, RoutedEventArgs e)
             else
             {
                 App.PropertiesDialogDisplay.Hide();
-                _tokenSource.Cancel();
-                _tokenSource.Dispose();
-                _tokenSource = new CancellationTokenSource();
             }
         }
     }