Merge branch 'master' of https://geogeob.visualstudio.com/_git/ModernKeePass

ModernKeePass/App.xaml.cs

@@ -99,7 +99,7 @@ namespace ModernKeePass
 #if DEBUG
             if (System.Diagnostics.Debugger.IsAttached)
             {
-                DebugSettings.EnableFrameRateCounter = true;
+                //DebugSettings.EnableFrameRateCounter = true;
             }
 #endif
 

ModernKeePass/Converters/IntToSymbolConverter.cs

@@ -75,6 +75,7 @@ namespace ModernKeePass.Converters
         public object ConvertBack(object value, Type targetType, object parameter, string language)
         {
             var symbol = (Symbol) value;
+            var defaultIcon = (int?) parameter ?? -1;
             switch (symbol)
             {
                 case Symbol.Delete: return (int)PwIcon.TrashBin;
@@ -123,7 +124,7 @@ namespace ModernKeePass.Converters
                 case Symbol.ZeroBars: return (int) PwIcon.Energy;
                 case Symbol.FourBars: return (int) PwIcon.EnergyCareful;
                 case Symbol.Scan: return (int) PwIcon.Scanner;
-                default: return (int) PwIcon.Key;
+                default: return defaultIcon;
             }
         }
     }

ModernKeePass/Interfaces/IFormat.cs

@@ -0,0 +1,9 @@
+using Windows.Storage;
+
+namespace ModernKeePass.Interfaces
+{
+    public interface IFormat
+    {
+        IPwEntity Import(IStorageFile source);
+    }
+}

ModernKeePass/Interfaces/IImportService.cs

@@ -0,0 +1,9 @@
+using Windows.Storage;
+
+namespace ModernKeePass.Interfaces
+{
+    public interface IImportService<in T> where T: IFormat
+    {
+        void Import(T format, IStorageFile source, IDatabaseService database);
+    }
+}

ModernKeePass/ModernKeePass.App.csproj

@@ -117,10 +117,13 @@
     </Compile>
     <Compile Include="Converters\IntToSymbolConverter.cs" />
     <Compile Include="Exceptions\NavigationException.cs" />
+    <Compile Include="Interfaces\IFormat.cs" />
+    <Compile Include="Interfaces\IImportService.cs" />
     <Compile Include="Interfaces\IProxyInvocationHandler.cs" />
     <Compile Include="Interfaces\IRecentService.cs" />
     <Compile Include="Interfaces\IRecentItem.cs" />
     <Compile Include="Interfaces\IResourceService.cs" />
+    <Compile Include="Services\ImportService.cs" />
     <Compile Include="Services\SingletonServiceBase.cs" />
     <Compile Include="TemplateSelectors\SelectableDataTemplateSelector.cs" />
     <Compile Include="ViewModels\Items\SettingsSaveVm.cs" />

ModernKeePass/Services/DatabaseService.cs

@@ -5,11 +5,9 @@ using ModernKeePass.Exceptions;
 using ModernKeePass.Interfaces;
 using ModernKeePass.ViewModels;
 using ModernKeePassLib;
-using ModernKeePassLib.Collections;
 using ModernKeePassLib.Cryptography.KeyDerivation;
 using ModernKeePassLib.Interfaces;
 using ModernKeePassLib.Keys;
-using ModernKeePassLib.Security;
 using ModernKeePassLib.Serialization;
 
 namespace ModernKeePass.Services
@@ -73,7 +71,7 @@ namespace ModernKeePass.Services
         {
             _settings = settings;
         }
-        
+
 
         /// <summary>
         /// Open a KeePass database
@@ -100,9 +98,7 @@ namespace ModernKeePass.Services
                 if (createNew)
                 {
                     _pwDatabase.New(ioConnection, key);
-
-                    //Get settings default values
-                    if (_settings.GetSetting<bool>("Sample")) CreateSampleData();
+                    
                     var fileFormat = _settings.GetSetting<string>("DefaultFileFormat");
                     switch (fileFormat)
                     {
@@ -122,7 +118,7 @@ namespace ModernKeePass.Services
                 throw new ArgumentException(ex.Message, ex);
             }
         }
-
+        
         public void ReOpen()
         {
             Open(_databaseFile, _compositeKey);
@@ -190,37 +186,5 @@ namespace ModernKeePass.Services
             _compositeKey = newCompositeKey;
             _pwDatabase.MasterKey = newCompositeKey;
         }
