Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							461f2ffb16 
							
						 
					 
					
						
						
							
							basic pgp encrypted file transfer  
						
						
						
					 
					
						2014-05-06 21:34:30 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bf2d0d5596 
							
						 
					 
					
						
						
							
							smoother scrolling (first step)  
						
						
						
					 
					
						2014-04-25 16:24:56 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							e4f9a38c76 
							
						 
					 
					
						
						
							
							Some icon tweaks  
						
						... 
						
						
						
						Use Roboto Light, thinner lines between tiles, slightly smaller letters 
						
					 
					
						2014-04-13 21:13:37 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							132689376c 
							
						 
					 
					
						
						
							
							Added ellipsis tile for large conversations  
						
						... 
						
						
						
						For more than 4 members in a conversation, the fourth tile now contains
an ellipsis to indicate this 
						
					 
					
						2014-04-13 21:13:37 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							901ce085a7 
							
						 
					 
					
						
						
							
							Major Contact Picture code cleanup  
						
						... 
						
						
						
						Notifications now have pseudotransparent icons, icons are generated in
the correct size. 
						
					 
					
						2014-04-13 21:13:37 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7dfe4ae082 
							
						 
					 
					
						
						
							
							some code cleanup. added setting to auto accept files. socks5 connections are now threaded  
						
						
						
					 
					
						2014-04-13 18:09:40 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f57b669f83 
							
						 
					 
					
						
						
							
							Merge branch 'development' of  https://github.com/strb/Conversations  into strb-development  
						
						
						
					 
					
						2014-04-12 10:22:18 +02:00 
						 
				 
			
				
					
						
							
							
								andy 
							
						 
					 
					
						
						
						
						
							
						
						
							f3b07250dd 
							
						 
					 
					
						
						
							
							Added tiled MUC icons  
						
						... 
						
						
						
						Now, MUCs have icons with up to 4 tiles representing MUC members,
similar to the gmail app.
Some caveats:
As of now, no ordering is imposed on the members, we simply pick the
first (up to) 4 returned by the MucOptions object. This could be done
better, e.g. by picking more important members first (based on
affil/role), or even going so far as to order them by how recently they
sent a message in the MUC.
Also, the code generating the tiles is really messy right now (tons of
copy and paste). It seems to work though. I will clean this up soon. 
						
					 
					
						2014-04-12 03:47:05 +02:00 
						 
				 
			
				
					
						
							
							
								andy 
							
						 
					 
					
						
						
						
						
							
						
						
							c230733736 
							
						 
					 
					
						
						
							
							More Contact Picture refactors  
						
						... 
						
						
						
						Use polymorphism to avoid dynamic dispatch based on nulled parameters.
