Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							b7ff2c3461 
							
						 
					 
					
						
						
							
							Use properly fixed numeral values in Trust enum  
						
						... 
						
						
						
						Why, oh God, why?! #thanksjamesgosling 
						
					 
					
						2015-07-21 01:52:22 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							0ee64124fe 
							
						 
					 
					
						
						
							
							Fix getNumTrustedKeys  
						
						
						
					 
					
						2015-07-20 22:02:54 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							19a0ae42d6 
							
						 
					 
					
						
						
							
							Lock TrustKeys if no trusted keys are available  
						
						
						
					 
					
						2015-07-20 14:56:41 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							012f036840 
							
						 
					 
					
						
						
							
							Optimize imports  
						
						
						
					 
					
						2015-07-20 14:26:29 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							dd964077b9 
							
						 
					 
					
						
						
							
							Fix axolotl database migration  
						
						... 
						
						
						
						Can't call getWritableDatabase in recreateAxolotlDb() 
						
					 
					
						2015-07-20 13:15:49 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							14010bf5a6 
							
						 
					 
					
						
						
							
							Ask for key trust when sending messages  
						
						... 
						
						
						
						If the contact (or the own account) has keys that have UNDECIDED trust,
we now drop the user into the new TrustKeysActivity, where they have to
decide for each new key whether it should be TRUSTED or UNTRUSTED. 
						
					 
					
						2015-07-19 22:27:26 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							4038af2f47 
							
						 
					 
					
						
						
							
							Fix trust status for outgoing messages  
						
						... 
						
						
						
						Tag sent messages with own fingerprint, set own fingerprint as always
trusted, include own fingerprint in database trust search, explicitly
reset trust colorfilter 
						
					 
					
						2015-07-19 22:23:28 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							31d375c2c3 
							
						 
					 
					
						
						
							
							Fix setIdentityKeyTrust update statement  
						
						
						
					 
					
						2015-07-19 22:23:27 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							160e4017df 
							
						 
					 
					
						
						
							
							Fix IdentityKey storage model  
						
						... 
						
						
						
						Added proper UNIQUE statement 
						
					 
					
						2015-07-19 22:23:27 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							d173913eba 
							
						 
					 
					
						
						
							
							Overhauled Message tagging  
						
						... 
						
						
						
						Messages are now tagged with the IdentityKey fingerprint of the
originating session. IdentityKeys have one of three trust states:
undecided (default), trusted, and untrusted/not yet trusted. 
						
					 
					
						2015-07-19 22:17:58 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							03614a0262 
							
						 
					 
					
						
						
							
							Fix getSubDeviceSessions SQL query  
						
						
						
					 
					
						2015-07-19 22:17:57 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							3458f5bb91 
							
						 
					 
					
						
						
							
							Clean up logging  
						
						... 
						
						
						
						Add a fixed prefix to axolotl-related log messages, set log levels
sensibly. 
						
					 
					
						2015-07-19 22:17:57 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							7049904c32 
							
						 
					 
					
						
						
							
							Add basic PEP managemend UI to EditAccountActivity  
						
						... 
						
						
						
						EditAccountActivity now show own fingerprint, and gives an option to
