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

Added unit tests (all passing unfortunately)

Browse Source 
UI improvements
Write mode still doesn't work
This commit is contained in:
Geoffroy Bonneville
2017-09-25 18:34:27 +02:00
parent 34996da19d
commit 22ea657885
72 changed files with 2563 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ModernKeePassLib/Serialization/FileLock.cs
View File

@@ -123,9 +123,9 @@ namespace ModernKeePassLibPCL.Serialization
return sb.ToString();
}
public static async Task<LockFileInfo> Load(IOConnectionInfo iocLockFile)
public static LockFileInfo Load(IOConnectionInfo iocLockFile)
{
using (var s = await IOConnection.OpenRead(iocLockFile))
using (var s = IOConnection.OpenRead(iocLockFile))
try
{
if(s == null) return null;
@@ -158,7 +158,7 @@ namespace ModernKeePassLibPCL.Serialization
}
// Throws on error
public static async Task<LockFileInfo> Create(IOConnectionInfo iocLockFile)
public static LockFileInfo Create(IOConnectionInfo iocLockFile)
{
byte[] pbID = CryptoRandom.Instance.GetRandomBytes(16);
string strTime = TimeUtil.SerializeUtc(DateTime.Now);
@@ -175,11 +175,11 @@ namespace ModernKeePassLibPCL.Serialization
sb.AppendLine(lfi.Machine);
sb.AppendLine(lfi.Domain);
using (var s = await IOConnection.OpenWrite(iocLockFile))
using (var s = IOConnection.OpenWrite(iocLockFile))
{
byte[] pbFile = StrUtil.Utf8.GetBytes(sb.ToString());
if (s == null) throw new IOException(iocLockFile.GetDisplayName());
await s.WriteAsync(pbFile.AsBuffer());
s.WriteAsync(pbFile.AsBuffer()).GetAwaiter().GetResult();
}
return lfi;
@@ -193,7 +193,7 @@ namespace ModernKeePassLibPCL.Serialization
m_iocLockFile = iocBaseFile.CloneDeep();
m_iocLockFile.Path += LockFileExt;
LockFileInfo lfiEx = LockFileInfo.Load(m_iocLockFile).Result;
LockFileInfo lfiEx = LockFileInfo.Load(m_iocLockFile);
if(lfiEx != null)
{
m_iocLockFile = null; // Otherwise Dispose deletes the existing one