Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5b1dda9148 
							
						 
					 
					
						
						
							
							deal with broken frameworks  
						
						
						
					 
					
						2015-08-16 14:55:40 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d7b3060fc8 
							
						 
					 
					
						
						
							
							catch broken base64 in avatars  
						
						
						
					 
					
						2015-08-16 14:55:24 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							51a2645349 
							
						 
					 
					
						
						
							
							synchronize packetCallbacks  
						
						
						
					 
					
						2015-08-16 12:12:22 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c082066118 
							
						 
					 
					
						
						
							
							catch null pointer in ScramSHA1 sasl  
						
						
						
					 
					
						2015-08-16 11:50:33 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ecac1e5943 
							
						 
					 
					
						
						
							
							Merge branch 'development'  
						
						
						
					 
					
						2015-08-15 19:12:51 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							6aec49f06d 
							
						 
					 
					
						
						
							
							Update license string with libraries  
						
						
						
					 
					
						2015-08-15 19:07:55 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							45d68c200e 
							
						 
					 
					
						
						
							
							Display error message if all contact keys purged  
						
						
						
					 
					
						2015-08-15 18:52:47 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1f34fb742c 
							
						 
					 
					
						
						
							
							Merge branch 'development'  
						
						
						
					 
					
						2015-08-15 14:26:37 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							32826ec29d 
							
						 
					 
					
						
						
							
							provide extra interface to close sockets.  fixes   #1330  
						
						
						
					 
					
						2015-08-15 14:14:33 +02:00 
						 
				 
			
				
					
						
							
							
								hlad 
							
						 
					 
					
						
						
						
						
							
						
						
							4539643f27 
							
						 
					 
					
						
						
							
							show HTTP upload availability on Edit account screen  
						
						
						
					 
					
						2015-08-14 22:24:05 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							dad90762b4 
							
						 
					 
					
						
						
							
							do not touch pictures that are already in the right format  
						
						... 
						
						
						
						fixed  #522  
					
						2015-08-11 16:50:00 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3677c6ec98 
							
						 
					 
					
						
						
							
							use same code that is used to open files for images  
						
						... 
						
						
						
						fixes  #1323  
					
						2015-08-11 15:24:06 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c0dcf4a55a 
							
						 
					 
					
						
						
							
							changed color of 'whispered' prefix  
						
						... 
						
						
						
						fixes  #1326  
					
						2015-08-11 15:13:17 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fd81491b05 
							
						 
					 
					
						
						
							
							put wake locks on out of band file transfers  
						
						
						
					 
					
						2015-08-10 19:48:36 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d30515a85a 
							
						 
					 
					
						
						
							
							report wrong file size in otr encrypted jingle file transfers to be compatible with conversations > 1.6  
						
						
						
					 
					
						2015-08-10 12:55:37 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b5e90850d8 
							
						 
					 
					
						
						
							
							provide more detailed error toasts for http file download  
						
						
						
					 
					
						2015-08-10 12:15:14 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b7f00ddac3 
							
						 
					 
					
						
						
							
							fixed image preview in notfications for images that arrived over jingle  
						
						
						
					 
					
						2015-08-08 17:19:40 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a6e00837af 
							
						 
					 
					
						
						
							
							decreased right hand side padding in contact keys  
						
						
						
					 
					
						2015-08-08 14:09:02 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8b9b74ff7e 
							
						 
					 
					
						
						
							
							renamed multi-end / axolotl to OMEMO  
						
						
						
					 
					
						2015-08-08 13:29:21 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							efdf3b6c1c 
							
						 
					 
					
						
						
							
							removed dead code  
						
						
						
					 
					
						2015-08-08 13:13:23 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cac577fa4e 
							
						 
					 
					
						
						
							
							don't request ack for iq stanzas before stream managment is initialized  
						
						... 
						
						
						
						fixes  #1322  
					
						2015-08-08 10:26:36 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							7437d0fe0c 
							
						 
					 
					
						
						
							
							Increase number of published prekeys for release  
						
						
						
					 
					
						2015-08-07 12:30:39 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							53ce5d223e 
							
						 
					 
					
						
						
							
							request server-ACKs for iq stanzas  
						
						
						
					 
					
						2015-08-06 20:48:55 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6694af8fca 
							
						 
					 
					
						
						
							
							fail old/invalid iq stanzas on bind  
						
						
						
					 
					
						2015-08-06 14:54:37 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5c0853f302 
							
						 
					 
					
						
						
							
							hide multi-end and otr encryption in conferences  
						
						
						
					 
					
						2015-08-06 13:09:53 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							34b22dea48 
							
						 
					 
					
						
						
							
							Improve TrustKeysActivity slider responsiveness  
						
						... 
						
						
						
						Slider used to skip back on drag-and-drop action. The switch doesn't
