v9.0.29552.0

ITHitBuild · ITHitBuild · commit a21b8c5fa844 · 2025-09-26T00:43:42.000+03:00
diff --git a/Common/Common.csproj b/Common/Common.csproj
@@ -15,7 +15,7 @@
     <Compile Remove="FolderMetadataExt.cs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ITHit.FileSystem.Windows" Version="9.0.29527.0" />
-    <PackageReference Include="ITHit.FileSystem" Version="9.0.29527.0" />
+    <PackageReference Include="ITHit.FileSystem.Windows" Version="9.0.29552.0" />
+    <PackageReference Include="ITHit.FileSystem" Version="9.0.29552.0" />
   </ItemGroup>
 </Project>
diff --git a/Windows/Common/Core/Common.Windows.Core.csproj b/Windows/Common/Core/Common.Windows.Core.csproj
@@ -23,8 +23,8 @@
     <PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.26100.1742" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ITHit.FileSystem.Windows.Package" Version="9.0.29527.0" />
-    <PackageReference Include="ITHit.FileSystem.Windows" Version="9.0.29527.0" />
+    <PackageReference Include="ITHit.FileSystem.Windows.Package" Version="9.0.29552.0" />
+    <PackageReference Include="ITHit.FileSystem.Windows" Version="9.0.29552.0" />
     <ProjectReference Include="..\..\..\Common\Common.csproj" />
   </ItemGroup>
 </Project>
diff --git a/Windows/Common/VirtualDrive/Common.Windows.VirtualDrive.csproj b/Windows/Common/VirtualDrive/Common.Windows.VirtualDrive.csproj
@@ -13,8 +13,8 @@
     <Compile Remove="IVirtualFolder.cs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ITHit.FileSystem.Windows.AppHelper" Version="9.0.29527.0" />
-    <PackageReference Include="ITHit.FileSystem.Windows" Version="9.0.29527.0" />
+    <PackageReference Include="ITHit.FileSystem.Windows.AppHelper" Version="9.0.29552.0" />
+    <PackageReference Include="ITHit.FileSystem.Windows" Version="9.0.29552.0" />
     <ProjectReference Include="..\..\..\Common\Common.csproj" />
     <ProjectReference Include="..\Core\Common.Windows.Core.csproj" />
   </ItemGroup>
