wismna/modernkeepass
1
0
Fork 0
mirror of https://github.com/wismna/ModernKeePass.git synced 2025-10-04 16:10:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

New clear all button in recent pages

Browse Source 
First-time open of app correctly shows Welcome page
New Home button in group and entry pages
This commit is contained in:
BONNEVILLE Geoffroy
2017-12-04 10:46:01 +01:00
parent 4f69b5cdcc
commit f173283a66
10 changed files with 98 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
ModernKeePass/ViewModels/CompositeKeyVm.cs
View File

@@ -22,16 +22,6 @@ namespace ModernKeePass.ViewModels
Success = 5
}
//private readonly App _app = Application.Current as App;
private bool _hasPassword;
private bool _hasKeyFile;
private string _password = string.Empty;
private string _status;
private StatusTypes _statusType;
private StorageFile _keyFile;
private string _keyFileText;
private readonly IResource _resource;
public IDatabase Database { get; set; }
public bool HasPassword
@@ -54,7 +44,7 @@ namespace ModernKeePass.ViewModels
}
}
public bool IsValid => HasPassword || HasKeyFile && KeyFile != null;
public bool IsValid => !_isOpening && (HasPassword || HasKeyFile && KeyFile != null);
public string Status
{
@@ -101,6 +91,16 @@ namespace ModernKeePass.ViewModels
public double PasswordComplexityIndicator => QualityEstimation.EstimatePasswordBits(Password?.ToCharArray());
private bool _hasPassword;
private bool _hasKeyFile;
private bool _isOpening;
private string _password = string.Empty;
private string _status;
private StatusTypes _statusType;
private StorageFile _keyFile;
private string _keyFileText;
private readonly IResource _resource;
public CompositeKeyVm() : this((Application.Current as App)?.Database, new ResourcesService()) { }
public CompositeKeyVm(IDatabase database, IResource resource)
@@ -115,12 +115,17 @@ namespace ModernKeePass.ViewModels
var error = string.Empty;
try
{
_isOpening = true;
Database.Open(CreateCompositeKey(), createNew);
}
catch (Exception e)
{
error = $"{_resource.GetResourceValue("CompositeKeyErrorOpen")}: {e.Message}";
}
finally
{
_isOpening = false;
}
switch ((DatabaseService.DatabaseStatus)Database.Status)
{
case DatabaseService.DatabaseStatus.Opened:

2
ModernKeePass/ViewModels/MainVm.cs
View File

@@ -111,6 +111,8 @@ namespace ModernKeePass.ViewModels
};
// Auto-select the Recent Items menu item if the conditions are met
SelectedItem = mainMenuItems.FirstOrDefault(m => m.IsSelected);
// Add currently opened database to the menu
if (database != null && database.Status == (int) DatabaseService.DatabaseStatus.Opened)
mainMenuItems.Add(new MainMenuItemVm
{

9
ModernKeePass/ViewModels/RecentVm.cs
View File

@@ -7,6 +7,7 @@ namespace ModernKeePass.ViewModels
{
public class RecentVm : NotifyPropertyChangedBase, IHasSelectableObject
{
private readonly IRecent _recent;
private ISelectableModel _selectedItem;
private ObservableCollection<IRecentItem> _recentItems = new ObservableCollection<IRecentItem>();
@@ -39,10 +40,16 @@ namespace ModernKeePass.ViewModels
public RecentVm(IRecent recent)
{
RecentItems = recent.GetAllFiles();
_recent = recent;
RecentItems = _recent.GetAllFiles();
if (RecentItems.Count > 0)
SelectedItem = RecentItems[0] as RecentItemVm;
}
public void ClearAll()
{
_recent.ClearAll();
RecentItems.Clear();
}
}
}