Keepass original source code version 2.34

src/KeePassLib2Android/Serialization/FileLock.cs

@@ -1,6 +1,6 @@
 /*
   KeePass Password Safe - The Open-Source Password Manager
-  Copyright (C) 2003-2012 Dominik Reichl <dominik.reichl@t-online.de>
+  Copyright (C) 2003-2016 Dominik Reichl <dominik.reichl@t-online.de>
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -19,10 +19,10 @@
 
 using System;
 using System.Collections.Generic;
-using System.Text;
-using System.IO;
-using System.Threading;
 using System.Diagnostics;
+using System.IO;
+using System.Text;
+using System.Threading;
 
 using KeePassLib.Cryptography;
 using KeePassLib.Resources;
@@ -154,13 +154,15 @@ namespace KeePassLib.Serialization
 					byte[] pbID = CryptoRandom.Instance.GetRandomBytes(16);
 					string strTime = TimeUtil.SerializeUtc(DateTime.Now);
 
-#if !KeePassLibSD
 					lfi = new LockFileInfo(Convert.ToBase64String(pbID), strTime,
+#if KeePassUAP
+						EnvironmentExt.UserName, EnvironmentExt.MachineName,
+						EnvironmentExt.UserDomainName);
+#elif KeePassLibSD
+						string.Empty, string.Empty, string.Empty);
+#else
 						Environment.UserName, Environment.MachineName,
 						Environment.UserDomainName);
-#else
-					lfi = new LockFileInfo(Convert.ToBase64String(pbID), strTime,
-						string.Empty, string.Empty, string.Empty);
 #endif
 
 					StringBuilder sb = new StringBuilder();
@@ -242,8 +244,8 @@ namespace KeePassLib.Serialization
 				if(bDisposing) Thread.Sleep(50);
 			}
 
-			if(bDisposing && !bFileDeleted)
-				IOConnection.DeleteFile(m_iocLockFile); // Possibly with exception
+			// if(bDisposing && !bFileDeleted)
+			//	IOConnection.DeleteFile(m_iocLockFile); // Possibly with exception
 
 			m_iocLockFile = null;
 		}