iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f8b662e7f8 
							
						 
					 
					
						
						
							
							muc tics for consistency  
						
						
						
					 
					
						2015-01-26 01:25:47 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							2a14a0d9b8 
							
						 
					 
					
						
						
							
							changed version code and version name to 1.0-beta2  
						
						
						
					 
					
						2015-01-26 00:50:06 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							91e85d2faf 
							
						 
					 
					
						
						
							
							adapt caps on whether or not message confirmation is on  
						
						
						
					 
					
						2015-01-26 00:48:56 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							94086bb9b7 
							
						 
					 
					
						
						
							
							don't put ejabberds status code muc messages into an actual conversation  
						
						
						
					 
					
						2015-01-26 00:26:16 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f0d428a56d 
							
						 
					 
					
						
						
							
							made connect time out more failsave  
						
						
						
					 
					
						2015-01-25 20:52:53 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4afdd6480a 
							
						 
					 
					
						
						
							
							Merge pull request  #930  from betheg/otr  
						
						... 
						
						
						
						otr: switch to the otr-state the partner alternate. 
						
					 
					
						2015-01-25 20:53:29 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1559144701 
							
						 
					 
					
						
						
							
							Merge pull request  #933  from betheg/mergeable  
						
						... 
						
						
						
						fix mergable() for /me command. 
						
					 
					
						2015-01-25 19:30:00 +01:00 
						 
				 
			
				
					
						
							
							
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							29331e49b9 
							
						 
					 
					
						
						
							
							fix mergable() for /me command.  
						
						
						
					 
					
						2015-01-25 16:58:06 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							82a74fabc9 
							
						 
					 
					
						
						
							
							set jingle file transfer to offer after iq offer has returned  
						
						
						
					 
					
						2015-01-25 16:32:59 +01:00 
						 
				 
			
				
					
						
							
							
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							7800647885 
							
						 
					 
					
						
						
							
							otr: switch to the otr-state the partner alternate.  
						
						... 
						
						
						
						should also fixed  #877  
						
					 
					
						2015-01-25 13:07:31 +01:00 
						 
				 
			
				
					
						
							
							
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							8041d23cb1 
							
						 
					 
					
						
						
							
							MessageParser: fix the regex for otr query messages.  
						
						
						
					 
					
						2015-01-24 16:19:58 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7769d305e6 
							
						 
					 
					
						
						
							
							Merge pull request  #924  from andersruneson/changeonlinecolor  
						
						... 
						
						
						
						Changed online color to green instead of primary 
						
					 
					
						2015-01-24 00:28:29 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							b9af38464e 
							
						 
					 
					
						
						
							
							fixed mam to work with muc  
						
						
						
					 
					
						2015-01-24 00:22:51 +01:00 
						 
				 
			
				
					
						
							
							
								Anders Sandblad 
							
						 
					 
					
						
						
						
						
							
						
						
							cbebd14dbd 
							
						 
					 
					
						
						
							
							Changed online color to green instead of primary  
						
						
						
					 
					
						2015-01-23 22:28:10 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							4e50098e31 
							
						 
					 
					
						
						
							
							show checkbox to hide offline contacts  
						
						
						
					 
					
						2015-01-21 17:24:02 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							2dc69eea68 
							
						 
					 
					
						
						
							
							fixed bug in find conference in database method  
						
						
						
					 
					
						2015-01-21 16:18:57 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							00c74503ab 
							
						 
					 
					
						
						
							
							deal with user entering full jids in join conference dialog  
						
						
						
					 
					
						2015-01-21 16:18:38 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							be9af442ef 
							
						 
					 
					
						
						
							
							always allow access to contact details. provide add button in contact details  
						
						
						
					 
					
						2015-01-21 15:31:40 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							764ef3c8cd 
							
						 
					 
					
						
						
							
							Add block/unblock to contact details menu  
						
						... 
						
						
						
						See #889  
						
					 
					
						2015-01-21 13:07:36 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							818c0e609c 
							
						 
					 
					
						
						
							
							Merge pull request  #908  from betheg/otr4j  
						
						... 
						
						
						
						otr4j: update to 0.22 
						
					 
					
						2015-01-21 11:48:42 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							e42e0f88e1 
							
						 
					 
					
						
						
							
							Add color / category to foreground notification  
						
						
						
					 
					
						2015-01-20 20:32:27 -05:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							7839438f51 
							
						 
					 
					
						
						
							
							changed message duplicate finder  
						
						
						
					 
					
						2015-01-20 22:54:58 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							6dc53c2b35 
							
						 
					 
					
						
						
							
							fixed missing image preview  
						
						
						
					 
					
						2015-01-20 22:54:26 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							04f4680582 
							
						 
					 
					
						
						
							
							fixed up button on v21 devices  
						
						
						
					 
					
						2015-01-20 22:53:45 +01:00 
						 
				 
			
				
					
						
							
							
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							fa7d748c3f 
							
						 
					 
					
						
						
							
							otr4j: update to 0.22  
						
						
						
					 
					
						2015-01-20 18:01:39 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							503237087f 
							
						 
					 
					
						
						
							
							Remove legacy SSL support  
						
						
						
					 
					
						2015-01-19 11:02:13 -05:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							1e607d7b1b 
							
						 
					 
					
						
						
							
							don't trim bodies  
						
						
						
					 
					
						2015-01-19 12:15:27 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							4cbf8120f5 
							
						 
					 
					
						
						
							
							fixed legacy translation of image received  
						
						
						
					 
					
						2015-01-19 12:14:30 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							e5dffcfb07 
							
						 
					 
					
						
						
							
							added changelog for 1.0  
						
						
						
					 
					
						2015-01-19 11:32:27 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							100ba6e7e7 
							
						 
					 
					
						
						
							
							check for deleted files when loading more messages from history  
						
						
						
					 
					
						2015-01-19 11:23:05 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							7af588c8b3 
							
						 
					 
					
						
						
							
							account for rounding errors when rescheduling wake up  
						
						
						
					 
					
						2015-01-19 11:17:27 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							fc2e458053 
							
						 
					 
					
						
						
							
							fixed bug when sharing files from google drive  
						
						
						
					 
					
						2015-01-18 20:27:16 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							149a6716b8 
							
						 
					 
					
						
						
							
							proper desc for offering and sending images in conversations overview  
						
						
						
					 
					
						2015-01-18 20:26:22 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							6756386eee 
							
						 
					 
					
						
						
							
							explain read marker  
						
						
						
					 
					
						2015-01-18 13:44:18 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							d58fadd05f 
							
						 
					 
					
						
						
							
							use same helper methods for images and files  
						
						
						
					 
					
						2015-01-18 13:00:57 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d453e5501b 
							
						 
					 
					
						
						
							
							Merge pull request  #899  from SamWhited/api21_notifications  
						
						... 
						
						
						
						Add some Android 21 notification features 
						
					 
					
						2015-01-18 11:58:11 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							78ac43cfa2 
							
						 
					 
					
						
						
							
							Merge pull request  #901  from kriztan/patch-2  
						
						... 
						
						
						
						Added new file type names for file transfers 
						
					 
					
						2015-01-18 11:57:34 +01:00 
						 
				 
			
				
					
						
							
							
								Christian S 
							
						 
					 
					
						
						
						
						
							
						
						
							ae16439bd6 
							
						 
					 
					
						
						
							
							Added new file type names for file transfers  
						
						... 
						
						
						
						- apk
