Removed User Account from composite key (probably never going to work as intended)

Changed copy URL to navigate to URL in entry quick menu

ModernKeePass/Actions/NavigateToUrlAction.cs

@@ -0,0 +1,33 @@
+using System;
+using Windows.UI.Xaml;
+using Microsoft.Xaml.Interactivity;
+using ModernKeePass.Common;
+
+namespace ModernKeePass.Actions
+{
+    public class NavigateToUrlAction : DependencyObject, IAction
+    {
+        public string Url
+        {
+            get { return (string)GetValue(UrlProperty); }
+            set { SetValue(UrlProperty, value); }
+        }
+
+        public static readonly DependencyProperty UrlProperty =
+            DependencyProperty.Register("Url", typeof(string), typeof(NavigateToUrlAction), new PropertyMetadata(string.Empty));
+
+        public object Execute(object sender, object parameter)
+        {
+            try
+            {
+                var uri = new Uri(Url);
+                return Windows.System.Launcher.LaunchUriAsync(uri).GetAwaiter().GetResult();
+            }
+            catch (Exception ex)
+            {
+                MessageDialogHelper.ShowErrorDialog(ex);
+                return false;
+            }
+        }
+    }
+}

ModernKeePass/ModernKeePassApp.csproj

@@ -109,6 +109,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Actions\ClipboardAction.cs" />
+    <Compile Include="Actions\NavigateToUrlAction.cs" />
     <Compile Include="Actions\SetupFocusAction.cs" />
     <Compile Include="App.xaml.cs">
       <DependentUpon>App.xaml</DependentUpon>
@@ -339,6 +340,10 @@
       <HintPath>..\packages\Microsoft.Toolkit.Uwp.Notifications.2.0.0\lib\dotnet\Microsoft.Toolkit.Uwp.Notifications.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="ModernKeePassLib, Version=2.37.0.2000, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ModernKeePassLib.2.37.8000\lib\netstandard1.2\ModernKeePassLib.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>
@@ -431,12 +436,6 @@
     <Content Include="Assets\Wide310x150Logo.scale-180.png" />
     <Content Include="Assets\Wide310x150Logo.scale-80.png" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\ModernKeePassLib\ModernKeePassLib.csproj">
-      <Project>{2e710089-9559-4967-846c-e763dd1f3acb}</Project>
-      <Name>ModernKeePassLib</Name>
-    </ProjectReference>
-  </ItemGroup>
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '12.0' ">
     <VisualStudioVersion>12.0</VisualStudioVersion>
   </PropertyGroup>

ModernKeePass/Strings/en-US/Resources.resw

@@ -193,7 +193,7 @@
     <value>Copy password</value>
   </data>
   <data name="EntryItemCopyUrl.Text" xml:space="preserve">
-    <value>Copy URL</value>
+    <value>Navigate to URL</value>
   </data>
   <data name="EntryLogin.Text" xml:space="preserve">
     <value>User name or login</value>

ModernKeePass/Strings/fr-FR/Resources.resw

@@ -193,7 +193,7 @@
     <value>Copier le mot de passe</value>
   </data>
   <data name="EntryItemCopyUrl.Text" xml:space="preserve">
-    <value>Copier l'URL</value>
+    <value>Naviguer vers l'URL</value>
   </data>
   <data name="EntryLogin.Text" xml:space="preserve">
     <value>Nom d'utilisateur ou login</value>

ModernKeePass/Views/EntryDetailPage.xaml

@@ -458,7 +458,13 @@
             <ProgressBar Value="{Binding PasswordComplexityIndicator, ConverterParameter=0\,128, Converter={StaticResource ProgressBarLegalValuesConverter}}" Maximum="128" Width="350" HorizontalAlignment="Left" Foreground="{Binding PasswordComplexityIndicator, ConverterParameter=128, Converter={StaticResource DoubleToForegroungBrushComplexityConverter}}" />
             <CheckBox x:Uid="EntryShowPassword" HorizontalAlignment="Left" Margin="-3,0,0,0" IsChecked="{Binding IsRevealPassword, Mode=TwoWay}" IsEnabled="{Binding IsRevealPasswordEnabled}" />
             <TextBlock TextWrapping="Wrap" Text="URL" FontSize="18"/>
