Opening Databases now use a Messenger service

ModernKeePass/Views/GroupDetailPage.xaml.cs

@@ -58,15 +58,9 @@ namespace ModernKeePass.Views
         {
             NavigationHelper.OnNavigatedTo(e);
             
-            var args = e.Parameter as PasswordEventArgs;
-            if (args != null)
-                DataContext = new GroupDetailVm(args.RootGroupId);
-            else
-            {
-                var navigationItem = e.Parameter as NavigationItem;
-                if (navigationItem != null)
-                    DataContext = new GroupDetailVm(navigationItem.Id) { IsEditMode = navigationItem.IsNew };
-            }
+            var navigationItem = e.Parameter as NavigationItem;
+            if (navigationItem != null)
+                DataContext = new GroupDetailVm(navigationItem.Id) { IsEditMode = navigationItem.IsNew };
         }
 
         protected override void OnNavigatedFrom(NavigationEventArgs e)

ModernKeePass/Views/MainPageFrames/OpenDatabasePage.xaml

@@ -5,19 +5,15 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:viewModels="using:ModernKeePass.ViewModels"
     xmlns:converters="using:ModernKeePass.Converters"
-    xmlns:interactivity="using:Microsoft.Xaml.Interactivity" 
-    xmlns:core="using:Microsoft.Xaml.Interactions.Core"
     xmlns:userControls="using:ModernKeePass.Views.UserControls"
     x:Class="ModernKeePass.Views.OpenDatabasePage"
     mc:Ignorable="d">
     <Page.Resources>
         <converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>
+        <viewModels:OpenVm x:Key="ViewModel"/>
     </Page.Resources>
-    <Page.DataContext>
-        <viewModels:OpenVm/>
-    </Page.DataContext>
 
-    <StackPanel Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+    <StackPanel Background="{ThemeResource ApplicationPageBackgroundThemeBrush}" DataContext="{StaticResource ViewModel}">
         <HyperlinkButton x:Uid="OpenBrowseButton" Click="ButtonBase_OnClick" Foreground="{StaticResource MainColor}" Style="{StaticResource MainColorHyperlinkButton}" />
         <TextBlock Style="{StaticResource BodyTextBlockStyle}" Margin="15,0,0,30" x:Uid="OpenBrowseDesc" />
         <!--<HyperlinkButton x:Uid="OpenUrlButton" IsEnabled="False" Foreground="{StaticResource MainColor}" Style="{StaticResource MainColorHyperlinkButton}" />
@@ -25,13 +21,7 @@
         <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:OpenDatabaseUserControl DatabaseFilePath="{Binding Token}">
-                    <interactivity:Interaction.Behaviors>
-                        <core:EventTriggerBehavior EventName="DatabaseOpened">
-                            <core:NavigateToPageAction TargetPage="ModernKeePass.Views.GroupDetailPage" />
-                        </core:EventTriggerBehavior>
-                    </interactivity:Interaction.Behaviors>
-                </userControls:OpenDatabaseUserControl>
+                <userControls:OpenDatabaseUserControl DatabaseFilePath="{Binding Token}" />
             </StackPanel>
         </Border>
     </StackPanel>

ModernKeePass/Views/MainPageFrames/OpenDatabasePage.xaml.cs

@@ -3,7 +3,13 @@ using Windows.Storage.AccessCache;
 using Windows.Storage.Pickers;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Navigation;
+using GalaSoft.MvvmLight.Messaging;
+using GalaSoft.MvvmLight.Views;
+using Messages;
+using Microsoft.Extensions.DependencyInjection;
+using ModernKeePass.Common;
 using ModernKeePass.Domain.Dtos;
+using ModernKeePass.Models;
 using ModernKeePass.ViewModels;
 
 // The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=234238
