From 89d3bd840989a878bebe7491b84191107a0e24da Mon Sep 17 00:00:00 2001
From: WeeXnes <somtrigi@gmail.com>
Date: Thu, 8 Jun 2023 21:59:40 +0200
Subject: [PATCH] UX improvements

---
 WeeXnes/Core/Global.cs                                       | 2 +-
 WeeXnes/Views/PasswordGenerator/PasswordGenView.xaml.cs      | 1 +
 WeeXnes/Views/PasswordGenerator/SavePasswordView.xaml.cs     | 4 +++-
 WeeXnes/Views/PasswordGenerator/SaveToKeyManagerView.xaml.cs | 3 ++-
 WeeXnes/WeeXnes.csproj                                       | 2 +-
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/WeeXnes/Core/Global.cs b/WeeXnes/Core/Global.cs
index 721d24f..70dc745 100644
--- a/WeeXnes/Core/Global.cs
+++ b/WeeXnes/Core/Global.cs
@@ -8,7 +8,7 @@ namespace WeeXnes.Core
 {
     public class Information
     {
-        public const string Version = "4.4.0";
+        public const string Version = "4.4.1";
         public const string EncryptionHash = "8zf5#RdyQ]$4x4_";
         public const string ApiUrl = "https://api.github.com/repos/weexnes/weexnessuite/releases/latest";
     }
diff --git a/WeeXnes/Views/PasswordGenerator/PasswordGenView.xaml.cs b/WeeXnes/Views/PasswordGenerator/PasswordGenView.xaml.cs
index 4e248ca..04f2e71 100644
--- a/WeeXnes/Views/PasswordGenerator/PasswordGenView.xaml.cs
+++ b/WeeXnes/Views/PasswordGenerator/PasswordGenView.xaml.cs
@@ -56,6 +56,7 @@ namespace WeeXnes.Views.PasswordGenerator
             }
 
             SavePasswordView.GeneratedPassword = generatedPassword;
+            SavePasswordView._prevPage = this;
             NavigationService.Navigate(new Uri("/Views/PasswordGenerator/SavePasswordView.xaml",UriKind.Relative));
         }
 
diff --git a/WeeXnes/Views/PasswordGenerator/SavePasswordView.xaml.cs b/WeeXnes/Views/PasswordGenerator/SavePasswordView.xaml.cs
index 4b5ba21..1e3055a 100644
--- a/WeeXnes/Views/PasswordGenerator/SavePasswordView.xaml.cs
+++ b/WeeXnes/Views/PasswordGenerator/SavePasswordView.xaml.cs
@@ -7,6 +7,7 @@ namespace WeeXnes.Views.PasswordGenerator
     public partial class SavePasswordView : Page
     {
         public static string GeneratedPassword = "";
+        public static PasswordGenView _prevPage = null;
         public SavePasswordView()
         {
             InitializeComponent();
@@ -19,7 +20,8 @@ namespace WeeXnes.Views.PasswordGenerator
 
         private void CloseDialog(object sender, RoutedEventArgs e)
         {
-            NavigationService.Navigate(new Uri("/Views/PasswordGenerator/PasswordGenView.xaml",UriKind.Relative));
+            if(_prevPage != null)
+                NavigationService.Navigate(_prevPage);
         }
         private void CopyToClipboard(object sender, RoutedEventArgs e)
         {
diff --git a/WeeXnes/Views/PasswordGenerator/SaveToKeyManagerView.xaml.cs b/WeeXnes/Views/PasswordGenerator/SaveToKeyManagerView.xaml.cs
index c107b3c..3027cda 100644
--- a/WeeXnes/Views/PasswordGenerator/SaveToKeyManagerView.xaml.cs
+++ b/WeeXnes/Views/PasswordGenerator/SaveToKeyManagerView.xaml.cs
@@ -8,6 +8,7 @@ namespace WeeXnes.Views.PasswordGenerator
 {
     public partial class SaveToKeyManagerView : Page
     {
+        
         public SaveToKeyManagerView()
         {
             InitializeComponent();
@@ -29,7 +30,7 @@ namespace WeeXnes.Views.PasswordGenerator
             {
                 Console.WriteLine(ex.Message);
             }
-            NavigationService.Navigate(new Uri("/Views/PasswordGenerator/PasswordGenView.xaml",UriKind.Relative));
+            NavigationService.Navigate(SavePasswordView._prevPage);
         }
     }
 }
\ No newline at end of file
diff --git a/WeeXnes/WeeXnes.csproj b/WeeXnes/WeeXnes.csproj
index 7fc099b..785abdb 100644
--- a/WeeXnes/WeeXnes.csproj
+++ b/WeeXnes/WeeXnes.csproj
@@ -4,7 +4,7 @@
     <PropertyGroup>
         <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
         <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-        <Version>4.4.0</Version>
+        <Version>4.4.1</Version>
         <ProjectGuid>{4B33CEE7-C74D-43B9-B99A-8B273D5195BC}</ProjectGuid>
         <OutputType>WinExe</OutputType>
         <RootNamespace>WeeXnes</RootNamespace>