-            <local:TextBoxWithButton x:Name="UrlTextBox" HorizontalAlignment="Left" Text="{Binding Url, Mode=TwoWay}" Height="32" Width="350" MaxLength="256" Style="{StaticResource TextBoxWithButtonStyle}" ButtonClick="UrlButton_Click" ButtonSymbol="&#xE111;" ButtonTooltip="Navigate to URL" />
+            <local:TextBoxWithButton x:Name="UrlTextBox" HorizontalAlignment="Left" Text="{Binding Url, Mode=TwoWay}" Height="32" Width="350" MaxLength="256" Style="{StaticResource TextBoxWithButtonStyle}" ButtonSymbol="&#xE111;" ButtonTooltip="Navigate to URL">
+                <interactivity:Interaction.Behaviors>
+                    <core:EventTriggerBehavior EventName="ButtonClick">
+                        <actions:NavigateToUrlAction Url="{Binding Url}" />
+                    </core:EventTriggerBehavior>
+                </interactivity:Interaction.Behaviors>
+            </local:TextBoxWithButton>
             <TextBlock x:Uid="EntryNotes" TextWrapping="Wrap" FontSize="18" />
             <TextBox HorizontalAlignment="Left" TextWrapping="Wrap" Text="{Binding Notes, Mode=TwoWay}" Width="350" Height="200" AcceptsReturn="True" IsSpellCheckEnabled="True" />
             <CheckBox  x:Uid="EntryExpirationDate" FontSize="18" IsChecked="{Binding HasExpirationDate, Mode=TwoWay}" />

ModernKeePass/Views/EntryDetailPage.xaml.cs

@@ -93,19 +93,6 @@ namespace ModernKeePass.Views
             if (Frame.CanGoBack) Frame.GoBack();
         }
         
