Philipp Crocoll 
							
						 
					 
					
						
						
							
						
						f6395908ee 
					 
					
						
						
							
							add back custom ColorTranslator, fixes PlatformnotSupportedException, closes  https://github.com/PhilippC/keepass2android/issues/1679  
						
						 
						
						
						
						
					 
					
						2021-05-18 20:26:08 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Philipp Crocoll 
							
						 
					 
					
						
						
							
						
						562a80132a 
					 
					
						
						
							
							merge changes from KeePass 2.48 with support for KDBX 4.1 and slightly improved merging behavior with respect to custom icons, closes  https://github.com/PhilippC/keepass2android/issues/1670  
						
						 
						
						
						
						
					 
					
						2021-05-14 08:01:34 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Philipp Crocoll 
							
						 
					 
					
						
						
							
						
						1479ecf03f 
					 
					
						
						
							
							allow to open .xml files (as unencrypted database) in read-only mode, closes  https://github.com/PhilippC/keepass2android/issues/1450  
						
						 
						
						
						
						
					 
					
						2020-10-24 09:47:00 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Philipp Crocoll 
							
						 
					 
					
						
						
							
						
						2b2deb291a 
					 
					
						
						
							
							catch invalid dates,  closes   #868  
						
						 
						
						
						
						
					 
					
						2020-02-15 04:15:35 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Philipp Crocoll 
							
						 
					 
					
						
						
							
						
						049764fe67 
					 
					
						
						
							
							don't save files in a file version lower than what was read,  closes   #791  
						
						 
						
						
						
						
					 
					
						2019-10-07 02:30:38 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Philipp Crocoll 
							
						 
					 
					
						
						
							
						
						99d0ecfd59 
					 
					
						
						
							
							refactoring, use less UrlUtil and more IFileStorage  
						
						 
						
						
						
						
					 
					
						2019-10-01 20:04:03 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Philipp Crocoll 
							
						 
					 
					
						
						
							
						
						8512bae997 
					 
					
						
						
							
							make sure we always save database as KDBX4 when using ChallengeXCKey (for compatibility with KeepassXC),  closes   #596  
						
						 
						
						
						
						
					 
					
						2018-11-20 06:08:30 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Philipp Crocoll 
							
						 
					 
					
						
						
							
						
						a2dab72b25 
					 
					
						
						
							
							first version to have multiple databases open at the same time. needs testing and bug fixing.  
						
						 
						
						
						
						
					 
					
						2018-10-16 06:33:00 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Philipp Crocoll 
							
						 
					 
					
						
						
							
						
						911c630b91 
					 
					
						
						
							
							start implementing KeepassXC Challenge-Response support (see  #4 ), currently waiting for  https://github.com/keepassxreboot/keepassxc/issues/1060 ), also missing support for saving at the moment and mem-leaking PasswordActivity  
						
						 
						
						
						
						
					 
					
						2017-10-16 07:36:49 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Philipp Crocoll 
							
						 
					 
					
						
						
							
						
						d0879bfe39 
					 
					
						
						
							
							complete merging of Keepass 2.35, fix auto-merge errors  
						
						 
						
						
						
						
					 
					
						2017-01-12 05:56:20 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Philipp Crocoll 
							
						 
					 
					
						
						
							
						
						34e572dad1 
					 
					
						
						
							
							Merge branch 'Keepass_Orig'  
						
						 
						
						... 
						
						
						
						Conflicts:
	src/KeePassLib2Android/Cryptography/CryptoRandom.cs
	src/KeePassLib2Android/Cryptography/HashingStreamEx.cs
	src/KeePassLib2Android/Cryptography/HmacOtp.cs
	src/KeePassLib2Android/Cryptography/PasswordGenerator/CharSetBasedGenerator.cs
	src/KeePassLib2Android/Cryptography/PasswordGenerator/CustomPwGenerator.cs
	src/KeePassLib2Android/Cryptography/PasswordGenerator/CustomPwGeneratorPool.cs
	src/KeePassLib2Android/Cryptography/PasswordGenerator/PatternBasedGenerator.cs
	src/KeePassLib2Android/Cryptography/PasswordGenerator/PwCharSet.cs
	src/KeePassLib2Android/Cryptography/PasswordGenerator/PwGenerator.cs
	src/KeePassLib2Android/Cryptography/PasswordGenerator/PwProfile.cs
	src/KeePassLib2Android/Cryptography/PopularPasswords.cs
	src/KeePassLib2Android/Cryptography/QualityEstimation.cs
	src/KeePassLib2Android/Cryptography/SelfTest.cs
	src/KeePassLib2Android/Delegates/Handlers.cs
	src/KeePassLib2Android/Interfaces/IDeepCloneable.cs
	src/KeePassLib2Android/Interfaces/IStatusLogger.cs
	src/KeePassLib2Android/Interfaces/IStructureItem.cs
	src/KeePassLib2Android/Interfaces/ITimeLogger.cs
	src/KeePassLib2Android/Interfaces/IUIOperations.cs
	src/KeePassLib2Android/Interfaces/IXmlSerializerEx.cs
	src/KeePassLib2Android/Keys/IUserKey.cs
	src/KeePassLib2Android/Keys/KcpCustomKey.cs
	src/KeePassLib2Android/Keys/KcpUserAccount.cs
	src/KeePassLib2Android/PwCustomIcon.cs
	src/KeePassLib2Android/PwGroup.cs
	src/KeePassLib2Android/Serialization/FileTransactionEx.cs
	src/KeePassLib2Android/Serialization/HashedBlockStream.cs
	src/KeePassLib2Android/Serialization/IOConnection.cs
	src/KeePassLib2Android/Serialization/KdbxFile.Read.cs
	src/KeePassLib2Android/Serialization/KdbxFile.Write.cs
	src/KeePassLib2Android/Translation/KPControlCustomization.cs
	src/KeePassLib2Android/Translation/KPFormCustomization.cs
	src/KeePassLib2Android/Utility/GfxUtil.cs
	src/KeePassLib2Android/Utility/MessageService.cs
	src/KeePassLib2Android/Utility/MonoWorkarounds.cs
	src/KeePassLib2Android/Utility/TimeUtil.cs 
						
						
					 
					
						2017-01-11 18:02:44 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Philipp Crocoll 
							
						 
					 
					
						
						
							
						
						26c0fde41c 
					 
					
						
						
							
							Keepass lib 2.35  
						
						 
						
						
						
						
					 
					
						2017-01-11 07:57:01 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Philipp Crocoll 
							
						 
					 
					
						
						
							
						
						2e8c76d0c4 
					 
					
						
						
							
							Merge branch 'Keepass_Orig' + adapt to changes in KeePassLib.  This introduced KDBX4 in Keepass2Android.  
						
						 
						
						... 
						
						
						
						NOTE: seems like merging broke the capability to read KDBX<=3.
Conflicts:
	src/KeePassLib2Android/Collections/AutoTypeConfig.cs
	src/KeePassLib2Android/Collections/ProtectedBinaryDictionary.cs
	src/KeePassLib2Android/Collections/ProtectedStringDictionary.cs
	src/KeePassLib2Android/Collections/PwObjectList.cs
	src/KeePassLib2Android/Collections/PwObjectPool.cs
	src/KeePassLib2Android/Collections/StringDictionaryEx.cs
	src/KeePassLib2Android/Cryptography/Cipher/CipherPool.cs
	src/KeePassLib2Android/Cryptography/Cipher/ICipherEngine.cs
	src/KeePassLib2Android/Cryptography/Cipher/Salsa20Cipher.cs
	src/KeePassLib2Android/Cryptography/Cipher/StandardAesEngine.cs
	src/KeePassLib2Android/Cryptography/CryptoRandom.cs
	src/KeePassLib2Android/Cryptography/CryptoRandomStream.cs
	src/KeePassLib2Android/Cryptography/HashingStreamEx.cs
	src/KeePassLib2Android/Cryptography/HmacOtp.cs
	src/KeePassLib2Android/Cryptography/PasswordGenerator/CharSetBasedGenerator.cs
	src/KeePassLib2Android/Cryptography/PasswordGenerator/CustomPwGenerator.cs
	src/KeePassLib2Android/Cryptography/PasswordGenerator/CustomPwGeneratorPool.cs
	src/KeePassLib2Android/Cryptography/PasswordGenerator/PatternBasedGenerator.cs
	src/KeePassLib2Android/Cryptography/PasswordGenerator/PwCharSet.cs
	src/KeePassLib2Android/Cryptography/PasswordGenerator/PwGenerator.cs
	src/KeePassLib2Android/Cryptography/PasswordGenerator/PwProfile.cs
	src/KeePassLib2Android/Cryptography/PopularPasswords.cs
	src/KeePassLib2Android/Cryptography/QualityEstimation.cs
	src/KeePassLib2Android/Cryptography/SelfTest.cs
	src/KeePassLib2Android/Delegates/Handlers.cs
	src/KeePassLib2Android/Interfaces/IDeepCloneable.cs
	src/KeePassLib2Android/Interfaces/IStatusLogger.cs
	src/KeePassLib2Android/Interfaces/IStructureItem.cs
	src/KeePassLib2Android/Interfaces/ITimeLogger.cs
	src/KeePassLib2Android/Interfaces/IUIOperations.cs
	src/KeePassLib2Android/Interfaces/IXmlSerializerEx.cs
	src/KeePassLib2Android/Keys/CompositeKey.cs
	src/KeePassLib2Android/Keys/IUserKey.cs
	src/KeePassLib2Android/Keys/KcpCustomKey.cs
	src/KeePassLib2Android/Keys/KcpKeyFile.cs
	src/KeePassLib2Android/Keys/KcpPassword.cs
	src/KeePassLib2Android/Keys/KcpUserAccount.cs
	src/KeePassLib2Android/Keys/KeyProvider.cs
	src/KeePassLib2Android/Keys/KeyProviderPool.cs
	src/KeePassLib2Android/Keys/KeyValidator.cs
	src/KeePassLib2Android/Keys/KeyValidatorPool.cs
	src/KeePassLib2Android/Keys/UserKeyType.cs
	src/KeePassLib2Android/Native/NativeLib.cs
	src/KeePassLib2Android/Native/NativeMethods.cs
	src/KeePassLib2Android/Properties/AssemblyInfo.cs
	src/KeePassLib2Android/PwCustomIcon.cs
	src/KeePassLib2Android/PwDatabase.cs
	src/KeePassLib2Android/PwDefs.cs
	src/KeePassLib2Android/PwDeletedObject.cs
	src/KeePassLib2Android/PwEntry.cs
	src/KeePassLib2Android/PwEnums.cs
	src/KeePassLib2Android/PwGroup.cs
	src/KeePassLib2Android/PwUuid.cs
	src/KeePassLib2Android/Resources/KLRes.Generated.cs
	src/KeePassLib2Android/Security/ProtectedBinary.cs
	src/KeePassLib2Android/Security/ProtectedString.cs
	src/KeePassLib2Android/Security/XorredBuffer.cs
	src/KeePassLib2Android/Serialization/BinaryReaderEx.cs
	src/KeePassLib2Android/Serialization/FileLock.cs
	src/KeePassLib2Android/Serialization/FileTransactionEx.cs
	src/KeePassLib2Android/Serialization/HashedBlockStream.cs
	src/KeePassLib2Android/Serialization/IOConnection.cs
	src/KeePassLib2Android/Serialization/IOConnectionInfo.cs
	src/KeePassLib2Android/Serialization/KdbxFile.Read.Streamed.cs
	src/KeePassLib2Android/Serialization/KdbxFile.Read.cs
	src/KeePassLib2Android/Serialization/KdbxFile.Write.cs
	src/KeePassLib2Android/Serialization/KdbxFile.cs
	src/KeePassLib2Android/Serialization/OldFormatException.cs
	src/KeePassLib2Android/Translation/KPControlCustomization.cs
	src/KeePassLib2Android/Translation/KPFormCustomization.cs
	src/KeePassLib2Android/Translation/KPStringTable.cs
	src/KeePassLib2Android/Translation/KPStringTableItem.cs
	src/KeePassLib2Android/Translation/KPTranslation.cs
	src/KeePassLib2Android/Translation/KPTranslationProperties.cs
	src/KeePassLib2Android/Utility/AppLogEx.cs
	src/KeePassLib2Android/Utility/GfxUtil.cs
	src/KeePassLib2Android/Utility/MemUtil.cs
	src/KeePassLib2Android/Utility/MessageService.cs
	src/KeePassLib2Android/Utility/StrUtil.cs
	src/KeePassLib2Android/Utility/TimeUtil.cs
	src/KeePassLib2Android/Utility/UrlUtil.cs 
						
						
					 
					
						2016-08-31 06:55:53 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Philipp Crocoll 
							
						 
					 
					
						
						
							
						
						a2f2e3d6f8 
					 
					
						
						
							
							Keepass Orig KeePass_160826  
						
						 
						
						
						
						
					 
					
						2016-08-30 04:11:48 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Philipp Crocoll 
							
						 
					 
					
						
						
							
						
						6d1e28e502 
					 
					
						
						
							
							Keepass original source code version 2.34  
						
						 
						
						
						
						
					 
					
						2016-08-30 04:09:53 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Philipp Crocoll 
							
						 
					 
					
						
						
							
						
						82b288ae71 
					 
					
						
						
							
							switch back to Mono implementation for GZip  
						
						 
						
						
						
						
					 
					
						2016-01-11 21:57:54 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Philipp Crocoll 
							
						 
					 
					
						
						
							
						
						8fc98df53b 
					 
					
						
						
							
							start implementing Xamarin.Insights based error reports  
						
						 
						
						
						
						
					 
					
						2016-01-11 20:58:42 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Philipp Crocoll 
							
						 
					 
					
						
						
							
						
						fad8dc8b22 
					 
					
						
						
							
							fixed bugs:  
						
						 
						
						... 
						
						
						
						- work around Mono bug in GZipStream (see http://sourceforge.net/p/keepass/bugs/1373/ ) by including a custom GZipStream implementation
 - fixed issue with export database to System file picker location
 - fixed issues with preference options crashing with ActivityNotFound (due to changes in Xamarin 5.1, see https://bugzilla.xamarin.com/show_bug.cgi?id=33617 
updated manifest/changelog 
						
						
					 
					
						2015-09-03 22:03:28 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Philipp Crocoll 
							
						 
					 
					
						
						
							
						
						ed15af3f8f 
					 
					
						
						
							
							* check if entered URI looks like a directory (not a file) and issue warning in SelectStorageLocationActivity  
						
						 
						
						... 
						
						
						
						* check if URI is directory and refuse to delete in IOConnection 
						
						
					 
					
						2015-06-17 06:33:29 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Philipp Crocoll 
							
						 
					 
					
						
						
							
						
						49c4fa5b05 
					 
					
						
						
							
							fixed issue loading kdb files with key file  
						
						 
						
						... 
						
						
						
						improved error message by adding messages to loading exceptions in Java 
						
						
					 
					
						2014-11-11 17:23:01 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Philipp Crocoll 
							
						 
					 
					
						
						
							
						
						ac351e5aa0 
					 
					
						
						
							
							uncommented code to (un)serialize IOConnectionInfo  
						
						 
						
						
						
						
					 
					
						2014-07-15 06:10:03 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Philipp Crocoll 
							
						 
					 
					
						
						
							
						
						3159af19cb 
					 
					
						
						
							
							Fixed bug in IOConnection.cs: Errors when uploading data to http(s) were not handled correctly  
						
						 
						
						... 
						
						
						
						Improved logging in CachingFileStorage 
						
						
					 
					
						2014-03-23 15:04:46 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Philipp Crocoll 
							
						 
					 
					
						
						
							
						
						3c349f68bc 
					 
					
						
						
							
							added random string to tmp-file path to avoid collisions during simultaneous uploads from multiple devices  
						
						 
						
						
						
						
					 
					
						2014-03-07 04:05:31 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Philipp Crocoll 
							
						 
					 
					
						
						
							
						
						736bbd5ec3 
					 
					
						
						
							
							* show toast for cache messages in the center of the screen to avoid hiding the keyboard when entering passwords  
						
						 
						
						... 
						
						
						
						* Bug fix with FTP access
* Bug fix with Group editing/adding
* Integrated Input Language Selection for keyboard
-> 0.9.3-r3 
						
						
					 
					
						2014-02-19 21:49:18 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Philipp Crocoll 
							
						 
					 
					
						
						
							
						
						bc1d5fb5f2 
					 
					
						
						
							
							fixed problems in certificate validation code (updates in Mono?) Also disabled linking in release to avoid problems.  
						
						 
						
						
						
						
					 
					
						2014-02-02 23:36:19 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								AlexVallat 
							
						 
					 
					
						
						
							
						
						f0b5b65d61 
					 
					
						
						
							
							Fix for KDPB format to use UTC for serialising dates (to match KDBX behaviour)  
						
						 
						
						
						
						
					 
					
						2014-01-03 07:55:32 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Philipp Crocoll 
							
						 
					 
					
						
						
							
						
						b320477a64 
					 
					
						
						
							
							Improved Certificate Handling (fixed problem with Certificate validation)  
						
						 
						
						
						
						
					 
					
						2013-12-12 10:24:24 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Philipp Crocoll 
							
						 
					 
					
						
						
							
						
						38572cf2a6 
					 
					
						
						
							
							Adaptions to 2.24 KPLib changes  
						
						 
						
						
						
						
					 
					
						2013-11-13 04:14:43 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Philipp Crocoll 
							
						 
					 
					
						
						
							
						
						1b84707970 
					 
					
						
						
							
							Merge branch 'kplibdesktop' into integrate_kplib_2_24_update  
						
						 
						
						... 
						
						
						
						Conflicts:
	src/KeePassLib2Android/Cryptography/CryptoRandom.cs
	src/KeePassLib2Android/Keys/KcpKeyFile.cs
	src/KeePassLib2Android/Keys/KcpUserAccount.cs
	src/KeePassLib2Android/Native/NativeLib.cs
	src/KeePassLib2Android/PwCustomIcon.cs
	src/KeePassLib2Android/PwDatabase.cs
	src/KeePassLib2Android/PwEntry.cs
	src/KeePassLib2Android/PwGroup.cs
	src/KeePassLib2Android/PwUuid.cs
	src/KeePassLib2Android/Security/ProtectedBinary.cs
	src/KeePassLib2Android/Serialization/FileLock.cs
	src/KeePassLib2Android/Serialization/FileTransactionEx.cs
	src/KeePassLib2Android/Serialization/HashedBlockStream.cs
	src/KeePassLib2Android/Serialization/IOConnection.cs
	src/KeePassLib2Android/Serialization/KdbxFile.Read.Streamed.cs
	src/KeePassLib2Android/Serialization/KdbxFile.Read.cs
	src/KeePassLib2Android/Serialization/KdbxFile.Write.cs
	src/KeePassLib2Android/Translation/KPControlCustomization.cs
	src/KeePassLib2Android/Translation/KPFormCustomization.cs
	src/KeePassLib2Android/Translation/KPStringTable.cs
	src/KeePassLib2Android/Translation/KPTranslation.cs
	src/KeePassLib2Android/Utility/GfxUtil.cs
	src/KeePassLib2Android/Utility/MessageService.cs
	src/KeePassLib2Android/Utility/StrUtil.cs 
						
						
					 
					
						2013-11-13 04:13:27 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Philipp Crocoll 
							
						 
					 
					
						
						
							
						
						05aeaf5bd3 
					 
					
						
						
							
							update 2.24 Copyright headers  
						
						 
						
						
						
						
					 
					
						2013-11-13 03:32:12 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Philipp Crocoll 
							
						 
					 
					
						
						
							
						
						aa81003823 
					 
					
						
						
							
							update to 2.24  
						
						 
						
						
						
						
					 
					
						2013-11-13 03:29:48 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Philipp Crocoll 
							
						 
					 
					
						
						
							
						
						277f1b46ad 
					 
					
						
						
							
							added NTLM auth support  
						
						 
						
						
						
						
					 
					
						2013-11-01 10:28:37 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								AlexVallat 
							
						 
					 
					
						
						
							
						
						bb0827ea51 
					 
					
						
						
							
							Added serializer precompile to preload step for kdbp files  
						
						 
						
						
						
						
					 
					
						2013-08-15 18:49:27 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Philipp Crocoll 
							
						 
					 
					
						
						
							
						
						370c937578 
					 
					
						
						
							
							Merge branch 'AlexVallat/Keepass2AndroidPerfOpt'  
						
						 
						
						... 
						
						
						
						Conflicts:
	src/KeePassLib2Android/Serialization/IOConnection.cs
	src/Kp2aBusinessLogic/IKp2aApp.cs
	src/Kp2aBusinessLogic/database/Database.cs
	src/keepass2android/Resources/Resource.designer.cs
	src/keepass2android/app/App.cs
	src/keepass2android/fileselect/FileSelectActivity.cs 
						
						
					 
					
						2013-08-10 20:25:10 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Philipp Crocoll 
							
						 
					 
					
						
						
							
						
						28fb854fb1 
					 
					
						
						
							
							Modifications for Mono for Android 4.8  
						
						 
						
						
						
						
					 
					
						2013-08-03 12:30:13 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Philipp Crocoll 
							
						 
					 
					
						
						
							
						
						c0520c055f 
					 
					
						
						
							
							+ SynchronizeCachedDatabase.cs: Synchronizes the local cache with the remote file. Applies merging if necessary.  
						
						 
						
						... 
						
						
						
						+ Tests (not yet complete) 
						
						
					 
					
						2013-08-01 22:20:39 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								AlexVallat 
							
						 
					 
					
						
						
							
						
						689f468b8f 
					 
					
						
						
							
							Async load database encrypted bytes to memory while entering password  
						
						 
						
						
						
						
					 
					
						2013-07-17 19:19:17 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								AlexVallat 
							
						 
					 
					
						
						
							
						
						ee5cc47f74 
					 
					
						
						
							
							Merge branch 'master' of  https://git01.codeplex.com/keepass2android  
						
						 
						
						
						
						
					 
					
						2013-07-13 19:54:09 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Philipp Crocoll 
							
						 
					 
					
						
						
							
						
						99cbe84879 
					 
					
						
						
							
							Added test for merge with kdbp file and fixed it in SaveDB  
						
						 
						
						
						
						
					 
					
						2013-07-13 20:13:45 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								AlexVallat 
							
						 
					 
					
						
						
							
						
						9f01e834d0 
					 
					
						
						
							
							Perf shortcut for PwUuid comparison. Don't write out Zero PwUuid's for custom icons (use null instead)  
						
						 
						
						
						
						
					 
					
						2013-07-13 09:20:48 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								AlexVallat 
							
						 
					 
					
						
						
							
						
						bf84662857 
					 
					
						
						
							
							Fixed reference equality checks for PwUuid  
						
						 
						
						
						
						
					 
					
						2013-07-13 08:14:32 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Philipp Crocoll 
							
						 
					 
					
						
						
							
						
						4c03c050e9 
					 
					
						
						
							
							Merge branch 'AlexVallat/ProtocolBuffers'  
						
						 
						
						
						
						
					 
					
						2013-07-12 16:42:35 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Philipp Crocoll 
							
						 
					 
					
						
						
							
						
						7eb77ff414 
					 
					
						
						
							
							Merge branch 'ProtocolBuffers' of  https://git01.codeplex.com/forks/alexvallat/keepass2androidperfopt  into AlexVallat/ProtocolBuffers  
						
						 
						
						
						
						
					 
					
						2013-07-12 16:41:18 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								AlexVallat 
							
						 
					 
					
						
						
							
						
						70c81d52ca 
					 
					
						
						
							
							Changed to using monodroid compiled protobuf-net.dll to avoid linker error with release build.  
						
						 
						
						
						
						
					 
					
						2013-07-12 14:41:46 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Philipp Crocoll 
							
						 
					 
					
						
						
							
						
						43ea197fd5 
					 
					
						
						
							
							Support for WebDav with domain users  
						
						 
						
						
						
						
					 
					
						2013-07-11 22:03:29 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Philipp Crocoll 
							
						 
					 
					
						
						
							
						
						16c08cbe8a 
					 
					
						
						
							
							Merge branch 'ProtocolBuffers' of  https://git01.codeplex.com/forks/alexvallat/keepass2androidperfopt  into AlexVallat/ProtocolBuffers  
						
						 
						
						... 
						
						
						
						Conflicts:
	src/KeePassLib2Android/PwDatabase.cs
	src/KeePassLib2Android/Serialization/KdbxFile.Read.cs 
						
						
					 
					
						2013-07-09 11:03:31 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Philipp Crocoll 
							
						 
					 
					
						
						
							
						
						d90407fd2d 
					 
					
						
						
							
							Merge  https://git01.codeplex.com/forks/alexvallat/keepass2androidperfopt  into AlexVallat/Keepass2AndroidPerfOpt  
						
						 
						
						
						
						
					 
					
						2013-07-09 10:13:26 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Philipp Crocoll 
							
						 
					 
					
						
						
							
						
						84aeb31fd0 
					 
					
						
						
							
							* Introduced IFileStorage interface: Better abstraction than current IOConnection (suitable for cloud support). Currently only implemented by the built-in IOConnection (local/http/ftp)  
						
						 
						
						... 
						
						
						
						* Implemented Merge functionality for SaveDB. UI is not yet implemented!
* Added tests for merge functionality 
						
						
					 
					
						2013-07-09 09:59:17 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Philipp Crocoll 
							
						 
					 
					
						
						
							
						
						5f4d467da4 
					 
					
						
						
							
							Added custom logger for better tracability of problems  
						
						 
						
						
						
						
					 
					
						2013-07-06 16:10:33 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								AlexVallat 
							
						 
					 
					
						
						
							
						
						b58d58771b 
					 
					
						
						
							
							Kdbp format selection by filename. If the filename ends in .kdbp, it is assumed to be kdbp format. Otherwise, kdbx format is used. A file is always saved in the same format it is opened in.  
						
						 
						
						
						
						
					 
					
						2013-06-30 09:47:40 +01:00