wismna/modernkeepasslib
1
0
Fork 0
mirror of https://github.com/wismna/ModernKeePassLib.git synced 2025-10-03 15:40:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update to version 2.42.1

Browse Source 
Some changes
Removed FutureAccesList code as it works only with UWP
This commit is contained in:
Geoffroy BONNEVILLE
2019-07-26 18:28:53 +02:00
parent 85b0e9f321
commit 26e8e5c223
52 changed files with 1373 additions and 506 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
ModernKeePassLib/PwDatabase.cs
View File

@@ -21,10 +21,9 @@ using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Drawing;
#if ModernKeePassLib
using Windows.UI.Xaml.Controls;
#if !KeePassUAP
using System.Drawing;
#endif
using ModernKeePassLib.Collections;
@@ -132,7 +131,7 @@ namespace ModernKeePassLib
}
/// <summary>
/// <c>IOConnection</c> of the currently opened database file.
/// <c>IOConnection</c> of the currently open database file.
/// Is never <c>null</c>.
/// </summary>
public IOConnectionInfo IOConnectionInfo
@@ -660,8 +659,8 @@ namespace ModernKeePassLib
}
/// <summary>
/// Save the currently opened database. The file is written to the location
/// it has been opened from.
/// Save the currently open database. The file is written to the
/// location it has been opened from.
/// </summary>
/// <param name="slLogger">Logger that recieves status information.</param>
public void Save(IStatusLogger slLogger)
@@ -695,16 +694,16 @@ namespace ModernKeePassLib
}
/// <summary>
/// Save the currently opened database to a different location. If
/// Save the currently open database to a different location. If
/// <paramref name="bIsPrimaryNow" /> is <c>true</c>, the specified
/// location is made the default location for future saves
/// using <c>SaveDatabase</c>.
/// </summary>
/// <param name="ioConnection">New location to serialize the database to.</param>
/// <param name="bIsPrimaryNow">If <c>true</c>, the new location is made the
/// standard location for the database. If <c>false</c>, a copy of the currently
/// opened database is saved to the specified location, but it isn't
/// made the default location (i.e. no lock files will be moved for
/// <param name="bIsPrimaryNow">If <c>true</c>, the new location is made
/// the standard location for the database. If <c>false</c>, a copy of the
/// currently open database is saved to the specified location, but it
/// isn't made the default location (i.e. no lock files will be moved for
/// example).</param>
/// <param name="slLogger">Logger that recieves status information.</param>
public void SaveAs(IOConnectionInfo ioConnection, bool bIsPrimaryNow,
@@ -736,8 +735,8 @@ namespace ModernKeePassLib
}
/// <summary>
/// Closes the currently opened database. No confirmation message is shown
/// before closing. Unsaved changes will be lost.
/// Closes the currently open database. No confirmation message
/// is shown before closing. Unsaved changes will be lost.
/// </summary>
public void Close()
{
@@ -801,6 +800,12 @@ namespace ModernKeePassLib
pgNew.Uuid = pg.Uuid;
pgNew.AssignProperties(pg, false, true);
if(!pgLocalContainer.CanAddGroup(pgNew))
{
Debug.Assert(false);
pgLocalContainer = m_pgRootGroup;
pgLocalContainer.CheckCanAddGroup(pgNew);
}
// pgLocalContainer.AddGroup(pgNew, true);
InsertObjectAtBestPos<PwGroup>(pgLocalContainer.Groups, pgNew, ppSrc);
pgNew.ParentGroup = pgLocalContainer;
@@ -1087,8 +1092,8 @@ namespace ModernKeePassLib
if(pgLocal.IsContainedIn(pg)) continue;
if(!pgLocal.CanAddGroup(pg)) { Debug.Assert(false); continue; }
pg.ParentGroup.Groups.Remove(pg);
// pgLocal.AddGroup(pg, true);
InsertObjectAtBestPos<PwGroup>(pgLocal.Groups, pg, ppSrc);
pg.ParentGroup = pgLocal;
@@ -1643,7 +1648,7 @@ namespace ModernKeePassLib
return null;
}
#elif !KeePassLibSD
#elif !KeePassLibSD && !ModernKeePassLib
[Obsolete("Additionally specify the size.")]
public Image GetCustomIcon(PwUuid pwIconId)
{