diff --git a/Windows/VirtualDrive/App.xaml.cs b/Windows/VirtualDrive/App.xaml.cs
@@ -224,7 +224,7 @@ private void CreateTrayIcon()
 
             ServiceProvider.DispatcherQueue.TryEnqueue(() =>
             {
-                Tray trayWindow = new Tray(engine, null);
+                Tray trayWindow = new Tray(engine, null, null);
                 Commands commands = new Commands(engine, settings.RemoteStorageRootPath, logFormatter.Log);
 
                 //Set header text, mount, unmount, start/stop sync handlers here - as Tray does not access to sample related things
diff --git a/Windows/VirtualDrive/Resources/Styles/Colors.xaml b/Windows/VirtualDrive/Resources/Styles/Colors.xaml
@@ -54,7 +54,8 @@
             <Color x:Key="AnimatedIconColor">#eaeaea</Color>
             <Color x:Key="HistoryItemHoveredColor">#242424</Color>
             <Color x:Key="HistoryItemPressedColor">#282828</Color>
-            <Color x:Key="DisabledButtonTextColor">#C8C8C8</Color>
+            <Color x:Key="DisabledButtonTextColor">#ffff</Color>
+            <Color x:Key="DisabledButtonBackgroundColor">#3C3C3C</Color>
             <Color x:Key="ButtonBackgroundColor">#242424</Color>
             <Color x:Key="TraySubMenuHoverColor">#323130</Color>
             <Color x:Key="DialogButtonHoverColor">#dddddd</Color>
diff --git a/Windows/VirtualDrive/VirtualDrive.csproj b/Windows/VirtualDrive/VirtualDrive.csproj
@@ -230,8 +230,8 @@
     <PackageReference Include="System.Drawing.Common" Version="9.0.0" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ITHit.FileSystem.Windows.Package" Version="9.0.29527.0" />
-    <PackageReference Include="ITHit.FileSystem.Windows.WinUI" Version="9.0.29527.0" />
+    <PackageReference Include="ITHit.FileSystem.Windows.Package" Version="9.0.29552.0" />
+    <PackageReference Include="ITHit.FileSystem.Windows.WinUI" Version="9.0.29552.0" />
     <ProjectReference Include="..\..\Common\Common.csproj" />
     <ProjectReference Include="..\Common\VirtualDrive\Common.Windows.VirtualDrive.csproj" />
   </ItemGroup>
diff --git a/Windows/VirtualFileSystem/VirtualFileSystem.csproj b/Windows/VirtualFileSystem/VirtualFileSystem.csproj
@@ -35,7 +35,7 @@ This project does not support ETags, locking, Microsoft Office documents editing
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.0" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ITHit.FileSystem.Windows.AppHelper" Version="9.0.29527.0" />
+    <PackageReference Include="ITHit.FileSystem.Windows.AppHelper" Version="9.0.29552.0" />
     <ProjectReference Include="..\Common\Core\Common.Windows.Core.csproj" />
   </ItemGroup>
   <ItemGroup>
diff --git a/Windows/WebDAVDrive/AppSettings.cs b/Windows/WebDAVDrive/AppSettings.cs
@@ -35,6 +35,11 @@ public class AppSettings : Settings
         /// </summary>
         public double ManualLockTimeoutMs { get; set; }
 
+        // <summary>
+        /// Controls the number of events in the tray window.
+        /// </summary>
+        public int TrayMaxHistoryItems { get; set; }
+
         /// <summary>
         /// Full outgoing synchronization and hydration/dehydration interval in milliseconds.
         /// </summary>
diff --git a/Windows/WebDAVDrive/Dialogs/Settings.xaml b/Windows/WebDAVDrive/Dialogs/Settings.xaml
@@ -37,7 +37,7 @@
                 </StackPanel>
                 <StackPanel Style="{StaticResource SettingsStackPanelWithTextBox}" Grid.Column="1">
                     <TextBox x:Name="AutomaticLockTimeout" Style="{StaticResource SettingsTextBoxStyle}" />
-                    <TextBlock x:Name="AutomaticRequiredMessage" x:Uid="AutomaticRequiredMessage" Style="{StaticResource SettingsErrorStyle}" />
+                    <TextBlock x:Name="AutomaticRequiredMessage" x:Uid="RequiredSettingMessage" Style="{StaticResource SettingsErrorStyle}" />
                     <TextBlock x:Name="AutomaticValidationMessage" x:Uid="AutomaticValidationMessage" Style="{StaticResource SettingsErrorStyle}" />
                 </StackPanel>
             </Grid>
@@ -68,6 +68,22 @@
                 </StackPanel>
                 <ToggleSwitch x:Uid="BottomToggle" x:Name="ReadOnlyOnLockedFiles" Grid.Column="1" Style="{StaticResource SettingsToggleStyle}" />
             </Grid>
+
+            <Grid Style="{StaticResource SettingsGridStyle}">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="100" />
+                </Grid.ColumnDefinitions>
+                <StackPanel Style="{StaticResource SettingsStackPanel}" Grid.Column="0">
+                    <TextBlock x:Uid="TrayMaxHistoryItemsLabel" Style="{StaticResource SettingsTextBlockStyle}" />
+                    <TextBlock x:Uid="TrayMaxHistoryItemsLabelDescription" Style="{StaticResource SettingsDescriptionStyle}" />
+                </StackPanel>
+                <StackPanel Style="{StaticResource SettingsStackPanelWithTextBox}" Grid.Column="1">
+                    <TextBox x:Name="TrayMaxHistoryItems" Style="{StaticResource SettingsTextBoxStyle}" />
+                    <TextBlock x:Name="TrayMaxHistoryItemsRequiredMessage" x:Uid="RequiredSettingMessage" Style="{StaticResource SettingsErrorStyle}" />
+                    <TextBlock x:Name="TrayMaxHistoryItemsValidationMessage" x:Uid="TrayMaxHistoryItemsValidationMessage" Style="{StaticResource SettingsErrorStyle}" />
+                </StackPanel>
+            </Grid>
         </StackPanel>
 
         <!-- Buttons -->
diff --git a/Windows/WebDAVDrive/Dialogs/Settings.xaml.cs b/Windows/WebDAVDrive/Dialogs/Settings.xaml.cs
@@ -1,3 +1,4 @@
+using ITHit.FileSystem.Windows.WinUI;
 using ITHit.FileSystem.Windows.WinUI.Dialogs;
 using Microsoft.UI.Xaml;
 using WebDAVDrive.Services;
@@ -13,12 +14,14 @@ public sealed partial class Settings : DialogWindow
         private readonly ResourceLoader resourceLoader = ResourceLoader.GetForViewIndependentUse();
 
         private readonly VirtualEngine engine;
+        private readonly Tray parentTrayWindow;
 
-        public Settings(VirtualEngine engine) : base()
+        public Settings(Tray trayWindow) : base()
         {
             InitializeComponent();
-            Resize(700, 600);
-            this.engine = engine;
+            Resize(700, 700);
+            engine = (trayWindow.Engine as VirtualEngine)!;
+            parentTrayWindow = trayWindow;
             Title = $"{ServiceProvider.GetService<AppSettings>().ProductName} - {resourceLoader.GetString("SettingsWindow/Title")}";
 
             // Resize and center the window.
@@ -27,6 +30,7 @@ public Settings(VirtualEngine engine) : base()
             //Set values from engine
             AutomaticLockTimeout.Text = (engine.AutoLockTimeoutMs / 1000).ToString();
             ManualLockTimeout.Text = engine.ManualLockTimeoutMs == -1 ? string.Empty : (engine.ManualLockTimeoutMs / 1000).ToString();
+            TrayMaxHistoryItems.Text = engine.TrayMaxHistoryItems.ToString();
             AutoLockEnable.IsOn = engine.AutoLock;
             ReadOnlyOnLockedFiles.IsOn = engine.SetLockReadOnly;
         }
@@ -39,7 +43,8 @@ private void OnCloseClicked(object sender, RoutedEventArgs e)
         private void OnSaveClicked(object sender, RoutedEventArgs e)
         {
             bool isValidationError = false;
-            AutomaticRequiredMessage.Visibility = AutomaticValidationMessage.Visibility = ManualValidationMessage.Visibility = Visibility.Collapsed;
+            AutomaticRequiredMessage.Visibility = AutomaticValidationMessage.Visibility = ManualValidationMessage.Visibility =
+                TrayMaxHistoryItemsRequiredMessage.Visibility = TrayMaxHistoryItemsValidationMessage.Visibility = Visibility.Collapsed;
 
             //"Automatic lock timeout" field is required and should be a number
             if (string.IsNullOrWhiteSpace(AutomaticLockTimeout.Text))
@@ -62,16 +67,39 @@ private void OnSaveClicked(object sender, RoutedEventArgs e)
                 ManualValidationMessage.Visibility = Visibility.Visible;
             }
 
+            //"Tray max history items" field is required and should be a 10+ integer number
+            if (string.IsNullOrWhiteSpace(TrayMaxHistoryItems.Text))
+            {
+                isValidationError = true;
+                TrayMaxHistoryItemsRequiredMessage.Visibility = Visibility.Visible;
+                TrayMaxHistoryItemsValidationMessage.Visibility = Visibility.Collapsed;
+            }
+            else if (!int.TryParse(TrayMaxHistoryItems.Text, out int trayMaxHistoryItems) || trayMaxHistoryItems < 10)
+            {
+                isValidationError = true;
+                TrayMaxHistoryItemsRequiredMessage.Visibility = Visibility.Collapsed;
+                TrayMaxHistoryItemsValidationMessage.Visibility = Visibility.Visible;
+            }
+
             if (!isValidationError)
             {
                 UserSettingsService userSettingsService = ServiceProvider.GetService<UserSettingsService>();
+                int trayMaxHistoryItemsShowing = int.Parse(TrayMaxHistoryItems.Text);
                 userSettingsService.SaveSettings(engine, new UserSettings
                 {
                     AutomaticLockTimeout = double.Parse(AutomaticLockTimeout.Text) * 1000,
                     ManualLockTimeout = string.IsNullOrWhiteSpace(ManualLockTimeout.Text) ? -1 : (double.Parse(ManualLockTimeout.Text) * 1000),
+                    TrayMaxHistoryItems = trayMaxHistoryItemsShowing,
                     SetLockReadOnly = ReadOnlyOnLockedFiles.IsOn,
                     AutoLock = AutoLockEnable.IsOn
-                });                
+                });
+                //update property of parent Tray window and clear history on the fly (if user provided smaller setting value)
+                int? oldValue = parentTrayWindow.TrayMaxHistoryItems;
+                parentTrayWindow.TrayMaxHistoryItems = trayMaxHistoryItemsShowing;
+                if (oldValue.HasValue && oldValue.Value > trayMaxHistoryItemsShowing)
+                {
+                    parentTrayWindow.CleanupHistoryItems();
+                }
 
                 Close();
             }