trigger explicit whole UI refreshes anymore, it now directly adjusts the
"done" button's locked status. 
						
					 
					
						2015-08-05 22:24:13 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a1c43d8fdf 
							
						 
					 
					
						
						
							
							added config.java variable to hide openpgp as an encryption method  
						
						
						
					 
					
						2015-08-05 18:52:34 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e10e9942de 
							
						 
					 
					
						
						
							
							changed text selection color  
						
						
						
					 
					
						2015-08-05 18:30:49 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c617cf6ef8 
							
						 
					 
					
						
						
							
							added Config.java varibale to lock account creation to specfic domain  
						
						
						
					 
					
						2015-08-03 22:58:17 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9b91d0bf75 
							
						 
					 
					
						
						
							
							sync translations with transifex  
						
						
						
					 
					
						2015-08-03 14:04:26 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a6bbe4d4ce 
							
						 
					 
					
						
						
							
							lets try jpeg for a while  
						
						
						
					 
					
						2015-08-01 23:37:41 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2bf30bb296 
							
						 
					 
					
						
						
							
							temporarily renamed new encryption method to 'Multi-End' until a better name has been found  
						
						
						
					 
					
						2015-08-01 23:36:59 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5529337da3 
							
						 
					 
					
						
						
							
							use content-type in http slot request and stick with during upload  
						
						
						
					 
					
						2015-08-01 22:37:17 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f9dec7cf86 
							
						 
					 
					
						
						
							
							fixed calculated file size in http slot request  
						
						
						
					 
					
						2015-08-01 22:23:58 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							6cd9383e53 
							
						 
					 
					
						
						
							
							Let UNTRUSTED/UNDECIDED keys become INACTIVE  
						
						
						
					 
					
						2015-08-01 18:30:11 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							60cd307f73 
							
						 
					 
					
						
						
							
							enable axolotl encryption for jingle supported file transfers  
						
						
						
					 
					
						2015-08-01 01:19:16 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							6059b96456 
							
						 
					 
					
						
						
							
							Provide process function for key transport message  
						
						
						
					 
					
						2015-07-31 23:28:09 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							909f761ca1 
							
						 
					 
					
						
						
							
							Refactor axolotl message processing workflow  
						
						... 
						
						
						
						XmppAxolotlMessage is now entirely responsible for handling encryption
and decryption of messages, only leveraging XmppAxolotlSession as a
packing/unpacking primitive for payload keys.
Removed pseudo-dead session generation code step from prepareMessage
function, as sessions have been created by invoking the
TrustKeysActivity for a while now.
Added prepareKeyTransportMessage function, which creates a message with
no payload. The key that is packed into the header keyElements can then
be used for other purposes (e.g. encrypted file transfer). 
						
					 
					
						2015-07-31 21:31:45 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							50b14434ee 
							
						 
					 
					
						
						
							
							Reformat code  
						
						
						
					 
					
						2015-07-31 21:31:45 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							5c421da1e1 
							
						 
					 
					
						
						
							
							Change to new wire protocol version  
						
						
						
					 
					
						2015-07-31 21:31:45 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							26ac7c9030 
							
						 
					 
					
						
						
							
							added missing carbon column message table create statement  
						
						... 
						
						
						
						fixes  #1310  
					
						2015-07-31 13:08:35 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							658919f239 
							
						 
					 
					
						
						
							
							improved 'next encryption' selection  
						
						
						
					 
					
						2015-07-31 00:52:46 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5191e4ce95 
							
						 
					 
					
						
						
							
							removed expert setting to 'force encryption'. merged certifcate and encryption settings into same category  
						
						
						
					 
					
						2015-07-31 00:51:30 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							74ab36fda2 
							
						 
					 
					
						
						
							
							Fix session logic: enforce same type of encryption  
						
						
						
					 
					
						2015-07-30 19:18:09 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1ed550b5c5 
							
						 
					 
					
						
						
							
							fixed some colors in message adapter  
						
						
						
					 
					
						2015-07-30 12:40:50 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							58d80f58be 
							
						 
					 
					
						
						
							
							use gcm for file encryption over http  
						
						
						
					 
					
						2015-07-29 23:45:37 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							b7c64cd19d 
							
						 
					 
					
						
						
							
							Reset lock color for non-axolotl messages  
						
						
						
					 
					
						2015-07-29 20:25:14 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							2b3bb02261 
							
						 
					 
					
						
						
							
							Highlight selected message's fingerprint in list  
						
						
						
					 
					
						2015-07-29 20:21:37 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							e07853ea62 
							
						 
					 
					
						
						
							
							Rerender message bubbles on encryption change  
						
						
						
					 
					
						2015-07-29 20:10:21 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							e6df4d81d2 
							
						 
					 
					
						
						
							
							Tag carbon messages in parser, adapt session logic  
						
						... 
						
						
						
						Messages sent from another device of the own account are now explicitly
tagged as carboned message. The session detection logic now uses this
tag to find "session borders". 
						
					 
					
						2015-07-29 16:41:58 +02:00