updated to handle utf8-bom string properly. (#378)

DevToys-app · Feb 13, 2022 · 5510f52 · 5510f52
1 parent 0bb688a
commit 5510f52
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/...ewModels/Tools/EncodersDecoders/Base64EncoderDecoder/Base64EncoderDecoderToolViewModel.cs b/...ewModels/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 @@ private async Task<string> DecodeBase64DataAsync(string? data)
             {
                 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 @@ private Encoding GetEncoder()
         {
             if (string.Equals(EncodingMode, DefaultEncoding, StringComparison.Ordinal))
             {
-                return Encoding.UTF8;
+                return new UTF8Encoding(true);
             }
             return Encoding.ASCII;
         }

diff --git a/...vToys/Views/Tools/EncodersDecoders/Base64EncoderDecoder/Base64EncoderDecoderToolPage.xaml b/...vToys/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}"/>