A Swiss Army knife for developers.
C# blazorcross-platformcsharpdesktopdesktop-appdesktop-applicationdeveloper-toolsextensiblefluentfluent-designlinuxmacosmicasyntax-highlightingtypescriptwindowswindows-10windows-11winui
updated to handle utf8-bom string properly. (#378)
BenjaminT5510f52c484c
diff --git a/src/dev/impl/DevToys/ViewModels/Tools/EncodersDecoders/Base64EncoderDecoder/Base64EncoderDecoderToolViewModel.cs b/src/dev/impl/DevToys/ViewModels/Tools/EncodersDecoders/Base64EncoderDecoder/Base64EncoderDecoderToolViewModel.csindex 12a9aea59..e09339f8e 100644--- a/src/dev/impl/DevToys/ViewModels/Tools/EncodersDecoders/Base64EncoderDecoder/Base64EncoderDecoderToolViewModel.cs+++ b/src/dev/impl/DevToys/ViewModels/Tools/EncodersDecoders/Base64EncoderDecoder/Base64EncoderDecoderToolViewModel.cs@@ -3,6 +3,7 @@using System;using System.Collections.Generic;using System.Composition;+using System.Linq;using System.Text;using System.Threading.Tasks;using DevToys.Api.Core;@@ -207,7 +208,16 @@ namespace DevToys.ViewModels.Tools.Base64EncoderDecoder{byte[]? decodedData = Convert.FromBase64String(data);Encoding encoder = GetEncoder();- decoded = encoder.GetString(decodedData);+ if (encoder is UTF8Encoding && decodedData != null)+ {+ byte[] preamble = encoder.GetPreamble();+ if (decodedData.Take(preamble.Length).SequenceEqual(preamble))+ {+ // need to keep it this way to have the dom char+ decoded += Encoding.Unicode.GetString(preamble, 0, 1);+ }+ }+ decoded += encoder.GetString(decodedData);}catch (FormatException){@@ -226,7 +236,7 @@ namespace DevToys.ViewModels.Tools.Base64EncoderDecoder{if (string.Equals(EncodingMode, DefaultEncoding, StringComparison.Ordinal)){- return Encoding.UTF8;+ return new UTF8Encoding(true);}return Encoding.ASCII;}diff --git a/src/dev/impl/DevToys/Views/Tools/EncodersDecoders/Base64EncoderDecoder/Base64EncoderDecoderToolPage.xaml b/src/dev/impl/DevToys/Views/Tools/EncodersDecoders/Base64EncoderDecoder/Base64EncoderDecoderToolPage.xamlindex d3fea91e8..1837d709b 100644--- a/src/dev/impl/DevToys/Views/Tools/EncodersDecoders/Base64EncoderDecoder/Base64EncoderDecoderToolPage.xaml+++ b/src/dev/impl/DevToys/Views/Tools/EncodersDecoders/Base64EncoderDecoder/Base64EncoderDecoderToolPage.xaml@@ -70,6 +70,7 @@Grid.Row="1"MinHeight="150"AcceptsReturn="True"+ IsRichTextEdit="True"Header="{x:Bind ViewModel.Strings.InputTitle}"Text="{x:Bind ViewModel.InputValue, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>@@ -78,6 +79,7 @@MinHeight="150"IsReadOnly="True"AcceptsReturn="True"+ IsRichTextEdit="True"Header="{x:Bind ViewModel.Strings.OutputTitle}"Text="{x:Bind ViewModel.OutputValue, Mode=OneWay}"/>