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

Database settings now work properly

Browse Source
This commit is contained in:
Geoffroy BONNEVILLE
2020-04-03 18:14:44 +02:00
parent b875f3c89d
commit e795a8c3c4
3 changed files with 8 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ModernKeePass.Application/Database/Queries/GetDatabase/GetDatabaseQuery.cs
View File

@@ -33,7 +33,7 @@ namespace ModernKeePass.Application.Database.Queries.GetDatabase
database.RecycleBinId = _databaseProxy.RecycleBinId; database.RecycleBinId = _databaseProxy.RecycleBinId;
database.Compression = _databaseProxy.Compression; database.Compression = _databaseProxy.Compression;
database.CipherId = _databaseProxy.CipherId; database.CipherId = _databaseProxy.CipherId;
database.KeyDerivationId = _databaseProxy.CipherId; database.KeyDerivationId = _databaseProxy.KeyDerivationId;
} }
return database; return database;
} }

1
ModernKeePass.Application/Parameters/Models/KeyDerivationVm.cs
View File

@@ -4,6 +4,5 @@
{ {
public string Id { get; set; } public string Id { get; set; }
public string Name { get; set; } public string Name { get; set; }
} }
} }

58
ModernKeePass/ViewModels/Items/SettingsDatabaseVm.cs
View File

@@ -44,11 +44,10 @@ namespace ModernKeePass.ViewModels
} }
} }
public ObservableCollection<IEntityVm> Groups { get; set; } public ObservableCollection<IEntityVm> Groups { get; }
public ObservableCollection<CipherVm> Ciphers { get; }
public IEnumerable<CipherVm> Ciphers => _mediator.Send(new GetCiphersQuery()).GetAwaiter().GetResult();
public IEnumerable<string> Compressions => _mediator.Send(new GetCompressionsQuery()).GetAwaiter().GetResult(); public IEnumerable<string> Compressions => _mediator.Send(new GetCompressionsQuery()).GetAwaiter().GetResult();
public IEnumerable<KeyDerivationVm> KeyDerivations => _mediator.Send(new GetKeyDerivationsQuery()).GetAwaiter().GetResult(); public ObservableCollection<KeyDerivationVm> KeyDerivations { get; }
public CipherVm SelectedCipher public CipherVm SelectedCipher
{ {
@@ -74,53 +73,6 @@ namespace ModernKeePass.ViewModels
set { _mediator.Send(new SetRecycleBinCommand { RecycleBinId = value.Id}).Wait(); } set { _mediator.Send(new SetRecycleBinCommand { RecycleBinId = value.Id}).Wait(); }
} }
/*public int CipherIndex
{
get
{
for (var inx = 0; inx < CipherPool.GlobalPool.EngineCount; ++inx)
{
if (CipherPool.GlobalPool[inx].CipherUuid.Equals(_database.DataCipher)) return inx;
}
return -1;
}
set { _database.DataCipher = CipherPool.GlobalPool[value].CipherUuid; }
}*/
/*public string CompressionName
{
get { return _database.}
set { _database.CompressionAlgorithm = (PwCompressionAlgorithm)Enum.Parse(typeof(PwCompressionAlgorithm), value); }
}*/
/*public string KeyDerivationName
{
get { return KdfPool.Get(_database.KeyDerivation.KdfUuid).Name; }
set { _database.KeyDerivation = KdfPool.Engines.FirstOrDefault(e => e.Name == value)?.GetDefaultParameters(); }
}
public ISelectableModel SelectedItem
{
get { return Groups.FirstOrDefault(g => g.IsSelected); }
set
{
if (_selectedItem == value || IsNewRecycleBin) return;
if (_selectedItem != null)
{
_selectedItem.IsSelected = false;
}
SetProperty(ref _selectedItem, (IEntityVm)value);
if (_selectedItem != null)
{
_selectedItem.IsSelected = true;
}
}
}*/
public SettingsDatabaseVm() : this(App.Mediator) { } public SettingsDatabaseVm() : this(App.Mediator) { }
public SettingsDatabaseVm(IMediator mediator) public SettingsDatabaseVm(IMediator mediator)
@@ -129,6 +81,10 @@ namespace ModernKeePass.ViewModels
_database = _mediator.Send(new GetDatabaseQuery()).GetAwaiter().GetResult(); _database = _mediator.Send(new GetDatabaseQuery()).GetAwaiter().GetResult();
var rootGroup = _mediator.Send(new GetGroupQuery { Id = _database.RootGroupId }).GetAwaiter().GetResult(); var rootGroup = _mediator.Send(new GetGroupQuery { Id = _database.RootGroupId }).GetAwaiter().GetResult();
Groups = new ObservableCollection<IEntityVm>(rootGroup.SubGroups); Groups = new ObservableCollection<IEntityVm>(rootGroup.SubGroups);
var ciphers = _mediator.Send(new GetCiphersQuery()).GetAwaiter().GetResult();
Ciphers = new ObservableCollection<CipherVm>(ciphers);
var keyDerivations = _mediator.Send(new GetKeyDerivationsQuery()).GetAwaiter().GetResult();
KeyDerivations = new ObservableCollection<KeyDerivationVm>(keyDerivations);
} }
} }
} }