- vcard 
						
					 
					
						2015-01-18 11:17:27 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							99989cd1d5 
							
						 
					 
					
						
						
							
							Add some Android 21 notification features  
						
						
						
					 
					
						2015-01-17 23:41:57 -05:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							83c806a774 
							
						 
					 
					
						
						
							
							Fix string substitutions with unknown filetypes  
						
						
						
					 
					
						2015-01-17 20:53:25 -05:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							dfc1cea882 
							
						 
					 
					
						
						
							
							Correct the download file string on notifications  
						
						... 
						
						
						
						Fixes  #896  
					
						2015-01-17 09:11:04 -05:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							edd58f19b4 
							
						 
					 
					
						
						
							
							Add download button on notification if applicable  
						
						
						
					 
					
						2015-01-16 01:10:01 -05:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							dc8b467cf6 
							
						 
					 
					
						
						
							
							sending read marker when resuming activity and conversation is open  
						
						
						
					 
					
						2015-01-15 16:32:24 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							c0993a9acb 
							
						 
					 
					
						
						
							
							show toast when avatar has been published -  fixed   #874  
						
						
						
					 
					
						2015-01-15 16:26:46 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							994c9495ba 
							
						 
					 
					
						
						
							
							added dedicated button to disable foreground service in perma notification  
						
						
						
					 
					
						2015-01-15 16:17:55 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							351e5d7065 
							
						 
					 
					
						
						
							
							fixed   #888  
						
						
						
					 
					
						2015-01-15 15:45:11 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a3f9f30a6c 
							
						 
					 
					
						
						
							
							Merge pull request  #885  from SamWhited/display-enter-key  
						
						... 
						
						
						
						Add option to swap enter/emoticon key 
						
					 
					
						2015-01-14 22:54:02 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							a6a9ed4877 
							
						 
					 
					
						
						
							
							handle muc nicks with white spaces.  fixed   #884  
						
						
						
					 
					
						2015-01-14 22:48:14 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							0a96bec3c1 
							
						 
					 
					
						
						
							
							Add option to swap enter/emoticon key  
						
						
						
					 
					
						2015-01-14 16:14:14 -05:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							548a585b2c 
							
						 
					 
					
						
						
							
							Harden the TLS connection cipher suites  
						
						
						
					 
					
						2015-01-14 13:10:15 -05:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							caf861d96f 
							
						 
					 
					
						
						
							
							Ensure type safety in Pebble notifications  
						
						... 
						
						
						
						Also use forward-compatible screen-on detection 
						
					 
					
						2015-01-13 23:18:35 -05:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							dd5101ff5c 
							
						 
					 
					
						
						
							
							catch bug in guessContentType  
						
						
						
					 
					
						2015-01-12 18:40:15 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8d3323e384 
							
						 
					 
					
						
						
							
							context menu for files and offered files.  fixed   #848   fixed   #849  
						
						
						
					 
					
						2015-01-12 16:42:20 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							77e4e1c2ac 
							
						 
					 
					
						
						
							
							reworked message preview / message meta information (ie file offered, received * file)  
						
						... 
						
						
						
						fixed  #837  
					
						2015-01-12 16:09:39 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							50c8065015 
							
						 
					 
					
						
						
							
							Merge pull request  #866  from SamWhited/xep0245  
						
						... 
						
						
						
						Add XEP-0245 (/me command) support 
						
					 
					
						2015-01-12 01:22:40 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							3c5224251c 
							
						 
					 
					
						
						
							
							Add XEP-0245 (/me command) support  
						
						
						
					 
					
						2015-01-11 18:32:00 -05:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ef6e4c5dd5 
							
						 
					 
					
						
						
							
							do not check image file size over http if accepted file size is 0  
						
						
						
					 
					
						2015-01-11 22:18:18 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b07b7519a6 
							
						 
					 
					
						
						
							
							keep proper image file extension  
						
						
						
					 
					
						2015-01-11 15:19:36 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							18eb187949 
							
						 
					 
					
						
						
							
							make room persistant when changing subject or other muc options  
						
						
						
					 
					
						2015-01-10 23:10:32 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							158f5dd17c 
							
						 
					 
					
						
						
							
							don't crash when selecting a conversation by uuid did not work  
						
						
						
					 
					
						2015-01-10 19:43:23 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c89fdec0b1 
							
						 
					 
					
						
						
							
							fixed regression in tablet ui  
						
						
						
					 
					
						2015-01-09 22:24:50 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							06eae476ee 
							
						 
					 
					
						
						
							
							Introduced expert options to control enter-is-send  
						
						... 
						
						
						
						(default == off) 
						
					 
					
						2015-01-09 19:23:26 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0a48f777ac 
							
						 
					 
					
						
						
							
							code cleanup for jingle proxy discovery  
						
						
						
					 
					
						2015-01-09 14:42:58 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d9f88c4669 
							
						 
					 
					
						
						
							
							ensure that everyone is member before making a room private  
						
						
						
					 
					
						2015-01-09 13:28:01 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a9159568b9 
							
						 
					 
					
						
						
							
							allow for very basic muc configuration  
						
						
						
					 
					
						2015-01-08 21:29:26 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0fe193b027 
							
						 
					 
					
						
						
							
							code cleanup  
						
						
						
					 
					
						2015-01-08 14:45:44 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f8aa1bfec4 
							
						 
					 
					
						
						
							
							kick after ban  
						
						
						
					 
					
						2015-01-08 01:23:53 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							061de5205e 
							
						 
					 
					
						
						
							
							some clean ups for affiliation change context menu  
						
						
						
					 
					
						2015-01-08 00:23:26 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8d655f445a 
							
						 
					 
					
						
						
							
							more muc options  
						
						... 
						
						
						
						* show invite button only with admin privileges or on public conferences
* Offer to ban user in public conferences.
Thanks to @betheg for the awesome ground work for this 
						
					 
					
						2015-01-07 18:34:24 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0ad8796b44 
							
						 
					 
					
						
						
							
							fixed invites  
						
						
						
					 
					
						2015-01-07 16:45:44 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ef525fb10e 
							
						 
					 
					
						
						
							
							basic affiliation changes in muc  
						
						
						
					 
					
						2015-01-07 15:03:29 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							81e9afdf19 
							
						 
					 
					
						
						
							
							reset next encryption when archiving conversations  
						
						
						
					 
					
						2015-01-07 12:20:39 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a22c8c04d8 
							
						 
					 
					
						
						
							
							use copyonwritearraylist in for phone helper  
						
						
						
					 
					
						2015-01-07 01:01:15 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d502e57661 
							
						 
					 
					
						
						
							
							refactored UiHelper  
						
						
						
					 
					
						2015-01-07 00:59:42 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f02f510c18 
							
						 
					 
					
						
						
							
							fixed bug in new ping strategy  
						
						
						
					 
					
						2015-01-06 19:46:52 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							353f4e38bb 
							
						 
					 
					
						
						
							
							mark sent images as sent_received instead of sent  
						
						... 
						
						
						
						fixed  #842  
					
						2015-01-06 18:44:34 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							562699c745 
							
						 
					 
					
						
						
							
							run invalidateOptionsMenu on uiThread  
						
						
						
					 
					
						2015-01-06 18:26:14 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4b0043ba91 
							
						 
					 
					
						
						
							
							fixed potential NPEs in ShareWithActivity  
						
						
						
					 
					
						2015-01-06 18:25:31 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fdcbdfdc05 
							
						 
					 
					
						
						
							
							added debug info + possible platform bug work arounds to message adapter  
						
						
						
					 
					
						2015-01-05 18:46:42 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0c51245ff5 
							
						 
					 
					
						
						
							
							reworked ping scheduling strategy. very experimental  
						
						
						
					 
					
						2015-01-05 18:45:39 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							85f24c9106 
							
						 
					 
					
						
						
							
							avoid requesting blocklist after stream resumption  
						
						
						
					 
					
						2015-01-05 16:17:05 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2679824770 
							
						 
					 
					
						
						
							
							prevent QR code parser from crashing  fixed   #839  
						
						
						
					 
					
						2015-01-05 15:08:13 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bdb335e6b0 
							
						 
					 
					
						
						
							
							Show affiliation instead of role in MucDetails and offer 'advanced mode' to display role  
						
						
						
					 
					
						2015-01-05 15:06:39 +01:00 
						 
				 
			
				
					
						
							
							
								Olivier Mehani 
							
						 
					 
					
						
						
						
						
							
						
						
							f1ebece866 
							
						 
					 
					
						
						
							
							Send notification to Pebble on new message  
						
						... 
						
						
						
						This implements basic notifications to the Pebble through the app (using
an intent).  This simply hooks into NotificationService.notify().
This is pretty basic, but it works (I haven't tested to see how the
intent is received when the Pebble app is not around, though). More
fancy stuff could probably be added to avoid getting flooded, but the
Pebble app already does a good job a filtering notification (e.g.,
screen on or quiet times).
Signed-off-by: Olivier Mehani <shtrom@ssji.net> 
						
					 
					
						2015-01-05 23:06:46 +11:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2723c9ccb9 
							
						 
					 
					
						
						
							
							made checks for valid image extensions case insensitive  
						
						
						
					 
					
						2015-01-04 23:04:23 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3522243835 
							
						 
					 
					
						
						
							
							do not run mam queries in findOrCreateConversation() when isn't available  
						
						
						
					 
					
						2015-01-04 18:16:55 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e6cd92a663 
							
						 
					 
					
						
						
							
							added higher auto accept file sizes  
						
						... 
						
						
						
						also changed labeling to MiB and KiB 
						
					 
					
						2015-01-04 17:53:06 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0d6d09b7e9 
							
						 
					 
					
						
						
							
							code cleanup + logging of spoofed iq packets  
						
						
						
					 
					
						2015-01-04 15:40:09 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							88704ce5cd 
							
						 
					 
					
						
						
							
							Verify IQ responses  
						
						... 
						
						
						
						Fixes  #20 
