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

Added test for merge with kdbp file and fixed it in SaveDB

Browse Source
This commit is contained in:
Philipp Crocoll
2013-07-13 20:13:45 +02:00
parent 30cdc6136f
commit 99cbe84879
5 changed files with 39 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Kp2aBusinessLogic/database/edit/SaveDB.cs
View File

@@ -175,7 +175,7 @@ namespace keepass2android
pwImp.MemoryProtection = pwDatabase.MemoryProtection.CloneDeep();
pwImp.MasterKey = pwDatabase.MasterKey;
KdbxFile kdbx = new KdbxFile(pwImp);
kdbx.Load(fileStorage.OpenFileForRead(ioc), KdbxFormat.Default, null);
kdbx.Load(fileStorage.OpenFileForRead(ioc), KdbpFile.GetFormatToUse(ioc), null);
pwDatabase.MergeIn(pwImp, PwMergeMethod.Synchronize, null);