From 654bd6b4e58e169eb934b939dbe63478ea4b5d55 Mon Sep 17 00:00:00 2001
From: Geoffroy BONNEVILLE <geoffroy.bonneville@younited-credit.fr>
Date: Sat, 2 May 2020 14:21:59 +0200
Subject: [PATCH] Corrected some Sonar issues Changed a little bit the Open and
 Set credentials User controls

---
 .../Common/Interfaces/IDatabaseProxy.cs       |  2 +-
 .../DependencyInjection.cs                    |  2 -
 .../Commands/SortGroups/SortGroupsCommand.cs  |  3 +-
 ModernKeePass/Package.appxmanifest            |  2 +-
 ModernKeePass/ViewModels/SettingsVm.cs        |  1 -
 .../MainPageFrames/RecentDatabasesPage.xaml   |  2 +-
 .../RecentDatabasesPage.xaml.cs               |  2 -
 .../UserControls/OpenDatabaseUserControl.xaml |  3 +-
 .../OpenDatabaseUserControl.xaml.cs           |  1 +
 .../SetCredentialsUserControl.xaml            | 10 +---
 .../en-us/baselisting/releaseNotes.txt        |  7 ---
 .../fr-fr/baselisting/releaseNotes.txt        |  7 ---
 README.md                                     |  4 +-
 WinAppCommon/Common/Constants.cs              |  8 +--
 WinAppCommon/Common/MessageDialogHelper.cs    | 56 -------------------
 .../Messages/DatabaseAlreadyOpenedMessage.cs  |  4 +-
 16 files changed, 16 insertions(+), 98 deletions(-)
 delete mode 100644 WinAppCommon/Common/MessageDialogHelper.cs

diff --git a/ModernKeePass.Application/Common/Interfaces/IDatabaseProxy.cs b/ModernKeePass.Application/Common/Interfaces/IDatabaseProxy.cs
index 03d638e..0c211d2 100644
--- a/ModernKeePass.Application/Common/Interfaces/IDatabaseProxy.cs
+++ b/ModernKeePass.Application/Common/Interfaces/IDatabaseProxy.cs
@@ -25,7 +25,7 @@ namespace ModernKeePass.Application.Common.Interfaces
 
         Task Open(byte[] file, Credentials credentials);
         Task ReOpen(byte[] file);
-        Task Create(Credentials credentials, string name, DatabaseVersion version = DatabaseVersion.V3);
+        Task Create(Credentials credentials, string name, DatabaseVersion version = DatabaseVersion.V4);
         Task<byte[]> SaveDatabase();
         Task<byte[]> SaveDatabase(byte[] newFileContents);
         void UpdateCredentials(Credentials credentials);
diff --git a/ModernKeePass.Application/DependencyInjection.cs b/ModernKeePass.Application/DependencyInjection.cs
index 5ec0c9d..19bdf9b 100644
--- a/ModernKeePass.Application/DependencyInjection.cs
+++ b/ModernKeePass.Application/DependencyInjection.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-using FluentValidation;
 using MediatR;
 using Microsoft.Extensions.DependencyInjection;
 using ModernKeePass.Application.Common.Behaviors;
@@ -13,7 +12,6 @@ namespace ModernKeePass.Application
             var assembly = typeof(DependencyInjection).GetTypeInfo().Assembly;
             services.AddMediatR(assembly);
             services.AddTransient(typeof(IPipelineBehavior<,>), typeof(DirtyStatusBehavior<,>));
-            //services.AddValidatorsFromAssembly(assembly);
 
             return services;
         }
diff --git a/ModernKeePass.Application/Group/Commands/SortGroups/SortGroupsCommand.cs b/ModernKeePass.Application/Group/Commands/SortGroups/SortGroupsCommand.cs
index 7235e1e..f5c6208 100644
--- a/ModernKeePass.Application/Group/Commands/SortGroups/SortGroupsCommand.cs
+++ b/ModernKeePass.Application/Group/Commands/SortGroups/SortGroupsCommand.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.Linq;
+using System.Linq;
 using MediatR;
 using ModernKeePass.Application.Common.Interfaces;
 using ModernKeePass.Application.Group.Models;
