qwe/keepass2android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

renamed DatabaseLoader to DatabaseFormat

Browse Source 
allow write access for kdb (UI not yet completed, but saving done)
This commit is contained in:
Philipp Crocoll
2015-02-02 21:37:05 +01:00
parent fc2e0fa15d
commit 3506e253db
16 changed files with 433 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/KeePassLib2Android/PwDatabase.cs
View File

@@ -564,12 +564,12 @@ namespace KeePassLib
/// <param name="ioSource">IO connection to load the database from.</param>
/// s<param name="pwKey">Key used to open the specified database.</param>
/// <param name="slLogger">Logger, which gets all status messages.</param>
/// <param name="loader"></param>
/// <param name="format"></param>
public void Open(IOConnectionInfo ioSource, CompositeKey pwKey,
IStatusLogger slLogger, IDatabaseLoader loader)
IStatusLogger slLogger, IDatabaseFormat format)
{
Open(IOConnection.OpenRead(ioSource), UrlUtil.StripExtension(
UrlUtil.GetFileName(ioSource.Path)), ioSource, pwKey, slLogger , loader);
UrlUtil.GetFileName(ioSource.Path)), ioSource, pwKey, slLogger , format);
}
@@ -577,7 +577,7 @@ namespace KeePassLib
/// Open a database provided as Stream.
/// </summary>
public void Open(Stream s, string fileNameWithoutPathAndExt, IOConnectionInfo ioSource, CompositeKey pwKey,
IStatusLogger slLogger, IDatabaseLoader loader)
IStatusLogger slLogger, IDatabaseFormat format)
{
Debug.Assert(s != null);
if (s == null) throw new ArgumentNullException("s");
@@ -600,10 +600,10 @@ namespace KeePassLib
m_bModified = false;
loader.PopulateDatabaseFromStream(this, pwKey, s, slLogger);
format.PopulateDatabaseFromStream(this, pwKey, s, slLogger);
m_pbHashOfLastIO = loader.HashOfLastStream;
m_pbHashOfFileOnDisk = loader.HashOfLastStream;
m_pbHashOfLastIO = format.HashOfLastStream;
m_pbHashOfFileOnDisk = format.HashOfLastStream;
Debug.Assert(m_pbHashOfFileOnDisk != null);
m_bDatabaseOpened = true;