Move fromServer/toServer to AbstractStanza 
					
						2015-01-04 08:28:13 -05:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							eb7e683403 
							
						 
					 
					
						
						
							
							Make IqPacket type an enum  
						
						
						
					 
					
						2015-01-04 08:20:30 -05:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5c190487bc 
							
						 
					 
					
						
						
							
							deal with prosodys muc namespace tagging of messages  
						
						
						
					 
					
						2015-01-04 12:37:22 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e32a927300 
							
						 
					 
					
						
						
							
							Use packet callbacks only for IqPackets. Removed unnecessary code  
						
						
						
					 
					
						2015-01-04 12:09:39 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f338d89753 
							
						 
					 
					
						
						
							
							no longer use ConcurrentHashMap in favor of synchronize on a final HashMap  
						
						
						
					 
					
						2015-01-04 00:14:40 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e89e54a04a 
							
						 
					 
					
						
						
							
							version bump to 0.10  
						
						
						
					 
					
						2015-01-03 19:11:27 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fc8bd64bfd 
							
						 
					 
					
						
						
							
							void messages getting reloaded through mam after clear history  
						
						
						
					 
					
						2015-01-03 18:22:26 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							be7de054be 
							
						 
					 
					
						
						
							
							record voice and attachment refactor  
						
						
						
					 
					
						2015-01-03 16:06:59 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							960b7343d3 
							
						 
					 
					
						
						
							
							disable / enable all accounts  
						
						
						
					 
					
						2015-01-03 13:36:48 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							521c289db1 
							
						 
					 
					
						
						
							
							update last presence only for messages  
						
						
						
					 
					
						2015-01-03 13:01:38 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8bda54d48c 
							
						 
					 
					
						
						
							
							code cleanup  
						
						
						
					 
					
						2015-01-03 00:47:22 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							969044b113 
							
						 
					 
					
						
						
							
							migrated change password into separate activity  
						
						
						
					 
					
						2015-01-03 00:11:02 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1988e244ef 
							
						 
					 
					
						
						
							
							some further otr improvements  
						
						
						
					 
					
						2015-01-02 15:14:06 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f58f27a1f7 
							
						 
					 
					
						
						
							
							click on dynamic tag to filter for that tag  
						
						
						
					 
					
						2015-01-02 14:47:08 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3df23a4f75 
							
						 
					 
					
						
						
							
							allow cancellation of waiting files  
						
						
						
					 
					
						2015-01-02 14:27:49 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bcd3be59ce 
							
						 
					 
					
						
						
							
							put Conversations into background mode earlier  
						
						
						
					 
					
						2015-01-02 12:04:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8d2f454479 
							
						 
					 
					
						
						
							
							prefer PLAIN over DIGEST-MD5  
						
						... 
						
						
						
						DIGEST-MD5 seems to be broken for a lot of cases (OpenFire)
switched priority of PLAIN to not cause any security errors 
						
					 
					
						2015-01-02 01:39:19 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3833e6dfef 
							
						 
					 
					
						
						
							
							improved OTR verification part one  
						
						
						
					 
					
						2015-01-02 01:21:14 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8f93f9c314 
							
						 
					 
					
						
						
							
							improved fromServer filter  
						
						
						
					 
					
						2014-12-30 09:36:00 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3c5d7d4f1b 
							
						 
					 
					
						
						
							
							refactor swithOverToTls stuff  
						
						
						
					 
					
						2014-12-30 01:17:11 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fb8737ed9f 
							
						 
					 
					
						
						
							
							fixed npe in block menu item  
						
						
						
					 
					
						2014-12-30 01:16:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							04de77261b 
							
						 
					 
					
						
						
							
							fixed   #818  
						
						
						
					 
					
						2014-12-30 01:13:35 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							b48bddb852 
							
						 
					 
					
						
						
							
							Fix typo in method name  
						
						
						
					 
					
						2014-12-29 14:21:20 -05:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							193d2645e6 
							
						 
					 
					
						
						
							
							code cleanup for change password stuff  
						
						
						
					 
					
						2014-12-25 22:28:19 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0c22a8d1c6 
							
						 
					 
					
						
						
							
							added callback to change account password to notify UI on success / failure  
						
						
						
					 
					
						2014-12-25 22:08:13 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							e4d9dca2fe 
							
						 
					 
					
						
						
							
							Add ability to change password on server  
						
						... 
						
						
						
						Fixes  #260  
					
						2014-12-25 21:38:55 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2081c1bef7 
							
						 
					 
					
						
						
							
							proper call to invalidateViews()  
						
						
						
					 
					
						2014-12-25 19:53:56 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ef1f72ea27 
							
						 
					 
					
						
						
							
							catch another exception in fingerprint generation  
						
						
						
					 
					
						2014-12-25 19:53:35 +01:00 
						 
				 
			
				
					
						
							
							
								pulser 
							
						 
					 
					
						
						
						
						
							
						
						
							3ada834839 
							
						 
					 
					
						
						
							
							Show server info option when blocking is unavailable  
						
						... 
						
						
						
						Current head of development branch doesn't show server information if
blocking is disabled. This is due to slightly wrong logic on an if
statement. This patch ensures only the blocking option is disabled when
blocking is not supported by the server, and that the feature remains
available. 
						
					 
					
						2014-12-24 20:54:56 +00:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							afbe727b17 
							
						 
					 
					
						
						
							
							Don't allow user to register domain only jids  
						
						
						
					 
					
						2014-12-23 17:35:36 -05:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							8a467e33dd 
							
						 
					 
					
						
						
							
							Don't show menu on create account screen  
						
						
						
					 
					
						2014-12-23 17:12:52 -05:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							d454788011 
							
						 
					 
					
						
						
							
							Remove old JID validator  
						
						
						
					 
					
						2014-12-23 13:23:13 -05:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							01107e31ae 
							
						 
					 
					
						
						
							
							Add more server compatibility info.  
						
						... 
						
						
						
						Hide server info behind a checkbox.
Add XEP-0352 support to the server info list
Add XEP-0237 to server info list
Add XEP-0352 support to the server info list
Add MaM and Blocking to the account XEPs list
Also add a toggle button to hide some of the list
Rebase on current codebase
Make MAM string more descriptive
Change show more button to checkbox menu item
Shorten `MAM (History)' to `MAM'
Order XEP list and hide all by default
Supress warning (which is wrong anyways)
Change `Show more' to `Show more info' 
						
					 
					
						2014-12-23 12:44:30 -05:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							d5f99560ff 
							
						 
					 
					
						
						
							
							made method private that is no longer required to be public  
						
						
						
					 
					
						2014-12-23 18:09:29 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							e152ed1e07 
							
						 
					 
					
						
						
							
							Simplify roster handling code  
						
						... 
						
						
						
						Merge result handling code into IqParser
Fixes  #20  
						
					 
					
						2014-12-22 12:53:31 -05:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							e1cb72b9ef 
							
						 
					 
					
						
						
							
							Fix NPEs in blocking code  
						
						
						
					 
					
						2014-12-22 11:24:08 -05: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 
							
						 
					 
					
						
						
						
						
							
						
						
							1517641713 
							
						 
					 
					
						
						
							
							get rid of special self presence object and incorporate that into roster  
						
						
						
					 
					
						2014-12-20 17:23:03 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							ce4848f742 
							
						 
					 
					
						
						
							
							more null checks for otr fingerprints  
						
						
						
					 
					
						2014-12-20 16:01:28 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							40335785aa 
							
						 
					 
					
						
						
							
							don't include empty fingerprints in list of otrfingerprints  
						
						
						
					 
					
						2014-12-20 15:21:03 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							6b047bed97 
							
						 
					 
					
						
						
							
							fixed another break continue bug  
						
						
						
					 
					
						2014-12-20 12:52:45 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							88f43643bf 
							
						 
					 
					
						
						
							
							inject ui callback into running mam query  
						
						
						
					 
					
						2014-12-20 12:52:08 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							627982df90 
							
						 
					 
					
						
						
							
							fixed   #755  
						
						
						
					 
					
						2014-12-19 13:40:16 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f00e168752 
							
						 
					 
					
						
						
							
							clean up conversation history after swtiching to a different conversation  
						
						
						
					 
					
						2014-12-17 21:05:47 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							de952cc959 
							
						 
					 
					
						
						
							
							show error if jid couldn't be parsed in new contact dialog  
						
						
						
					 
					
						2014-12-17 21:04:54 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							c30108eb17 
							
						 
					 
					
						
						
							
							Merge branch 'development' of  https://github.com/siacs/Conversations  into development  
						
						
						
					 
					
						2014-12-17 10:51:28 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							741a0c129d 
							
						 
					 
					
						
						
							
							made scroling smoother + bug fixes for history loading  
						
						
						
					 
					
						2014-12-17 10:50:51 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							80435eca5c 
							
						 
					 
					
						
						
							
							smoothed out scrolling a bit  
						
						
						
					 
					
						2014-12-17 09:32:51 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5603440a91 
							
						 
					 
					
						
						
							
							Merge pull request  #783  from SamWhited/quiet-hours  
						
						... 
						
						
						
						Update summary in TimePreference change listener 
						
					 
					
						2014-12-17 07:15:31 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							1a7ed4ed7c 
							
						 
					 
					
						
						
							
							properly detect images in share with  
						
						
						
					 
					
						2014-12-17 07:12:38 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							fd4cf499a2 
							
						 
					 
					
						
						
							
							Merge branch 'issue756' of  https://github.com/SamWhited/Conversations  into SamWhited-issue756  
						
						
						
					 
					
						2014-12-17 07:00:42 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							3f6638cb64 
							
						 
					 
					
						
						
							
							properly count mam messages  
						
						
						
					 
					
						2014-12-17 06:59:58 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							0b4987581f 
							
						 
					 
					
						
						
							
							Handle time comparisons using longs  
						
						
						
					 
					
						2014-12-16 18:03:16 -05:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							6659339eff 
							
						 
					 
					
						
						
							
							Allow sending of any filetype via intent  
						
						... 
						
						
						
						Fixes  #756  
					
						2014-12-15 22:31:55 -05:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							f9c783085d 
							
						 
					 
					
						
						
							
							Update summary in TimePreference change listener  
						
						... 
						
						
						
						Ensures the summary is updated even if we change the time preference