diff --git a/ModernKeePass/Package.appxmanifest b/ModernKeePass/Package.appxmanifest
index 426f5a5..3ee3005 100644
--- 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.16.0.12" />
+  <Identity Name="wismna.ModernKeePass" Publisher="CN=0719A91A-C322-4EE0-A257-E60733EECF06" Version="1.17.0.12" />
   <Properties>
     <DisplayName>ModernKeePass</DisplayName>
     <PublisherDisplayName>wismna</PublisherDisplayName>
diff --git a/ModernKeePass/ViewModels/SettingsVm.cs b/ModernKeePass/ViewModels/SettingsVm.cs
index 283bb22..f1b72e8 100644
--- a/ModernKeePass/ViewModels/SettingsVm.cs
+++ b/ModernKeePass/ViewModels/SettingsVm.cs
@@ -3,7 +3,6 @@ using System.Linq;
 using Windows.UI.Xaml.Controls;
 using GalaSoft.MvvmLight;
 using MediatR;
-using Microsoft.Extensions.DependencyInjection;
 using ModernKeePass.Application.Common.Interfaces;
 using ModernKeePass.Application.Database.Queries.GetDatabase;
 using ModernKeePass.Domain.Interfaces;
diff --git a/ModernKeePass/Views/MainPageFrames/RecentDatabasesPage.xaml b/ModernKeePass/Views/MainPageFrames/RecentDatabasesPage.xaml
index 23b77fe..3a3fc80 100644
--- a/ModernKeePass/Views/MainPageFrames/RecentDatabasesPage.xaml
+++ b/ModernKeePass/Views/MainPageFrames/RecentDatabasesPage.xaml
@@ -11,7 +11,7 @@
     <Page.Resources>
         <converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>
     </Page.Resources>
-    <Grid x:Name="Grid" Background="{StaticResource ApplicationPageBackgroundThemeBrush}">
+    <Grid Background="{StaticResource ApplicationPageBackgroundThemeBrush}">
         <Grid.RowDefinitions>
             <RowDefinition Height="40" />
             <RowDefinition Height="*" />
diff --git a/ModernKeePass/Views/MainPageFrames/RecentDatabasesPage.xaml.cs b/ModernKeePass/Views/MainPageFrames/RecentDatabasesPage.xaml.cs
index eb25951..fd1c864 100644
--- a/ModernKeePass/Views/MainPageFrames/RecentDatabasesPage.xaml.cs
+++ b/ModernKeePass/Views/MainPageFrames/RecentDatabasesPage.xaml.cs
@@ -9,8 +9,6 @@ namespace ModernKeePass.Views
     /// </summary>
     public sealed partial class RecentDatabasesPage
     {
-        private RecentVm Model => (RecentVm)DataContext;
-        
         public RecentDatabasesPage()
         {
             InitializeComponent();
diff --git a/ModernKeePass/Views/UserControls/OpenDatabaseUserControl.xaml b/ModernKeePass/Views/UserControls/OpenDatabaseUserControl.xaml
index 504174e..3f3c655 100644
--- a/ModernKeePass/Views/UserControls/OpenDatabaseUserControl.xaml
+++ b/ModernKeePass/Views/UserControls/OpenDatabaseUserControl.xaml
@@ -39,8 +39,7 @@
         <CheckBox Grid.Row="1" Grid.Column="0" IsChecked="{Binding HasKeyFile, Mode=TwoWay}" />
         <HyperlinkButton Grid.Row="1" Grid.Column="1" Margin="-15,0,0,0" 
                          x:Name="HyperlinkButton"
-                         Content="{Binding KeyFileText}" 
-                         IsEnabled="{Binding HasKeyFile}" 
+                         Content="{Binding KeyFileText}"
                          Click="KeyFileButton_Click" />
 
         <Button Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="2"
diff --git a/ModernKeePass/Views/UserControls/OpenDatabaseUserControl.xaml.cs b/ModernKeePass/Views/UserControls/OpenDatabaseUserControl.xaml.cs
index f68d6ef..74627a2 100644
--- a/ModernKeePass/Views/UserControls/OpenDatabaseUserControl.xaml.cs
+++ b/ModernKeePass/Views/UserControls/OpenDatabaseUserControl.xaml.cs
@@ -55,6 +55,7 @@ namespace ModernKeePass.Views.UserControls
             var token = StorageApplicationPermissions.FutureAccessList.Add(file, file.Name);
             Model.KeyFilePath = token;
             Model.KeyFileText = file.Name;
+            Model.HasKeyFile = true;
         }
     }
 }
