Removed QueryString.Net package and replaced it with Data.Json

Version 1.4
2025-10-03 15:40:18 -04:00 · 2017-10-19 15:53:03 +02:00
parent 66fd87124b
commit 6bb37d9e70
7 changed files with 23 additions and 33 deletions
--- a/ModernKeePass/App.xaml.cs
+++ b/ModernKeePass/App.xaml.cs
@@ -2,11 +2,11 @@
 using System.Collections.Generic;
 using Windows.ApplicationModel;
 using Windows.ApplicationModel.Activation;
+using Windows.Data.Json;
 using Windows.Storage;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Navigation;
-using Microsoft.QueryStringDotNET;
 using ModernKeePass.Common;
 using ModernKeePass.Interfaces;

@@ -65,9 +65,8 @@ namespace ModernKeePass
            if (rootFrame == null)
            {
                // Create a Frame to act as the navigation context and navigate to the first page
-                rootFrame = new Frame();
+                rootFrame = new Frame {Language = Windows.Globalization.ApplicationLanguages.Languages[0]};
                // Set the default language
-                rootFrame.Language = Windows.Globalization.ApplicationLanguages.Languages[0];

                rootFrame.NavigationFailed += OnNavigationFailed;

@@ -82,7 +81,7 @@ namespace ModernKeePass

            if (e is LaunchActivatedEventArgs)
            {
-                var lauchActivatedEventArgs = e as LaunchActivatedEventArgs;
+                var lauchActivatedEventArgs = (LaunchActivatedEventArgs) e;
                if (rootFrame.Content == null)
                {
                    // When the navigation stack isn't restored navigate to the first page,
@@ -128,7 +127,6 @@ namespace ModernKeePass
        private void OnSuspending(object sender, SuspendingEventArgs e)
        {
            var deferral = e.SuspendingOperation.GetDeferral();
-            //TODO: Save application state and stop any background activity
            Database.Save();
            deferral.Complete();
        }
@@ -150,9 +148,10 @@ namespace ModernKeePass

        private void UndoEntityDelete(string arguments)
        {
-            var args = QueryString.Parse(arguments);
-            var entity = PendingDeleteEntities[args["entityId"]];
-            PendingDeleteEntities.Remove(args["entityId"]);
+            if (arguments == null) return;
+            var args = JsonObject.Parse(arguments);
+            var entity = PendingDeleteEntities[args["entityId"].GetString()];
+            PendingDeleteEntities.Remove(args["entityId"].GetString());
            entity.UndoDelete();
        }
    }
--- a/ModernKeePass/BundleArtifacts/neutral.txt
+++ b/ModernKeePass/BundleArtifacts/neutral.txt
@@ -1,4 +1,4 @@
-MainPackage=C:\Users\GBE\Source\Repos\ModernKeePass\ModernKeePass\bin\Release\ModernKeePass_1.3.0.17_AnyCPU.appx
-SymbolPackage=C:\Users\GBE\Source\Repos\ModernKeePass\ModernKeePass\AppPackages\ModernKeePass_1.3.0.17_Test\ModernKeePass_1.3.0.17_AnyCPU.appxsym
-ResourcePack=C:\Users\GBE\Source\Repos\ModernKeePass\ModernKeePass\bin\Release\ModernKeePass_1.3.0.17_scale-140.appx
-ResourcePack=C:\Users\GBE\Source\Repos\ModernKeePass\ModernKeePass\bin\Release\ModernKeePass_1.3.0.17_scale-180.appx
+MainPackage=C:\Users\GBE\Source\Repos\ModernKeePass\ModernKeePass\bin\Release\ModernKeePass_1.4.0.19_AnyCPU.appx
+SymbolPackage=C:\Users\GBE\Source\Repos\ModernKeePass\ModernKeePass\AppPackages\ModernKeePass_1.4.0.19_Test\ModernKeePass_1.4.0.19_AnyCPU.appxsym
+ResourcePack=C:\Users\GBE\Source\Repos\ModernKeePass\ModernKeePass\bin\Release\ModernKeePass_1.4.0.19_scale-140.appx
+ResourcePack=C:\Users\GBE\Source\Repos\ModernKeePass\ModernKeePass\bin\Release\ModernKeePass_1.4.0.19_scale-180.appx
--- a/ModernKeePass/Common/ToastNotificationHelper.cs
+++ b/ModernKeePass/Common/ToastNotificationHelper.cs
@@ -1,8 +1,8 @@
 using System;
+using Windows.Data.Json;
 using Windows.Data.Xml.Dom;
 using Windows.UI.Notifications;
 using Windows.UI.Xaml;
-using Microsoft.QueryStringDotNET;
 using ModernKeePass.Interfaces;

 namespace ModernKeePass.Common
@@ -69,12 +69,13 @@ namespace ModernKeePass.Common
            toastElements[0].AppendChild(notificationXml.CreateTextNode($"{entityType} {entity.Name} deleted"));
            toastElements[1].AppendChild(notificationXml.CreateTextNode("Click me to undo"));
            var toastNode = notificationXml.SelectSingleNode("/toast");
-            ((XmlElement)toastNode)?.SetAttribute("launch", new QueryString
-                {
-                    { "entityType", entityType },
-                    { "entityId", entity.Id }

-                }.ToString());
+            var launch = new JsonObject
+            {
+                {"entityType", JsonValue.CreateStringValue(entityType)},
+                {"entityId", JsonValue.CreateStringValue(entity.Id)}
+            };
+            ((XmlElement)toastNode)?.SetAttribute("launch", launch.Stringify());

            var toast = new ToastNotification(notificationXml)
            {
@@ -87,10 +88,11 @@ namespace ModernKeePass.Common
        private static void Toast_Dismissed(ToastNotification sender, ToastDismissedEventArgs args)
        {
            var toastNode = sender.Content.SelectSingleNode("/toast");
-            var launchArguments = QueryString.Parse(((XmlElement)toastNode)?.GetAttribute("launch"));
+            if (toastNode == null) return;
+            var launchArguments = JsonObject.Parse(((XmlElement)toastNode).GetAttribute("launch"));
            var app = (App)Application.Current;
-            var entity = app.PendingDeleteEntities[launchArguments["entityId"]];
-            app.PendingDeleteEntities.Remove(launchArguments["entityId"]);
+            var entity = app.PendingDeleteEntities[launchArguments["entityId"].GetString()];
+            app.PendingDeleteEntities.Remove(launchArguments["entityId"].GetString());
            entity.CommitDelete();
        }
    }
--- a/ModernKeePass/ModernKeePass.csproj
+++ b/ModernKeePass/ModernKeePass.csproj
@@ -255,10 +255,6 @@
      <HintPath>..\packages\ModernKeePassLib.2.28.4000\lib\netstandard1.2\ModernKeePassLib.dll</HintPath>
      <Private>True</Private>
    </Reference>
-    <Reference Include="QueryString.NETCore, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\QueryString.NET.1.0.0\lib\dotnet\QueryString.NETCore.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
    <Reference Include="Splat, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
      <HintPath>..\packages\Splat.2.0.0\lib\Portable-Win81+Wpa81\Splat.dll</HintPath>
      <Private>True</Private>
--- a/ModernKeePass/Package.appxmanifest
+++ b/ModernKeePass/Package.appxmanifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/2010/manifest" xmlns:m2="http://schemas.microsoft.com/appx/2013/manifest">
-  <Identity Name="wismna.ModernKeePass" Publisher="CN=0719A91A-C322-4EE0-A257-E60733EECF06" Version="1.3.0.17" />
+  <Identity Name="wismna.ModernKeePass" Publisher="CN=0719A91A-C322-4EE0-A257-E60733EECF06" Version="1.4.0.19" />
  <Properties>
    <DisplayName>ModernKeePass</DisplayName>
    <PublisherDisplayName>wismna</PublisherDisplayName>
--- a/ModernKeePass/Pages/GroupDetailPage.xaml.cs
+++ b/ModernKeePass/Pages/GroupDetailPage.xaml.cs
@@ -1,19 +1,13 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
-using Windows.ApplicationModel.Background;
-using Windows.Data.Xml.Dom;
 using Windows.Storage.Streams;
 using Windows.UI.Core;
-using Windows.UI.Notifications;
 using Windows.UI.Popups;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Navigation;
-using Microsoft.QueryStringDotNET;
-using Microsoft.Toolkit.Uwp.Notifications;
 using ModernKeePass.Common;
-using ModernKeePass.Interfaces;
 using ModernKeePass.ViewModels;

 // The Group Detail Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=234229
--- a/ModernKeePass/packages.config
+++ b/ModernKeePass/packages.config
@@ -6,7 +6,6 @@
  <package id="ModernKeePassLib" version="2.28.4000" targetFramework="win81" />
  <package id="NETStandard.Library" version="2.0.0" targetFramework="win81" />
  <package id="Portable.BouncyCastle" version="1.8.1.3" targetFramework="win81" />
-  <package id="QueryString.NET" version="1.0.0" targetFramework="win81" />
  <package id="Splat" version="2.0.0" targetFramework="win81" />
  <package id="System.Collections" version="4.0.11" targetFramework="win81" />
  <package id="System.Diagnostics.Debug" version="4.0.11" targetFramework="win81" />