-        
-        private void CreateSampleData()
-        {
-            _pwDatabase.RootGroup.AddGroup(new PwGroup(true, true, "Banking", PwIcon.Count), true);
-            _pwDatabase.RootGroup.AddGroup(new PwGroup(true, true, "Email", PwIcon.EMail), true);
-            _pwDatabase.RootGroup.AddGroup(new PwGroup(true, true, "Internet", PwIcon.World), true);
-
-            var pe = new PwEntry(true, true);
-            pe.Strings.Set(PwDefs.TitleField, new ProtectedString(_pwDatabase.MemoryProtection.ProtectTitle,
-                "Sample Entry"));
-            pe.Strings.Set(PwDefs.UserNameField, new ProtectedString(_pwDatabase.MemoryProtection.ProtectUserName,
-                "Username"));
-            pe.Strings.Set(PwDefs.UrlField, new ProtectedString(_pwDatabase.MemoryProtection.ProtectUrl,
-                PwDefs.HomepageUrl));
-            pe.Strings.Set(PwDefs.PasswordField, new ProtectedString(_pwDatabase.MemoryProtection.ProtectPassword,
-                "Password"));
-            pe.Strings.Set(PwDefs.NotesField, new ProtectedString(_pwDatabase.MemoryProtection.ProtectNotes,
-                "You may safely delete this sample"));
-            _pwDatabase.RootGroup.AddEntry(pe, true);
-
-            pe = new PwEntry(true, true);
-            pe.Strings.Set(PwDefs.TitleField, new ProtectedString(_pwDatabase.MemoryProtection.ProtectTitle,
-                "Sample Entry #2"));
-            pe.Strings.Set(PwDefs.UserNameField, new ProtectedString(_pwDatabase.MemoryProtection.ProtectUserName,
-                "Michael321"));
-            pe.Strings.Set(PwDefs.UrlField, new ProtectedString(_pwDatabase.MemoryProtection.ProtectUrl,
-                PwDefs.HelpUrl + "kb/testform.html"));
-            pe.Strings.Set(PwDefs.PasswordField, new ProtectedString(_pwDatabase.MemoryProtection.ProtectPassword,
-                "12345"));
-            pe.AutoType.Add(new AutoTypeAssociation("*Test Form - KeePass*", string.Empty));
-            _pwDatabase.RootGroup.AddEntry(pe, true);
-        }
     }
 }

ModernKeePass/Services/ImportService.cs

@@ -0,0 +1,24 @@
+using ModernKeePass.Interfaces;
+using Windows.Storage;
+using ModernKeePass.ViewModels;
+
+namespace ModernKeePass.Services
+{
+    public class ImportService : IImportService<IFormat>
+    {
+        public void Import(IFormat format, IStorageFile source, IDatabaseService databaseService)
+        {
+            var entities = (GroupVm)format.Import(source);
+
+            foreach (var entry in entities.Entries)
+            {
+                databaseService.RootGroup.Entries.Add(entry);
+            }
+
+            foreach (var subGroup in entities.Groups)
+            {
+                databaseService.RootGroup.Groups.Add(subGroup);
+            }
+        }
+    }
+}

ModernKeePass/Strings/en-US/Resources.resw

@@ -483,4 +483,7 @@
   <data name="RestoreGroupCommand.Message" xml:space="preserve">
     <value>Group restored to its original position</value>
   </data>
+  <data name="NewImportCheckbox.Content" xml:space="preserve">
+    <value>Import existing data</value>
+  </data>
 </root>

ModernKeePass/Strings/fr-FR/Resources.resw

@@ -483,4 +483,7 @@
   <data name="RestoreGroupCommand.Message" xml:space="preserve">
     <value>Groupe replacée à son emplacement d'origine</value>
   </data>
+  <data name="NewImportCheckbox.Content" xml:space="preserve">
+    <value>Importer des données existantes</value>
+  </data>
 </root>

ModernKeePass/ViewModels/NewVm.cs

