From f23786ce5e30d0f629a6a09583a472bc5dbdcd8c Mon Sep 17 00:00:00 2001
From: Tian Liao <tilia@microsoft.com>
Date: Fri, 25 Oct 2024 09:54:02 +0800
Subject: [PATCH] renaming

---
 src/Calculator/Calculator.csproj              |  2 +-
 .../Utils/{SerdeUtils.cs => JsonUtils.cs}     |  3 +-
 src/Calculator/Views/MainPage.xaml.cs         | 29 ++-----------------
 3 files changed, 4 insertions(+), 30 deletions(-)
 rename src/Calculator/Utils/{SerdeUtils.cs => JsonUtils.cs} (98%)

diff --git a/src/Calculator/Calculator.csproj b/src/Calculator/Calculator.csproj
index 589e2fe8..6dee5aa8 100644
--- a/src/Calculator/Calculator.csproj
+++ b/src/Calculator/Calculator.csproj
@@ -167,7 +167,7 @@
     <Compile Include="Selectors\NavViewMenuItemTemplateSelector.cs" />
     <Compile Include="Utils\ResourceVirtualKey.cs" />
     <Compile Include="Utils\ResourceString.cs" />
-    <Compile Include="Utils\SerdeUtils.cs" />
+    <Compile Include="Utils\JsonUtils.cs" />
     <Compile Include="Utils\ThemeHelper.cs" />
     <Compile Include="Views\GraphingCalculator\EquationStylePanelControl.xaml.cs">
       <DependentUpon>EquationStylePanelControl.xaml</DependentUpon>
diff --git a/src/Calculator/Utils/SerdeUtils.cs b/src/Calculator/Utils/JsonUtils.cs
similarity index 98%
rename from src/Calculator/Utils/SerdeUtils.cs
rename to src/Calculator/Utils/JsonUtils.cs
index bf4ec663..060c2b14 100644
--- a/src/Calculator/Utils/SerdeUtils.cs
+++ b/src/Calculator/Utils/JsonUtils.cs
@@ -1,11 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Security.Cryptography.X509Certificates;
 using System.Text.Json.Serialization;
 using CalculatorApp.ViewModel.Snapshot;
 
-namespace CalculatorApp.SerdeUtils
+namespace CalculatorApp.JsonUtils
 {
     internal class CalcManagerHistoryTokenAlias
     {
diff --git a/src/Calculator/Views/MainPage.xaml.cs b/src/Calculator/Views/MainPage.xaml.cs
index cb6a5036..a3f142bc 100644
--- a/src/Calculator/Views/MainPage.xaml.cs
+++ b/src/Calculator/Views/MainPage.xaml.cs
@@ -4,7 +4,6 @@ using System.ComponentModel;
 using System.Threading.Tasks;
 
 using Windows.ApplicationModel.UserActivities;
-using Windows.Data.Json;
 using Windows.Foundation;
 using Windows.Graphics.Display;
 using Windows.Storage;
@@ -18,6 +17,7 @@ using Microsoft.UI.Xaml.Controls;
 
 using CalculatorApp.Common;
 using CalculatorApp.Converters;
+using CalculatorApp.JsonUtils;
 using CalculatorApp.ViewModel;
 using CalculatorApp.ViewModel.Common;
 using CalculatorApp.ViewModel.Common.Automation;
@@ -77,11 +77,8 @@ namespace CalculatorApp
                     string embeddedData;
                     try
                     {
-                        var json = JsonSerializer.Serialize(new SerdeUtils.ApplicationSnapshotAlias { Value = Model.Snapshot });
-                        var json2 = JsonSerializer.Serialize(Model.Snapshot);
+                        var json = JsonSerializer.Serialize(new ApplicationSnapshotAlias { Value = Model.Snapshot });
                         embeddedData = Convert.ToBase64String(Compress(json));
-                        var e2 = Convert.ToBase64String(Compress(json2));
-                        var diff = embeddedData.Length - e2.Length;
                     }
                     catch (Exception)
                     {
@@ -734,28 +731,6 @@ namespace CalculatorApp
                 }
                 return compressed.ToArray();
             }
-
-            //encodedSnapshot = null;
-            //try
-            //{
-            //    var rawJson = Encoding.UTF8.GetBytes(JsonSerializer.Serialize(new SerdeUtils.ApplicationSnapshotAlias { Value = Model.Snapshot }));
-            //    using (var compressed = new MemoryStream())
-            //    {
-            //        using (var deflater = new DeflateStream(compressed, CompressionLevel.Optimal, true))
-            //        {
-            //            deflater.Write(rawJson, 0, rawJson.Length);
-            //        }
-            //        byte[] data;
-            //        compressed.Read(data, 0, );
-            //        Convert.ToBase64String(compressed.GetBuffer());
-            //    }
-            //}
-            //catch (Exception)
-            //{
-            //    // TODO: trace errors
-            //    return false;
-            //}
-            //return true;
         }
 
         private Calculator m_calculator;