Feature: Add ZIP encoding selection support for browsing archives with non-UTF-8 filenames

src/Files.App.Launcher/Files.App.Launcher.vcxproj

@@ -89,7 +89,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions);_SILENCE_EXPERIMENTAL_COROUTINE_DEPRECATION_WARNINGS</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
   </ItemDefinitionGroup>
@@ -103,7 +103,7 @@
     <ClCompile>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions);_SILENCE_EXPERIMENTAL_COROUTINE_DEPRECATION_WARNINGS</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Link>

src/Files.App/Data/Items/EncodingItem.cs

@@ -50,7 +50,7 @@ public EncodingItem(Encoding encoding, string name)
             //reference: https://en.wikipedia.org/wiki/Windows_code_page
             //East Asian
             "shift_jis",       //Japanese
-            "gb2312",          //Simplified Chinese
+            "gb18030",          //Simplified Chinese
             "big5",            //Traditional Chinese
             "ks_c_5601-1987",  //Korean
 

src/Files.App/Data/Models/CurrentInstanceViewModel.cs

@@ -146,6 +146,20 @@ public bool IsPageTypeLibrary
 			}
 		}
 
+		private string? zipEncodingName;
+		public string? ZipEncodingName
+		{
+			get => zipEncodingName;
+			set => SetProperty(ref zipEncodingName, value);
+		}
+
+		private bool isZipEncodingUndetermined;
+		public bool IsZipEncodingUndetermined
+		{
+			get => isZipEncodingUndetermined;
+			set => SetProperty(ref isZipEncodingUndetermined, value);
+		}
+
 		public bool CanCopyPathInPage
 		{
 			get => !isPageTypeMtpDevice && !isPageTypeRecycleBin && isPageTypeNotHome && !isPageTypeSearchResults && !IsPageTypeReleaseNotes && !IsPageTypeSettings;

src/Files.App/Data/Models/DirectoryPropertiesViewModel.cs

@@ -1,6 +1,12 @@
 // Copyright (c) Files Community
 // Licensed under the MIT License.
 
+using Files.App.Data.Items;
+using Files.App.Utils.Storage;
+using Files.Shared.Helpers;
+using Microsoft.Extensions.Logging;
+using System.ComponentModel;
+using System.Text;
 using System.Windows.Input;
 
 namespace Files.App.ViewModels.UserControls
@@ -9,6 +15,8 @@ public sealed partial class StatusBarViewModel : ObservableObject
 	{
 		private IContentPageContext ContentPageContext { get; } = Ioc.Default.GetRequiredService<IContentPageContext>();
 		private IDevToolsSettingsService DevToolsSettingsService = Ioc.Default.GetRequiredService<IDevToolsSettingsService>();
+		private readonly IStorageArchiveService StorageArchiveService = Ioc.Default.GetRequiredService<IStorageArchiveService>();
+		private CurrentInstanceViewModel? InstanceViewModel => ContentPageContext.ShellPage?.InstanceViewModel;
 
 		// The first branch will always be the active one.
 		public const int ACTIVE_BRANCH_INDEX = 0;
@@ -81,6 +89,30 @@ public string ExtendedStatusInfo
 			set => SetProperty(ref _ExtendedStatusInfo, value);
 		}
 
+		private bool _IsZipEncodingSelectorVisible;
+		public bool IsZipEncodingSelectorVisible
+		{
+			get => _IsZipEncodingSelectorVisible;
+			set => SetProperty(ref _IsZipEncodingSelectorVisible, value);
+		}
+
+		public List<EncodingItem> ZipEncodingOptions { get; } = EncodingItem.Defaults.ToList();
+
+		private EncodingItem? _SelectedZipEncoding;
+		public EncodingItem? SelectedZipEncoding
+		{
+			get => _SelectedZipEncoding;
+			set
+			{
+				if(value is null)
+				{
+					return;
+				}
+				if (SetProperty(ref _SelectedZipEncoding, value))
+					_ = OnZipEncodingChangedAsync(value);
+			}
+		}
+
 		public bool ShowOpenInIDEButton
 		{
 			get
@@ -112,6 +144,24 @@ public StatusBarViewModel()
 						break;
 				}
 			};