@@ -1,7 +1,49 @@
-namespace ModernKeePass.ViewModels
+using Windows.Storage;
+using Windows.UI.Xaml.Controls;
+using ModernKeePass.Interfaces;
+using ModernKeePassLib;
+
+namespace ModernKeePass.ViewModels
 {
     public class NewVm : OpenVm
     {
         public string Password { get; set; }
+
+        public bool IsImportChecked { get; set; }
+
+        public IStorageFile ImportFile { get; set; }
+
+        public IFormat ImportFormat { get; set; }
+        
+        public void PopulateInitialData(IDatabaseService database, ISettingsService settings, IImportService<IFormat> importService)
+        {
+            if (settings.GetSetting<bool>("Sample") && !IsImportChecked) CreateSampleData(database);
+            else if (IsImportChecked && ImportFile != null) importService.Import(ImportFormat, ImportFile, database);
+        }
+
+        private void CreateSampleData(IDatabaseService database)
+        {
+            var bankingGroup = database.RootGroup.AddNewGroup("Banking");
+            bankingGroup.IconId = (int) Symbol.Calculator;
+
+            var emailGroup = database.RootGroup.AddNewGroup("Email");
+            emailGroup.IconId = (int) Symbol.Mail;
+
+            var internetGroup = database.RootGroup.AddNewGroup("Internet");
+            internetGroup.IconId = (int) Symbol.World;
+
+            var sample1 = database.RootGroup.AddNewEntry();
+            sample1.Name = "Sample Entry";
+            sample1.UserName = "Username";
+            sample1.Url = PwDefs.HomepageUrl;
+            sample1.Password = "Password";
+            sample1.Notes = "You may safely delete this sample";
+
+            var sample2 = database.RootGroup.AddNewEntry();
+            sample2.Name = "Sample Entry #2";
+            sample2.UserName = "Michael321";
+            sample2.Url = PwDefs.HelpUrl + "kb/testform.html";
+            sample2.Password = "12345";
+        }
     }
 }

ModernKeePass/Views/EntryDetailPage.xaml

@@ -19,7 +19,6 @@
         <converters:InverseBooleanToVisibilityConverter x:Key="InverseBooleanToVisibilityConverter" />
         <converters:ProgressBarLegalValuesConverter x:Key="ProgressBarLegalValuesConverter" />
         <converters:DoubleToSolidColorBrushConverter x:Key="DoubleToForegroungBrushComplexityConverter" />
-        <converters:NullToBooleanConverter x:Key="NullToBooleanConverter" />
         <converters:ColorToBrushConverter x:Key="ColorToBrushConverter" />
         <converters:IntToSymbolConverter x:Key="IntToSymbolConverter" />
         <Style TargetType="PasswordBox" x:Name="PasswordBoxWithButtonStyle">
@@ -499,7 +498,7 @@
                     <RowDefinition Height="20" />
                 </Grid.RowDefinitions>
                 <Viewbox MaxHeight="30" Width="50" Grid.Column="0" Grid.Row="0" Visibility="{Binding IsEditMode, Converter={StaticResource BooleanToVisibilityConverter}}">
-                    <userControls:SymbolPickerUserControl Width="80" Height="40" SelectedSymbol="{Binding IconId, Converter={StaticResource IntToSymbolConverter}, Mode=TwoWay}" />
+                    <userControls:SymbolPickerUserControl Width="80" Height="40" SelectedSymbol="{Binding IconId, Converter={StaticResource IntToSymbolConverter}, ConverterParameter=0, Mode=TwoWay}" />
                 </Viewbox>
                 <Viewbox MaxHeight="30" Width="50" Grid.Column="0" Grid.Row="0" Visibility="{Binding IsEditMode, Converter={StaticResource InverseBooleanToVisibilityConverter}}">
                     <SymbolIcon Symbol="{Binding IconId, Converter={StaticResource IntToSymbolConverter}}" Width="80" Height="40"  />

ModernKeePass/Views/GroupDetailPage.xaml

@@ -105,7 +105,7 @@
                                         </Grid.ColumnDefinitions>
                                         <Border Grid.Column="0" Background="{Binding BackgroundColor, ConverterParameter={StaticResource MainColor}, Converter={StaticResource ColorToBrushConverter}}">
                                             <Viewbox MaxHeight="50" Width="100">
-                                                <SymbolIcon Symbol="{Binding IconId, Converter={StaticResource IntToSymbolConverter}}" Foreground="{StaticResource TextColor}" />
+                                                <SymbolIcon Symbol="{Binding IconId, Converter={StaticResource IntToSymbolConverter}, ConverterParameter=0}" Foreground="{StaticResource TextColor}" />
                                             </Viewbox>
                                         </Border>
                                         <StackPanel Grid.Column="1" VerticalAlignment="Top" Margin="10,10,0,0" >
@@ -207,7 +207,7 @@
                     <RowDefinition Height="20" />
                 </Grid.RowDefinitions>
                 <Viewbox MaxHeight="30" Width="50" Grid.Column="0" Grid.Row="0" Visibility="{Binding IsEditMode, Converter={StaticResource BooleanToVisibilityConverter}}">