diff --git a/ModernKeePass/Views/UserControls/SetCredentialsUserControl.xaml b/ModernKeePass/Views/UserControls/SetCredentialsUserControl.xaml
index f62a72b..a2da8e0 100644
--- a/ModernKeePass/Views/UserControls/SetCredentialsUserControl.xaml
+++ b/ModernKeePass/Views/UserControls/SetCredentialsUserControl.xaml
@@ -35,17 +35,13 @@
             x:Uid="CompositeKeyPassword" 
             x:Name="PasswordBox"
             Password="{Binding Password, Mode=TwoWay}" 
-            IsPasswordRevealButtonEnabled="True" >
-        <interactivity:Interaction.Behaviors>
-            <core:EventTriggerBehavior EventName="GotFocus">
-                <core:ChangePropertyAction TargetObject="{Binding}" PropertyName="HasPassword" Value="True" />
-            </core:EventTriggerBehavior>
-        </interactivity:Interaction.Behaviors>
-        </PasswordBox>
+            IsEnabled="{Binding HasPassword}" 
+            IsPasswordRevealButtonEnabled="True" />
         <PasswordBox Grid.Row="1" Grid.Column="1" Height="30"
             x:Uid="CompositeKeyConfirmPassword" 
             x:Name="ConfirmPasswordBox"
             Password="{Binding ConfirmPassword, Mode=TwoWay}" 
+            IsEnabled="{Binding HasPassword}" 
             IsPasswordRevealButtonEnabled="True" />
         <ProgressBar  Grid.Row="1" Grid.Column="1"
             Maximum="128" VerticalAlignment="Bottom" 