+
+			SubscribeToShellPage();
+			ContentPageContext.PropertyChanged += OnContentPageContextPropertyChanged;
+		}
+
+		private void OnContentPageContextPropertyChanged(object? sender, PropertyChangedEventArgs e)
+		{
+			if (e.PropertyName == nameof(ContentPageContext.ShellPage))
+			{
+				UnsubscribeFromInstanceViewModel();
+				SubscribeToShellPage();
+			}
+		}
+
+		private void SubscribeToShellPage()
+		{
+			SubscribeToInstanceViewModel();
+			_ = UpdateZipEncodingStateAsync();
 		}
 
 		public void UpdateGitInfo(bool isGitRepository, string? repositoryPath, BranchItem? head)
@@ -164,5 +214,146 @@ public Task ExecuteDeleteBranch(string? branchName)
 		{
 			return GitHelpers.DeleteBranchAsync(_gitRepositoryPath, GitBranchDisplayName, branchName);
 		}
+
+		public async Task UpdateZipEncodingStateAsync()
+		{
+			if (ContentPageContext.ShellPage?.SlimContentPage?.StatusBarViewModel != this)
+				return;
+
+			var instanceVM = InstanceViewModel;
+			if (instanceVM is null)
+				return;
+
+			if (!instanceVM.IsPageTypeZipFolder)
+			{
+				IsZipEncodingSelectorVisible = false;
+				return;
+			}
+
+			var workingDir = ContentPageContext.ShellPage?.ShellViewModel.WorkingDirectory;
+			if (string.IsNullOrEmpty(workingDir) || !ZipStorageFolder.IsZipPath(workingDir))
+				return;
+
+			if (TryRestoreZipEncodingFromContainerPath(workingDir))
+				return;
+
+			try
+			{
+				var isUndetermined = await StorageArchiveService.IsEncodingUndeterminedAsync(workingDir);
+				instanceVM.IsZipEncodingUndetermined = isUndetermined;
+
+				if (!isUndetermined)
+				{
+					IsZipEncodingSelectorVisible = false;
+					return;
+				}
+
+				var detected = await StorageArchiveService.DetectEncodingAsync(workingDir);
+				if (detected is not null)
+				{
+					instanceVM.ZipEncodingName = detected.WebName;
+					EncodingItem? ZipEncodingItem = ZipEncodingOptions.FirstOrDefault(e =>
+						e.Encoding?.WebName.Equals(detected.WebName, StringComparison.OrdinalIgnoreCase) == true);
+					if(ZipEncodingItem == null)
+					{
+						ZipEncodingItem = new EncodingItem(detected, detected.EncodingName);
+					}
+				    ZipEncodingOptions.Add(ZipEncodingItem);
+					SelectedZipEncoding = ZipEncodingItem;
+				}
+				else
+				{
+					instanceVM.ZipEncodingName = null;
+					SelectedZipEncoding = ZipEncodingOptions.FirstOrDefault(e => e.Encoding is null);
+				}
+
+				IsZipEncodingSelectorVisible = true;
+			}
+			catch (Exception ex)
+			{
+				App.Logger.LogError(ex, "Error checking zip encoding.");
+				IsZipEncodingSelectorVisible = false;
+			}
+		}
+
+		private bool TryRestoreZipEncodingFromContainerPath(string workingDir)
+		{
+			if (!FileExtensionHelpers.IsBrowsableZipFile(workingDir, out var ext))
+				return false;
+
+			var marker = workingDir.IndexOf(ext, StringComparison.OrdinalIgnoreCase);
+			if (marker is -1)
+				return false;
+
+			var containerPath = workingDir.Substring(0, marker + ext.Length);
+			if (!ZipStorageFolder.TryGetEncodingForContainerPath(containerPath, out var encoding))
+				return false;
+
+			EncodingItem? match = encoding is not null
+				? ZipEncodingOptions.FirstOrDefault(e => e.Encoding == encoding)
+				: ZipEncodingOptions.FirstOrDefault(e => e.Encoding is null);
+
+			if (match is null && encoding is not null)
+			{
+				match = new EncodingItem(encoding, encoding.EncodingName);
+				ZipEncodingOptions.Add(match);
+			}
+
+			if (match is not null)
+			{
+				SelectedZipEncoding = match;
+				IsZipEncodingSelectorVisible = true;
+				return true;
+			}
+
+			return false;
+		}
+
+		private async Task OnZipEncodingChangedAsync(EncodingItem encodingItem)
+		{
+			if (ContentPageContext.ShellPage is null)
+				return;
+
+			if (ContentPageContext.ShellPage?.SlimContentPage?.StatusBarViewModel != this)
+				return;
+
+			var workingDir = ContentPageContext.ShellPage.ShellViewModel.WorkingDirectory;
+			if (string.IsNullOrEmpty(workingDir))
+				return;
+
+			if (FileExtensionHelpers.IsBrowsableZipFile(workingDir, out var ext))
+			{
+				var marker = workingDir.IndexOf(ext, StringComparison.OrdinalIgnoreCase);
+				if (marker is not -1)
+				{
+					var containerPath = workingDir.Substring(0, marker + ext.Length);
+					ZipStorageFolder.SetEncodingForContainerPath(containerPath, encodingItem.Encoding);
+				}
+			}
+
+			ContentPageContext.ShellPage.ShellViewModel.RefreshItems(null);
+		}
+
+		internal void SubscribeToInstanceViewModel()
+		{
+			var instanceVM = InstanceViewModel;
+			if (instanceVM is not null)
+				instanceVM.PropertyChanged += OnInstanceViewModelPropertyChanged;
+		}
+
+		internal void UnsubscribeFromInstanceViewModel()
+		{
+			var instanceVM = InstanceViewModel;
+			if (instanceVM is not null)
+				instanceVM.PropertyChanged -= OnInstanceViewModelPropertyChanged;
+		}
+
+		private void OnInstanceViewModelPropertyChanged(object? sender, PropertyChangedEventArgs e)
+		{
+			if (e.PropertyName is nameof(CurrentInstanceViewModel.IsPageTypeZipFolder))
+			{
+				_ = UpdateZipEncodingStateAsync();
+			}
+		}
 	}
 }