diff --git a/Windows/WebDAVDrive/Resources/Styles/Colors.xaml b/Windows/WebDAVDrive/Resources/Styles/Colors.xaml
@@ -54,7 +54,8 @@
             <Color x:Key="AnimatedIconColor">#eaeaea</Color>
             <Color x:Key="HistoryItemHoveredColor">#242424</Color>
             <Color x:Key="HistoryItemPressedColor">#282828</Color>
-            <Color x:Key="DisabledButtonTextColor">#C8C8C8</Color>
+            <Color x:Key="DisabledButtonTextColor">#ffff</Color>
+            <Color x:Key="DisabledButtonBackgroundColor">#3C3C3C</Color>
             <Color x:Key="ButtonBackgroundColor">#242424</Color>
             <Color x:Key="TraySubMenuHoverColor">#323130</Color>
             <Color x:Key="DialogButtonHoverColor">#dddddd</Color>
diff --git a/Windows/WebDAVDrive/Resources/en-US/Resources.resw b/Windows/WebDAVDrive/Resources/en-US/Resources.resw
@@ -261,9 +261,9 @@
     <value>Manual lock timeout in seconds. Manual lock is set via context menu and is not extended. Set to -1 for infinity. Note that many WebDAV servers do not accept Infinity and will set its own default timeout instead.</value>
     <comment>Manual lock timeout description (settings)</comment>
   </data>