diff --git a/ModernKeePass/appMetadata/en-us/baselisting/releaseNotes.txt b/ModernKeePass/appMetadata/en-us/baselisting/releaseNotes.txt
index 9473ccd..e69de29 100644
--- a/ModernKeePass/appMetadata/en-us/baselisting/releaseNotes.txt
+++ b/ModernKeePass/appMetadata/en-us/baselisting/releaseNotes.txt
@@ -1,7 +0,0 @@
-Database corruption issues should now be a thing of the past:
-  Database integrity is checked after each save
-  Data is written to the filesystem using a transactional model (meaning: if an error occurs, the original file is left untouched)
-  Auto-save on suspend/exit is now only active when database has changes and its size is under 1MB
-Added the ability to move entries and groups
-Allows restoring and deleting from entry history
-Updated KeePass lib to version 2.44
\ No newline at end of file
diff --git a/ModernKeePass/appMetadata/fr-fr/baselisting/releaseNotes.txt b/ModernKeePass/appMetadata/fr-fr/baselisting/releaseNotes.txt
index 50b536b..e69de29 100644
--- a/ModernKeePass/appMetadata/fr-fr/baselisting/releaseNotes.txt
+++ b/ModernKeePass/appMetadata/fr-fr/baselisting/releaseNotes.txt
@@ -1,7 +0,0 @@
-Les problemes de corruption de bases de données sont maintenant totalement corrigees :
-  L'integrite de la base de donnees est verfiee apres chaque sauvegarde
-  Les donnees sont ecrites dans le systeme de fichiers en utilisant un modele transactionnel (autrement dit, s'il y a une erreur, le fichier original n'est pas modifie)
-  L'auto-sauvegarde lors de la suspension/sortie ne se fait que lorsqu'il y a eu des changements et que la taille de la base de donnees est inferieure a 1MB
-Possibilite de deplacer des groupes et des entree
-Possibilite de supprimer et restaurer des versions de l'historique d'entrees
-Libraire mise a jour en version 2.44
\ No newline at end of file
diff --git a/README.md b/README.md
index 1f1af84..4d15501 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ You can get it [here](https://www.microsoft.com/en-us/store/p/modernkeepass/9mwq
 - Use Recycle Bin
 - Search entries
 - Sort and reorder entries
-- View entries history
+- View, delete and restore from entry history
 - Use Semantic Zoom to see your entries in a grouped mode
 - List recently opened databases
 - Open database from Windows Explorer
@@ -43,4 +43,4 @@ Otherwise, there are still many things left to implement:
 
 # Credits
 *Dominik Reichl* for the [KeePass application](https://keepass.info/), library and file format  
-*David Lechner* for his [PCL adapatation](https://github.com/dlech/KeePass2PCL) of the KeePass Library and the correlated tests which served as an inspiration basis for my own adaptation
+*David Lechner* for his [PCL adapatation](https://github.com/dlech/KeePass2PCL) of the KeePass Library and the related tests which served as an inspiration basis for my own adaptation
diff --git a/WinAppCommon/Common/Constants.cs b/WinAppCommon/Common/Constants.cs
index ccebcf7..87bc674 100644
--- a/WinAppCommon/Common/Constants.cs
+++ b/WinAppCommon/Common/Constants.cs
@@ -1,20 +1,20 @@
 namespace ModernKeePass.Common
 {
-    public class Constants
+    public static class Constants
     {
-        public class Navigation
+        public static class Navigation
         {
             public static string MainPage => nameof(MainPage);
             public static string EntryPage => nameof(EntryPage);
             public static string GroupPage => nameof(GroupPage);
         }
 
-        public class File
+        public static class File
         {
             public static int OneMegaByte => 1048576;
         }
 
-        public class Settings
+        public static class Settings
         {
             public static string SaveSuspend => nameof(SaveSuspend);
             public static string Sample => nameof(Sample);
diff --git a/WinAppCommon/Common/MessageDialogHelper.cs b/WinAppCommon/Common/MessageDialogHelper.cs
deleted file mode 100644
index 45ba232..0000000
--- a/WinAppCommon/Common/MessageDialogHelper.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using Windows.UI.Popups;
-
-namespace ModernKeePass.Common
-{
-    public static class MessageDialogHelper
-    {
-        public static async Task ShowActionDialog(string title, string contentText, string actionButtonText, string cancelButtonText, UICommandInvokedHandler actionCommand, UICommandInvokedHandler cancelCommand)
-        {
-            // Create the message dialog and set its content
-            var messageDialog = CreateBasicDialog(title, contentText, cancelButtonText, cancelCommand);
-
-            // Add commands and set their callbacks; both buttons use the same callback function instead of inline event handlers
-            messageDialog.Commands.Add(new UICommand(actionButtonText, actionCommand));
-            
-            // Show the message dialog
-            await messageDialog.ShowAsync().AsTask().ConfigureAwait(false);
-        }
-        
-        public static async Task ShowErrorDialog(Exception exception)
-        {
-            if (exception == null) return;
-            // Create the message dialog and set its content
-            var messageDialog = CreateBasicDialog(exception.Message, exception.StackTrace, "OK");
-            
-            // Show the message dialog
-            await messageDialog.ShowAsync().AsTask().ConfigureAwait(false);
-        }
-
-        public static async Task ShowNotificationDialog(string title, string message)
-        {
-            var dialog = CreateBasicDialog(title, message, "OK");
-
-            // Show the message dialog
-            await dialog.ShowAsync().AsTask().ConfigureAwait(false);
-        }
-
-        private static MessageDialog CreateBasicDialog(string title, string message, string dismissActionText, UICommandInvokedHandler cancelCommand = null)
-        {
-            // Create the message dialog and set its content
-            var messageDialog = new MessageDialog(message, title);
-
-            // Add commands and set their callbacks
-            messageDialog.Commands.Add(new UICommand(dismissActionText, cancelCommand));
-
-            // Set the command that will be invoked by default
-            messageDialog.DefaultCommandIndex = 1;
-
-            // Set the command to be invoked when escape is pressed
-            messageDialog.CancelCommandIndex = 1;
-
-            return messageDialog;
-        }
-    }
-}
diff --git a/WinAppCommon/Messages/DatabaseAlreadyOpenedMessage.cs b/WinAppCommon/Messages/DatabaseAlreadyOpenedMessage.cs
index 7503c62..8cfe909 100644
--- a/WinAppCommon/Messages/DatabaseAlreadyOpenedMessage.cs
+++ b/WinAppCommon/Messages/DatabaseAlreadyOpenedMessage.cs
@@ -1,6 +1,4 @@
-using ModernKeePass.Application.Database.Models;
-
-namespace Messages
+namespace Messages
 {
     public class DatabaseAlreadyOpenedMessage
     {