From ed7a85dde7569616635865a482827e4300ef020d Mon Sep 17 00:00:00 2001
From: Philipp Crocoll <crocoapps@googlemail.com>
Date: Mon, 15 Jul 2013 20:42:16 +0200
Subject: [PATCH] fixed a bug with creating databases

---
 src/Kp2aBusinessLogic/database/edit/SaveDB.cs | 74 ++++++++++---------
 1 file changed, 40 insertions(+), 34 deletions(-)

diff --git a/src/Kp2aBusinessLogic/database/edit/SaveDB.cs b/src/Kp2aBusinessLogic/database/edit/SaveDB.cs
index 71794a0c..5798190a 100644
--- a/src/Kp2aBusinessLogic/database/edit/SaveDB.cs
+++ b/src/Kp2aBusinessLogic/database/edit/SaveDB.cs
@@ -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);
 			}
-			
 			
 		}