-  <data name="AutomaticRequiredMessage.Text" xml:space="preserve">
+  <data name="RequiredSettingMessage.Text" xml:space="preserve">
     <value>Required</value>
-    <comment>Enable automatic locking required message</comment>
+    <comment>Required validation message (settings)</comment>
   </data>
   <data name="AutomaticLockTimeoutLabel.Text" xml:space="preserve">
     <value>Automatic lock timeout (seconds)</value>
@@ -338,16 +338,28 @@
     <value>Must be a number</value>
     <comment>Enable manual locking validation message</comment>
   </data>
+  <data name="TrayMaxHistoryItemsValidationMessage.Text" xml:space="preserve">
+    <value>Enter 10+ integer</value>
+    <comment>Enable manual locking validation message</comment>
+  </data>
   <data name="EnableDebugLogging" xml:space="preserve">
     <value>Enable Debug Logging</value>
     <comment>Enable Debug Logging context menu text</comment>
   </data>
   <data name="DisableDebugLogging" xml:space="preserve">
     <value>Disable Debug Logging</value>
-	  <comment>Disable Debug Logging context menu text</comment>
+    <comment>Disable Debug Logging context menu text</comment>
   </data>
   <data name="OpenLogFile.Text" xml:space="preserve">
     <value>Open Log File</value>
     <comment>Open Log File menu text</comment>
   </data>
+  <data name="TrayMaxHistoryItemsLabel.Text" xml:space="preserve">
+    <value>Tray max history items</value>
+    <comment>Tray max history items label (settings)</comment>
+  </data>
+  <data name="TrayMaxHistoryItemsLabelDescription.Text" xml:space="preserve">
+    <value>Controls the number of events in the tray window.</value>
+    <comment>Tray max history items description (settings)</comment>
+  </data>
 </root>