regenerate local keying material (and wipe all sessions associated with
the old keys in the process).
It also now displays a list of other own devices, and gives an option to
remove all but the current device. 
						
					 
					
						2015-07-19 22:17:55 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							7a962e5180 
							
						 
					 
					
						
						
							
							Refactor axolotl database recreation  
						
						
						
					 
					
						2015-07-19 21:32:27 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							74026b742b 
							
						 
					 
					
						
						
							
							Save IdentityKeys in database  
						
						
						
					 
					
						2015-07-19 21:32:26 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							9e07fc5651 
							
						 
					 
					
						
						
							
							DatabaseBackend bugfixes  
						
						... 
						
						
						
						Don't leak cursors, initially create tables 
						
					 
					
						2015-07-19 21:32:26 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							299bbdf27f 
							
						 
					 
					
						
						
							
							Reformat code to use tabs  
						
						... 
						
						
						
						This really sucks to do it like this. Sorry. :( 
						
					 
					
						2015-07-19 21:32:26 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							f73aa1a200 
							
						 
					 
					
						
						
							
							Reworked axolotl protocol layer  
						
						... 
						
						
						
						Numerous fixes 
						
					 
					
						2015-07-19 21:32:25 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							b8048a5538 
							
						 
					 
					
						
						
							
							CryptoNext persistance layer mockup  
						
						... 
						
						
						
						Initial sketch of the peripheral storage infrastructure for the new
axolotl-based encryption scheme. 
						
					 
					
						2015-07-19 21:32:21 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4274fe90ac 
							
						 
					 
					
						
						
							
							try to catch weird npe in android sdk  
						
						
						
					 
					
						2015-07-11 21:24:30 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ce79f4bbe3 
							
						 
					 
					
						
						
							
							renamed downloadable to transferable  
						
						
						
					 
					
						2015-07-10 15:11:03 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d30fb6f0a1 
							
						 
					 
					
						
						
							
							avoid very rare npe  
						
						
						
					 
					
						2015-07-03 21:32:46 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							aca9d8036c 
							
						 
					 
					
						
						
							
							made httpconnection (download) ready all kind of files  
						
						
						
					 
					
						2015-06-30 17:15:02 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6af97c724c 
							
						 
					 
					
						
						
							
							made storage path decision entirely based upon file extension  
						
						
						
					 
					
						2015-06-30 14:04:39 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d7de311379 
							
						 
					 
					
						
						
							
							refactored bodyContainsDownloadable to be more flexible  
						
						
						
					 
					
						2015-06-30 13:52:53 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9eb9a52205 
							
						 
					 
					
						
						
							
							initial http upload support  
						
						... 
						
						
						
						be careful: little error handling and no encryption 
						
					 
					
						2015-06-29 15:21:41 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							b69ee7125d 
							
						 
					 
					
						
						
							
							Force Nameprepping of JID domain parts  
						
						... 
						
						
						
						The IDN.toAscii()/IDN.toUnicode() family only namepreps the original
domain passed to it if it contained non-ASCII characters. This means
that for all-ASCII domains, no canonicalization is performed, which
leads to issues like case-sensitivity. This workaround explicitly
namepreps domain parts before calling IDN.toAscii() on them, in order to
get a canonicalized representation (most notably, case invariance). A
basic DB migration is also included. 
						
					 
					
						2015-05-14 15:52:55 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6a15bc26b6 
							
						 
					 
					
						
						
							
							npe check after reading image uri  
						
						
						
					 
					
						2015-04-28 22:23:45 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b1843fb61a 
							
						 
					 
					
						
						
							
							print stack trace on io error  
						
						
						
					 
					
						2015-04-28 09:35:10 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c283fec0d1 
							
						 
					 
					
						
						
							
							hard code bitmap configs  
						
						
						
					 
					
						2015-04-26 20:26:59 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d07baccf97 
							
						 
					 
					
						
						
							
							cleaned up file handling  
						
						
						
					 
					
						2015-04-25 14:08:24 +02:00 
						 
				 
			
				
					
						
							
							
								Holger Weiß 
							
						 
					 
					
						
						
						
						
							
						
						
							52af62d298 
							
						 
					 
					
						
						
							
							Set file size also for cached avatars  
						
						
						
					 
					
						2015-03-17 17:36:17 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							864c709c96 
							
						 
					 
					
						
						
							
							catching out of memory run time exception in hasEnabledAccounts()  
						
						
						
					 
					
						2015-02-28 12:03:53 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							2dc69eea68 
							
						 
					 
					
						
						
							
							fixed bug in find conference in database method  
						
						
						
					 
					
						2015-01-21 16:18:57 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b07b7519a6 
							
						 
					 
					
						
						
							
							keep proper image file extension  
						
						
						
					 
					
						2015-01-11 15:19:36 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3833e6dfef 
							
						 
					 
					
						
						
							
							improved OTR verification part one  
						
						
						
					 
					
						2015-01-02 01:21:14 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							af7a64491f 
							
						 
					 
					
						
						
							
							Add support for XEP-0191 (Blocking command)  
						
						... 
						
						
						
						Fixes  #791 
Squash of commits:
534f25d7dae3ce6852243e28fdd0a69ac01e9463
808fdf5147f27a912a60bee39aa4bf1ddd4f43b4
1eaf8a8330710ad35ba7c368e04f909af623ae4c
31585242c2359efdcd0eeddb9745077f54dbc9eb
2e69bd0bd0286ed1e98a42f4c3421ba4d8cf524b
e904fb5015bf3a1904ab941a1957edf3b1e7abd2
eebbadf3b3816bbf8fcccb763e419fed252d266f
7c5b87724ce494e5a6e8026557ed50a8fd9f23e8
b0eaaf446937794fe19cbdb4f8309c3ff83d4e42
8c652f9e8bb3512958d9ad8c6f1326505f2d98c8
ad0ea1ad948ff6f8fde7b0b10f5163dc8852032f
f5d49897e0dba691ef53a0eddb9ed34d129ad442
a08fa64c505bd895b7c626cfad182380373be20b
de67079113e08394a276048c31f6b21baa300829
9069f342173ba30c2b20c67529c7ff497a6a257d
0169fa79d161ee898c4b6762e207087682a952d8
8585a5bd75a5d56927fed8317729bd15fffe4dcc
0053528a078369e0b65dcf71bda251072a1299c7
e901a9c3554bd7cca193e92919b463991eadfea7
c5c78257434813c69ab9b7558bcc8f7cbe858433
e905af348d46d77bc46b5f7211527684acc02fab
13a0f9a10c7892b0f90f5fabd2f2615701b0fd66
2cfba1e24b0139839e4453b92be7e20634d150cf
58e074fb5bb44b05a8104250fccd7c024c808c1a
0d6cf98fc8eab212d798ac79b336f9b70a14f06d
e23620f56b85bcab9f3b5d9ce1c01524cd9674dc
d72cd2fcc8d54176c3ff53411a69b9bb4642eff3
195143dff8836623a37094a6b8fa6aa01ef31580
5f5f3caf3a1e480a99d27ee5c34ba516419c52e4
1dee3d5861c9f9c710da4cbda3688d94c622ca93
23949b8aa32c78b27bab49bb3c4f3ff588925ce1
9bf97f8ae522796e0dacb7f6fe7a7f90f86a93a1 
					
						2014-12-22 08:19:00 -05:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							ccdb0fd971 
							
						 
					 
					
						
						
							
							save server id from mam messages. check for dups before adding mam  
						
						
						
					 
					
						2014-12-10 14:08:06 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							888475d4fe 
							
						 
					 
					
						
						
							
							additional null pointer saftey checks  
						
						
						
					 
					
						2014-11-21 15:25:57 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							66abdfccd4 
							
						 
					 
					
						
						
							
							create file and dirs before creating file  
						
						
						
					 
					
						2014-11-20 22:02:32 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							cf00f3fade 
							
						 
					 
					
						
						
							
							happy hanukkah  
						
						
						
					 
					
						2014-11-16 17:21:21 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							2b21bc13fc 
							
						 
					 
					
						
						
							
							Merge branch 'master' into development  
						
						
						
					 
					
						2014-11-16 00:34:44 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							ac4eabbd22 
							
						 
					 
					
						
						
							
							close cursor for database  
						
						
						
					 
					
						2014-11-16 00:34:16 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							e7a70a46e0 
							
						 
					 
					
						
						
							
							some mime and pgp fixes for file transfer  
						
						
						
					 
					
						2014-11-15 15:34:12 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							16847a30c8 
							
						 
					 
					
						
						
							
							support for pgp files  
						
						
						
					 
					
						2014-11-15 15:34:12 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							c7acfe85c3 
							
						 
					 
					
						
						
							
							progress for http images as well. fixed open button for sent files  
						
						
						
					 
					
						2014-11-15 15:34:12 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							dac12be53e 
							
						 
					 
					
						
						
							
							copy non local files to private storage first  
						
						
						
					 
					
						2014-11-15 15:34:11 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							02cbda68a7 
							
						 
					 
					
						
						
							
							bug fixes and various improvements for file transfer  
						
						
						
					 
					
						2014-11-15 15:34:11 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							7a90ca429b 
							
						 
					 
					
						
						
							
							basic arbitrary file transfer  
						
						
						
					 
					
						2014-11-15 15:34:11 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							9053f4aca0 
							
						 
					 
					
						
						
							
							Move a chunk of classes over to using JID objects  
						
						
						
					 
					
						2014-11-09 07:00:40 -05:00