programatically; also allows other places to stop the summary from being
updated by setting a new listener. 
						
					 
					
						2014-12-15 17:46:32 -05:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							e2f50ab855 
							
						 
					 
					
						
						
							
							go through mam history page by page. load mam dynamically on scroll  
						
						
						
					 
					
						2014-12-15 23:06:29 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							03ca971e2e 
							
						 
					 
					
						
						
							
							Merge pull request  #782  from SamWhited/quiet-hours  
						
						... 
						
						
						
						Make some magic number constants final 
						
					 
					
						2014-12-15 19:28:21 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							ea61142d7e 
							
						 
					 
					
						
						
							
							Make some magic number constants final  
						
						
						
					 
					
						2014-12-15 11:39:18 -05:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							ab2187dbdf 
							
						 
					 
					
						
						
							
							fixed crashing on unparsed jids  
						
						
						
					 
					
						2014-12-15 17:36:16 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							183e31ade1 
							
						 
					 
					
						
						
							
							Merge branch 'quiet-hours' of  https://github.com/SamWhited/Conversations  into SamWhited-quiet-hours  
						
						
						
					 
					
						2014-12-15 17:35:29 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							e084266595 
							
						 
					 
					
						
						
							
							migrated more jid parsing to use getAttributeAsJid. added error logging  
						
						
						
					 
					
						2014-12-15 17:29:17 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							af0f8e87bb 
							
						 
					 
					
						
						
							
							Make silent notification when quiet hours are on  
						
						... 
						
						
						
						Notify, just don't play a sound or vibrate
Also make the Java annoyingly verbose... I can't help myself... ahh! 
						
					 
					
						2014-12-15 11:23:50 -05:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							25d8546ae8 
							
						 
					 
					
						
						
							
							Merge branch 'quiet-hours' of  https://github.com/SamWhited/Conversations  into SamWhited-quiet-hours  
						
						
						
					 
					
						2014-12-15 17:16:49 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							2bd4621245 
							
						 
					 
					
						
						
							
							fixed history deletion.  fixed   #780  
						
						
						
					 
					
						2014-12-15 17:14:27 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							209e62d68b 
							
						 
					 
					
						
						
							
							avoid npe on weird platform bugs  
						
						
						
					 
					
						2014-12-15 16:55:38 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f8a496a5f1 
							
						 
					 
					
						
						
							
							run mam queries only when online  
						
						
						
					 
					
						2014-12-14 23:23:56 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							a6d4b0aec5 
							
						 
					 
					
						
						
							
							Add quiet hours feature  
						
						
						
					 
					
						2014-12-14 15:07:41 -05:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							5cbae25808 
							
						 
					 
					
						
						
							
							more patches for dns helper  
						
						
						
					 
					
						2014-12-14 19:02:29 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							50410dad33 
							
						 
					 
					
						
						
							
							possible dns fixes  
						
						
						
					 
					
						2014-12-14 18:31:52 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							de06cb38d1 
							
						 
					 
					
						
						
							
							refactored the way certain messages are being found within a conversation  
						
						
						
					 
					
						2014-12-14 18:10:46 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							fc293aaede 
							
						 
					 
					
						
						
							
							avoiding concurrent modification  
						
						
						
					 
					
						2014-12-13 22:17:27 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							6148f04d7b 
							
						 
					 
					
						
						
							
							fixed regression  
						
						
						
					 
					
						2014-12-13 20:05:46 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							899802646c 
							
						 
					 
					
						
						
							
							reverse through mam history when loading larger chuncks  
						
						
						
					 
					
						2014-12-13 15:32:11 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							02a89f4ce2 
							
						 
					 
					
						
						
							
							Merge branch 'feature/mam' into development  
						
						... 
						
						
						
						Conflicts:
	src/main/java/eu/siacs/conversations/services/XmppConnectionService.java 
						
					 
					
						2014-12-13 13:55:24 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							2368ba518d 
							
						 
					 
					
						
						
							
							refactored phone contacts merger  
						
						
						
					 
					
						2014-12-13 13:52:57 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							b523518e4b 
							
						 
					 
					
						
						
							
							various mam improvments  
						
						
						
					 
					
						2014-12-13 12:25:52 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f2510ae9f6 
							
						 
					 
					
						
						
							
							mark otr messages as no-store for mam  
						
						
						
					 
					
						2014-12-10 14:08:06 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							1dcdc79a71 
							
						 
					 
					
						
						
							
							changed lastMessageReceived into lastMessageTransmitted to account for sent messages as well. (will trigger on sm ack)  
						
						
						
					 
					
						2014-12-10 14:08:06 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							ccdb0fd971 
							
						 
					 
					
						
						
							
							save server id from mam messages. check for dups before adding mam  
						
						
						
					 
					
						2014-12-10 14:08:06 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							0ab530932a 
							
						 
					 
					
						
						
							
							added max history age (default 1w). automatically sort newly added mam messages  
						
						
						
					 
					
						2014-12-10 14:08:06 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							4a94389f05 
							
						 
					 
					
						
						
							
							very basic mam support  
						
						
						
					 
					
						2014-12-10 14:08:06 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							34558cc277 
							
						 
					 
					
						
						
							
							store last message received date in conversation  
						
						
						
					 
					
						2014-12-10 14:08:06 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							2b958e51df 
							
						 
					 
					
						
						
							
							removed unnecessary otr error response  
						
						
						
					 
					
						2014-12-10 14:07:56 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							05d1f46c15 
							
						 
					 
					
						
						
							
							recreate activity after theme has changed.  fixed   #764  
						
						
						
					 
					
						2014-12-09 20:22:21 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							78370094e9 
							
						 
					 
					
						
						
							
							cleanup: removed unused emoticon parsing  
						
						
						
					 
					
						2014-12-09 14:21:35 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							9d52f62767 
							
						 
					 
					
						
						
							
							cleanup: removed stream compression  
						
						
						
					 
					
						2014-12-09 14:14:15 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							5acd471880 
							
						 
					 
					
						
						
							
							version bump to 0.9.3  
						
						
						
					 
					
						2014-12-07 21:42:50 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							490f40b196 
							
						 
					 
					
						
						
							
							possible work around for some weird - possibly sdk - bugs  
						
						
						
					 
					
						2014-12-07 21:14:13 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							9c9e22c020 
							
						 
					 
					
						
						
							
							fixed digest-md5  
						
						
						
					 
					
						2014-12-04 12:33:56 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							2274c38726 
							
						 
					 
					
						
						
							
							close cursors after querying phone db  
						
						
						
					 
					
						2014-12-03 23:29:35 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							e623e28487 
							
						 
					 
					
						
						
							
							fixed   #651  
						
						
						
					 
					
						2014-12-03 17:05:37 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							46e319b241 
							
						 
					 
					
						
						
							
							more safety checks for listener counts  
						
						
						
					 
					
						2014-12-03 14:55:09 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							a38005ec89 
							
						 
					 
					
						
						
							
							fixed   #544  
						
						
						
					 
					
						2014-12-03 12:33:32 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							9e97529b3d 
							
						 
					 
					
						
						
							
							version bump to 0.9.2  
						
						
						
					 
					
						2014-12-03 11:18:49 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							685f405154 
							
						 
					 
					
						
						
							
							display proper error in edit account details if jid is invalid  
						
						
						
					 
					
						2014-12-03 10:52:55 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							8f62d95e1f 
							
						 
					 
					
						
						
							
							further npe checks  
						
						
						
					 
					
						2014-12-03 10:45:47 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							aaeba697bd 
							
						 
					 
					
						
						
							
							refactored the message adapter a bit  
						
						
						
					 
					
						2014-12-03 10:35:30 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							be358b77d6 
							
						 
					 
					
						
						
							
							set nick and autojoin=true for new bookmarks  
						
						
						
					 
					
						2014-12-03 10:34:05 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							c273637156 
							
						 
					 
					
						
						
							
							made muc parser more compatible with legacy mucs?! (whatever that is exactly)  
						
						
						
					 
					
						2014-12-03 01:46:26 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							feec659b08 
							
						 
					 
					
						
						
							
							Make sure SASL tokenizer strips strings  
						
						... 
						
						
						
						Fix DIGEST-MD5 auth (make sure we're not splitting on BASE64 `==') 
						
					 
					
						2014-12-02 19:33:41 -05:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							46b2760069 
							
						 
					 
					
						
						
							
							worked around concurrent modification exception  
						
						
						
					 
					
						2014-12-03 00:54:07 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							4a80914603 
							
						 
					 
					
						
						
							
							fixed another npe in hasBookmark  
						
						
						
					 
					
						2014-12-03 00:18:07 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							138345c5bf 
							
						 
					 
					
						
						
							
							Merge pull request  #740  from SamWhited/jidrpfix  
						
						... 
						
						
						
						Fix RFC 6122 implementation 
						
					 
					
						2014-12-03 00:12:36 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							eb0f8c08bd 
							
						 
					 
					
						
						
							
							safety net in joinMuc  
						
						
						
					 
					
						2014-12-03 00:06:57 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							39a3f372dd 
							
						 
					 
					
						
						
							
							clean up getProposedNick  
						
						
						
					 
					
						2014-12-03 00:06:57 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							9152e1ac95 
							
						 
					 
					
						
						
							
							fixed potential npes in message parser  
						
						
						
					 
					
						2014-12-03 00:06:57 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							241de062da 
							
						 
					 
					
						
						
							
							cleaned up avatar / tile creation  
						
						
						
					 
					
						2014-12-03 00:06:57 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							29a7828c5f 
							
						 
					 
					
						
						
							
							Allow JIDs such as "example.net/@"  
						
						
						
					 
					
						2014-12-02 10:17:50 -05:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							4f9dd82457 
							
						 
					 
					
						
						
							
							"example.net/@/" should be a valid JID.  
						
						... 
						
						
						
						Retab JID file 
						
					 
					
						2014-12-02 10:09:31 -05:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							3fc834c067 
							
						 
					 
					
						
						
							
							Fix RFC 6122 implementation  
						
						... 
						
						
						
						JID resourceparts should be able to contain "@" and "/" characters 
						
					 
					
						2014-12-02 09:16:09 -05:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							9dd445a507 
							
						 
					 
					
						
						
							
							fixed   #728  
						
						
						
					 
					
						2014-12-01 12:33:57 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							6a429d9939 
							
						 
					 
					
						
						
							
							bumped cap version as well  
						
						
						
					 
					
						2014-12-01 11:25:47 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							8d306ac64f 
							
						 
					 
					
						
						
							
							clear encrypted messages on reinit  
						
						
						
					 
					
						2014-12-01 11:18:55 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							96bbd16ca5 
							
						 
					 
					
						
						
							
							worked around rare npe  
						
						
						
					 
					
						2014-12-01 10:58:06 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							5992d4ac00 
							
						 
					 
					
						
						
							
							fixed npe if roster jid couldnt be parsed  
						
						
						
					 
					
						2014-12-01 10:25:36 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							a4b4c13c66 
							
						 
					 
					
						
						
							
							do not query service info from main server again  
						
						
						
					 
					
						2014-12-01 09:48:30 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							57fd763066 
							
						 
					 
					
						
						
							
							don't request fragment before updating  
						
						
						
					 
					
						2014-11-30 22:27:11 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							52a43db6d6 
							
						 
					 
					
						
						
							
							Merge pull request  #721  from SamWhited/warning_fixes  
						
						... 
						
						
						
						Warning "fixes" 
						
					 
					
						2014-11-29 19:14:13 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							d98486d1ca 
							
						 
					 
					
						
						
							
							fixed npe for broken bookmarks  
						
						
						
					 
					
						2014-11-29 19:09:28 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							afc673bb15 
							
						 
					 
					
						
						
							
							Misc. "fixes" to correct warnings.  
						
						
						
					 
					
						2014-11-29 07:50:59 -05:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							1ff9293ee1 
							
						 
					 
					
						
						
							
							fix for concurrency issue  
						
						
						
					 
					
						2014-11-29 13:09:56 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							7ba41c6a8e 
							
						 
					 
					
						
						
							
							fixed npe.  fixed   #717  
						
						
						
					 
					
						2014-11-27 10:30:06 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							2f02d8d398 
							
						 
					 
					
						
						
							
							create conversation with bare jid  
						
						
						
					 
					
						2014-11-27 10:26:53 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							0b8032dbd6 
							
						 
					 
					
						
						
							
							use getAttributeAsJid method  
						
						
						
					 
					
						2014-11-27 10:26:34 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7a75a8bc5a 
							
						 
					 
					
						
						
							
							Merge pull request  #713  from betheg/muc  
						
						... 
						
						
						
						MUC: do not add yourself to the muc user list. 
						
					 
					
						2014-11-24 11:53:28 +01:00 
						 
				 
			
				
					
						
							
							
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							31b539daf7 
							
						 
					 
					
						
						
							
							MUC: option to set/delete bookmark in conference details.  
						
						
						
					 
					
						2014-11-23 21:37:45 +01:00 
						 
				 
			
				
					
						
							
							
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							dbe8280662 
							
						 
					 
					
						
						
							
							add an listener for the muc roster update.  
						
						... 
						
						
						
						this is for the ConferenceDetailsActivity to show