-                    <userControls:SymbolPickerUserControl Width="80" Height="40" SelectedSymbol="{Binding IconId, Converter={StaticResource IntToSymbolConverter}, Mode=TwoWay}" />
+                    <userControls:SymbolPickerUserControl Width="80" Height="40" SelectedSymbol="{Binding IconId, Converter={StaticResource IntToSymbolConverter}, ConverterParameter=48, Mode=TwoWay}" />
                 </Viewbox>
                 <Viewbox MaxHeight="30" Width="50" Grid.Column="0" Grid.Row="0" Visibility="{Binding IsEditMode, Converter={StaticResource InverseBooleanToVisibilityConverter}}">
                     <SymbolIcon Symbol="{Binding IconId, Converter={StaticResource IntToSymbolConverter}}" Width="80" Height="40"  />

ModernKeePass/Views/MainPageFrames/ImportExportPage.xaml

@@ -23,7 +23,9 @@
         <HyperlinkButton Grid.Column="0" Grid.Row="1" Content="Select file..." Style="{StaticResource MainColorHyperlinkButton}" Click="ImportFileButton_OnClick" />
         <StackPanel Grid.Column="1" Grid.Row="1" >
             <TextBlock Text="Format" Style="{StaticResource BodyTextBlockStyle}" Margin="0,0,0,10" />
-            <ComboBox Style="{StaticResource MainColorComboBox}" />
+            <ComboBox Style="{StaticResource MainColorComboBox}">
+                <ComboBoxItem>CSV</ComboBoxItem>
+            </ComboBox>
         </StackPanel>
         <StackPanel Grid.Column="2" Grid.Row="1" >
             <TextBlock Text="Import into..." Style="{StaticResource BodyTextBlockStyle}" Margin="0,0,0,10" />

ModernKeePass/Views/MainPageFrames/NewDatabasePage.xaml

@@ -16,20 +16,26 @@
     <Page.DataContext>
         <viewModels:NewVm />
     </Page.DataContext>
-    
+
     <StackPanel Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
         <HyperlinkButton x:Uid="NewCreateButton" Click="ButtonBase_OnClick" Foreground="{StaticResource MainColor}" Style="{StaticResource MainColorHyperlinkButton}" />
         <TextBlock Style="{StaticResource BodyTextBlockStyle}" Margin="15,0,0,30" x:Uid="NewCreateDesc" />
         <Border HorizontalAlignment="Left" BorderThickness="1" BorderBrush="AliceBlue" Width="550" Visibility="{Binding IsFileSelected, Converter={StaticResource BooleanToVisibilityConverter}}">
             <StackPanel Margin="25,0,25,0">
                 <TextBlock Text="{Binding Name}" />
-                <userControls:CompositeKeyUserControl x:Uid="CompositeKeyNewButton" CreateNew="True" DatabaseFile="{Binding DatabaseFile}">
-                    <interactivity:Interaction.Behaviors>
-                        <core:EventTriggerBehavior EventName="ValidationChecked">
-                            <core:NavigateToPageAction TargetPage="ModernKeePass.Views.GroupDetailPage" />
-                        </core:EventTriggerBehavior>
-                    </interactivity:Interaction.Behaviors>
-                </userControls:CompositeKeyUserControl>
+                <userControls:CompositeKeyUserControl x:Uid="CompositeKeyNewButton" CreateNew="True" DatabaseFile="{Binding DatabaseFile}" ValidationChecked="CompositeKeyUserControl_OnValidationChecked" />
+            </StackPanel>
+        </Border>
+        <CheckBox x:Name="CheckBox" x:Uid="NewImportCheckbox" IsChecked="{Binding IsImportChecked}" />
+        <Border HorizontalAlignment="Left" BorderThickness="1" BorderBrush="AliceBlue" Width="550" Visibility="{Binding IsChecked, Converter={StaticResource BooleanToVisibilityConverter}, ElementName=CheckBox}">
+            <StackPanel Margin="25,0,25,0">
+                <HyperlinkButton Content="Select file..." Style="{StaticResource MainColorHyperlinkButton}" Click="ImportFileButton_OnClick" />
+                <StackPanel>
+                    <TextBlock Text="Format" Style="{StaticResource BodyTextBlockStyle}" Margin="0,0,0,10" />
+                    <ComboBox Style="{StaticResource MainColorComboBox}" SelectedItem="{Binding ImportFormat}">
+                        <ComboBoxItem>CSV</ComboBoxItem>
+                    </ComboBox>
+                </StackPanel>
             </StackPanel>
         </Border>
     </StackPanel>

ModernKeePass/Views/MainPageFrames/NewDatabasePage.xaml.cs

@@ -2,6 +2,8 @@
 using System.Collections.Generic;
 using Windows.Storage.Pickers;
 using Windows.UI.Xaml;