@@ -15,11 +21,24 @@ namespace ModernKeePass.Views
     /// </summary>
     public sealed partial class OpenDatabasePage
     {
-        public OpenVm Model => (OpenVm)DataContext;
+        private readonly INavigationService _navigation;
+        private OpenVm Model => (OpenVm)Resources["ViewModel"];
 
-        public OpenDatabasePage()
+        public OpenDatabasePage(): this(
+            App.Services.GetRequiredService<INavigationService>(),
+            App.Services.GetRequiredService<IMessenger>()) { }
+
+        public OpenDatabasePage(INavigationService navigation, IMessenger messenger)
         {
+            _navigation = navigation;
             InitializeComponent();
+
+            messenger.Register<DatabaseOpenedMessage>(this, NavigateToPage);
+        }
+
+        private void NavigateToPage(DatabaseOpenedMessage message)
+        {
+            _navigation.NavigateTo(Constants.Navigation.GroupPage, new NavigationItem { Id = message.RootGroupId });
         }
 
         protected override async void OnNavigatedTo(NavigationEventArgs e)

ModernKeePass/Views/MainPageFrames/RecentDatabasesPage.xaml

@@ -4,18 +4,15 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:viewModels="using:ModernKeePass.ViewModels"
-    xmlns:converters="using:ModernKeePass.Converters" 
-    xmlns:interactivity="using:Microsoft.Xaml.Interactivity" 
-    xmlns:core="using:Microsoft.Xaml.Interactions.Core"
+    xmlns:converters="using:ModernKeePass.Converters"
     xmlns:userControls="using:ModernKeePass.Views.UserControls"
     x:Class="ModernKeePass.Views.RecentDatabasesPage"
     mc:Ignorable="d">
     <Page.Resources>
         <converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>
         <viewModels:RecentVm x:Key="ViewModel"/>
-        <!--<CollectionViewSource x:Name="RecentItemsSource" Source="{Binding RecentItems}" />-->
     </Page.Resources>
-    <Grid Background="{StaticResource ApplicationPageBackgroundThemeBrush}" DataContext="{StaticResource ViewModel}">
+    <Grid x:Name="Grid" Background="{StaticResource ApplicationPageBackgroundThemeBrush}" DataContext="{StaticResource ViewModel}">
         <Grid.RowDefinitions>
             <RowDefinition Height="40" />
             <RowDefinition Height="*" />
@@ -43,16 +40,10 @@
                         </Grid.ColumnDefinitions>
                         <TextBlock Grid.Row="0" Text="{Binding Name}" Padding="5,0,0,0" />
                         <TextBlock Grid.Row="1" Text="{Binding Path}" Padding="5,0,0,0" FontSize="10" />
-                        <userControls:OpenDatabaseUserControl Grid.Row="2" HorizontalAlignment="Stretch" MinWidth="400" Margin="0,10,0,0" Visibility="{Binding IsSelected, Converter={StaticResource BooleanToVisibilityConverter}}" DatabaseFilePath="{Binding Token}">
-                            <interactivity:Interaction.Behaviors>
-                                <core:EventTriggerBehavior EventName="DatabaseOpening">
-                                    <core:CallMethodAction TargetObject="{Binding}" MethodName="UpdateAccessTime" />
-                                </core:EventTriggerBehavior>
-                                <core:EventTriggerBehavior EventName="DatabaseOpened">
-                                    <core:NavigateToPageAction TargetPage="ModernKeePass.Views.GroupDetailPage" />
-                                </core:EventTriggerBehavior>
-                            </interactivity:Interaction.Behaviors>
-                        </userControls:OpenDatabaseUserControl>
+                        <userControls:OpenDatabaseUserControl Grid.Row="2" 
+                            HorizontalAlignment="Stretch" MinWidth="400" Margin="0,10,0,0" 
+                            Visibility="{Binding IsSelected, Converter={StaticResource BooleanToVisibilityConverter}}" 
+                            DatabaseFilePath="{Binding Token}" />
                     </Grid>
                 </DataTemplate>
             </ListView.ItemTemplate>

ModernKeePass/Views/MainPageFrames/RecentDatabasesPage.xaml.cs

@@ -1,5 +1,13 @@
 // Pour en savoir plus sur le modèle d'élément Page vierge, consultez la page http://go.microsoft.com/fwlink/?LinkId=234238
 
+using GalaSoft.MvvmLight.Messaging;
+using GalaSoft.MvvmLight.Views;
+using Messages;
+using Microsoft.Extensions.DependencyInjection;
+using ModernKeePass.Common;
+using ModernKeePass.Models;
+using ModernKeePass.ViewModels;
+
 namespace ModernKeePass.Views
 {
     /// <summary>
@@ -7,9 +15,29 @@ namespace ModernKeePass.Views
     /// </summary>
     public sealed partial class RecentDatabasesPage
     {
-        public RecentDatabasesPage()
+        private RecentVm Model => (RecentVm)Resources["ViewModel"];
+
+        private readonly INavigationService _navigation;
+        private readonly IMessenger _messenger;
+
+        public RecentDatabasesPage(): this(
+            App.Services.GetRequiredService<INavigationService>(),
+            App.Services.GetRequiredService<IMessenger>())
+        { }
+
+        public RecentDatabasesPage(INavigationService navigation, IMessenger messenger)
         {
+            _navigation = navigation;
+            _messenger = messenger;
             InitializeComponent();
+
+            messenger.Register<DatabaseOpeningMessage>(this, action => Model.UpdateAccessTime(action.Token));
+            messenger.Register<DatabaseOpenedMessage>(this, NavigateToPage);
+        }
+        
+        private void NavigateToPage(DatabaseOpenedMessage message)
+        {
+            _navigation.NavigateTo(Constants.Navigation.GroupPage, new NavigationItem { Id = message.RootGroupId });
         }
     }
 }

ModernKeePass/Views/UserControls/OpenDatabaseUserControl.xaml

@@ -1,4 +1,4 @@
-<UserControl
+<UserControl x:Name="UserControl"
      x:Class="ModernKeePass.Views.UserControls.OpenDatabaseUserControl"
      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -43,10 +43,9 @@
                          Click="KeyFileButton_Click" 
                          Style="{StaticResource MainColorHyperlinkButton}" />
         <Button Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="2"
-                x:Name="OpenButton"
-                x:Uid="OpenDatabaseControlButton"
-                Click="OpenButton_OnClick"
-                IsEnabled="{Binding IsValid}"
+                Content="{Binding OpenButtonLabel}"
+                Command="{Binding OpenDatabaseCommand}"
+                CommandParameter="{Binding DatabaseFilePath, ElementName=UserControl}"
                 Style="{StaticResource MainColorButton}" />
         <TextBlock Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="3" Height="Auto" FontSize="14" FontWeight="Light" 
                    Text="{Binding Status}" 

ModernKeePass/Views/UserControls/OpenDatabaseUserControl.xaml.cs

@@ -1,19 +1,12 @@
 using System;
-using System.Threading.Tasks;
 using Windows.Storage.AccessCache;
 using Windows.Storage.Pickers;
 using Windows.System;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Input;
-using MediatR;
+using GalaSoft.MvvmLight.Messaging;
+using Messages;
 using Microsoft.Extensions.DependencyInjection;
-using ModernKeePass.Application.Common.Interfaces;
-using ModernKeePass.Application.Database.Commands.CloseDatabase;
-using ModernKeePass.Application.Database.Commands.SaveDatabase;
-using ModernKeePass.Application.Database.Queries.GetDatabase;
-using ModernKeePass.Common;
-using ModernKeePass.Events;
-using ModernKeePass.Extensions;
 using ModernKeePass.ViewModels;
 
 // Pour en savoir plus sur le modèle d'élément Contrôle utilisateur, consultez la page http://go.microsoft.com/fwlink/?LinkId=234236
@@ -22,8 +15,6 @@ namespace ModernKeePass.Views.UserControls
 {
     public sealed partial class OpenDatabaseUserControl
     {
-        private readonly IMediator _mediator;
-        private readonly IResourceProxy _resource;
         public OpenDatabaseControlVm Model => Grid.DataContext as OpenDatabaseControlVm;
         
         public string DatabaseFilePath
@@ -38,54 +29,19 @@ namespace ModernKeePass.Views.UserControls
                 typeof(OpenDatabaseUserControl),
                 new PropertyMetadata(null, (o, args) => { }));
         
-        public OpenDatabaseUserControl() : this(App.Services.GetRequiredService<IMediator>(), App.Services.GetRequiredService<IResourceProxy>()) { }
+        public OpenDatabaseUserControl() : this(App.Services.GetRequiredService<IMessenger>()) { }
 
-        public OpenDatabaseUserControl(IMediator mediator, IResourceProxy resource)
+        public OpenDatabaseUserControl(IMessenger messenger)
         {
-            _mediator = mediator;
-            _resource = resource;
             InitializeComponent();
-        }
-
-        public event EventHandler DatabaseOpening;
-        public event EventHandler<PasswordEventArgs> DatabaseOpened;
-
-        private async void OpenButton_OnClick(object sender, RoutedEventArgs e)
-        {
-            DatabaseOpening?.Invoke(this, new EventArgs());
             
-            var database = await _mediator.Send(new GetDatabaseQuery());
-            if (database.IsOpen)
-            {
-                await MessageDialogHelper.ShowActionDialog(_resource.GetResourceValue("MessageDialogDBOpenTitle"),
-                    string.Format(_resource.GetResourceValue("MessageDialogDBOpenDesc"), database.Name),
-                    _resource.GetResourceValue("MessageDialogDBOpenButtonSave"),
-                    _resource.GetResourceValue("MessageDialogDBOpenButtonDiscard"),
-                    async command =>
-                    {
-                        await _mediator.Send(new SaveDatabaseCommand());
-                        ToastNotificationHelper.ShowGenericToast(
-                            database.Name,
-                            _resource.GetResourceValue("ToastSavedMessage"));
-                        await _mediator.Send(new CloseDatabaseCommand());
-                        await OpenDatabase();
-                    },
-                    async command =>
-                    {
-                        await _mediator.Send(new CloseDatabaseCommand());
-                        await OpenDatabase();
-                    });
-            }
-            else
-            {
-                await OpenDatabase();
-            }
+            messenger.Register<DatabaseClosedMessage>(this, async action => await Model.OpenDatabase(DatabaseFilePath));
         }
 
-        private void PasswordBox_KeyDown(object sender, KeyRoutedEventArgs e)
+        private async void PasswordBox_KeyDown(object sender, KeyRoutedEventArgs e)
         {
             if (e.Key != VirtualKey.Enter || !Model.IsValid) return;
-            OpenButton_OnClick(sender, e);
+            await Model.TryOpenDatabase(DatabaseFilePath);
             // Stop the event from triggering twice
             e.Handled = true;
         }
@@ -106,17 +62,5 @@ namespace ModernKeePass.Views.UserControls
             var token = StorageApplicationPermissions.FutureAccessList.Add(file);
             Model.KeyFilePath = token;
         }
-        
-        private async Task OpenDatabase()
-        {
-            var oldLabel = OpenButton.Content;
-            OpenButton.Content = _resource.GetResourceValue("CompositeKeyOpening");
-            if (await Dispatcher.RunTaskAsync(async () => await Model.OpenDatabase(DatabaseFilePath)))
-            {
-                DatabaseOpened?.Invoke(this, new PasswordEventArgs(Model.RootGroupId));
-            }
-
-            OpenButton.Content = oldLabel;
-        }
     }
 }