src/Files.App/Services/Storage/StorageArchiveService.cs

@@ -386,7 +386,9 @@ public async Task<bool> IsEncodingUndeterminedAsync(string archiveFilePath)
 			{
 				using (ZipFile zipFile = new ZipFile(archiveFilePath))
 				{
-					return !zipFile.Cast<ZipEntry>().All(entry => entry.IsUnicodeText);
+					return !zipFile.Cast<ZipEntry>().All(
+						entry => entry.IsUnicodeText || entry.Name.All(c => char.IsAscii(c))
+					);
 				}
 			}
 			catch (Exception ex)

src/Files.App/UserControls/StatusBar.xaml

@@ -30,6 +30,7 @@
 			<ColumnDefinition />
 			<ColumnDefinition Width="Auto" />
 			<ColumnDefinition Width="Auto" />
+			<ColumnDefinition Width="Auto" />
 		</Grid.ColumnDefinitions>
 
 		<!--  Folder and selection info  -->
@@ -193,10 +194,57 @@
 				Background="{ThemeResource DividerStrokeColorDefaultBrush}" />
 		</StackPanel>
 
+		<!--  ZIP Encoding Selector  -->
+		<Button
+			x:Name="ZipEncodingSelector"
+			Grid.Column="2"
+			Height="24"
+			Padding="8,0,8,0"
+			Background="Transparent"
+			BorderBrush="Transparent"
+			ToolTipService.ToolTip="{helpers:ResourceString Name=Encoding}"
+			Visibility="{x:Bind StatusBarViewModel.IsZipEncodingSelectorVisible, Mode=OneWay}">
+
+			<!--  Encoding Name  -->
+			<TextBlock Text="{x:Bind StatusBarViewModel.SelectedZipEncoding.Name, Mode=OneWay, FallbackValue='', TargetNullValue=''}" />
+
+			<Button.Flyout>
+				<Flyout x:Name="ZipEncodingFlyout" Opening="ZipEncodingFlyout_Opening">
+					<Grid
+						Width="240"
+						Height="300"
+						Margin="-16">
+
+						<!--  Encodings List  -->
+						<ListView
+							x:Name="ZipEncodingList"
+							Padding="4"
+							Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+							IsItemClickEnabled="True"
+							ItemClick="ZipEncodingList_ItemClick"
+							ItemsSource="{x:Bind StatusBarViewModel.ZipEncodingOptions, Mode=OneWay}"
+							SelectedItem="{x:Bind StatusBarViewModel.SelectedZipEncoding, Mode=TwoWay}"
+							SelectionMode="Single">
+
+							<ListView.ItemTemplate>
+								<DataTemplate x:DataType="data:EncodingItem">
+									<TextBlock
+										VerticalAlignment="Center"
+										Text="{x:Bind Name}"
+										TextTrimming="CharacterEllipsis" />
+								</DataTemplate>
+							</ListView.ItemTemplate>
+
+						</ListView>
+					</Grid>
+				</Flyout>
+			</Button.Flyout>
+		</Button>
+
 		<!--  Use visibility because it causes a crash to use a TwoWay x:Bind on an element that is inside an element with x:Load (#12589, #12599)  -->
 		<Button
 			x:Name="GitBranch"
-			Grid.Column="2"
+			Grid.Column="3"
 			Height="24"
 			Margin="4,0,0,0"
 			Padding="8,0,8,0"

src/Files.App/UserControls/StatusBar.xaml.cs

@@ -55,11 +55,26 @@ private async void BranchesFlyout_Opening(object _, object e)
 			StatusBarViewModel.SelectedBranchIndex = StatusBarViewModel.ACTIVE_BRANCH_INDEX;
 		}
 