+using ModernKeePass.Events;
+using ModernKeePass.Services;
 using ModernKeePass.ViewModels;
 
 // The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=234238
@@ -33,5 +35,25 @@ namespace ModernKeePass.Views
             if (file == null) return;
             Model.OpenFile(file);
         }
+
+        private async void ImportFileButton_OnClick(object sender, RoutedEventArgs e)
+        {
+            var picker =
+                new FileOpenPicker
+                {
+                    ViewMode = PickerViewMode.List,
+                    SuggestedStartLocation = PickerLocationId.DocumentsLibrary
+                };
+            picker.FileTypeFilter.Add(".csv");
+
+            // Application now has read/write access to the picked file
+            Model.ImportFile = await picker.PickSingleFileAsync();
+        }
+
+        private void CompositeKeyUserControl_OnValidationChecked(object sender, PasswordEventArgs e)
+        {
+            Model.PopulateInitialData(DatabaseService.Instance, new SettingsService());
+            Frame.Navigate(typeof(GroupDetailPage));
+        }
     }
 }

ModernKeePass/Views/UserControls/HamburgerMenuUserControl.xaml

@@ -26,7 +26,7 @@
             <x:Double x:Key="HamburgerMenuSize">300</x:Double>
             <DataTemplate x:Name="IsSpecial">
                 <StackPanel Orientation="Horizontal">
-                    <SymbolIcon Symbol="{Binding IconId, Converter={StaticResource IntToSymbolConverter}}" Margin="7,15,0,15">
+                    <SymbolIcon Symbol="{Binding IconId, Converter={StaticResource IntToSymbolConverter}, ConverterParameter=48}" Margin="7,15,0,15">
                         <ToolTipService.ToolTip>
                             <ToolTip Content="{Binding Path={Binding DisplayMemberPath, ElementName=UserControl}}" />
                         </ToolTipService.ToolTip>
@@ -36,7 +36,7 @@
             </DataTemplate>
             <DataTemplate x:Name="IsNormal">
                 <StackPanel Orientation="Horizontal">
-                    <SymbolIcon Symbol="{Binding IconId, Converter={StaticResource IntToSymbolConverter}}" Margin="7,15,0,15">
+                    <SymbolIcon Symbol="{Binding IconId, Converter={StaticResource IntToSymbolConverter}, ConverterParameter=48}" Margin="7,15,0,15">
                         <ToolTipService.ToolTip>
                             <ToolTip Content="{Binding Path={Binding DisplayMemberPath, ElementName=UserControl}}" />
                         </ToolTipService.ToolTip>

ModernKeePass/Views/UserControls/SymbolPickerUserControl.xaml.cs

@@ -1,7 +1,9 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
+using ModernKeePass.Converters;
 
 // The User Control item template is documented at http://go.microsoft.com/fwlink/?LinkId=234236
 
@@ -9,7 +11,7 @@ namespace ModernKeePass.Views.UserControls
 {
     public sealed partial class SymbolPickerUserControl
     {
-        public Symbol[] Symbols { get; }
+        public IEnumerable<Symbol> Symbols { get; }
 
         public Symbol SelectedSymbol
         {
@@ -26,8 +28,8 @@ namespace ModernKeePass.Views.UserControls
         public SymbolPickerUserControl()
         {
             InitializeComponent();
-
-            Symbols = (Symbol[])Enum.GetValues(typeof(Symbol));
+            var converter = new IntToSymbolConverter();
+            Symbols = Enum.GetValues(typeof(Symbol)).Cast<Symbol>().Where(s => (int)converter.ConvertBack(s, null, null, string.Empty) != -1);
         }
 
         private void ComboBox_OnLoaded(object sender, RoutedEventArgs e)

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

@@ -1,4 +1,5 @@
 Improved search box
 Changing entry icon creates a new history entry
 Corrected startup crash on some versions of Windows
-Entry delete button now shows up correctly
+Entry delete button now shows up correctly
+List of icons now only displays valid values

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

@@ -1,4 +1,5 @@
 Amelioration de la recherche
 Changer l'icone d'une entree cree un historique
 Correction de crash lors du lancement avec certaines versions de Windows
-Le bouton de suppression d'une entree apparait bien desormais
+Le bouton de suppression d'une entree apparait bien desormais
+La liste des icones n'affiche desormais que des valeurs valables

ModernKeePassApp.Test/Mock/DatabaseServiceMock.cs

@@ -46,7 +46,7 @@ namespace ModernKeePassApp.Test.Mock
         {
             _compositeKey = newCompositeKey;
         }
-
+        
         public void CreateRecycleBin(string title)
         {
             throw new NotImplementedException();