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

Merge branch 'ProtocolBuffers' of https://git01.codeplex.com/forks/alexvallat/keepass2androidperfopt into AlexVallat/ProtocolBuffers

Browse Source 
Conflicts:
	src/KeePassLib2Android/PwDatabase.cs
	src/KeePassLib2Android/Serialization/KdbxFile.Read.cs
This commit is contained in:
Philipp Crocoll
2013-07-09 11:03:31 +02:00
parent 5a6564f897 b58d58771b
commit 16c08cbe8a
10 changed files with 4238 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/KeePassLib2Android/PwDatabase.cs
View File

@@ -605,8 +605,7 @@ namespace KeePassLib
KdbxFile kdbx = new KdbxFile(this);
kdbx.DetachBinaries = m_strDetachBins;
kdbx.Load(s, KdbxFormat.Default, slLogger);
kdbx.Load(s, KdbpFile.GetFormatToUse(ioSource), slLogger);
s.Close();
m_pbHashOfLastIO = kdbx.HashOfFileOnDisk;
@@ -642,7 +641,7 @@ namespace KeePassLib
Stream s = ft.OpenWrite();
KdbxFile kdb = new KdbxFile(this);
kdb.Save(s, null, KdbxFormat.Default, slLogger);
kdb.Save(s, null, KdbpFile.GetFormatToUse(m_ioSource), slLogger);
ft.CommitWrite();