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

Fixed SaveDb for CachingFileStorage and target file not existing

Browse Source 
-> + Tests
First, very simple implementation of ChangingFileStorage in KP2A App (preliminary)
This commit is contained in:
Philipp Crocoll
2013-08-08 20:40:02 +02:00
parent 289e10e1c4
commit a671c4f241
8 changed files with 246 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -99,12 +99,10 @@ namespace keepass2android
}
if (
(_streamForOrigFile != null)
|| fileStorage.CheckForFileChangeFast(ioc, _app.GetDb().LastFileVersion) //first try to use the fast change detection
|| (FileHashChanged(ioc, _app.GetDb().KpDatabase.HashOfFileOnDisk)) //if that fails, hash the file and compare:
|| (FileHashChanged(ioc, _app.GetDb().KpDatabase.HashOfFileOnDisk) == FileHashChange.Changed) //if that fails, hash the file and compare:
)
{
@@ -243,14 +241,26 @@ namespace keepass2android
_app.GetDb().LastFileVersion = fileStorage.GetCurrentFileVersionFast(ioc);
}
public byte[] HashFile(IOConnectionInfo iocFile)
public byte[] HashOriginalFile(IOConnectionInfo iocFile)
{
if (iocFile == null) { Debug.Assert(false); return null; } // Assert only
Stream sIn;
try
{
sIn = _app.GetFileStorage(iocFile).OpenFileForRead(iocFile);
IFileStorage fileStorage = _app.GetFileStorage(iocFile);
CachingFileStorage cachingFileStorage = fileStorage as CachingFileStorage;
if (cachingFileStorage != null)
{
string hash;
cachingFileStorage.GetRemoteDataAndHash(iocFile, out hash);
return MemUtil.HexStringToByteArray(hash);
}
else
{
sIn = fileStorage.OpenFileForRead(iocFile);
}
if (sIn == null) throw new FileNotFoundException();
}
catch (Exception) { return null; }
@@ -267,10 +277,20 @@ namespace keepass2android
return pbHash;
}
private bool FileHashChanged(IOConnectionInfo ioc, byte[] hashOfFileOnDisk)
enum FileHashChange
{
Equal,
Changed,
FileNotAvailable
}
private FileHashChange FileHashChanged(IOConnectionInfo ioc, byte[] hashOfFileOnDisk)
{
StatusLogger.UpdateSubMessage(_app.GetResourceString(UiStringKey.CheckingTargetFileForChanges));
return !MemUtil.ArraysEqual(HashFile(ioc), hashOfFileOnDisk);
byte[] fileHash = HashOriginalFile(ioc);
if (fileHash == null)
return FileHashChange.FileNotAvailable;
return MemUtil.ArraysEqual(fileHash, hashOfFileOnDisk) ? FileHashChange.Equal : FileHashChange.Changed;
}