+		private async void ZipEncodingFlyout_Opening(object _, object e)
+		{
+			if (StatusBarViewModel is null)
+				return;
+
+			await StatusBarViewModel.UpdateZipEncodingStateAsync();
+			if (StatusBarViewModel.SelectedZipEncoding is not null)
+				ZipEncodingList.SelectedItem = StatusBarViewModel.SelectedZipEncoding;
+		}
+
 		private void BranchesList_ItemClick(object sender, ItemClickEventArgs e)
 		{
 			BranchesFlyout.Hide();
 		}
 
+		private void ZipEncodingList_ItemClick(object sender, ItemClickEventArgs e)
+		{
+			ZipEncodingFlyout.Hide();
+		}
+
 		private void BranchesFlyout_Closing(object _, object e)
 		{
 			if (StatusBarViewModel is null)

src/Files.App/Utils/Storage/StorageBaseItems/IPasswordProtectedItem.cs

@@ -16,7 +16,8 @@ async Task<TOut> RetryWithCredentialsAsync<TOut>(Func<Task<TOut>> func, Exceptio
 		{
 			var handled = exception is SevenZipOpenFailedException szofex && szofex.Result is OperationResult.WrongPassword ||
 				exception is ExtractionFailedException efex && efex.Result is OperationResult.WrongPassword ||
-				exception is FtpAuthenticationException;
+				exception is FtpAuthenticationException ||
+				exception is ICSharpCode.SharpZipLib.Zip.ZipException szlzex && szlzex.Message.Contains("encrypted");
 
 			if (!handled || PasswordRequestedCallback is null)
 				throw exception;