Next up: Prettier MUC icons 
						
					 
					
						2014-04-12 03:46:54 +02:00 
						 
				 
			
				
					
						
							
							
								andy 
							
						 
					 
					
						
						
						
						
							
						
						
							3d6f03e859 
							
						 
					 
					
						
						
							
							Refactor UIHelper to use getContactPicture  
						
						... 
						
						
						
						Normalize the interface, reduce code duplication 
						
					 
					
						2014-04-12 03:46:43 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							96be96f9f8 
							
						 
					 
					
						
						
							
							open latest conversation from notification  
						
						
						
					 
					
						2014-04-11 23:05:45 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							51100ab48b 
							
						 
					 
					
						
						
							
							failed messages get now marked inline  
						
						
						
					 
					
						2014-04-11 09:13:56 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ba0bedc5fa 
							
						 
					 
					
						
						
							
							changed behaviour of expecption handler to check if accounts are working before removing the stacktrace  
						
						
						
					 
					
						2014-04-10 13:19:58 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9fc7a1b980 
							
						 
					 
					
						
						
							
							added button to open images  
						
						
						
					 
					
						2014-04-06 15:28:19 +02:00 
						 
				 
			
				
					
						
							
							
								Rene Treffer 
							
						 
					 
					
						
						
						
						
							
						
						
							c82c6251b8 
							
						 
					 
					
						
						
							
							Switch to FULL_SYNC to make prosody happy  
						
						
						
					 
					
						2014-04-05 11:39:45 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							34bd79ac04 
							
						 
					 
					
						
						
							
							notify on incomming received carbon messages  
						
						
						
					 
					
						2014-04-04 17:58:53 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							caf214c212 
							
						 
					 
					
						
						
							
							fixing more notification f-ups  
						
						
						
					 
					
						2014-04-04 13:01:07 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bd9dba1a69 
							
						 
					 
					
						
						
							
							Merge branch 'compression' of  https://github.com/rtreffer/Conversations  into rtreffer-compression  
						
						
						
					 
					
						2014-04-03 23:50:48 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							91aeffae1b 
							
						 
					 
					
						
						
							
							possible fix for some weird notification bugs  
						
						
						
					 
					
						2014-04-03 23:50:34 +02:00 
						 
				 
			
				
					
						
							
							
								Rene Treffer 
							
						 
					 
					
						
						
						
						
							
						
						
							7db21136a3 
							
						 
					 
					
						
						
							
							Add support for users with empty name  
						
						
						
					 
					
						2014-04-03 18:37:48 +02:00 
						 
				 
			
				
					
						
							
							
								Rene Treffer 
							
						 
					 
					
						
						
						
						
							
						
						
							9502ff25dd 
							
						 
					 
					
						
						
							
							Add compression support  
						
						
						
					 
					
						2014-04-03 18:37:25 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2506ef82df 
							
						 
					 
					
						
						
							
							be compatible with openkeychain api v3  
						
						
						
					 
					
						2014-04-03 17:39:57 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e70c0cfffd 
							
						 
					 
					
						
						
							
							Merge pull request  #40  from rtreffer/minidns  
						
						... 
						
						
						
						Add ability to use a provided ipv4 address on connect 
						
					 
					
						2014-04-03 11:13:45 +02:00 
						 
				 
			
				
					
						
							
							
								Rene Treffer 
							
						 
					 
					
						
						
						
						
							
						
						
							eae4e5d518 
							
						 
					 
					
						
						
							
							Add ability to use a provided ipv4 address on connect  
						
						
						
					 
					
						2014-04-03 11:01:20 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							01925fb2cc 
							
						 
					 
					
						
						
							
							tryping to resolve the wake lock bug  
						
						
						
					 
					
						2014-04-03 10:41:21 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2b8dfc2bab 
							
						 
					 
					
						
						
							
							cleared up logging a little bit. no need for an entire stack trace at this point  
						
						
						
					 
					
						2014-04-03 10:12:50 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2efb97efa0 
							
						 
					 
					
						
						
							
							Merge pull request  #39  from rtreffer/minidns  
						
						... 
						
						
						
						Switch to a small DNS library for DNS resolving. 
						
					 
					
						2014-04-03 09:50:57 +02:00 
						 
				 
			
				
					
						
							
							
								Rene Treffer 
							
						 
					 
					
						
						
						
						
							
						
						
							ff88dc0eaa 
							
						 
					 
					
						
						
							
							Switch to a small DNS library for DNS resolving.  
						
						
						
					 
					
						2014-04-03 09:42:58 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							21be7bc160 
							
						 
					 
					
						
						
							
							added permenant notification when one or more accounts are unable to connect  
						
						
						
					 
					
						2014-04-03 09:21:45 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1fe49a0545 
							
						 
					 
					
						
						
							
							fixed digest-md5 auth to work with prosody as well. thank you Florian Schmaus  
						
						
						
					 
					
						2014-04-01 11:38:34 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							601e5ca33e 
							
						 
					 
					
						
						
							
							fixed   #30  - added support for digest-md5 - only works with Icewarp 11???git add src/?  
						
						
						
					 
					
						2014-03-31 15:22:27 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							aed5b01434 
							
						 
					 
					
						
						
							
							changed all them beautifull colors  
						
						
						
					 
					
						2014-03-31 11:11:17 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6bb7764d72 
							
						 
					 
					
						
						
							
							null pointer fix  
						
						
						
					 
					
						2014-03-31 09:45:39 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							38efb84690 
							
						 
					 
					
						
						
							
							treat dns timeouts as temporary. also increased timeout  
						
						
						
					 
					
						2014-03-28 19:00:01 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							268eae7813 
							
						 
					 
					
						
						
							
							fixed login issue with latest ejabberd  
						
						
						
					 
					
						2014-03-28 18:31:04 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a649310fe2 
							
						 
					 
					
						
						
							
							streamlined sasl code  
						
						
						
					 
					
						2014-03-28 14:48:11 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ea766d970f 
							
						 
					 
					
						
						
							
							crash reporter  
						
						
						
					 
					
						2014-03-27 16:09:23 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							592068e7cf 
							
						 
					 
					
						
						
							
							code cleanup  
						
						
						
					 
					
						2014-03-27 14:41:01 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8988873d77 
							
						 
					 
					
						
						
							
							more dns fixes. hopefully the last  
						
						
						
					 
					
						2014-03-27 14:31:55 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f99887d7ca 
							
						 
					 
					
						
						
							
							further dns improvements  
						
						
						
					 
					
						2014-03-27 11:03:10 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0c37abf1e9 
							
						 
					 
					
						
						
							
							made work around not being a work around any more  
						
						
						
					 
					
						2014-03-26 00:17:26 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							956b646e2a 
							
						 
					 
					
						
						
							
							more srv lookup fixes  
						
						
						
					 
					
						2014-03-25 18:12:27 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0b9e089ac6 
							
						 
					 
					
						
						
							
							using actual dns servers provided by the system  
						
						
						
					 
					
						2014-03-25 17:21:56 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1b3c288225 
							
						 
					 
					
						
						
							
							holding wake locks during onStartCommand  
						
						
						
					 
					
						2014-03-23 14:15:14 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ee1c9e611b 
							
						 
					 
					
						
						
							
							more otr fixes  
						
						
						
					 
					
						2014-03-21 23:09:14 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a9e34d3492 
							
						 
					 
					
						
						
							
							tryed to fix more otr bugs. new resource setting  
						
						
						
					 
					
						2014-03-21 22:14:52 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							079712060c 
							
						 
					 
					
						
						
							
							otr safety guard  
						
						
						
					 
					
						2014-03-21 21:25:28 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							36dccb9f77 
							
						 
					 
					
						
						
							
							fixed users profile picture  
						
						
						
					 
					
						2014-03-21 14:58:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6be2a08f19 
							
						 
					 
					
						
						
							
							otr messages are now ignored if conversations isnt 100% sure the message is ours  
						
						
						
					 
					
						2014-03-19 16:16:40 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							389d4db311 
							
						 
					 
					
						
						
							
							rename in muc fixed  
						
						
						
					 
					
						2014-03-19 15:05:01 +01:00