moparisthebest
/
keepass2android
mirror of https://github.com/moparisthebest/keepass2android
1
0
Fork 0
Code Issues Releases Wiki Activity

fixed a bug with creating databases

This commit is contained in:
Philipp Crocoll 2013-07-15 20:42:16 +02:00
parent 72ab132979
commit ed7a85dde7
1 changed files with 40 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,14 +54,15 @@ namespace keepass2android
public override void Run ()
{
if (! _dontSave) {
if (!_dontSave)
{
try
{
StatusLogger.UpdateMessage(UiStringKey.saving_database);
IOConnectionInfo ioc = _app.GetDb().Ioc;
IFileStorage fileStorage = _app.GetFileStorage(ioc);
if ((!_app.GetBooleanPreference(PreferenceKey.CheckForFileChangesOnSave))
|| (_app.GetDb().KpDatabase.HashOfFileOnDisk == null)) //first time saving
{
@ -70,42 +71,42 @@ namespace keepass2android
return;
}
if (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:
{
//ask user...
_app.AskYesNoCancel(UiStringKey.TitleSyncQuestion, UiStringKey.MessageSyncQuestion,
//yes = sync
(sender, args) =>
{
Action runHandler = () =>
{
//note: when synced, the file might be downloaded once again from the server. Caching the data
//in the hashing function would solve this but increases complexity. I currently assume the files are
//small.
MergeIn(fileStorage, ioc);
PerformSaveWithoutCheck(fileStorage, ioc);
Finish(true);
};
RunInWorkerThread(runHandler);
},
{
Action runHandler = () =>
{
//note: when synced, the file might be downloaded once again from the server. Caching the data
//in the hashing function would solve this but increases complexity. I currently assume the files are
//small.
MergeIn(fileStorage, ioc);
PerformSaveWithoutCheck(fileStorage, ioc);
Finish(true);
};
RunInWorkerThread(runHandler);
},
//no = overwrite
(sender, args) =>
{
RunInWorkerThread( () =>
{
PerformSaveWithoutCheck(fileStorage, ioc);
Finish(true);
});
},
{
RunInWorkerThread(() =>
{
PerformSaveWithoutCheck(fileStorage, ioc);
Finish(true);
});
},
//cancel
(sender, args) =>
{
RunInWorkerThread(() => Finish(false));
},
{
RunInWorkerThread(() => Finish(false));
},
_ctx
);
}
@ -114,8 +115,10 @@ namespace keepass2android
PerformSaveWithoutCheck(fileStorage, ioc);
Finish(true);
}
} catch (Exception e) {
}
catch (Exception e)
{
/* TODO KPDesktop:
* catch(Exception exSave)
{
@ -123,12 +126,15 @@ namespace keepass2android
bSuccess = false;
}
*/
Kp2aLog.Log("Error while saving: "+e.ToString());
Finish (false, e.Message);
Kp2aLog.Log("Error while saving: " + e.ToString());
Finish(false, e.Message);
return;
}
}
}
else
{
Finish(true);
}
}