precence updates immediately. 
						
					 
					
						2014-11-23 15:19:44 +01:00 
						 
				 
			
				
					
						
							
							
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							bdfdc5fb10 
							
						 
					 
					
						
						
							
							MUC: do not add yourself to the muc user list.  
						
						
						
					 
					
						2014-11-23 15:19:07 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							28fefad834 
							
						 
					 
					
						
						
							
							work around to not confuse irc transport with real conference servers  
						
						
						
					 
					
						2014-11-21 20:34:19 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							36f8a31d7d 
							
						 
					 
					
						
						
							
							Merge pull request  #706  from betheg/unused_imports  
						
						... 
						
						
						
						remove unused imports. 
						
					 
					
						2014-11-21 20:03:46 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							81a1a48b8d 
							
						 
					 
					
						
						
							
							update action bar with conversations updates as well  
						
						
						
					 
					
						2014-11-21 20:02:13 +01:00 
						 
				 
			
				
					
						
							
							
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							febbefefa5 
							
						 
					 
					
						
						
							
							MUC: set from when join muc.  
						
						
						
					 
					
						2014-11-21 19:37:50 +01:00 
						 
				 
			
				
					
						
							
							
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							dc0dba3faf 
							
						 
					 
					
						
						
							
							remove unused imports.  
						
						
						
					 
					
						2014-11-21 19:17:27 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							424de3ea3a 
							
						 
					 
					
						
						
							
							move task to back and not finish when hitting back button  
						
						
						
					 
					
						2014-11-21 18:57:27 +01:00 
						 
				 
			
				
					
						
							
							
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							44faec7051 
							
						 
					 
					
						
						
							
							STATUS_CODE_SELF_PRESENCE is not set in all case.  
						
						
						
					 
					
						2014-11-21 16:14:56 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							888475d4fe 
							
						 
					 
					
						
						
							
							additional null pointer saftey checks  
						
						
						
					 
					
						2014-11-21 15:25:57 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							de0b36fc78 
							
						 
					 
					
						
						
							
							verify contacts key only on initiating side of smp  
						
						
						
					 
					
						2014-11-21 13:42:25 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							92ad4cb736 
							
						 
					 
					
						
						
							
							changed listener timing and cache clearing after muc presences  
						
						
						
					 
					
						2014-11-20 22:44:31 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							66abdfccd4 
							
						 
					 
					
						
						
							
							create file and dirs before creating file  
						
						
						
					 
					
						2014-11-20 22:02:32 +01:00 
						 
				 
			
				
					
						
							
							
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							3e3767cb06 
							
						 
					 
					
						
						
							
							change status codes string 'number' to a better readable constant.  
						
						
						
					 
					
						2014-11-20 21:37:56 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							a207240881 
							
						 
					 
					
						
						
							
							fixed potential NPEs  
						
						
						
					 
					
						2014-11-20 18:42:47 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							a142dcc263 
							
						 
					 
					
						
						
							
							import fixes  
						
						
						
					 
					
						2014-11-20 18:33:04 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							8b10ea676c 
							
						 
					 
					
						
						
							
							Merge branch 'development' of  https://github.com/siacs/Conversations  into development  
						
						
						
					 
					
						2014-11-20 18:20:45 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							0ad6d0616f 
							
						 
					 
					
						
						
							
							brought ad hoc conferences back.  fixed   #688   fixed   #367  
						
						
						
					 
					
						2014-11-20 18:20:42 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							73d184352e 
							
						 
					 
					
						
						
							
							Remove broken / unused imports  
						
						
						
					 
					
						2014-11-19 14:57:23 -05:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							e9948f6b84 
							
						 
					 
					
						
						
							
							sent read marker to full jid  
						
						
						
					 
					
						2014-11-19 17:40:42 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							cbf42ee12c 
							
						 
					 
					
						
						
							
							some saftey checks before registering listeners in XmppActivity  
						
						
						
					 
					
						2014-11-19 17:31:28 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							66087cb360 
							
						 
					 
					
						
						
							
							put error notification into notification service  
						
						
						
					 
					
						2014-11-18 15:26:28 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							1122e084a0 
							
						 
					 
					
						
						
							
							simplified message merge condition  
						
						
						
					 
					
						2014-11-18 14:49:49 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							10bf2b77a8 
							
						 
					 
					
						
						
							
							synchronized message list in conversation fragment  
						
						
						
					 
					
						2014-11-18 14:43:15 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							dcebc120ac 
							
						 
					 
					
						
						
							
							show dynamic tags in contacts activity as well  
						
						
						
					 
					
						2014-11-18 14:24:06 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							ab832bcff7 
							
						 
					 
					
						
						
							
							properly remove conversations context menu  
						
						
						
					 
					
						2014-11-18 13:51:04 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							d29c861d03 
							
						 
					 
					
						
						
							
							disabled broken conversations context menu  
						
						
						
					 
					
						2014-11-18 03:12:51 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							018a0c7978 
							
						 
					 
					
						
						
							
							better usage of synchronized in some places  
						
						
						
					 
					
						2014-11-18 03:10:59 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							090e6ecf09 
							
						 
					 
					
						
						
							
							better exception handling in XmppConnection.connect. (never return without throwing exception. use finally to release wake lock. use status.server_not_found instead of status.offline when necessary  
						
						
						
					 
					
						2014-11-18 01:48:16 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							240d2d68c8 
							
						 
					 
					
						
						
							
							context menu for conversations.  fixed   #630  
						
						
						
					 
					
						2014-11-18 00:07:27 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							86241a260a 
							
						 
					 
					
						
						
							
							clear avatar cache with new roster push from server  
						
						
						
					 
					
						2014-11-17 21:28:16 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							abbadcb58b 
							
						 
					 
					
						
						
							
							avoided some null pointers  
						
						
						
					 
					
						2014-11-17 20:45:00 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f41c3eee04 
							
						 
					 
					
						
						
							
							context menu for muc participants + refactor trueCounterpart to use Jid class  
						
						
						
					 
					
						2014-11-17 20:02:46 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							283d5058e5 
							
						 
					 
					
						
						
							
							synchronized around cache clear in avatar service  
						
						
						
					 
					
						2014-11-17 20:01:56 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							b6d8977237 
							
						 
					 
					
						
						
							
							Use `Locale.US' for string comparisons in search  
						
						
						
					 
					
						2014-11-17 12:19:45 -05:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							8865cc406c 
							
						 
					 
					
						
						
							
							trim search before searching  
						
						
						
					 
					
						2014-11-17 17:31:26 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							1a5af45afb 
							
						 
					 
					
						
						
							
							Merge branch 'development' of  https://github.com/siacs/Conversations  into development  
						
						
						
					 
					
						2014-11-17 17:24:56 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							252c7e68d6 
							
						 
					 
					
						
						
							
							split search keywords by whitespaces and imply AND operatior  
						
						
						
					 
					
						2014-11-17 17:24:33 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							55957a77b3 
							
						 
					 
					
						
						
							
							Fix linter suppression  
						
						
						
					 
					
						2014-11-17 09:19:11 -05:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							967cd922e1 
							
						 
					 
					
						
						
							
							highlight muc members by touching their name in muc details.  fixed   #503  
						
						
						
					 
					
						2014-11-17 01:54:01 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							2036c58cd7 
							
						 
					 
					
						
						
							
							made tags searchable  
						
						
						
					 
					
						2014-11-16 23:58:30 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							8c4236b01b 
							
						 
					 
					
						
						
							
							fixed regression of xmpp uris not working  
						
						
						
					 
					
						2014-11-16 22:23:42 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							155b607f4d 
							
						 
					 
					
						
						
							
							Merge pull request  #673  from SamWhited/development  
						
						... 
						
						
						
						Fix fetching accounts by JIDs 
						
					 
					
						2014-11-16 17:35:59 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							cf00f3fade 
							
						 
					 
					
						
						
							
							happy hanukkah  
						
						
						
					 
					
						2014-11-16 17:21:21 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							5765a91db6 
							
						 
					 
					
						
						
							
							Fix fetching accounts by JIDs  
						
						... 
						
						
						
						Fixes a crash when publishing an avatar 
						
					 
					
						2014-11-16 10:04:45 -05:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							84b2ce10b7 
							
						 
					 
					
						
						
							
							Merge branch 'development' of  https://github.com/siacs/Conversations  into development  
						
						
						
					 
					
						2014-11-16 12:28:21 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							ac8c2b7e62 
							
						 
					 
					
						
						
							
							show full time stamp in connection established field  
						
						
						
					 
					
						2014-11-16 12:11:14 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f18f3086af 
							
						 
					 
					
						
						
							
							better error checking in ssl switch over  
						
						
						
					 
					
						2014-11-16 12:00:53 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							cfdda5f8fd 
							
						 
					 
					
						
						
							
							Don't escape passwords in SASL  
						
						... 
						
						
						
						Fixes  #671  
					
						2014-11-15 21:11:14 -05:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							2067b9bd8d 
							
						 
					 
					
						
						
							
							made scan and show qr code more accessible in VerifyOtrActivity  
						
						
						
					 
					
						2014-11-16 02:10:29 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							88c3537b68 
							
						 
					 
					
						
						
							
							parse otr-fingerprint in qr codes and nfc. include otr fingerprint in shareable uri where ever possible  
						
						
						
					 
					
						2014-11-16 00:20:20 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0fb1772f18 
							
						 
					 
					
						
						
							
							Merge pull request  #669  from SamWhited/scramcaching  
						
						... 
						
						
						
						Cache SCRAM-SHA-1 keys for current session 
						
					 
					
						2014-11-15 21:02:13 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							5a634fdf47 
							
						 
					 
					
						
						
							
							small modifications for changing an account status in XmppConnection  
						
						
						
					 
					
						2014-11-15 20:54:28 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							a463f82e3b 
							
						 
					 
					
						
						
							
							Cache SCRAM-SHA-1 keys for current session  
						
						
						
					 
					
						2014-11-15 12:57:36 -05:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							69ab8a2adb 
							
						 
					 
					
						
						
							
							Merge pull request  #668  from SamWhited/auth-pinning  
						
						... 
						
						
						
						Auth mechanism pinning 
						
					 
					
						2014-11-15 17:44:51 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							17cec63c14 
							
						 
					 
					
						
						
							
							Set security error status on TLS cert mismatch  
						
						
						
					 
					
						2014-11-15 11:40:41 -05:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							d2388a5a7e 
							
						 
					 
					
						
						
							
							Remove extra status wrapper method  
						
						
						
					 
					
						2014-11-15 11:31:15 -05:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							251f4d6d7f 
							
						 
					 
					
						
						
							
							Add incompatible server status  
						
						
						
					 
					
						2014-11-15 11:29:58 -05:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							7ba9854c22 
							
						 
					 
					
						
						
							
							fixed some disco / carbon related bugs  
						
						
						
					 
					
						2014-11-15 17:24:06 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							c09d450db8 
							
						 
					 
					
						
						
							
							Add security error status  
						
						
						
					 
					
						2014-11-15 11:21:47 -05:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							d94b07c916 
							
						 
					 
					
						
						
							
							Make account status an enum  
						
						
						
					 
					
						2014-11-15 11:12:41 -05:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							847877f9d2 
							
						 
					 
					
						
						
							
							Add auth method pinning  
						
						
						
					 
					
						2014-11-15 10:01:08 -05:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							35bf13f5ef 
							
						 
					 
					
						
						
							
							Merge branch 'feature/file_transfer' into development  
						
						... 
						
						
						
						Conflicts:
	src/main/res/values/strings.xml 
						
					 
					
						2014-11-15 15:52:15 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							07b07115d6 
							
						 
					 
					
						
						
							
							Merge branch 'feature/foreground_service' into development  
						
						... 
						
						
						
						Conflicts:
	src/main/res/values/strings.xml 
						
					 
					
						2014-11-15 15:51:27 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							5b9c690c47 
							
						 
					 
					
						
						
							
							Merge branch 'feature/otr_verification' into development  
						
						
						
					 
					
						2014-11-15 15:50:35 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							bdc86bb8e3 
							
						 
					 
					
						
						
							
							added low priority and removed date in foreground noticfication  
						
						
						
					 
					
						2014-11-15 15:34:34 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							3c6b3506e3 
							
						 
					 
					
						
						
							
							turn on foreground service in expert settings  
						
						
						
					 
					
						2014-11-15 15:34:34 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							41f7848f2c 
							
						 
					 
					
						
						
							
							handled more error cases  
						
						
						
					 
					
						2014-11-15 15:34:12 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							ca2d86cf87 
							
						 
					 
					
						
						
							
							better cleanup after unsuccesful transfers  
						
						
						
					 
					
						2014-11-15 15:34:12 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							47d44448f3 
							
						 
					 
					
						
						
							
							fixed description in notifications and conversation overview  
						
						
						
					 
					
						2014-11-15 15:34:12 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							e0f012dba1 
							
						 
					 
					
						
						
							
							fixed resending for files as well  
						
						
						
					 
					
						2014-11-15 15:34:12 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							cc4f3702a8 
							
						 
					 
					
						
						
							
							made file transfers cancelable  
						
						
						
					 
					
						2014-11-15 15:34:12 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							4ab558715c 
							
						 
					 
					
						
						
							
							adepted conversationadapter to deal with files  
						
						
						
					 
					
						2014-11-15 15:34:12 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							af2922adea 
							
						 
					 
					
						
						
							
							progress for ibb transfers  
						
						
						
					 
					
						2014-11-15 15:34:12 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							4b5d6f5b4f 
							
						 
					 
					
						
						
							
							Improve auth error handling and state machine  
						
						
						
					 
					
						2014-11-15 08:49:00 -05:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							0e550789d3 
							
						 
					 
					
						
						
							
							Add SCRAM-SHA1 support  
						
						... 
						
						
						
						Factor out GS2 tokanization into own class
Add authentication exception class
Fixes  #71  
						
					 
					
						2014-11-14 18:00:12 -05:00 
						 
				 
			
				
					
						
							
							
								Kevin Rauwolf 
							
						 
					 
					
						
						
						
						
							
						
						
							2bb68bcbba 
							
						 
					 
					
						
						
							
							Added check for empty from on group chat packet  
						
						
						
					 
					
						2014-11-14 11:40:43 -08:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							3118340ade 
							
						 
					 
					
						
						
							
							fixed possible npe when loading null counterpart into message  
						
						
						
					 
					
						2014-11-14 19:49:44 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							17c2ed411d 
							
						 
					 
					
						
						
							
							made presences synchronized  
						
						
						
					 
					
						2014-11-13 14:44:41 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							2db569b20f 
							
						 
					 
					
						
						
							
							made presences synchronized  
						
						
						
					 
					
						2014-11-13 14:44:19 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							77ba68d61f 
							
						 
					 
					
						
						
							
							more npe checks in muc packet parser  
						
						
						
					 
					
						2014-11-13 14:27:27 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							e6a4fa031b 
							
						 
					 
					
						
						
							
							more npe checks in muc packet parser  
						
						
						
					 
					
						2014-11-13 14:27:10 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							88c8373553 
							
						 
					 
					
						
						
							
							Merge pull request  #656  from SamWhited/authrefactor  
						
						... 
						
						
						
						Refactor authentication code 
						
					 
					
						2014-11-12 23:01:18 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							2222483b42 
							
						 
					 
					
						
						
							
							Make sure we're storing the display JID as Unicode  
						
						
						
					 
					
						2014-11-12 16:19:16 -05:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							14cfb60952 
							
						 
					 
					
						
						
							
							Refactor authentication code  
						
						
						
					 
					
						2014-11-12 10:15:38 -05:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f1e2be4096 
							
						 
					 
					
						
						
							
							check if account is online before doing smp  
						
						
						
					 
					
						2014-11-12 12:45:59 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							52ca2e7391 
							
						 
					 
					
						
						
							
							Merge branch 'feature/otr_verification' of  https://github.com/siacs/Conversations  into feature/otr_verification  
						
						... 
						
						
						
						Conflicts:
	src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java 
						
					 
					
						2014-11-11 17:45:16 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							d1bf9a3f6d 
							
						 
					 
					
						
						
							
							use auto register for verify otr listeners  
						
						
						
					 
					
						2014-11-11 17:42:09 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							76f4cf1a73 
							
						 
					 
					
						
						
							
							small bug fix  
						
						
						
					 
					
						2014-11-11 17:40:51 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							e33fc26cbe 
							
						 
					 
					
						
						
							
							added snackbar to indicate smp. more error handling in verify activity  
						
						
						
					 
					
						2014-11-11 17:40:51 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							6cd2ff0d88 
							
						 
					 
					
						
						
							
							initial smp support  
						
						
						
					 
					
						2014-11-11 17:40:51 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							e555fe4b03 
							
						 
					 
					
						
						
							
							auto register/unregister listeners  
						
						
						
					 
					
						2014-11-11 17:39:28 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							fce78abb1c 
							
						 
					 
					
						
						
							
							temporarliy got rid of some insane work arounds in favor of some maybe less insane work arounds  
						
						
						
					 
					
						2014-11-11 00:16:43 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							8cb97f517f 
							
						 
					 
					
						
						
							
							small bug fix  
						
						
						
					 
					
						2014-11-10 23:47:04 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							dc98b3dbd5 
							
						 
					 
					
						
						
							
							added snackbar to indicate smp. more error handling in verify activity  
						
						
						
					 
					
						2014-11-10 22:03:23 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							8740b55d37 
							
						 
					 
					
						
						
							
							initial smp support  
						
						
						
					 
					
						2014-11-10 19:23:54 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							c8a6b05163 
							
						 
					 
					
						
						
							
							made Jid class parse otr session ids  
						
						
						
					 
					
						2014-11-10 11:37:31 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							89ee999e1b 
							
						 
					 
					
						
						
							
							more refactoring for presence selection. removed getTo, getFrom and getJid from Element  
						
						
						
					 
					
						2014-11-10 01:24:35 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							72068d1a26 
							
						 
					 
					
						
						
							
							fixed private messages  
						
						
						
					 
					
						2014-11-09 21:14:37 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							385bea0fe3 
							
						 
					 
					
						
						
							
							s/getResourcepart().isEmpty()/isBareJid()/  
						
						
						
					 
					
						2014-11-09 13:13:19 -05:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							56b4ac1751 
							
						 
					 
					
						
						
							
							use isBareJid instead of getResourcePart().isEmpty()  
						
						
						
					 
					
						2014-11-09 19:06:43 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							eb9e988361 
							
						 
					 
					
						
						
							
							fixed muc sender history for some cases (where the previous nick was a valid jid)  
						
						
						
					 
					
						2014-11-09 18:24:01 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							69ef17efc0 
							
						 
					 
					
						
						
							
							migrated some otr stuff to new jid classes  
						
						
						
					 
					
						2014-11-09 17:46:00 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							c310ada8b3 
							
						 
					 
					
						
						
							
							Merge branch 'development' of  https://github.com/siacs/Conversations  into development  
						
						
						
					 
					
						2014-11-09 17:05:20 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cb1a36da79 
							
						 
					 
					
						
						
							
							Merge pull request  #642  from SamWhited/accountgetjid  
						
						... 
						
						
						
						Rework `Account.getJid()' to return full JIDs 
						
					 
					
						2014-11-09 17:06:09 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							e9af0d4ca7 
							
						 
					 
					
						
						
							
							Merge branch 'master' into development  
						
						
						
					 
					
						2014-11-09 17:02:49 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							61f046a675 
							
						 
					 
					
						
						
							
							make avatar service not break on empty names  
						
						
						
					 
					
						2014-11-09 17:02:39 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							180a0e4408 
							
						 
					 
					
						
						
							
							Rework `Account.getJid()' to return full JIDs  
						
						... 
						
						
						
						Remove `Account.getFullJid()' 
						
					 
					
						2014-11-09 10:57:22 -05:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							ad6fef063b 
							
						 
					 
					
						
						
							
							fixed null pointer in message merger  
						
						
						
					 
					
						2014-11-09 16:47:31 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							377bd49ee8 
							
						 
					 
					
						
						
							
							refactored code to always contain full jid for counterpart  
						
						
						
					 
					
						2014-11-09 16:21:13 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							2b99b694eb 
							
						 
					 
					
						
						
							
							fixed full jid for account  
						
						
						
					 
					
						2014-11-09 16:20:36 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							87c4fd9050 
							
						 
					 
					
						
						
							
							return null if from ist not set in abstract stanza  
						
						
						
					 
					
						2014-11-09 16:18:53 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							53c7905631 
							
						 
					 
					
						
						
							
							Check for illegal arguments to the toASCII func  
						
						
						
					 
					
						2014-11-09 09:05:02 -05:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							7cfcf10f48 
							
						 
					 
					
						
						
							
							Fix contact highlighting in MUC  
						
						
						
					 
					
						2014-11-09 07:20:08 -05:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							fc594e9b73 
							
						 
					 
					
						
						
							
							Fix issue with IDN SRV records  
						
						
						
					 
					
						2014-11-09 07:00:40 -05:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							02db197a89 
							
						 
					 
					
						
						
							
							Fix crash on account creation  
						
						
						
					 
					
						2014-11-09 07:00:40 -05:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							cc34c60255 
							
						 
					 
					
						
						
							
							Don't crash on packets with no "from" specified  
						
						
						
					 
					
						2014-11-09 07:00:40 -05:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							1a3327f2b1 
							
						 
					 
					
						
						
							
							Create avatar's for JID's w/o localparts  
						
						
						
					 
					
						2014-11-09 07:00:40 -05:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							5ce0cd3802 
							
						 
					 
					
						
						
							
							Fields that we sync on should be final  
						
						
						
					 
					
						2014-11-09 07:00:40 -05:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							e49c2b14ed 
							
						 
					 
					
						
						
							
							Fix bug introduced by rebase  
						
						
						
					 
					
						2014-11-09 07:00:40 -05:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							778fb9de6c 
							
						 
					 
					
						
						
							
							Fix letter avatar selection in MUC  
						
						
						
					 
					
						2014-11-09 07:00:40 -05:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							efa4cec24d 
							
						 
					 
					
						
						
							
							More formatting fixes in MUC  
						
						
						
					 
					
						2014-11-09 07:00:40 -05:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							dd426ca6de 
							
						 
					 
					
						
						
							
							Format contact names in MUC properly  
						
						
						
					 
					
						2014-11-09 07:00:40 -05:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							1f5908b1d1 
							
						 
					 
					
						
						
							
							Fix JID parsing error  
						
						
						
					 
					
						2014-11-09 07:00:40 -05:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							9db624ec7b 
							
						 
					 
					
						
						
							
							It builds again!  
						
						
						
					 
					
						2014-11-09 07:00:40 -05:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							864f319500 
							
						 
					 
					
						
						
							
							Add a packet JID place I missed...  
						
						
						
					 
					
						2014-11-09 07:00:40 -05:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							f108fc5a5c 
							
						 
					 
					
						
						
							
							Update more files to use JID objects  
						
						
						
					 
					
						2014-11-09 07:00:40 -05:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							bf9207456e 
							
						 
					 
					
						
						
							
							Update another chunk of stuff to use JID objects  
						
						
						
					 
					
						2014-11-09 07:00:40 -05:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							f15900426d 
							
						 
					 
					
						
						
							
							Update more files to use JID objects  
						
						
						
					 
					
						2014-11-09 07:00:40 -05:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							9053f4aca0 
							
						 
					 
					
						
						
							
							Move a chunk of classes over to using JID objects  
						
						
						
					 
					
						2014-11-09 07:00:40 -05:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							a990861316 
							
						 
					 
					
						
						
							
							Use factories to generate JIDs  
						
						
						
					 
					
						2014-11-09 06:59:49 -05:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							a11878b139 
							
						 
					 
					
						
						
							
							Improve JID error handling  
						
						
						
					 
					
						2014-11-09 06:59:49 -05:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							8e23b6c272 
							
						 
					 
					
						
						
							
							Add first attempt at JID class  
						
						
						
					 
					
						2014-11-09 06:59:49 -05:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							589bf01545 
							
						 
					 
					
						
						
							
							version bump to 0.8.3 + changelog  
						
						
						
					 
					
						2014-11-09 11:08:09 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							4d7bee2e38 
							
						 
					 
					
						
						
							
							fixed   #634  
						
						
						
					 
					
						2014-11-09 10:51:54 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							acfbd44529 
							
						 
					 
					
						
						
							
							got rid of MTM and mRandom variable in favor of using a reference to service  
						
						
						
					 
					
						2014-11-09 10:50:45 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							047aaf5d4f 
							
						 
					 
					
						
						
							
							check if socket was null before doing ssl connect  
						
						
						
					 
					
						2014-11-08 20:52:02 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							ea657ece0d 
							
						 
					 
					
						
						
							
							update conversation fragment on every backend connect  
						
						
						
					 
					
						2014-11-08 20:51:27 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8a2f20b6ed 
							
						 
					 
					
						
						
							
							Merge pull request  #549  from emdete/p2  
						
						... 
						
						
						
						adjust api level wrapping 
						
					 
					
						2014-11-08 13:32:13 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							014f5a195b 
							
						 
					 
					
						
						
							
							bug fixes for the previous ui refactoring  
						
						
						
					 
					
						2014-11-07 21:49:31 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							e45d7bda38 
							
						 
					 
					
						
						
							
							UI code refactoring  
						
						
						
					 
					
						2014-11-07 15:38:59 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							e42b6d715b 
							
						 
					 
					
						
						
							
							fixed   #633  
						
						
						
					 
					
						2014-11-06 17:25:14 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							dace729c5b 
							
						 
					 
					
						
						
							
							don't show avatar on initial account creation  
						
						
						
					 
					
						2014-11-06 16:51:50 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							413623337b 
							
						 
					 
					
						
						
							
							version bump to 0.8.2  
						
						
						
					 
					
						2014-11-06 10:32:04 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							2253814519 
							
						 
					 
					
						
						
							
							fixed notifications for images  
						
						
						
					 
					
						2014-11-05 21:37:40 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							6a43bda4d7 
							
						 
					 
					
						
						
							
							fixed   #617  
						
						
						
					 
					
						2014-11-05 00:06:07 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0c94804813 
							
						 
					 
					
						
						
							
							Merge pull request  #626  from SamWhited/issue612  
						
						... 
						
						
						
						Add last seen info to the database 
						
					 
					
						2014-11-04 22:59:32 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							7d4e03cc9a 
							
						 
					 
					
						
						
							
							Merge branch 'development' of  https://github.com/siacs/Conversations  into development  
						
						
						
					 
					
						2014-11-04 22:56:36 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							96563aca52 
							
						 
					 
					
						
						
							
							Add last seen info to the database  
						
						... 
						
						
						
						Fixes  #612  
					
						2014-11-04 16:41:35 -05:00 
						 
				 
			
				
					
						
							
							
								M. Dietrich 
							
						 
					 
					
						
						
						
						
							
						
						
							e22d3b4946 
							
						 
					 
					
						
						
							
							adjust api level wrapping  
						
						
						
					 
					
						2014-11-04 20:05:45 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							88c0793694 
							
						 
					 
					
						
						
							
							link to account details when touching own avatar  
						
						
						
					 
					
						2014-11-04 18:52:29 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							f10dd428ba 
							
						 
					 
					
						
						
							
							Convert about dialog to activity  
						
						
						
					 
					
						2014-11-04 12:48:46 -05:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							8bf40308c8 
							
						 
					 
					
						
						
							
							Move AboutDialog to correct path  
						
						
						
					 
					
						2014-11-04 12:47:58 -05:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							ff10b094a0 
							
						 
					 
					
						
						
							
							clear avatar cache after nick name change  
						
						
						
					 
					
						2014-11-04 18:27:20 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ff22f93185 
							
						 
					 
					
						
						
							
							Merge pull request  #625  from SamWhited/linterfix  
						
						... 
						
						
						
						Make linter ignore properly checked API mismatch 
						
					 
					
						2014-11-04 17:59:26 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							b234b690c9 
							
						 
					 
					
						
						
							
							Make linter ignore properly checked API mismatch  
						
						
						
					 
					
						2014-11-04 11:52:47 -05:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							cd5a56e8e7 
							
						 
					 
					
						
						
							
							show avatar in editaccount  
						
						
						
					 
					
						2014-11-04 17:38:41 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							b824e55277 
							
						 
					 
					
						
						
							
							register nfc callback in every activity that provides a proper sharable uri  
						
						
						
					 
					
						2014-11-04 17:10:35 +01:00 
						 
				 
			
				
					
						
							
							
								M. Dietrich 
							
						 
					 
					
						
						
						
						
							
						
						
							2ce95b19a9 
							
						 
					 
					
						
						
							
							optimize code abit  
						
						
						
					 
					
						2014-11-04 13:32:44 +01:00 
						 
				 
			
				
					
						
							
							
								M. Dietrich 
							
						 
					 
					
						
						
						
						
							
						
						
							b6c20d9260 
							
						 
					 
					
						
						
							
							implement "correct" ndef parsing  
						
						
						
					 
					
						2014-11-04 13:32:37 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							b3582c970e 
							
						 
					 
					
						
						
							
							made qr code available from muc and contact details as well  
						
						
						
					 
					
						2014-11-04 12:15:14 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							12e2f0bdd7 
							
						 
					 
					
						
						
							
							added missing return statement. fixed api bug  
						
						
						
					 
					
						2014-11-04 11:04:05 +01:00 
						 
				 
			
				
					
						
							
							
								M. Dietrich 
							
						 
					 
					
						
						
						
						
							
						
						
							fb24bf98c9 
							
						 
					 
					
						
						
							
							be more OO  
						
						
						
					 
					
						2014-11-04 10:49:10 +01:00 
						 
				 
			
				
					
						
							
							
								M. Dietrich 
							
						 
					 
					
						
						
						
						
							
						
						
							32396b3bde 
							
						 
					 
					
						
						
							
							support pre JELLY_BEAN ndef  
						
						
						
					 
					
						2014-11-04 10:48:59 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							7a9327d960 
							
						 
					 
					
						
						
							
							fixed nfc. react to ?join uris. some refactoring. code cleanup. thanks to @emdete  
						
						
						
					 
					
						2014-11-03 23:47:49 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							d458919c8f 
							
						 
					 
					
						
						
							
							unfinishd qr code implemenation. thanks to @emdete  
						
						
						
					 
					
						2014-11-03 22:47:07 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							28a186cd6c 
							
						 
					 
					
						
						
							
							basic beam code / untested  
						
						
						
					 
					
						2014-11-03 20:55:46 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							4614ff343e 
							
						 
					 
					
						
						
							
							create file explicitly before downloading image  
						
						
						
					 
					
						2014-11-03 20:55:31 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							ec9c264cf7 
							
						 
					 
					
						
						
							
							more error handling for http connection  
						
						
						
					 
					
						2014-11-03 19:59:11 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							3e05ef77b1 
							
						 
					 
					
						
						
							
							version bump to 0.8.1  
						
						
						
					 
					
						2014-11-03 11:20:51 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							49920649db 
							
						 
					 
					
						
						
							
							always use exif helper  
						
						
						
					 
					
						2014-11-03 11:20:32 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							27f42dfb63 
							
						 
					 
					
						
						
							
							more error handling in xmppconnection  
						
						
						
					 
					
						2014-11-03 10:03:45 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							1ea2e7dc3b 
							
						 
					 
					
						
						
							
							fixed arrayoutofbounds + spelling  
						
						
						
					 
					
						2014-11-01 14:33:34 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							46f147a82c 
							
						 
					 
					
						
						
							
							Merge branch 'gradle' into development  
						
						... 
						
						
						
						Conflicts:
	.gitignore
	CHANGELOG.md
	README.md
	libs/MemorizingTrustManager
	libs/minidns
	libs/openpgp-api-lib 
						
					 
					
						2014-10-30 15:33:13 -04:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							281ce3105f 
							
						 
					 
					
						
						
							
							Make conversations the root project  
						
						
						
					 
					
						2014-10-22 15:47:11 -04:00