moparisthebest/keepass2android
1
0
Fork 0
mirror of https://github.com/moparisthebest/keepass2android synced 2024-12-23 15:38:47 -05:00
Code Issues Releases Wiki Activity

Fixed bug: keyfile-only databases couldn't be loaded with pre-loading enabled

Browse Source
This commit is contained in:
Philipp Crocoll 2013-10-24 06:44:45 +02:00
parent eeffea5316
commit 6a96d6729f
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Kp2aBusinessLogic/database/Database.cs
View File

@ -113,19 +113,17 @@ namespace keepass2android
pwDatabase.Open(databaseData ?? fileStorage.OpenFileForRead(iocInfo), filename, iocInfo, compositeKey, status); pwDatabase.Open(databaseData ?? fileStorage.OpenFileForRead(iocInfo), filename, iocInfo, compositeKey, status);
LastFileVersion = fileVersion; LastFileVersion = fileVersion;
} }
catch (Exception) catch (InvalidCompositeKeyException e)
{ {
if ((password == "") && (keyfile != null)) if ((password == "") && (keyfile != null))
{ {
//if we don't get a password, we don't know whether this means "empty password" or "no password" //if we don't get a password, we don't know whether this means "empty password" or "no password"
//retry without password: //retry without password:
compositeKey.RemoveUserKey(compositeKey.GetUserKey(typeof (KcpPassword))); compositeKey.RemoveUserKey(compositeKey.GetUserKey(typeof (KcpPassword)));
if (databaseData != null)
{
databaseData.Seek(0, SeekOrigin.Begin);
}
var fileVersion = _app.GetFileStorage(iocInfo).GetCurrentFileVersionFast(iocInfo); var fileVersion = _app.GetFileStorage(iocInfo).GetCurrentFileVersionFast(iocInfo);
pwDatabase.Open(databaseData ?? fileStorage.OpenFileForRead(iocInfo), filename, iocInfo, compositeKey, status); //don't reuse the memory stream databaseData: it's already closed.
//We could try to avoid reading the file again here, but probably the case is rare enough so this is ok.
pwDatabase.Open(fileStorage.OpenFileForRead(iocInfo), filename, iocInfo, compositeKey, status);
LastFileVersion = fileVersion; } LastFileVersion = fileVersion; }
else throw; else throw;
} }