-        private async void UrlButton_Click(object sender, RoutedEventArgs e)
-        {
-            try
-            {
-                var uri = new Uri(UrlTextBox.Text);
-                await Windows.System.Launcher.LaunchUriAsync(uri);
-            }
-            catch (Exception ex)
-            {
-                MessageDialogHelper.ShowErrorDialog(ex);
-            }
-        }
-
         private void EntryDetailPage_OnSizeChanged(object sender, SizeChangedEventArgs e)
         {
             VisualStateManager.GoToState(this, e.NewSize.Width < 700 ? "Small" : "Large", true);

ModernKeePass/Views/GroupDetailPage.xaml

@@ -255,7 +255,7 @@
                                                 <MenuFlyoutItem x:Uid="EntryItemCopyUrl">
                                                     <interactivity:Interaction.Behaviors>
                                                         <core:EventTriggerBehavior EventName="Click">
-                                                            <actions:ClipboardAction Text="{Binding Url}" />
+                                                            <actions:NavigateToUrlAction Url="{Binding Url}" />
                                                         </core:EventTriggerBehavior>
                                                     </interactivity:Interaction.Behaviors>
                                                 </MenuFlyoutItem>

ModernKeePass/Views/UserControls/CompositeKeyUserControl.xaml

@@ -11,7 +11,6 @@
     xmlns:viewModels="using:ModernKeePass.ViewModels"
     mc:Ignorable="d" >
     <UserControl.Resources>
-        <SolidColorBrush x:Key="ErrorColorBrush" Color="Red"/>
         <converters:ProgressBarLegalValuesConverter x:Key="ProgressBarLegalValuesConverter"/>
         <converters:DoubleToSolidColorBrushConverter x:Key="DoubleToForegroungBrushConverter"/>
         <converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>
@@ -31,7 +30,6 @@
             <RowDefinition Height="45" />
             <RowDefinition Height="40" />
             <RowDefinition Height="40" />
-            <RowDefinition Height="40" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
         <CheckBox Grid.Row="0" Grid.Column="0" IsChecked="{Binding HasPassword, Mode=TwoWay}" />
@@ -56,9 +54,7 @@
                 </ToolTipService.ToolTip>
             </SymbolIcon>
         </HyperlinkButton>
-        <CheckBox Grid.Row="2" Grid.Column="0" IsChecked="{Binding HasUserAccount, Mode=TwoWay}" />
+        <Button Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="2" Content="{Binding ButtonLabel, ElementName=UserControl}" Click="OpenButton_OnClick" Background="{ThemeResource ListViewItemSelectedPointerOverBorderThemeBrush}" Foreground="{ThemeResource TextBoxBackgroundThemeBrush}" IsEnabled="{Binding IsValid}" />
-        <TextBlock Grid.Row="2" Grid.Column="1" x:Uid="CompositeKeyUserAccount" FontSize="14" VerticalAlignment="Center" />
+        <TextBlock Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="3" Height="28" FontSize="14" FontWeight="Light" Text="{Binding Status}" Foreground="{Binding StatusType, Converter={StaticResource DiscreteIntToSolidColorBrushConverter}}" Visibility="{Binding Status, Converter={StaticResource EmptyStringToVisibilityConverter}}" />
-        <Button Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="3" Content="{Binding ButtonLabel, ElementName=UserControl}" Click="OpenButton_OnClick" Background="{ThemeResource ListViewItemSelectedPointerOverBorderThemeBrush}" Foreground="{ThemeResource TextBoxBackgroundThemeBrush}" IsEnabled="{Binding IsValid}" />
-        <TextBlock Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="4" Height="28" FontSize="14" FontWeight="Light" Text="{Binding Status}" Foreground="{Binding StatusType, Converter={StaticResource DiscreteIntToSolidColorBrushConverter}}" Visibility="{Binding Status, Converter={StaticResource EmptyStringToVisibilityConverter}}" />
     </Grid>
 </UserControl>

ModernKeePass/appMetadata/en-us/baselisting/releaseNotes.txt

@@ -1,2 +1,2 @@
-Error when opening file from Explorer corrected
+New inline menu on Entries to quickly copy login, password, and navigate to URL
-Filter entries reverted to search entries because of regressions
+Design changes

ModernKeePass/appMetadata/fr-fr/baselisting/releaseNotes.txt

@@ -1,2 +1,2 @@
-Correction d'un bug lors de l'ouverture d'un fichier par Explorer
+Ajout d'un menu intégré à la liste d'entrées afin de copier rapidement le login, mot de passe et de naviguer vers l'URL
-Rétablissement de la recherche d'entrées à la place du filtre à cause de régressions multiples
+Quelques changements de design

ModernKeePassLib/Cryptography/ProtectedData.cs

@@ -1,62 +1,10 @@
 using System;
-using System.Runtime.InteropServices.WindowsRuntime;
-using System.Threading.Tasks;
-using Windows.Security.Cryptography.DataProtection;
-using Windows.Storage.Streams;
 using ModernKeePassLib.Native;
 
 namespace ModernKeePassLib.Cryptography
 {
     public static class ProtectedData
     {
-        public static async Task ProtectStream(byte[] buffer, IOutputStream stream)
-        {
-            //instantiate a DataProtectionProvider for decryption
-            var dpp = new DataProtectionProvider("LOCAL=user");
-
-            //Open a stream to load data in
-            using (var inputStream = new InMemoryRandomAccessStream())
-            {
-                //cteate data writer to write data to the input stream
-                using (var dw = new DataWriter(inputStream))
-                {
-                    //write data to the stream
-                    dw.WriteBuffer(buffer.AsBuffer());
-                    await dw.StoreAsync();
-
-                    //encrypt the intput stream into the file stream
-                    await dpp.ProtectStreamAsync(inputStream.GetInputStreamAt(0),
-                        stream);
-                }
-            }
-        }
-
-        public static async Task<byte[]> UnprotectStream(IInputStream stream)
-        {
-            //instantiate a DataProtectionProvider for decryption
-            var dpp = new DataProtectionProvider();
-
-            //create a stream to decrypte the data to
-            using (var outputStream = new InMemoryRandomAccessStream())
-            {
-                //decrypt the data
-                await dpp.UnprotectStreamAsync(stream, outputStream);
-
-                //fill the data reader with the content of the outputStream,
-                //but from position 0
-                using (var dr = new DataReader(outputStream.GetInputStreamAt(0)))
-                {
-                    //load data from the stream to the dataReader
-                    await dr.LoadAsync((uint)outputStream.Size);
-
-                    //load the data from the datareader into a buffer
-                    IBuffer data = dr.ReadBuffer((uint)outputStream.Size);
-
-                    return data.ToArray();
-                }
-            }
-        }
-
         public static byte[] Unprotect(byte[] pbEnc, byte[] mPbOptEnt, DataProtectionScope currentUser)
         {
             throw new NotImplementedException();

ModernKeePassLib/Keys/KcpUserAccount.cs

@@ -20,7 +20,6 @@
 using System;
 using System.Diagnostics;
 using System.IO;
-using System.Runtime.InteropServices.WindowsRuntime;
 using System.Security;
 
 #if ModernKeePassLib
@@ -68,9 +67,9 @@ namespace ModernKeePassLib.Keys
         {
             // Test if ProtectedData is supported -- throws an exception
             // when running on an old system (Windows 98 / ME).
-			/*byte[] pbDummyData = new byte[128];
+            byte[] pbDummyData = new byte[128];
             ProtectedData.Protect(pbDummyData, m_pbEntropy,
-				DataProtectionScope.CurrentUser);*/
+                DataProtectionScope.CurrentUser);
 
             byte[] pbKey = LoadUserKey(false);
             if (pbKey == null) pbKey = CreateUserKey();
@@ -99,9 +98,8 @@ namespace ModernKeePassLib.Keys
 #endif
 
             strUserDir = UrlUtil.EnsureTerminatingSeparator(strUserDir, false);
-
-#if !ModernKeePassLib
             strUserDir += PwDefs.ShortProductName;
+#if !ModernKeePassLib
 
 			if(bCreate && !Directory.Exists(strUserDir))
 				Directory.CreateDirectory(strUserDir);
@@ -119,16 +117,15 @@ namespace ModernKeePassLib.Keys
             {
                 string strFilePath = GetUserKeyFilePath(false);
 #if ModernKeePassLib
-			    var file = StorageFile.GetFileFromPathAsync(strFilePath).GetAwaiter().GetResult();
+                var fileStream = StorageFile.GetFileFromPathAsync(strFilePath).GetAwaiter().GetResult().OpenStreamForReadAsync().GetAwaiter().GetResult();
-			    using (var fileStream = file.OpenReadAsync().GetAwaiter().GetResult())
+                var pbProtectedKey = new byte[(int)fileStream.Length];
-			    {
+                fileStream.Read(pbProtectedKey, 0, (int)fileStream.Length);
-			        pbKey = ProtectedData.UnprotectStream(fileStream).GetAwaiter().GetResult();
+                fileStream.Dispose();
-			    }
 #else
 				byte[] pbProtectedKey = File.ReadAllBytes(strFilePath);
+#endif
                 pbKey = ProtectedData.Unprotect(pbProtectedKey, m_pbEntropy,
                     DataProtectionScope.CurrentUser);
-#endif
             }
             catch (Exception)
             {
@@ -148,15 +145,13 @@ namespace ModernKeePassLib.Keys
             string strFilePath = GetUserKeyFilePath(true);
 
             byte[] pbRandomKey = CryptoRandom.Instance.GetRandomBytes(64);
-#if ModernKeePassLib
-		    var file = ApplicationData.Current.RoamingFolder.CreateFileAsync(UserKeyFileName, CreationCollisionOption.ReplaceExisting).GetAwaiter().GetResult();
-		    using (var fileStream = file.OpenAsync(FileAccessMode.ReadWrite).GetAwaiter().GetResult())
-		    {
-		        ProtectedData.ProtectStream(pbRandomKey, fileStream).GetAwaiter().GetResult();
-		    }
-#else
             byte[] pbProtectedKey = ProtectedData.Protect(pbRandomKey,
                 m_pbEntropy, DataProtectionScope.CurrentUser);
+#if ModernKeePassLib
+            var fileStream = StorageFile.GetFileFromPathAsync(strFilePath).GetAwaiter().GetResult().OpenStreamForWriteAsync().GetAwaiter().GetResult();
+            fileStream.Write(pbProtectedKey, 0, (int)fileStream.Length);
+            fileStream.Dispose();
+#else
 			File.WriteAllBytes(strFilePath, pbProtectedKey);
 #endif
 

ModernKeePassLib/ModernKeePassLib.nuspec

@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>ModernKeePassLib</id>
-    <version>2.37.9000</version>
+    <version>2.37.8000</version>
     <title>ModernKeePassLib</title>
     <authors>Geoffroy Bonneville</authors>
     <owners>Geoffroy Bonneville</owners>
@@ -10,7 +10,7 @@
     <projectUrl>https://github.com/wismna/ModernKeePass</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Portable KeePass Password Management Library that targets .Net Standard and WinRT. Allows reading, editing and writing to KeePass 2.x databases.</description>
-    <releaseNotes>Implements Windows User Accounts</releaseNotes>
+    <releaseNotes></releaseNotes>
     <copyright>Copyright © 2017 Geoffroy Bonneville</copyright>
     <tags>KeePass KeePassLib Portable PCL NetStandard</tags>
     <dependencies>