diff --git a/Windows/WebDAVDrive/Services/DrivesService.cs b/Windows/WebDAVDrive/Services/DrivesService.cs
@@ -3,6 +3,10 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Security.Cryptography;
+using System.Security.Principal;
+using System.Text;
+using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using Windows.Storage.Provider;
 using Windows.ApplicationModel.Resources;
@@ -21,6 +25,7 @@
 using ITHit.FileSystem.Windows.WinUI;
 using WindowManager = ITHit.FileSystem.Samples.Common.Windows.WindowManager;
 
+
 namespace WebDAVDrive.Services
 {
     public class DrivesService : IDrivesService
@@ -114,7 +119,7 @@ public async Task UnMountAsync(Guid? engineGuid)
                     ServiceProvider.DispatcherQueue.TryEnqueue(async () =>
                     {
                         Tray existingTrayWindow = trayWindows[engineId];
-                        await trayWindows[engineId].SetEngineAsync(null, null);
+                        await trayWindows[engineId].SetEngineAsync(null, null, null);
                         AdjustEngineRelatedThings(existingTrayWindow, null);
                         //as single window is not more connected to engine - add it to dictionary with Guid.Empty
                         trayWindows.Remove(engineId);
@@ -333,10 +338,10 @@ await Registrar.RegisterSyncRootAsync(
 
                 // Print Engine config, settings, logging headers.
                 await LogFormatter.PrintEngineStartInfoAsync(engine, webDAVServerUrl);
-                
+
                 if (defaultTrayWindow != null)
                 {
-                    await defaultTrayWindow.SetEngineAsync(engine, engine?.Settings?.Compare);
+                    await defaultTrayWindow.SetEngineAsync(engine, engine?.Settings?.Compare, engine?.Settings?.TrayMaxHistoryItems);
                     AdjustEngineRelatedThings(defaultTrayWindow, engine);
                     //remap single window to new engine in dictionary and clear defaultTrayWindow variable
                     trayWindows.Add(engine!.InstanceId, defaultTrayWindow);
@@ -347,7 +352,7 @@ await Registrar.RegisterSyncRootAsync(
                 {
                     CreateTrayIcon(engine);
                 }
-                
+
                 // Start processing OS file system calls.
                 await engine.StartAsync();
 
@@ -375,11 +380,11 @@ private void CreateTrayIcon(VirtualEngine? engine)
             {
                 
                 // Create Tray window.
-                Tray trayWindow = new Tray(engine, engine?.Settings?.Compare);
+                Tray trayWindow = new Tray(engine, engine?.Settings?.Compare, engine?.TrayMaxHistoryItems);
 
                 //Set header text, mount, unmount, start/stop sync handlers here - as Tray does not access to sample related things                    
                 trayWindow.Header = ServiceProvider.GetService<AppSettings>().ProductName;
-                trayWindow.ShowSettingsMenu.Click += (sender, e) => ShowSettingsMenuClick(trayWindow.Engine as VirtualEngine);
+                trayWindow.ShowSettingsMenu.Click += (sender, e) => ShowSettingsMenuClick(trayWindow);
                 trayWindow.MountNewDriveMenu.Click += (sender, e) => TrayMountNewDriveClick();
                 trayWindow.UnmountMenu.Click += (sender, e) => TrayUnmountClick(trayWindow.Engine as VirtualEngine);
                 trayWindow.ShowFeedbackMenu.Click += async (sender, e) => await Commands.OpenSupportPortalAsync();
@@ -461,9 +466,9 @@ private void AdjustEngineRelatedThings(Tray trayWindow, VirtualEngine? engine)
             });
         }
 
-        private void ShowSettingsMenuClick(VirtualEngine? engine)
+        private void ShowSettingsMenuClick(Tray trayWindow)
         {
-            ServiceProvider.DispatcherQueue.TryEnqueue(() => _ = engine == null ? false : new Settings(engine).Show());
+            ServiceProvider.DispatcherQueue.TryEnqueue(() => _ = trayWindow.Engine is VirtualEngine ? new Settings(trayWindow).Show() : false);
         }
 
         private string GetDisplayName(string webDAVServerUrl)
@@ -485,7 +490,35 @@ private string GenerateRootPathForProtocolMounting()
         /// <remarks>An identifier in the form: [Storage Provider ID]![Windows SID]![Account ID]</remarks>
         private string GetSyncRootId(string remoteStoragePathRoot)
         {
-            return $"{Settings.AppID}!{System.Security.Principal.WindowsIdentity.GetCurrent().User}!{remoteStoragePathRoot}";
+            string accountId = WindowsIdentity.GetCurrent()?.User?.ToString() ?? "default";
+            string contextId = GetFullSha1Hash($"{Sanitize(accountId)}|{Sanitize(remoteStoragePathRoot)}");
+            string syncRootId = $"{Settings.AppID}!{contextId}";
+
+            // Ensure it doesn't exceed Windows path limits
+            if (syncRootId.Length > 200)
+                syncRootId = syncRootId.Substring(0, 200);
+
+            return syncRootId;
+        }
+
+        /// <summary>
+        /// Replace invalid characters with underscore
+        /// </summary>
+        private static string Sanitize(string input)
+        {
+            return Regex.Replace(input, @"[^A-Za-z0-9._-]", "_");
+        }
+
+        /// <summary>
+        /// Generates SHA1 hash for the input string.
+        /// </summary>
+        private static string GetFullSha1Hash(string input)
+        {
+            using (var sha1 = SHA1.Create())
+            {
+                byte[] bytes = sha1.ComputeHash(Encoding.UTF8.GetBytes(input));
+                return BitConverter.ToString(bytes).Replace("-", ""); // 40 hex chars
+            }
         }
 
         
diff --git a/Windows/WebDAVDrive/Services/UserSettingsService.cs b/Windows/WebDAVDrive/Services/UserSettingsService.cs
@@ -4,6 +4,7 @@ public class UserSettings
     {
         public double AutomaticLockTimeout { get; set; }
         public double ManualLockTimeout { get; set; }
+        public int TrayMaxHistoryItems { get; set; }
         public bool SetLockReadOnly { get; set; }
         public bool AutoLock { get; set; }
     }
@@ -19,6 +20,7 @@ public void SaveSettings(VirtualEngine engine, UserSettings model)
             //save to engine
             engine.AutoLockTimeoutMs = model.AutomaticLockTimeout;
             engine.ManualLockTimeoutMs = model.ManualLockTimeout;
+            engine.TrayMaxHistoryItems = model.TrayMaxHistoryItems;
             engine.AutoLock = model.AutoLock;
             engine.SetLockReadOnly = model.SetLockReadOnly;
         }
diff --git a/Windows/WebDAVDrive/VirtualEngine.cs b/Windows/WebDAVDrive/VirtualEngine.cs
diff --git a/Windows/WebDAVDrive/VirtualFile.cs b/Windows/WebDAVDrive/VirtualFile.cs
diff --git a/Windows/WebDAVDrive/VirtualFileSystemItem.cs b/Windows/WebDAVDrive/VirtualFileSystemItem.cs
diff --git a/Windows/WebDAVDrive/WebDAVDrive.csproj b/Windows/WebDAVDrive/WebDAVDrive.csproj

Original file line number	Diff line number	Diff line change
`@@ -224,7 +224,7 @@ private void CreateTrayIcon()`
`224`	`224`
`225`	`225`	`ServiceProvider.DispatcherQueue.TryEnqueue(() =>`
`226`	`226`	`{`
`227`		`- Tray trayWindow = new Tray(engine, null);`
	`227`	`+ Tray trayWindow = new Tray(engine, null, null);`
`228`	`228`	`Commands commands = new Commands(engine, settings.RemoteStorageRootPath, logFormatter.Log);`
`229`	`229`
`230`	`230`	`//Set header text, mount, unmount, start/stop sync handlers here - as Tray does not access to sample related things`