Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7917c19d18 
							
						 
					 
					
						
						
							
							broader exception catchers  
						
						
						
					 
					
						2016-08-30 13:15:00 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3685c8cd2a 
							
						 
					 
					
						
						
							
							use file provider for taking pictures  
						
						
						
					 
					
						2016-08-30 13:14:38 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d32cbcc70d 
							
						 
					 
					
						
						
							
							don't show up navigation in startConversation when there are no open conversations  
						
						
						
					 
					
						2016-08-30 13:13:06 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							af329eff46 
							
						 
					 
					
						
						
							
							add more logging to pgp engine  
						
						
						
					 
					
						2016-08-30 13:12:09 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2c187d0e7c 
							
						 
					 
					
						
						
							
							mark conversation as read when swiping a notification with quick reply away  
						
						
						
					 
					
						2016-08-27 15:25:37 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							caafd03130 
							
						 
					 
					
						
						
							
							don't automatically download files and avatars when datasaver is on  
						
						
						
					 
					
						2016-08-27 13:35:52 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3d5940cb76 
							
						 
					 
					
						
						
							
							bring back connectivity changed events on android n  
						
						
						
					 
					
						2016-08-27 12:15:25 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							78e962ce67 
							
						 
					 
					
						
						
							
							don't overwrite edited information in editaccount on rotate  
						
						
						
					 
					
						2016-08-26 21:48:14 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ea0e6d0619 
							
						 
					 
					
						
						
							
							don't set notification mode to background when on pause  
						
						
						
					 
					
						2016-08-26 21:13:33 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fd54dc5aff 
							
						 
					 
					
						
						
							
							wrap dynamic tags into multiple lines.  fixes   #2003  
						
						
						
					 
					
						2016-08-26 16:34:42 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							76cbb4f727 
							
						 
					 
					
						
						
							
							some multi-window optimizations. set min width to 300  
						
						
						
					 
					
						2016-08-26 16:05:38 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e33d8451a8 
							
						 
					 
					
						
						
							
							attach contact to notification  
						
						
						
					 
					
						2016-08-26 13:35:01 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f931c08da7 
							
						 
					 
					
						
						
							
							add snackbar for request presence subscription  
						
						
						
					 
					
						2016-08-26 10:19:59 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b52f079292 
							
						 
					 
					
						
						
							
							always display allow contact perm dialog after intro  
						
						
						
					 
					
						2016-08-26 10:19:42 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9e0145a8f6 
							
						 
					 
					
						
						
							
							survive rotation in editaccount  
						
						
						
					 
					
						2016-08-26 09:10:59 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e98ab37c9d 
							
						 
					 
					
						
						
							
							made payment required error standard compliant  
						
						
						
					 
					
						2016-08-25 23:42:42 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							910b38ec13 
							
						 
					 
					
						
						
							
							add file provider to share files on android n  
						
						
						
					 
					
						2016-08-25 22:41:33 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2e4713897d 
							
						 
					 
					
						
						
							
							offer quick reply on android N  
						
						
						
					 
					
						2016-08-25 17:30:44 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							542626758d 
							
						 
					 
					
						
						
							
							use N style stacked notifications  
						
						
						
					 
					
						2016-08-25 15:20:06 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0b9d38cf32 
							
						 
					 
					
						
						
							
							send register IQs without full from  
						
						
						
					 
					
						2016-08-25 13:50:54 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f1ecbf2ff8 
							
						 
					 
					
						
						
							
							made image preview size smaller for low res images  
						
						
						
					 
					
						2016-08-25 13:46:33 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8927ba8065 
							
						 
					 
					
						
						
							
							various null pointer checks  
						
						
						
					 
					
						2016-08-20 10:44:50 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							285d86b375 
							
						 
					 
					
						
						
							
							display error status for missing internet permission  
						
						
						
					 
					
						2016-08-19 21:47:08 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cf909afc60 
							
						 
					 
					
						
						
							
							check for rare null pointer platform bug in share intent handling  
						
						
						
					 
					
						2016-08-19 21:46:47 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b5d3859b22 
							
						 
					 
					
						
						
							
							add payment required error  
						
						
						
					 
					
						2016-08-16 10:39:59 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							343bb7ff28 
							
						 
					 
					
						
						
							
							don't close otr session on every presence change  
						
						
						
					 
					
						2016-08-13 12:43:06 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							94aee445e7 
							
						 
					 
					
						
						
							
							start file observer in background  
						
						
						
					 
					
						2016-08-13 12:40:48 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4736d12e99 
							
						 
					 
					
						
						
							
							make lastMessageTransmitted return max(clear_date,last_message)  
						
						
						
					 
					
						2016-08-13 12:36:30 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							eb8b6165d7 
							
						 
					 
					
						
						
							
							be more careful in recursive file observer. limit depth  
						
						
						
					 
					
						2016-08-13 12:35:10 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							08725ba2bb 
							
						 
					 
					
						
						
							
							use direct ssl when port was manually set to 5223  
						
						... 
						
						
						
						this should create a work around for the oracle xmpp server 
						
					 
					
						2016-08-10 12:34:05 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9bfdbc708e 
							
						 
					 
					
						
						
							
							close tcp connection after 30s of inactivity when in push_mode  
						
						
						
					 
					
						2016-08-09 19:21:54 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							856029a611 
							
						 
					 
					
						
						
							
							don't do idle ping if close_tcp option is set  
						
						
						
					 
					
						2016-08-09 17:26:18 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a51de9fcd9 
							
						 
					 
					
						
						
							
							explictly set account status to offline when waiting for push  
						
						
						
					 
					
						2016-08-09 17:25:45 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							121312d103 
							
						 
					 
					
						
						
							
							catch all throwables when parsing xml  
						
						
						
					 
					
						2016-08-02 10:58:54 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d02e24248f 
							
						 
					 
					
						
						
							
							catch platform bug when getting ringer mode  
						
						
						
					 
					
						2016-08-02 10:58:31 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8b331895d1 
							
						 
					 
					
						
						
							
							catch NPE in getVideoPreview() because getFrame sometimes returns null  
						
						
						
					 
					
						2016-08-02 10:57:50 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ed2fa20414 
							
						 
					 
					
						
						
							
							handle invalid prekey ids in bundle  
						
						
						
					 
					
						2016-08-02 10:40:24 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9dc8e3db9d 
							
						 
					 
					
						
						
							
							set tablet, phone or pc identity  
						
						
						
					 
					
						2016-07-31 22:32:51 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1b114beb0b 
							
						 
					 
					
						
						
							
							add logging when swiping away from recents is being ignored  
						
						
						
					 
					
						2016-07-31 22:32:10 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3c48b14448 
							
						 
					 
					
						
						
							
							catch exception when trying to get video preview of pgp encrypted file  
						
						
						
					 
					
						2016-07-31 22:31:47 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0e96e0a796 
							
						 
					 
					
						
						
							
							show identity type for device selection  
						
						
						
					 
					
						2016-07-28 22:58:37 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							178229ac60 
							
						 
					 
					
						
						
							
							add OS to version response  
						
						
						
					 
					
						2016-07-27 20:58:13 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							dbab43e423 
							
						 
					 
					
						
						
							
							fixed rare null pointer in avatar creation  
						
						
						
					 
					
						2016-07-27 20:11:22 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cf7df84cab 
							
						 
					 
					
						
						
							
							add trillian to html otr parsing  fixes   #1963  
						
						
						
					 
					
						2016-07-27 20:11:02 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							58a3ef46ce 
							
						 
					 
					
						
						
							
							fixed regression in file delete detection due to missing !  
						
						
						
					 
					
						2016-07-26 20:44:28 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							82908fb54b 
							
						 
					 
					
						
						
							
							added more logging for file deletion  
						
						
						
					 
					
						2016-07-26 20:43:05 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3409399ef1 
							
						 
					 
					
						
						
							
							display specific error message when password is too weak on registration  
						
						
						
					 
					
						2016-07-25 15:57:47 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							198a9f2226 
							
						 
					 
					
						
						
							
							refactored how view intents are handled  
						
						... 
						
						
						
						processing view intents before saved instance caused troubles when the activity was destroyed
fixes  #1969  
						
					 
					
						2016-07-25 14:16:09 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							89a05265ea 
							
						 
					 
					
						
						
							
							refactored deleted file detection to monitor entire sd card.  fixes   #1968  
						
						
						
					 
					
						2016-07-23 16:12:45 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3d372cb339 
							
						 
					 
					
						
						
							
							feed version response from app name instead of static variable  
						
						
						
					 
					
						2016-07-22 18:22:21 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6dcce76568 
							
						 
					 
					
						
						
							
							don't crash when opening 'xmpp:' uris  
						
						
						
					 
					
						2016-07-22 16:33:09 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3a5735e717 
							
						 
					 
					
						
						
							
							provide black background video thumbnail if preview couldn't be generated  
						
						
						
					 
					
						2016-07-22 16:32:38 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e9c00c0427 
							
						 
					 
					
						
						
							
							push file offered notification when initial HTTP HEAD req. fails  
						
						
						
					 
					
						2016-07-21 19:17:26 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c8188ee52c 
							
						 
					 
					
						
						
							
							offer back/cancel button when using magic create  
						
						
						
					 
					
						2016-07-21 19:16:41 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2843a0af26 
							
						 
					 
					
						
						
							
							announce OTR support as per XEP-0378  
						
						
						
					 
					
						2016-07-17 22:51:40 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e90e333f29 
							
						 
					 
					
						
						
							
							allow message correction by default since security implications are negligible  
						
						... 
						
						
						
						Conversations only allows correction of the *last* message. so nudging a message into oblivion by adding a message correction doesn't work. also conversations checks the fingerprint for encrypted messages 
						
					 
					
						2016-07-17 22:42:37 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							eb3ac1c326 
							
						 
					 
					
						
						
							
							additional null pointer checks when verifying otr keys  
						
						
						
					 
					
						2016-07-17 22:02:08 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3e50d4831f 
							
						 
					 
					
						
						
							
							show toast hint when touching inactive omemo fingerprints  
						
						
						
					 
					
						2016-07-17 20:31:04 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							baa149924a 
							
						 
					 
					
						
						
							
							show error notification in connecting state as well  
						
						
						
					 
					
						2016-07-14 23:23:13 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1db85e582e 
							
						 
					 
					
						
						
							
							add more error states for stream errors  
						
						
						
					 
					
						2016-07-14 17:05:43 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2803d342e1 
							
						 
					 
					
						
						
							
							include pgp and omemo fallback message only when unencrypted is enabled  
						
						
						
					 
					
						2016-07-14 16:06:05 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							223d50c1a0 
							
						 
					 
					
						
						
							
							don't take stanza-id into account when deduping muc pms  
						
						
						
					 
					
						2016-07-14 09:01:15 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							27690865a6 
							
						 
					 
					
						
						
							
							respond to XEP-0202: Entity Time  
						
						
						
					 
					
						2016-07-13 18:10:10 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							58d5d2a1be 
							
						 
					 
					
						
						
							
							don't time out disco request but just send bind request  
						
						
						
					 
					
						2016-07-13 00:20:57 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ff1b23b4d9 
							
						 
					 
					
						
						
							
							call update file params from thread  
						
						... 
						
						
						
						now that file params has more work to do we should make sure we always call it from a sperate thread 
						
					 
					
						2016-07-13 00:20:38 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							be4aa2afc9 
							
						 
					 
					
						
						
							
							show a preview for video files  
						
						
						
					 
					
						2016-07-11 21:24:33 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							57e51bc735 
							
						 
					 
					
						
						
							
							don't crash when tabbing through muc user list with offline users  
						
						
						
					 
					
						2016-07-08 13:24:14 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cdee91363c 
							
						 
					 
					
						
						
							
							simplified muc users ordering  
						
						
						
					 
					
						2016-07-04 19:30:19 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ac8aa63916 
							
						 
					 
					
						
						
							
							do not crash on jingle connection when contact doesn't use disco  
						
						
						
					 
					
						2016-07-04 19:29:46 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9efa242d96 
							
						 
					 
					
						
						
							
							use direct invites to re-invite muc members  
						
						
						
					 
					
						2016-06-30 23:09:16 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							30110431ba 
							
						 
					 
					
						
						
							
							use dnd as overriding status  
						
						
						
					 
					
						2016-06-30 23:08:55 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							91c3732c63 
							
						 
					 
					
						
						
							
							don't show 'disable foreground service' button.  fixes   #1933  
						
						
						
					 
					
						2016-06-29 17:20:27 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f7933c26d7 
							
						 
					 
					
						
						
							
							don't crash on broken base64 in omemo messages.  fixes   #1934  
						
						
						
					 
					
						2016-06-29 17:18:57 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1d79a677c8 
							
						 
					 
					
						
						
							
							support jingle ft:4 to be compatible with swift  
						
						... 
						
						
						
						Conversations and Gajim both have an implementation bug that sends the jingle session id instead of the transport id (compare XEP-260 2.2). This commit has a work around for this that remains buggy when using ft:3. If gajim is ever to fix this we will be incompatbile. gajim should implement ft:4 instead. (gajim to gajim is broken as well) 
						
					 
					
						2016-06-29 17:16:40 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b5caa8fa35 
							
						 
					 
					
						
						
							
							don't show 'create conference' toast on invite  
						
						
						
					 
					
						2016-06-28 10:34:43 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8882c6b6fd 
							
						 
					 
					
						
						
							
							parse §5.1.2 full jids from muc archives for OMEMO messages  
						
						
						
					 
					
						2016-06-28 10:33:46 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e63d6b4bf2 
							
						 
					 
					
						
						
							
							only keep offline members in members only conferences  
						
						
						
					 
					
						2016-06-28 10:32:06 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							72a2622c84 
							
						 
					 
					
						
						
							
							introduced share button in contact details. remove show qr  
						
						
						
					 
					
						2016-06-24 15:16:01 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							97fe14c4be 
							
						 
					 
					
						
						
							
							code cleanup in jingle socks5 transport  
						
						
						
					 
					
						2016-06-24 13:36:37 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							78e3afc1af 
							
						 
					 
					
						
						
							
							show error toasts on ui thread  
						
						
						
					 
					
						2016-06-24 13:36:06 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d2ca0c7fe8 
							
						 
					 
					
						
						
							
							catch exceptions when retrieving uri file extension  
						
						
						
					 
					
						2016-06-24 13:35:39 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4d5e0c291e 
							
						 
					 
					
						
						
							
							remove white spaces from hostname  
						
						
						
					 
					
						2016-06-22 12:23:11 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							982a20fef5 
							
						 
					 
					
						
						
							
							refactor code that reads real jid from muc  
						
						
						
					 
					
						2016-06-22 12:22:57 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4ba5472d0c 
							
						 
					 
					
						
						
							
							respond to block list push  
						
						
						
					 
					
						2016-06-22 12:22:36 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d28d968985 
							
						 
					 
					
						
						
							
							make sure that we always release wake lock even after throwing exception  
						
						
						
					 
					
						2016-06-22 12:22:03 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							34454ef2ec 
							
						 
					 
					
						
						
							
							synchronize stanza count increment and write  
						
						
						
					 
					
						2016-06-22 12:21:33 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							28dc888159 
							
						 
					 
					
						
						
							
							display toast on pgp error  
						
						
						
					 
					
						2016-06-19 11:08:17 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							37e7175a86 
							
						 
					 
					
						
						
							
							log reason for not showing notification  
						
						
						
					 
					
						2016-06-19 11:04:59 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							85c82d9b3b 
							
						 
					 
					
						
						
							
							remove ascii control chars when creating xml  
						
						
						
					 
					
						2016-06-19 00:07:15 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f91d16cbe7 
							
						 
					 
					
						
						
							
							don't fail on missing jid in bookmarks  
						
						
						
					 
					
						2016-06-16 20:38:35 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b92b3863b9 
							
						 
					 
					
						
						
							
							don't handle chat states in muc or from archive  
						
						
						
					 
					
						2016-06-16 20:38:02 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fc3aefd56e 
							
						 
					 
					
						
						
							
							show toast when connection to openkeychain could not be made  
						
						
						
					 
					
						2016-06-16 20:37:32 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							dcc13d7a3d 
							
						 
					 
					
						
						
							
							log download failure caused by missing content length  
						
						
						
					 
					
						2016-06-16 20:36:51 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							48a7818e88 
							
						 
					 
					
						
						
							
							mark used otr fingprint in contact details and highlight pgp  
						
						
						
					 
					
						2016-06-16 12:12:24 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1eb776f39c 
							
						 
					 
					
						
						
							
							synchronize message body changes for message correction  
						
						
						
					 
					
						2016-06-16 11:47:40 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f8b1e8098c 
							
						 
					 
					
						
						
							
							extract relevant extension from file name when processing share intent  
						
						
						
					 
					
						2016-06-16 11:46:25 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							60588af825 
							
						 
					 
					
						
						
							
							replace corrected messages in decryption queue  
						
						
						
					 
					
						2016-06-15 14:29:25 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5f4471a45e 
							
						 
					 
					
						
						
							
							only dismiss sent message after encryption  
						
						
						
					 
					
						2016-06-15 13:53:34 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cb5393c32f 
							
						 
					 
					
						
						
							
							refresh UI to redraw message hint after switching to pgp  
						
						
						
					 
					
						2016-06-15 13:52:49 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5f40a7042d 
							
						 
					 
					
						
						
							
							delay notification until after pgp decryption  
						
						
						
					 
					
						2016-06-15 12:44:29 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e0575642b5 
							
						 
					 
					
						
						
							
							log all fail reasons  
						
						
						
					 
					
						2016-06-15 12:33:59 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							73679b97f1 
							
						 
					 
					
						
						
							
							show xep-0172 nick only for contacts with mutual presence subscription  
						
						
						
					 
					
						2016-06-15 09:44:01 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							49de43b364 
							
						 
					 
					
						
						
							
							clear muc tiles when avatar of member changes  
						
						
						
					 
					
						2016-06-14 17:11:31 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f9600b950f 
							
						 
					 
					
						
						
							
							sort muc users by affiliation, name.  fixes   #1913  
						
						
						
					 
					
						2016-06-14 14:41:32 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							95a51ea2e0 
							
						 
					 
					
						
						
							
							synchronize access to stanza queue  
						
						
						
					 
					
						2016-06-14 10:17:37 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							39ad426ca9 
							
						 
					 
					
						
						
							
							remove messages from decryption queue when trimming a conversation  
						
						
						
					 
					
						2016-06-13 19:06:09 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							40f81f19df 
							
						 
					 
					
						
						
							
							make sure tagwriter is clear before force closing socket  
						
						
						
					 
					
						2016-06-13 19:05:32 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							587fb3cca3 
							
						 
					 
					
						
						
							
							refactored pgp decryption  
						
						
						
					 
					
						2016-06-13 13:32:14 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f4e3cd5098 
							
						 
					 
					
						
						
							
							actually do add fall back message for omemo  
						
						
						
					 
					
						2016-06-12 14:49:04 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							31dd7b5a21 
							
						 
					 
					
						
						
							
							parse real jid from muc mam messages. (disabled)  
						
						... 
						
						
						
						parsing this is dangerous if server doesn't filter properly
thus it is disabled in config 
						
					 
					
						2016-06-12 12:50:53 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							74d376be68 
							
						 
					 
					
						
						
							
							close db cursor after reading cert  
						
						
						
					 
					
						2016-06-12 12:50:31 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a70f57358e 
							
						 
					 
					
						
						
							
							use darker green as background for chat bubbles in dark theme  
						
						
						
					 
					
						2016-06-10 22:39:02 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4bf9a1e809 
							
						 
					 
					
						
						
							
							use darker colors for actionbar on dark theme  
						
						
						
					 
					
						2016-06-10 20:15:09 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cb7c47bc62 
							
						 
					 
					
						
						
							
							catch conversations sort exception. not vital at this point  
						
						
						
					 
					
						2016-06-09 14:50:13 +02:00 
						 
				 
			
				
					
						
							
							
								Steffen Keiper 
							
						 
					 
					
						
						
						
						
							
						
						
							7932244c51 
							
						 
					 
					
						
						
							
							Dark theme, theme switch, icons, style, strings  
						
						... 
						
						
						
						added some white icons,
changed hardcoded icons to theme attributes,
changed icon_edit_dark to icon_edit_body to reflect icons position,
grey message bubbles in dark theme,
misc
purged ic_action_chat as it wasn't used
preference use_white_background changed to use_green_background, default true
grey chat bubbles darker, text white
replaced all grey600 with black icons and 0.54 alpha attribute
highlightColor in dark grey chat bubble now darker than background 
						
					 
					
						2016-06-08 20:07:40 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b88128241e 
							
						 
					 
					
						
						
							
							Merge pull request  #1895  from pp3345/right-alt  
						
						... 
						
						
						
						Do not treat Right Alt key as a modifier for key combos 
						
					 
					
						2016-06-05 23:19:56 +02:00 
						 
				 
			
				
					
						
							
							
								Yussuf Khalil 
							
						 
					 
					
						
						
						
						
							
						
						
							92bad0fa1e 
							
						 
					 
					
						
						
							
							Do not treat right alt key as a modifier for key combos  
						
						
						
					 
					
						2016-06-05 20:21:44 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							36ae840d76 
							
						 
					 
					
						
						
							
							log all background stanzas when background logging is enabled  
						
						
						
					 
					
						2016-06-05 02:04:31 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7a97da6d21 
							
						 
					 
					
						
						
							
							swap sending presence and csi  
						
						
						
					 
					
						2016-06-04 22:42:12 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							71e9117176 
							
						 
					 
					
						
						
							
							opt-in to send last userinteraction in presence  
						
						
						
					 
					
						2016-06-04 16:16:14 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7398424f3b 
							
						 
					 
					
						
						
							
							trim nick from bookmark before checking if it's empty  
						
						
						
					 
					
						2016-06-03 19:24:11 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e26d842549 
							
						 
					 
					
						
						
							
							don't use a bookmarks name if it's empty  
						
						
						
					 
					
						2016-06-03 18:43:45 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							161fdf7340 
							
						 
					 
					
						
						
							
							throw writeexecption in downloader if flush fails  
						
						
						
					 
					
						2016-06-03 14:27:05 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e402348f9b 
							
						 
					 
					
						
						
							
							disconnect account in background after deletion.  fixes   #1861  
						
						
						
					 
					
						2016-06-03 14:18:43 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							583aba1b44 
							
						 
					 
					
						
						
							
							print specific toast when download failed because of write error  
						
						
						
					 
					
						2016-06-02 21:37:52 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							594aab56db 
							
						 
					 
					
						
						
							
							fixed regression that would not show clear devices  
						
						
						
					 
					
						2016-06-02 20:46:01 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							25211f13b3 
							
						 
					 
					
						
						
							
							make grace period configurable  
						
						
						
					 
					
						2016-06-02 00:24:37 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e43a01159c 
							
						 
					 
					
						
						
							
							deactive grace period when receiving screen on action  
						
						
						
					 
					
						2016-06-01 21:51:46 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							45cc33ca36 
							
						 
					 
					
						
						
							
							deactivate grace period when coming to foreground  
						
						
						
					 
					
						2016-06-01 21:30:50 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							91732b89ea 
							
						 
					 
					
						
						
							
							log background msgs not foreground msgs  
						
						
						
					 
					
						2016-06-01 11:37:03 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							add8e2cb74 
							
						 
					 
					
						
						
							
							don't replace \n\t\r  
						
						
						
					 
					
						2016-06-01 09:04:08 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							15316e6a7f 
							
						 
					 
					
						
						
							
							only log inner stanza but display isCarbon  
						
						
						
					 
					
						2016-06-01 09:03:21 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5c5d5cc4e3 
							
						 
					 
					
						
						
							
							don't show empty templates  
						
						
						
					 
					
						2016-06-01 00:25:14 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							24ea66c9fc 
							
						 
					 
					
						
						
							
							display invite again menu item for offline members  
						
						
						
					 
					
						2016-06-01 00:12:14 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ffba53777c 
							
						 
					 
					
						
						
							
							check if session is optional  
						
						
						
					 
					
						2016-05-31 23:09:45 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ea6a008b39 
							
						 
					 
					
						
						
							
							execute phone contact changes in singlethreadexecutor  
						
						
						
					 
					
						2016-05-31 17:20:21 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1838023c88 
							
						 
					 
					
						
						
							
							log failure reason in http upload on wrong response code  
						
						
						
					 
					
						2016-05-31 17:19:56 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b3337c4ad7 
							
						 
					 
					
						
						
							
							don't scroll to pos 0 when uuid wasn't found  
						
						
						
					 
					
						2016-05-31 16:44:59 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5b9ba79495 
							
						 
					 
					
						
						
							
							use whitespace as message seperator  
						
						
						
					 
					
						2016-05-30 21:12:19 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9321ccc775 
							
						 
					 
					
						
						
							
							handle app links for conferences  
						
						
						
					 
					
						2016-05-30 21:12:04 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8eb1640a26 
							
						 
					 
					
						
						
							
							remove unicode control chars before sending  
						
						
						
					 
					
						2016-05-30 21:11:34 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							be0fc59314 
							
						 
					 
					
						
						
							
							handle app links with @ in them  
						
						
						
					 
					
						2016-05-30 13:06:42 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							272cffe797 
							
						 
					 
					
						
						
							
							Revert "always notify by default in conferences"  
						
						... 
						
						
						
						This reverts commit e9494af098 
						
					 
					
						2016-05-29 22:55:01 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ea18ceae4a 
							
						 
					 
					
						
						
							
							avoid npe when sending omemo messages to group  
						
						
						
					 
					
						2016-05-29 21:25:27 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							49cefd1c0c 
							
						 
					 
					
						
						
							
							handle app links  
						
						... 
						
						
						
						invites in the form of https://conversations/i/localpart/domainpart  
						
					 
					
						2016-05-29 20:44:58 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9afafe387a 
							
						 
					 
					
						
						
							
							fix creation of conferences with 1 participant  
						
						
						
					 
					
						2016-05-29 20:21:53 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c3ec3ea70a 
							
						 
					 
					
						
						
							
							don't merge messages over the char limit  
						
						
						
					 
					
						2016-05-29 10:32:07 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2c55954ddd 
							
						 
					 
					
						
						
							
							show in ui when text was shortened  
						
						
						
					 
					
						2016-05-29 01:14:45 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							aaf5233efe 
							
						 
					 
					
						
						
							
							limit text size in message adapter to 2k and also limit text size in conversations adapter  
						
						
						
					 
					
						2016-05-28 23:48:39 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							422fd1847f 
							
						 
					 
					
						
						
							
							only rendering first 5k chars of each message  
						
						
						
					 
					
						2016-05-28 23:13:47 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fde27f447f 
							
						 
					 
					
						
						
							
							count xmpp uris when disableing text selection  
						
						
						
					 
					
						2016-05-28 17:01:05 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b3f50d1ad0 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/gjedeer/Conversations  into gjedeer-master  
						
						
						
					 
					
						2016-05-28 16:07:25 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bc326efd2c 
							
						 
					 
					
						
						
							
							schedule first idle ping on service creation  
						
						
						
					 
					
						2016-05-28 16:07:16 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bc36f1950f 
							
						 
					 
					
						
						
							
							added idle ping in 10min intervals  
						
						
						
					 
					
						2016-05-28 14:44:22 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ae7543bbfc 
							
						 
					 
					
						
						
							
							put bug report jid in config. include package signature in report  
						
						
						
					 
					
						2016-05-28 11:04:18 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							06bef5de8d 
							
						 
					 
					
						
						
							
							use EOT as message seperator  
						
						
						
					 
					
						2016-05-28 11:03:29 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							29bd1103c0 
							
						 
					 
					
						
						
							
							refactored toasts shown when adhoc creating mucs  
						
						
						
					 
					
						2016-05-27 20:05:40 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a241ab66de 
							
						 
					 
					
						
						
							
							use activity title 'choose participants' when doing that  
						
						
						
					 
					
						2016-05-27 19:17:57 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f70fcc7bb8 
							
						 
					 
					
						
						
							
							use first letter to draw tiles for avatars  
						
						... 
						
						
						
						some users or conferences might have emojis in their names 
						
					 
					
						2016-05-27 11:34:12 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							44833c1499 
							
						 
					 
					
						
						
							
							don't push default muc conf twice  
						
						
						
					 
					
						2016-05-27 10:35:00 +02:00 
						 
				 
			
				
					
						
							
							
								GDR! 
							
						 
					 
					
						
						
						
						
							
						
						
							82c3cbaf2a 
							
						 
					 
					
						
						
							
							Add geo: link support in longer messages  
						
						
						
					 
					
						2016-05-26 23:26:38 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							21ebb35e44 
							
						 
					 
					
						
						
							
							add 'create conference' dialog  
						
						
						
					 
					
						2016-05-26 22:53:55 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d9ff61ea2e 
							
						 
					 
					
						
						
							
							show contact avatar in muc users unless that contact has its own avatar  
						
						
						
					 
					
						2016-05-26 22:37:00 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							841e718d6a 
							
						 
					 
					
						
						
							
							make newly created conferences private by default  
						
						
						
					 
					
						2016-05-26 12:39:31 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c4e82eb3f8 
							
						 
					 
					
						
						
							
							change hint in edit subject dialog  
						
						
						
					 
					
						2016-05-26 12:39:04 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c06e2787c7 
							
						 
					 
					
						
						
							
							sending warning to receiving client if that client doesn't support omemo.  
						
						... 
						
						
						
						fixes  #1873  
					
						2016-05-25 23:24:36 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							83adbb6052 
							
						 
					 
					
						
						
							
							hide fingerprints in UI if encryption is disabled  
						
						
						
					 
					
						2016-05-25 22:12:13 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5137837f6d 
							
						 
					 
					
						
						
							
							only publish keys if omemo is enabled  
						
						
						
					 
					
						2016-05-25 21:55:01 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c65c314801 
							
						 
					 
					
						
						
							
							only subscribe to omemo pep events if omemo is enabled  
						
						
						
					 
					
						2016-05-25 21:54:46 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							79796b0079 
							
						 
					 
					
						
						
							
							don't respond to otr messages in muc pms  
						
						
						
					 
					
						2016-05-25 21:05:51 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b69ab65b12 
							
						 
					 
					
						
						
							
							show regitration failed try again later in UI  
						
						
						
					 
					
						2016-05-24 13:26:30 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							abbdf232c6 
							
						 
					 
					
						
						
							
							show hint in subject quick edit. only show subject as preset  
						
						
						
					 
					
						2016-05-22 18:20:57 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e5b8302fd9 
							
						 
					 
					
						
						
							
							show first unread message on top after reinit  
						
						
						
					 
					
						2016-05-22 17:52:27 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a8420c9ad0 
							
						 
					 
					
						
						
							
							disable stanza logging  
						
						
						
					 
					
						2016-05-21 10:45:10 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							277e3d59c8 
							
						 
					 
					
						
						
							
							update ui after affiliation changes  
						
						
						
					 
					
						2016-05-21 09:25:37 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e1cf7b8cb6 
							
						 
					 
					
						
						
							
							refactore exceptionhandler to have one line file writer  
						
						
						
					 
					
						2016-05-21 08:54:29 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9ce2cfa3d2 
							
						 
					 
					
						
						
							
							resetting fetch status error when mutual subscription is reestablished  
						
						
						
					 
					
						2016-05-19 10:47:27 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8d595c1fc2 
							
						 
					 
					
						
						
							
							sync around individual calls instead of synchronizing entire object  
						
						
						
					 
					
						2016-05-19 10:47:03 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ef27055434 
							
						 
					 
					
						
						
							
							show password dialog when account was magic created  
						
						
						
					 
					
						2016-05-19 10:46:19 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3f65b0e985 
							
						 
					 
					
						
						
							
							access disco over caching mechanism instead of querying db  
						
						
						
					 
					
						2016-05-19 10:44:16 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							70497318dd 
							
						 
					 
					
						
						
							
							remove unwanted 'use previous encryption' lookup  
						
						
						
					 
					
						2016-05-19 10:42:57 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0eb8d4226e 
							
						 
					 
					
						
						
							
							also save form elements in disco storage  
						
						
						
					 
					
						2016-05-19 10:41:56 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							627bf18f8c 
							
						 
					 
					
						
						
							
							don't NPE on rare race condition while fetching MAM  
						
						
						
					 
					
						2016-05-19 10:40:03 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							afa3883089 
							
						 
					 
					
						
						
							
							synchronize around identity key generation  
						
						
						
					 
					
						2016-05-19 10:39:47 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b478eca315 
							
						 
					 
					
						
						
							
							improved ordering of muc participants  
						
						
						
					 
					
						2016-05-17 15:01:56 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							61726f4994 
							
						 
					 
					
						
						
							
							refactored muc item parsing to also parse muc status messages  
						
						
						
					 
					
						2016-05-17 14:25:58 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							14952ba5e5 
							
						 
					 
					
						
						
							
							offer offline members to be invited again  
						
						
						
					 
					
						2016-05-17 10:43:48 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fc5304c6fe 
							
						 
					 
					
						
						
							
							change affiliation for in memory users that are currently not joined in a conference  
						
						
						
					 
					
						2016-05-16 19:58:36 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8d0693ed6a 
							
						 
					 
					
						
						
							
							keep conference members in memory and show them in conference details  
						
						
						
					 
					
						2016-05-16 19:58:36 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d7c5264ad0 
							
						 
					 
					
						
						
							
							cap exponential backoff at 300s (10 attempts)  
						
						
						
					 
					
						2016-05-16 19:58:24 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6f1a4494eb 
							
						 
					 
					
						
						
							
							use the same typo in both saving disco and reading disco  
						
						
						
					 
					
						2016-05-15 12:35:51 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cf5ca27a06 
							
						 
					 
					
						
						
							
							escape HTML in OTR messages if other client is Pidgin  
						
						
						
					 
					
						2016-05-15 12:35:31 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c9e9dc2ef2 
							
						 
					 
					
						
						
							
							include name in locations received in MUCs  
						
						
						
					 
					
						2016-05-15 11:08:00 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a25912c32c 
							
						 
					 
					
						
						
							
							log incoming iq requests  
						
						
						
					 
					
						2016-05-15 09:55:06 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							540f6f3d7a 
							
						 
					 
					
						
						
							
							send caps hash in muc join  
						
						... 
						
						
						
						this prevents desktop clients from iq'ing use when they join 
						
					 
					
						2016-05-15 09:54:49 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6a28b5a9fa 
							
						 
					 
					
						
						
							
							don't show duplicate status message in contact details  
						
						
						
					 
					
						2016-05-13 11:57:02 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e41a9483bd 
							
						 
					 
					
						
						
							
							only default to omemo when all our devices support it  
						
						
						
					 
					
						2016-05-13 11:47:29 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							aced9d2697 
							
						 
					 
					
						
						
							
							do not process self presence  
						
						... 
						
						
						
						we don't want our own resource show up in the self contact 
						
					 
					
						2016-05-13 11:20:27 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b756d61c45 
							
						 
					 
					
						
						
							
							show presence of other resources as template  
						
						
						
					 
					
						2016-05-13 10:45:30 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b8c1bd2cba 
							
						 
					 
					
						
						
							
							reset attempt count when reconnecting because of timeout  
						
						
						
					 
					
						2016-05-12 21:57:07 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2014f388b1 
							
						 
					 
					
						
						
							
							interrupt XMPPConnection Thread  
						
						... 
						
						
						
						in some cases the the DNS query might take too long (even though we specified a timeout)
if that happens we need a secondary solution (besides killing the socket) to stop the thread 
						
					 
					
						2016-05-12 21:54:46 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cbdb413613 
							
						 
					 
					
						
						
							
							prefer IPv4 DNS servers  
						
						... 
						
						
						
						some devices might have problems contacting the IPv6 DNS server while in sleep mode 
						
					 
					
						2016-05-12 21:39:47 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f4369b29ae 
							
						 
					 
					
						
						
							
							improve keyboard handling.  fixes   #1387  
						
						... 
						
						
						
						* start a new Conversations by pressing mod+space
* automatically start searching when pressing keys in StartConversationsActivity
* when hitting enter when number of search results == 1 open that conversation 
						
					 
					
						2016-05-12 18:49:54 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7113e21a43 
							
						 
					 
					
						
						
							
							use 'phone' or 'tablet' as default resource  
						
						
						
					 
					
						2016-05-12 18:47:41 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							908aa19a36 
							
						 
					 
					
						
						
							
							make omemo default when all resources support it  
						
						
						
					 
					
						2016-05-12 14:20:11 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							09e20f6e01 
							
						 
					 
					
						
						
							
							check if pgpengine is still bound before using it  
						
						
						
					 
					
						2016-05-12 11:30:53 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1bc92482e9 
							
						 
					 
					
						
						
							
							scroll to bottom after sending multi-line message  
						
						
						
					 
					
						2016-05-12 10:39:04 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cc209afc51 
							
						 
					 
					
						
						
							
							stop processing PreKeyWhisperMessage if there is no PreKeyId  
						
						... 
						
						
						
						fixes  #1832  
					
						2016-05-10 18:11:13 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8e3948e495 
							
						 
					 
					
						
						
							
							don’t let attempt count fall below zero  
						
						
						
					 
					
						2016-05-10 17:48:09 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c37b5af2ca 
							
						 
					 
					
						
						
							
							add lock domain and magic create domain to known hosts  
						
						
						
					 
					
						2016-05-10 10:53:44 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e542dd3923 
							
						 
					 
					
						
						
							
							always show download button when link is encrypted  
						
						... 
						
						
						
						dont check for known mime type 
						
					 
					
						2016-05-10 10:32:25 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							549be9bb3d 
							
						 
					 
					
						
						
							
							report host-account as account state in UI  
						
						
						
					 
					
						2016-05-10 10:29:02 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							27b245ac35 
							
						 
					 
					
						
						
							
							do not show last-seen metric in UI  
						
						
						
					 
					
						2016-05-10 09:41:30 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							488780d2ce 
							
						 
					 
					
						
						
							
							fix logging wrong variable for failed resume  
						
						
						
					 
					
						2016-05-08 21:53:45 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6f3b8f64d1 
							
						 
					 
					
						
						
							
							check for h attribute in 'failed' nonza  
						
						
						
					 
					
						2016-05-08 21:45:18 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fb7525e0b9 
							
						 
					 
					
						
						
							
							catch all exceptions thrown by xml pull parser  
						
						
						
					 
					
						2016-05-07 11:34:45 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							76889b9c58 
							
						 
					 
					
						
						
							
							handle invalid base64 is SASl SCRAM response  
						
						
						
					 
					
						2016-05-07 11:34:17 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e2d3bef739 
							
						 
					 
					
						
						
							
							Merge pull request  #1829  from sebastianv89/patch-1  
						
						... 
						
						
						
						Remove copy of innerkey 
						
					 
					
						2016-05-05 20:23:03 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a7cd05bd4e 
							
						 
					 
					
						
						
							
							report bind failure as account state  
						
						
						
					 
					
						2016-05-05 20:22:47 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0157039e87 
							
						 
					 
					
						
						
							
							log more information about HTTP’s max upload size  
						
						
						
					 
					
						2016-05-05 19:34:44 +02:00 
						 
				 
			
				
					
						
							
							
								Sebastian 
							
						 
					 
					
						
						
						
						
							
						
						
							544e1dee65 
							
						 
					 
					
						
						
							
							Remove copy of innerkey  
						
						... 
						
						
						
						The line overwrites this.innerkey with the value that was already there. 
						
					 
					
						2016-05-05 17:09:01 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6e0ec9b924 
							
						 
					 
					
						
						
							
							republish pgp signature when changing status  
						
						
						
					 
					
						2016-05-05 13:17:04 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							12704fa640 
							
						 
					 
					
						
						
							
							refactor captcha response handling to avoid network on main thread exception  
						
						
						
					 
					
						2016-05-05 09:58:35 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c27663c456 
							
						 
					 
					
						
						
							
							clear password field before setting new one  
						
						
						
					 
					
						2016-05-04 18:23:36 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fb41a4ffaa 
							
						 
					 
					
						
						
							
							fixed npe when calling changepassword activity directly  
						
						
						
					 
					
						2016-05-04 18:22:17 +02:00 
						 
				 
			
				
					
						
							
							
								klemens 
							
						 
					 
					
						
						
						
						
							
						
						
							7047d68165 
							
						 
					 
					
						
						
							
							spelling fixes  
						
						
						
					 
					
						2016-05-04 10:29:29 +02:00 
						 
				 
			
				
					
						
							
							
								Sebastian 
							
						 
					 
					
						
						
						
						
							
						
						
							cf374ec4ef 
							
						 
					 
					
						
						
							
							Renaming of variable  
						
						... 
						
						
						
						Was probably just a copy/paste typo. 
						
					 
					
						2016-05-03 23:35:57 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cef2eb58a7 
							
						 
					 
					
						
						
							
							fixed presence template dedup for 'online' status  
						
						
						
					 
					
						2016-05-03 22:16:51 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							06a561743a 
							
						 
					 
					
						
						
							
							ping all accounts at the same time  
						
						
						
					 
					
						2016-05-02 14:31:30 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d23178acb9 
							
						 
					 
					
						
						
							
							show only username when registering account with magic create  
						
						
						
					 
					
						2016-05-02 10:37:28 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							98ecac0ffa 
							
						 
					 
					
						
						
							
							removed unnecessary logging  
						
						
						
					 
					
						2016-04-30 13:34:20 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							936006173c 
							
						 
					 
					
						
						
							
							properly cancel avatar tasks  
						
						
						
					 
					
						2016-04-29 20:38:23 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d5608cb4f3 
							
						 
					 
					
						
						
							
							catch ActivityNotFoundException when requesting battery op  
						
						
						
					 
					
						2016-04-29 13:58:37 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c7882b7225 
							
						 
					 
					
						
						
							
							port all android drop down list items to our own  
						
						
						
					 
					
						2016-04-29 13:48:30 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6d9ca25915 
							
						 
					 
					
						
						
							
							catch rare NPE when determining max http size  
						
						
						
					 
					
						2016-04-29 13:24:26 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							252d015b71 
							
						 
					 
					
						
						
							
							synchronize around thumbnail cache to avoid loading images twice  
						
						
						
					 
					
						2016-04-28 20:15:28 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1d2e2f71c2 
							
						 
					 
					
						
						
							
							cancel potential tasks when receiving image preview from cache  
						
						
						
					 
					
						2016-04-28 20:14:53 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							51753a1d39 
							
						 
					 
					
						
						
							
							cleaned up captcha dialog  
						
						
						
					 
					
						2016-04-28 20:13:58 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5021b9a5dd 
							
						 
					 
					
						
						
							
							don't request disco from self  
						
						
						
					 
					
						2016-04-28 19:02:20 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							29616d02a8 
							
						 
					 
					
						
						
							
							removed unused config variables  
						
						
						
					 
					
						2016-04-27 16:43:02 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ebcb13c8eb 
							
						 
					 
					
						
						
							
							made it possible to go back to welcome screen from edit account  
						
						
						
					 
					
						2016-04-27 10:35:08 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9c3e910dc4 
							
						 
					 
					
						
						
							
							prevent user from accidentally changing password after using magic create  
						
						
						
					 
					
						2016-04-26 23:23:48 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							59652ecaf2 
							
						 
					 
					
						
						
							
							fixed table creation  
						
						
						
					 
					
						2016-04-25 11:06:17 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a363e0a5d8 
							
						 
					 
					
						
						
							
							don't create templates for empty status messages  
						
						
						
					 
					
						2016-04-23 15:10:35 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cd1fbf60ec 
							
						 
					 
					
						
						
							
							add change prescence to manage account context menu  
						
						
						
					 
					
						2016-04-23 12:33:56 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a9c1768107 
							
						 
					 
					
						
						
							
							show status messages in contact details  
						
						
						
					 
					
						2016-04-23 12:19:00 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1901abd05f 
							
						 
					 
					
						
						
							
							expert setting to manually change presence  
						
						
						
					 
					
						2016-04-22 21:25:06 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1a073ca454 
							
						 
					 
					
						
						
							
							added magic create welcome screen  
						
						
						
					 
					
						2016-04-19 18:03:24 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e9494af098 
							
						 
					 
					
						
						
							
							always notify by default in conferences  
						
						
						
					 
					
						2016-04-14 22:37:05 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							eb63cdb9ad 
							
						 
					 
					
						
						
							
							removed unnecessary call to stopSelf() after logging out  
						
						
						
					 
					
						2016-04-14 21:45:36 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							72aa10b536 
							
						 
					 
					
						
						
							
							add setting for quick sharing  
						
						
						
					 
					
						2016-04-14 21:12:44 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							39e717ed94 
							
						 
					 
					
						
						
							
							removed unused call to cancel events  
						
						
						
					 
					
						2016-04-14 00:16:59 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c53c6cb6b6 
							
						 
					 
					
						
						
							
							create Config varibale to show the disable foreground service button  
						
						
						
					 
					
						2016-04-13 18:00:12 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							594e65bb2b 
							
						 
					 
					
						
						
							
							hacky workaround to determine if uri points to private file on < lolipop  
						
						
						
					 
					
						2016-04-13 11:14:36 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4332b0df44 
							
						 
					 
					
						
						
							
							return own jid as true counterpart on self messages in muc  
						
						
						
					 
					
						2016-04-13 11:13:47 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3e654bea0e 
							
						 
					 
					
						
						
							
							added share uri button to conference details  
						
						
						
					 
					
						2016-04-12 18:30:02 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2a4db01709 
							
						 
					 
					
						
						
							
							reverse order in contact chooser  
						
						
						
					 
					
						2016-04-12 18:29:41 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7223b5b274 
							
						 
					 
					
						
						
							
							minor code cleanup  
						
						
						
					 
					
						2016-04-12 17:52:58 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7ff890e513 
							
						 
					 
					
						
						
							
							republish avatar if server offers non-persistent pep :-(  
						
						
						
					 
					
						2016-04-11 22:20:32 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5786e75374 
							
						 
					 
					
						
						
							
							don't throw IO exception at end of stream  
						
						
						
					 
					
						2016-04-10 00:19:53 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							91b17c6925 
							
						 
					 
					
						
						
							
							fixed 'connecting…' button  
						
						
						
					 
					
						2016-04-10 00:19:20 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							607b7d1593 
							
						 
					 
					
						
						
							
							moved authentication into seperate method. force close socket before changing status  
						
						
						
					 
					
						2016-04-10 00:18:14 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							83fab06508 
							
						 
					 
					
						
						
							
							introduced setting to turn of notification led  
						
						
						
					 
					
						2016-04-09 21:48:06 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							65548ddccb 
							
						 
					 
					
						
						
							
							use startdate as lower bound when querying archive with after=x  
						
						
						
					 
					
						2016-04-09 12:31:08 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b99d70bfe7 
							
						 
					 
					
						
						
							
							don't show contact details when in conversations with self  
						
						
						
					 
					
						2016-04-09 10:59:54 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2713fd50c8 
							
						 
					 
					
						
						
							
							use last received message id when querying archive  
						
						
						
					 
					
						2016-04-09 10:29:34 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							14b46c3ee7 
							
						 
					 
					
						
						
							
							transform nimbuzz workaround into a more general 'waitForDisco' condition  
						
						
						
					 
					
						2016-04-09 08:53:58 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a8ebc5fafc 
							
						 
					 
					
						
						
							
							add required disco#items query to timeout list  
						
						
						
					 
					
						2016-04-08 20:20:37 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							db0301310b 
							
						 
					 
					
						
						
							
							removed ernoexception in exchange for a regular exeption to prevent verify error on <5.0  
						
						
						
					 
					
						2016-04-08 18:28:40 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0460702710 
							
						 
					 
					
						
						
							
							check file owner when attaching files or using them as avatar  
						
						
						
					 
					
						2016-04-07 20:29:40 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							290f0a123e 
							
						 
					 
					
						
						
							
							prevent null pointer when checking http upload max size  
						
						
						
					 
					
						2016-04-07 19:20:45 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ecaf75e5ec 
							
						 
					 
					
						
						
							
							better detect broken pep  
						
						... 
						
						
						
						mark pep as broken when publishing bundle or device list failed
reset 'brokenness' when account is getting disabled 
						
					 
					
						2016-04-05 13:31:03 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0385e3a8d6 
							
						 
					 
					
						
						
							
							switched around info and items query to avoid race condition  
						
						
						
					 
					
						2016-04-04 20:35:40 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5787687997 
							
						 
					 
					
						
						
							
							removed unnecessary wait for disconnect  
						
						
						
					 
					
						2016-04-04 20:07:09 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							61997912fd 
							
						 
					 
					
						
						
							
							made sure the disco#items query has returned before finalizing the bind  
						
						
						
					 
					
						2016-04-04 20:06:07 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							701742f550 
							
						 
					 
					
						
						
							
							don't ask for resource when server uses http upload v0.1  
						
						
						
					 
					
						2016-04-02 18:07:38 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2549ce89b0 
							
						 
					 
					
						
						
							
							check max http file size when attaching files  
						
						
						
					 
					
						2016-04-01 00:03:14 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							74c496fe3e 
							
						 
					 
					
						
						
							
							add methods to check max file size for http upload  
						
						
						
					 
					
						2016-03-31 21:56:59 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e074104004 
							
						 
					 
					
						
						
							
							save otr fingerprint in message  
						
						
						
					 
					
						2016-03-31 21:15:49 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							867d0ef191 
							
						 
					 
					
						
						
							
							include form fields into caps hash calculation  
						
						
						
					 
					
						2016-03-31 14:21:56 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8d98c52803 
							
						 
					 
					
						
						
							
							closed some cursors under error conditions  
						
						
						
					 
					
						2016-03-31 13:55:46 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							343a6b4e6b 
							
						 
					 
					
						
						
							
							made setting aes keys in DownloadableFile more readable  
						
						
						
					 
					
						2016-03-31 13:55:25 +02:00 
						 
				 
			
				
					
						
							
							
								Christian S 
							
						 
					 
					
						
						
						
						
							
						
						
							1d458e8ab3 
							
						 
					 
					
						
						
							
							Update ShortcutBadger to version 1.1.4  
						
						
						
					 
					
						2016-03-27 20:17:51 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a9b66e3ea5 
							
						 
					 
					
						
						
							
							allow to delete attachments.  fixes   #1539  
						
						
						
					 
					
						2016-03-23 19:23:22 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							281cb65046 
							
						 
					 
					
						
						
							
							only add image files to media scanner  
						
						
						
					 
					
						2016-03-23 12:20:09 +01:00 
						 
				 
			
				
					
						
							
							
								licaon-kter 
							
						 
					 
					
						
						
						
						
							
						
						
							6ba90ec43c 
							
						 
					 
					
						
						
							
							Typo attempt  
						
						
						
					 
					
						2016-03-22 11:54:45 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							135c8567a5 
							
						 
					 
					
						
						
							
							show room nick for /me command in sent muc messages.  fixes   #1773  
						
						
						
					 
					
						2016-03-20 17:33:42 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ac09011690 
							
						 
					 
					
						
						
							
							be less strict when sharing EXTRA_TEXT intents  
						
						
						
					 
					
						2016-03-20 17:25:16 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7df24407dc 
							
						 
					 
					
						
						
							
							be more careful to avoid creating multiple connections  
						
						
						
					 
					
						2016-03-20 17:24:41 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b51ce43d36 
							
						 
					 
					
						
						
							
							don't show v\omemo keys as such if not enabled  
						
						
						
					 
					
						2016-03-20 17:24:15 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b17ca3543f 
							
						 
					 
					
						
						
							
							made it possible to share text files  
						
						
						
					 
					
						2016-03-16 18:09:19 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							48be5af55f 
							
						 
					 
					
						
						
							
							reworked sharewith activity to stay open during sharing  
						
						... 
						
						
						
						closing the activity prematuraly caused uri permissions to be revoked 
						
					 
					
						2016-03-16 10:46:33 +01:00 
						 
				 
			
				
					
						
							
							
								fiaxh 
							
						 
					 
					
						
						
						
						
							
						
						
							eaddfa7fd1 
							
						 
					 
					
						
						
							
							Check if path for URI is accessible  
						
						... 
						
						
						
						The path extracted from the Cursor might not be accessible for Conversations. FileUtils accesses URI information through the ContentProvider, so this wouldn't be noticed.
Fixes sharing from open-keychain's TemporaryContentProvider 
						
					 
					
						2016-03-15 11:42:13 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0af8ee341c 
							
						 
					 
					
						
						
							
							simplified getUsers(max) code  
						
						
						
					 
					
						2016-03-13 17:42:17 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1153e6120d 
							
						 
					 
					
						
						
							
							added logging in case fragment wasn't attached  
						
						
						
					 
					
						2016-03-13 17:41:38 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							290f53f4a6 
							
						 
					 
					
						
						
							
							fixed recursive call instead of call to super in PublishProfileActivity  
						
						
						
					 
					
						2016-03-13 17:39:13 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							817d344521 
							
						 
					 
					
						
						
							
							log reason for bind failure  
						
						
						
					 
					
						2016-03-11 09:01:40 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9548f43998 
							
						 
					 
					
						
						
							
							close cursor in caps db query  
						
						
						
					 
					
						2016-03-11 09:01:27 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e6a9829dd2 
							
						 
					 
					
						
						
							
							don't show opt-out of battery optimization dialog when push is enabled  
						
						
						
					 
					
						2016-03-06 15:53:49 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							86fff5839a 
							
						 
					 
					
						
						
							
							warn in conversations when account is disabled  
						
						
						
					 
					
						2016-03-06 12:16:29 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d3542202b5 
							
						 
					 
					
						
						
							
							Merge branch 'Mess' of  https://github.com/tarun018/Conversations  into tarun018-Mess  
						
						
						
					 
					
						2016-03-04 21:31:54 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e9b4a2a021 
							
						 
					 
					
						
						
							
							show host in file size checker  
						
						
						
					 
					
						2016-03-04 21:30:34 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							09d87965fb 
							
						 
					 
					
						
						
							
							mark oob messages and always display download button  
						
						
						
					 
					
						2016-03-04 20:09:21 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							aa24a0f779 
							
						 
					 
					
						
						
							
							don't automatically crop avatar  
						
						
						
					 
					
						2016-03-04 14:32:38 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							89eea3636f 
							
						 
					 
					
						
						
							
							add a few more know file extensions  
						
						
						
					 
					
						2016-03-04 11:24:53 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							07263370d9 
							
						 
					 
					
						
						
							
							allow to copy original url even while downloading.  fixes   #1743  
						
						
						
					 
					
						2016-03-04 11:24:40 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bc5f64bffe 
							
						 
					 
					
						
						
							
							moved avatarfetcher reset code to bind  
						
						
						
					 
					
						2016-03-03 13:33:02 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4cb2d0ca93 
							
						 
					 
					
						
						
							
							avoid unnecessary disconnect. prevent NetworkOnMainThreadException  
						
						
						
					 
					
						2016-03-03 13:31:59 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c9e4b332bf 
							
						 
					 
					
						
						
							
							don't break with srcoll events on empty message lists  
						
						
						
					 
					
						2016-03-03 11:14:59 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							aaf64732b0 
							
						 
					 
					
						
						
							
							expert option to treat vibrate as silent mode for XA.  fixes   #1530  
						
						
						
					 
					
						2016-03-01 19:00:18 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							15a1873d97 
							
						 
					 
					
						
						
							
							removed unused config variable  
						
						
						
					 
					
						2016-03-01 18:58:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fd246f7e5a 
							
						 
					 
					
						
						
							
							properly persist accepted crypto targets  
						
						
						
					 
					
						2016-03-01 12:22:20 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							198dc2c6b4 
							
						 
					 
					
						
						
							
							let users confirm each member in a conference even if that contact is already trusted  
						
						
						
					 
					
						2016-03-01 11:26:59 +01:00 
						 
				 
			
				
					
						
							
							
								Tarun 
							
						 
					 
					
						
						
						
						
							
						
						
							df7b399e04 
							
						 
					 
					
						
						
							
							Fix Issue  #1634  : Shows XMPP URI as links.  
						
						... 
						
						
						
						Shows XMPP URI as links, other than Web URL's and Email Addresses. Also performs respective actions on clicking XMPP URI. 
						
					 
					
						2016-02-29 23:35:50 +05:30 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							134c75ae01 
							
						 
					 
					
						
						
							
							use correct jid when leaving a conference.  fixes   #1732  
						
						
						
					 
					
						2016-02-29 16:32:24 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9e0466d1e6 
							
						 
					 
					
						
						
							
							refactored omemo to take multiple recipients  
						
						
						
					 
					
						2016-02-29 13:18:07 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							199ae3a4d8 
							
						 
					 
					
						
						
							
							rename purge keys positive button to 'purge keys'  
						
						
						
					 
					
						2016-02-28 23:10:50 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4ba41540fd 
							
						 
					 
					
						
						
							
							made hashtable in roster store jids instead of strings  
						
						
						
					 
					
						2016-02-28 20:45:50 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							24a9ac2908 
							
						 
					 
					
						
						
							
							always search offline contacts as well.  fixes   #1653  
						
						
						
					 
					
						2016-02-27 15:41:34 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2c224d0f18 
							
						 
					 
					
						
						
							
							Merge branch 'master' of github.com:siacs/Conversations  
						
						
						
					 
					
						2016-02-27 11:26:09 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3cf21e2d37 
							
						 
					 
					
						
						
							
							Merge pull request  #1721  from fiaxh/export_logs_storage_permission  
						
						... 
						
						
						
						Request WRITE_EXTERNAL_STORAGE for ExportLogsPreference in >= M 
						
					 
					
						2016-02-27 11:25:56 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							60ab03afb1 
							
						 
					 
					
						
						
							
							changed single_account config into more simple lock_settings  
						
						
						
					 
					
						2016-02-27 10:25:31 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7fd6a37e67 
							
						 
					 
					
						
						
							
							disallow message correction by default.  fixes   #1720  
						
						
						
					 
					
						2016-02-26 09:48:58 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							dc00a92499 
							
						 
					 
					
						
						
							
							execute pending mam queries every time we come online  
						
						
						
					 
					
						2016-02-26 09:46:25 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5d3ee60ca4 
							
						 
					 
					
						
						
							
							hide add account icons when single_account is set to true  
						
						
						
					 
					
						2016-02-24 17:12:29 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bbede8bbeb 
							
						 
					 
					
						
						
							
							optionally lock conference domains as well and hide known domains in ui  
						
						
						
					 
					
						2016-02-24 16:53:19 +01:00 
						 
				 
			
				
					
						
							
							
								fiaxh 
							
						 
					 
					
						
						
						
						
							
						
						
							e1a2f248af 
							
						 
					 
					
						
						
							
							Request WRITE_EXTERNAL_STORAGE for ExportLogsPreference in >= M  
						
						
						
					 
					
						2016-02-24 16:35:26 +01:00 
						 
				 
			
				
					
						
							
							
								fiaxh 
							
						 
					 
					
						
						
						
						
							
						
						
							a88c2d48c0 
							
						 
					 
					
						
						
							
							No possibility of multiple invocation of log export  
						
						
						
					 
					
						2016-02-24 15:10:41 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d1a456f3e3 
							
						 
					 
					
						
						
							
							made hard coded choice for encryptions more flexible and disable parsing  
						
						
						
					 
					
						2016-02-24 14:47:49 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ddafa65849 
							
						 
					 
					
						
						
							
							Merge pull request  #1715  from fiaxh/gpg_decryption_failed  
						
						... 
						
						
						
						PGP Retry decryption from message menu 
						
					 
					
						2016-02-24 09:23:30 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							17b1fcc3ea 
							
						 
					 
					
						
						
							
							set noMessagesLeftOnServer before conference configuration fetch  
						
						
						
					 
					
						2016-02-23 16:15:55 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							34f2a63190 
							
						 
					 
					
						
						
							
							update notification after message correction  
						
						
						
					 
					
						2016-02-23 16:15:23 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0298f0181e 
							
						 
					 
					
						
						
							
							reset pending subscription request when receiving roster update  
						
						
						
					 
					
						2016-02-23 16:14:55 +01:00 
						 
				 
			
				
					
						
							
							
								fiaxh 
							
						 
					 
					
						
						
						
						
							
						
						
							894b5892a9 
							
						 
					 
					
						
						
							
							Retry decryption from message menu  
						
						
						
					 
					
						2016-02-23 16:05:42 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							beb216c300 
							
						 
					 
					
						
						
							
							made presences object final in contact  
						
						
						
					 
					
						2016-02-23 14:25:01 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							689ded1607 
							
						 
					 
					
						
						
							
							properly trigger show load more messages in mucs  
						
						
						
					 
					
						2016-02-22 20:28:58 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a0d0ed34ae 
							
						 
					 
					
						
						
							
							turned muc errors into enum. added error codes for service shutdown  
						
						
						
					 
					
						2016-02-22 20:19:58 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d2cfac222e 
							
						 
					 
					
						
						
							
							show load more messages when auto loading is disabled and messages are still left on server  
						
						
						
					 
					
						2016-02-21 17:32:46 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b00c561f81 
							
						 
					 
					
						
						
							
							check for uuid change when decrypting pgp messages  
						
						
						
					 
					
						2016-02-21 11:43:03 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ed740b4868 
							
						 
					 
					
						
						
							
							some mucs may grant voice to visitors in unmoderated rooms  
						
						
						
					 
					
						2016-02-21 11:42:41 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3bde4dbedb 
							
						 
					 
					
						
						
							
							change uuid when replacing messages  
						
						
						
					 
					
						2016-02-20 00:01:39 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e6f8b7d9fa 
							
						 
					 
					
						
						
							
							decrypt pgp message corrections  
						
						
						
					 
					
						2016-02-19 21:02:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a2cb009f4c 
							
						 
					 
					
						
						
							
							skip avatar ui when pep is not available.  fixes   #1706  
						
						
						
					 
					
						2016-02-19 20:54:53 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							df992d2566 
							
						 
					 
					
						
						
							
							don't reset whisper on reInit.  fixes   #1637  
						
						
						
					 
					
						2016-02-19 20:54:43 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							49a3f6f281 
							
						 
					 
					
						
						
							
							never parse show in presences as offline  
						
						
						
					 
					
						2016-02-19 11:09:28 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ac687d6bbd 
							
						 
					 
					
						
						
							
							don't log start reason  
						
						
						
					 
					
						2016-02-17 16:52:57 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							59978e157c 
							
						 
					 
					
						
						
							
							only offer message correction for the very last message  
						
						
						
					 
					
						2016-02-17 16:51:36 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3626e4b3a0 
							
						 
					 
					
						
						
							
							fixed regression that caused messages in muc not being send  
						
						
						
					 
					
						2016-02-17 16:50:48 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c2fbdbde83 
							
						 
					 
					
						
						
							
							log reason why otr message won't be parsed  
						
						
						
					 
					
						2016-02-16 14:22:47 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							86b1865eec 
							
						 
					 
					
						
						
							
							fixed regression that caused ui to redraw a lot  
						
						
						
					 
					
						2016-02-16 14:22:21 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							349dd8291d 
							
						 
					 
					
						
						
							
							made clear that archiving preferences are server side  
						
						
						
					 
					
						2016-02-16 12:52:31 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a9b957e8a2 
							
						 
					 
					
						
						
							
							added setting to opt-out of message correction. renamed preferences and options to settings  
						
						
						
					 
					
						2016-02-16 09:57:59 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0ca4a33bfb 
							
						 
					 
					
						
						
							
							added some OTR logging  
						
						
						
					 
					
						2016-02-16 09:15:41 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c0b3a3ff0c 
							
						 
					 
					
						
						
							
							basic support for XEP-0308: Last Message Correction.  fixes   #864  
						
						
						
					 
					
						2016-02-15 23:15:04 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							335058b78b 
							
						 
					 
					
						
						
							
							removed unnecessary conditions when sending read marker  
						
						
						
					 
					
						2016-02-15 23:09:42 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c4b1df1bf3 
							
						 
					 
					
						
						
							
							add missing type='submit' attribute to enable push form  
						
						
						
					 
					
						2016-02-15 22:12:39 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8ccb2005b3 
							
						 
					 
					
						
						
							
							only show load more messages button when mam is available  
						
						... 
						
						
						
						also update ui after that button has been pressed. fixes  #1695  
						
					 
					
						2016-02-14 23:53:17 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							356199978e 
							
						 
					 
					
						
						
							
							fixed server info push not showing up when unavailable  
						
						
						
					 
					
						2016-02-14 18:19:11 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							251f2479c2 
							
						 
					 
					
						
						
							
							optional mode to close tcp connection when going into background  
						
						... 
						
						
						
						acts only when push is available. disable all non-push accounts to test properly 
						
					 
					
						2016-02-14 13:20:23 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6f9f871928 
							
						 
					 
					
						
						
							
							send push enable to server. simplified logging  
						
						
						
					 
					
						2016-02-13 14:20:07 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c7a14092a8 
							
						 
					 
					
						
						
							
							fixed compile bug in free version  
						
						
						
					 
					
						2016-02-13 00:03:57 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c430848ade 
							
						 
					 
					
						
						
							
							push gcm token on bind instead of every connect  
						
						
						
					 
					
						2016-02-12 23:37:42 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							32da65f910 
							
						 
					 
					
						
						
							
							client side support for XEP-0357: Push Notifications  
						
						
						
					 
					
						2016-02-12 11:39:27 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f37098a54f 
							
						 
					 
					
						
						
							
							catch all axolotl parse exception at once.  fixes   #1692  
						
						
						
					 
					
						2016-02-11 12:26:43 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1bb38e25f2 
							
						 
					 
					
						
						
							
							send muc messages after join  
						
						
						
					 
					
						2016-02-10 09:53:48 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f16690ae1f 
							
						 
					 
					
						
						
							
							allow user to set MAM preferences  
						
						
						
					 
					
						2016-02-09 13:01:17 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							91ec4839ac 
							
						 
					 
					
						
						
							
							prepend instead off append mam messages to conversations when going in reverse  
						
						
						
					 
					
						2016-02-04 16:40:18 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							28733e052f 
							
						 
					 
					
						
						
							
							fixed performance regression in on scroll listener  
						
						
						
					 
					
						2016-02-04 16:29:17 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4fdb0d92fe 
							
						 
					 
					
						
						
							
							prevent previoulsly cleared messages from reloading.  fixes   #1110  
						
						
						
					 
					
						2016-02-04 14:39:16 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f88b8c703e 
							
						 
					 
					
						
						
							
							add more fault tolerant checks for messages left on server  
						
						
						
					 
					
						2016-02-04 11:55:42 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							17791a703e 
							
						 
					 
					
						
						
							
							removed unecessary logging when muc tiles update  
						
						
						
					 
					
						2016-02-04 10:27:38 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7dd9545ea3 
							
						 
					 
					
						
						
							
							use TLSv1.2 as SSL context on supported plattforms  
						
						
						
					 
					
						2016-02-03 18:17:16 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1d572c61d0 
							
						 
					 
					
						
						
							
							cache server caps  
						
						
						
					 
					
						2016-02-03 17:19:05 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0911669b07 
							
						 
					 
					
						
						
							
							count all messages in a query  
						
						
						
					 
					
						2016-02-03 16:04:21 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1274b0ef39 
							
						 
					 
					
						
						
							
							Revert "get rid of broken totalMessageCount for mam queries"  
						
						... 
						
						
						
						This reverts commit 58c6f9bfb2 
						
					 
					
						2016-02-03 10:40:44 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f0798216d5 
							
						 
					 
					
						
						
							
							refactored disco cache. avoid making duplicate call. check hash  
						
						
						
					 
					
						2016-02-03 10:40:02 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4a1a59f0c8 
							
						 
					 
					
						
						
							
							Merge branch 'disco-caps' of  https://github.com/singpolyma/Conversations  into singpolyma-disco-caps  
						
						
						
					 
					
						2016-02-02 18:19:26 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							01bad12708 
							
						 
					 
					
						
						
							
							fixed 'unencrypted' not showing up for conferences when encryption is forced  
						
						
						
					 
					
						2016-02-02 18:15:57 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							58c6f9bfb2 
							
						 
					 
					
						
						
							
							get rid of broken totalMessageCount for mam queries  
						
						
						
					 
					
						2016-02-02 15:39:46 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fab0a45955 
							
						 
					 
					
						
						
							
							re-read common name from certificates on startup  
						
						
						
					 
					
						2016-02-02 13:43:20 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ba9ba8ffe2 
							
						 
					 
					
						
						
							
							avoid npe when accessing the pgp connection service  
						
						
						
					 
					
						2016-02-02 11:21:29 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f30df7a535 
							
						 
					 
					
						
						
							
							catch a few NPE when parsing invalid pep nodes  
						
						
						
					 
					
						2016-02-02 11:21:07 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3978c04782 
							
						 
					 
					
						
						
							
							respect autojoin setting on newly created bookmarks as well  
						
						
						
					 
					
						2016-02-01 14:22:52 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1e7647e385 
							
						 
					 
					
						
						
							
							opt out handling of the autojoin flag.  fixes   #1666  
						
						
						
					 
					
						2016-02-01 13:54:08 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							336daea875 
							
						 
					 
					
						
						
							
							made create context menu call in StartConversationsActivity more failsafe  
						
						
						
					 
					
						2016-02-01 12:31:46 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a3e11415ec 
							
						 
					 
					
						
						
							
							refactored user handling in conferences. show try again button when conference has errors  
						
						
						
					 
					
						2016-02-01 12:11:40 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2eef37174e 
							
						 
					 
					
						
						
							
							fixed false set of subject in conference with empty body tag  
						
						
						
					 
					
						2016-01-31 14:42:35 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							82870b27ed 
							
						 
					 
					
						
						
							
							prefer dns servers from networsk with the default route  
						
						
						
					 
					
						2016-01-29 12:12:23 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c416948f8b 
							
						 
					 
					
						
						
							
							be more careful with resetting the stream id  
						
						
						
					 
					
						2016-01-29 12:09:55 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							28ebf927fb 
							
						 
					 
					
						
						
							
							try to make in-valid-session detection work for pgp  
						
						
						
					 
					
						2016-01-29 12:09:31 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d2c5a939ed 
							
						 
					 
					
						
						
							
							show values in formfieldwrappers and allow form to be set to read only  
						
						
						
					 
					
						2016-01-26 17:23:24 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							edc6ce4ff2 
							
						 
					 
					
						
						
							
							hide jid row in list item list when jid is  null  
						
						
						
					 
					
						2016-01-26 14:47:34 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7c0eae8059 
							
						 
					 
					
						
						
							
							expert setting to trigger extended connection options  
						
						
						
					 
					
						2016-01-25 21:17:53 +01:00 
						 
				 
			
				
					
						
							
							
								Stephen Paul Weber 
							
						 
					 
					
						
						
						
						
							
						
						
							ae84ff2f0c 
							
						 
					 
					
						
						
							
							Do disco for caps hashes we have never seen  
						
						... 
						
						
						
						Then cache it 
						
					 
					
						2016-01-24 17:46:08 -05:00 
						 
				 
			
				
					
						
							
							
								Stephen Paul Weber 
							
						 
					 
					
						
						
						
						
							
						
						
							000f59d614 
							
						 
					 
					
						
						
							
							Fetch cached caps result on new presence  
						
						
						
					 
					
						2016-01-24 17:46:08 -05:00 
						 
				 
			
				
					
						
							
							
								Stephen Paul Weber 
							
						 
					 
					
						
						
						
						
							
						
						
							bf5b2f73f5 
							
						 
					 
					
						
						
							
							Use a Presence class for presence information  
						
						... 
						
						
						
						Only has status for now, but doing it so I can add disco to it 
						
					 
					
						2016-01-24 17:46:08 -05:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							31fd425c9a 
							
						 
					 
					
						
						
							
							changed FileBackend API to allow files instead of messages to be copied and resized  
						
						
						
					 
					
						2016-01-24 12:17:00 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8850a1fbe3 
							
						 
					 
					
						
						
							
							added FormWrapper and form field validation  
						
						
						
					 
					
						2016-01-23 20:32:00 +01:00 
						 
				 
			
				
					
						
							
							
								Stephen Paul Weber 
							
						 
					 
					
						
						
						
						
							
						
						
							ad36a4ba89 
							
						 
					 
					
						
						
							
							Persisitence and loading for ServiceDiscoveryResult  
						
						
						
					 
					
						2016-01-23 10:53:56 -05:00 
						 
				 
			
				
					
						
							
							
								Stephen Paul Weber 
							
						 
					 
					
						
						
						
						
							
						
						
							56f8fff935 
							
						 
					 
					
						
						
							
							Implement toJSON on ServiceDiscoveryResult  
						
						
						
					 
					
						2016-01-23 10:52:45 -05:00 
						 
				 
			
				
					
						
							
							
								Stephen Paul Weber 
							
						 
					 
					
						
						
						
						
							
						
						
							1e335d527b 
							
						 
					 
					
						
						
							
							Generate capHash from any discovery result  
						
						
						
					 
					
						2016-01-23 10:52:44 -05:00 
						 
				 
			
				
					
						
							
							
								Stephen Paul Weber 
							
						 
					 
					
						
						
						
						
							
						
						
							fccce229c6 
							
						 
					 
					
						
						
							
							Factor out a representation of XEP-0030 results  
						
						... 
						
						
						
						And the parser from Element to this representation. 
						
					 
					
						2016-01-23 10:52:40 -05:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0569a1e769 
							
						 
					 
					
						
						
							
							introduced boolean form field wrapper  
						
						
						
					 
					
						2016-01-23 16:23:23 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							39fdf4a333 
							
						 
					 
					
						
						
							
							added support for field types jid-single and text-private  
						
						
						
					 
					
						2016-01-23 12:44:08 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6140861143 
							
						 
					 
					
						
						
							
							reset stanza queue when resetting xmppconnection  
						
						
						
					 
					
						2016-01-23 11:40:32 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							43521891f0 
							
						 
					 
					
						
						
							
							show fetch errors in trust keys activity  
						
						
						
					 
					
						2016-01-23 11:39:02 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ba98fe4f86 
							
						 
					 
					
						
						
							
							use extract account from intent method and final EXTRA_ACCOUNT variable  
						
						
						
					 
					
						2016-01-22 20:46:24 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a6c5430cdd 
							
						 
					 
					
						
						
							
							added UI wrapper for (some) form fields  
						
						
						
					 
					
						2016-01-22 20:22:47 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a47430c2f7 
							
						 
					 
					
						
						
							
							added convenience method to extract account from intent  
						
						
						
					 
					
						2016-01-22 20:21:45 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							40005cec1b 
							
						 
					 
					
						
						
							
							added config variable to allow non-tls connections  
						
						
						
					 
					
						2016-01-22 11:20:31 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							77c0fb0b2a 
							
						 
					 
					
						
						
							
							changed spacing in create dialogs and notify user when no accounts are activated  
						
						
						
					 
					
						2016-01-22 11:14:56 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							eacc7ed1e6 
							
						 
					 
					
						
						
							
							add convenience to get an account object from a spinner  
						
						
						
					 
					
						2016-01-21 17:57:24 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e71acdef29 
							
						 
					 
					
						
						
							
							catch security exception when user prevents access to address book  
						
						
						
					 
					
						2016-01-20 16:18:15 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0619685e55 
							
						 
					 
					
						
						
							
							add intent!=null check in onActivityResultin PublishProfilePicture  
						
						
						
					 
					
						2016-01-20 16:11:17 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0b239243d9 
							
						 
					 
					
						
						
							
							Merge pull request  #1655  from adithyaphilip/pgp-fix  
						
						... 
						
						
						
						Fixes having to choose PGP twice, upgrades openpgp-api to 10 
						
					 
					
						2016-01-16 21:35:38 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a83365ee95 
							
						 
					 
					
						
						
							
							make ConversationsActivity more resistent against being restarted  
						
						
						
					 
					
						2016-01-16 21:18:59 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7b1efe15cd 
							
						 
					 
					
						
						
							
							reuse same xmppconnection for reconnects  
						
						
						
					 
					
						2016-01-16 19:21:11 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							41ae4af1b8 
							
						 
					 
					
						
						
							
							made constructor private in Account entity  
						
						
						
					 
					
						2016-01-16 18:57:47 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ad5bcb7d43 
							
						 
					 
					
						
						
							
							removed some unused methods from db backend  
						
						
						
					 
					
						2016-01-16 18:57:19 +01:00 
						 
				 
			
				
					
						
							
							
								Adithya Abraham Philip 
							
						 
					 
					
						
						
						
						
							
						
						
							a9a3ef0f67 
							
						 
					 
					
						
						
							
							fixed PGP having to be selected twice  
						
						
						
					 
					
						2016-01-16 04:26:01 +05:30 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							494a04ffb1 
							
						 
					 
					
						
						
							
							hide prepare image toasts when attaching multiple images  
						
						
						
					 
					
						2016-01-15 23:47:55 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d85854b686 
							
						 
					 
					
						
						
							
							show toast when image cropper get oom  
						
						
						
					 
					
						2016-01-15 23:47:16 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							943d0391d4 
							
						 
					 
					
						
						
							
							catch exception when reading message id from database  
						
						
						
					 
					
						2016-01-15 23:46:52 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c5743067ad 
							
						 
					 
					
						
						
							
							nimbuzz.com: don't wait for disco replies to set account to online  
						
						
						
					 
					
						2016-01-15 14:26:23 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							aa6955a0d6 
							
						 
					 
					
						
						
							
							fixed typo when reading battery_op setting  
						
						
						
					 
					
						2016-01-14 20:38:16 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							12fd5c46ef 
							
						 
					 
					
						
						
							
							show /me messages in conference notifications without the name of the sender  
						
						
						
					 
					
						2016-01-13 17:36:04 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							14428da108 
							
						 
					 
					
						
						
							
							show key fetch error in activity when there are no keys to be used  
						
						
						
					 
					
						2016-01-13 12:19:56 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							571eb2f7f9 
							
						 
					 
					
						
						
							
							check for file storage permission before selecting avatar  
						
						
						
					 
					
						2016-01-13 12:05:59 +01:00 
						 
				 
			
				
					
						
							
							
								Dheeraj CVR 
							
						 
					 
					
						
						
						
						
							
						
						
							ffb49c7217 
							
						 
					 
					
						
						
							
							use batch transactions when writing roster  
						
						... 
						
						
						
						Fixes https://github.com/siacs/Conversations/issues/1648  
						
					 
					
						2016-01-13 11:56:35 +04:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3e9fd0185a 
							
						 
					 
					
						
						
							
							throw security exception instead of going to next srv entry  
						
						
						
					 
					
						2016-01-12 23:42:47 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							893751a1d2 
							
						 
					 
					
						
						
							
							move some ssl socket modifiers into a seperate helper class  
						
						
						
					 
					
						2016-01-12 16:33:15 +01:00 
						 
				 
			
				
					
						
							
							
								moparisthebest 
							
						 
					 
					
						
						
						
						
							
						
						
							217f6603c0 
							
						 
					 
					
						
						
							
							Implement XEP-0368: SRV records for XMPP over TLS  
						
						
						
					 
					
						2016-01-11 17:25:16 -05:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							20ec9ff2c6 
							
						 
					 
					
						
						
							
							reworked that loop that iterates over various servers  
						
						
						
					 
					
						2016-01-11 19:05:25 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c296d6f446 
							
						 
					 
					
						
						
							
							ask to be excluded from battery optimization  
						
						
						
					 
					
						2016-01-11 11:17:45 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4ab8fe13de 
							
						 
					 
					
						
						
							
							let the user decide on whether or not to compress pictures  
						
						
						
					 
					
						2016-01-09 16:17:39 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							708d7c5b98 
							
						 
					 
					
						
						
							
							automatically adjust image compression to keep files under 512MiB  
						
						
						
					 
					
						2016-01-09 16:16:18 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6acb80a83a 
							
						 
					 
					
						
						
							
							added Config.java variable to change the default notification behaviour to always  
						
						
						
					 
					
						2016-01-08 22:07:23 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9dce42ac7f 
							
						 
					 
					
						
						
							
							don't show snackbar when notifications are disabled or paused  
						
						
						
					 
					
						2016-01-08 21:35:20 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a3e136b550 
							
						 
					 
					
						
						
							
							show per conference notification settings in details activity  
						
						
						
					 
					
						2016-01-08 21:30:46 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0bb3ae37f0 
							
						 
					 
					
						
						
							
							show icon in conversations overview when notifications are disabled  
						
						
						
					 
					
						2016-01-08 14:41:55 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5dd5685885 
							
						 
					 
					
						
						
							
							Merge pull request  #1641  from fiaxh/uuid-fix  
						
						... 
						
						
						
						Correct uuid check according to RFC 4122 
						
					 
					
						2016-01-08 00:17:21 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c59eb75a59 
							
						 
					 
					
						
						
							
							avoid duplicate messages when sending files to mucs.  fixes   #1635  
						
						
						
					 
					
						2016-01-06 12:59:13 +01:00 
						 
				 
			
				
					
						
							
							
								fiaxh 
							
						 
					 
					
						
						
						
						
							
						
						
							62d0eebe5c 
							
						 
					 
					
						
						
							
							Correct uuid check according to RFC 4122  
						
						
						
					 
					
						2016-01-05 20:07:29 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c3e2d2cfba 
							
						 
					 
					
						
						
							
							added missing synchronize when pushing messages from mam backlog  
						
						
						
					 
					
						2016-01-04 20:14:29 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fb97f9d18f 
							
						 
					 
					
						
						
							
							null check in getOriginalPath  
						
						
						
					 
					
						2016-01-04 20:14:08 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							501034fe0e 
							
						 
					 
					
						
						
							
							Allow entering a JID from 'choose contact'. thanks @singpolyma  
						
						... 
						
						
						
						fixes  #1611 
fixes  #1602  
					
						2016-01-04 17:27:54 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fdb6b0e30d 
							
						 
					 
					
						
						
							
							only report error after third unsuccesful attempt to connect  
						
						
						
					 
					
						2016-01-04 15:33:11 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f815a7cd26 
							
						 
					 
					
						
						
							
							properly rotate avatars  
						
						
						
					 
					
						2016-01-04 15:17:02 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							95bf0630f0 
							
						 
					 
					
						
						
							
							show trust keys activties if own keys are undecided  
						
						
						
					 
					
						2016-01-04 12:11:58 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c116f735dc 
							
						 
					 
					
						
						
							
							add obb url to unencrypted messages  
						
						
						
					 
					
						2016-01-03 19:39:06 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a319446d41 
							
						 
					 
					
						
						
							
							edit account activity was still showing the omemo key with leading 0x05.  fixes   #1631  
						
						
						
					 
					
						2016-01-03 19:38:48 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d875061407 
							
						 
					 
					
						
						
							
							removed xhtml body.  fixes   #1594  
						
						
						
					 
					
						2016-01-01 16:52:32 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							73e2389eee 
							
						 
					 
					
						
						
							
							use actual message timestamp instead of delay when updating last seen.  fixes   #1618  
						
						
						
					 
					
						2015-12-31 18:06:11 +01:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							58d213f291 
							
						 
					 
					
						
						
							
							Fix OMEMO session creating loggin  
						
						... 
						
						
						
						Now prints the correct JID to the log when finding devices without
sessions. 
						
					 
					
						2015-12-31 15:48:43 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cfccf5e90d 
							
						 
					 
					
						
						
							
							handle null names in getColorForName  
						
						
						
					 
					
						2015-12-29 10:32:54 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7bb67ee660 
							
						 
					 
					
						
						
							
							strip leading 0x05 off omemo fingerprints  
						
						
						
					 
					
						2015-12-27 18:37:31 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							703d95fcf8 
							
						 
					 
					
						
						
							
							lower case all fingerprints.  fixes   #1521  
						
						
						
					 
					
						2015-12-27 18:37:12 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c3bdec1ce9 
							
						 
					 
					
						
						
							
							dedublicate bookmarks  
						
						
						
					 
					
						2015-12-27 17:29:32 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bcf99db3df 
							
						 
					 
					
						
						
							
							fixed stuck at omemo encryption when x509 verification is being used  
						
						
						
					 
					
						2015-12-27 17:29:19 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f49158a44b 
							
						 
					 
					
						
						
							
							register context menu long click listener on message text.  fixes   #1614  
						
						
						
					 
					
						2015-12-27 17:28:42 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							be91c0741f 
							
						 
					 
					
						
						
							
							made text selectable again unless text contains more than 1 link  
						
						... 
						
						
						
						fixes  #1615  
					
						2015-12-26 19:18:37 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c40372fc0d 
							
						 
					 
					
						
						
							
							code cleanup  
						
						
						
					 
					
						2015-12-23 22:30:14 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f46cbb38a9 
							
						 
					 
					
						
						
							
							show certificate information  
						
						
						
					 
					
						2015-12-23 19:18:53 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d0bad09f13 
							
						 
					 
					
						
						
							
							save certificate when verifying with x509  
						
						
						
					 
					
						2015-12-23 17:41:26 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							534013fd0c 
							
						 
					 
					
						
						
							
							store identity key in XmppAxolotlSession instead of the fingerprint  
						
						
						
					 
					
						2015-12-19 15:44:11 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ade89beb96 
							
						 
					 
					
						
						
							
							use presence name not server name when verification is being used  
						
						
						
					 
					
						2015-12-19 13:07:38 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							15c8cb8ac6 
							
						 
					 
					
						
						
							
							add more debugging to certificate checks after new omemo session was established  
						
						
						
					 
					
						2015-12-19 12:44:55 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e8bf5cada4 
							
						 
					 
					
						
						
							
							only offer plain and omemo encryption when x509 verification is enabled  
						
						
						
					 
					
						2015-12-19 12:44:12 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f05f97251c 
							
						 
					 
					
						
						
							
							prefer server name over address book name when x509 verification is being used  
						
						
						
					 
					
						2015-12-19 12:43:09 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							20b4e756fe 
							
						 
					 
					
						
						
							
							add 'store' message hint to displayed chat markers  
						
						
						
					 
					
						2015-12-17 15:32:03 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0f9058ffef 
							
						 
					 
					
						
						
							
							throw exception at the end of the stream  
						
						
						
					 
					
						2015-12-17 15:20:06 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e10a0b0c4c 
							
						 
					 
					
						
						
							
							let message parser not artifically fail on messages with no to attribute  
						
						
						
					 
					
						2015-12-17 14:30:00 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							43dd681239 
							
						 
					 
					
						
						
							
							timeout service discovery after 20s  
						
						
						
					 
					
						2015-12-15 19:24:05 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							85f36e9dbc 
							
						 
					 
					
						
						
							
							default force encryption to false  
						
						
						
					 
					
						2015-12-14 10:58:55 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f6b22dad20 
							
						 
					 
					
						
						
							
							splite PARANOIA_MODE into three different options  
						
						
						
					 
					
						2015-12-14 10:54:55 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							042939e44d 
							
						 
					 
					
						
						
							
							make message text non-selectable.  fixes   #1606  
						
						
						
					 
					
						2015-12-14 10:44:43 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							50817956c2 
							
						 
					 
					
						
						
							
							changed order of send presence and execute mam queries  
						
						
						
					 
					
						2015-12-12 16:01:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							88523bbb50 
							
						 
					 
					
						
						
							
							more detailed logging  
						
						
						
					 
					
						2015-12-12 15:58:22 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5e4b55a0ff 
							
						 
					 
					
						
						
							
							notfiy after mam catchup only if message count > 0  
						
						
						
					 
					
						2015-12-11 20:43:50 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a1ac4fd665 
							
						 
					 
					
						
						
							
							fix cancelation of http downloads and enable resume  
						
						
						
					 
					
						2015-12-11 20:33:41 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b2c278c91b 
							
						 
					 
					
						
						
							
							set bookmark name to room subject if no subject has been set before  
						
						
						
					 
					
						2015-12-11 19:28:44 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							293e820a58 
							
						 
					 
					
						
						
							
							get rid of lastMessageTransmitted in favor of db query  
						
						
						
					 
					
						2015-12-11 13:52:04 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5ffb87059c 
							
						 
					 
					
						
						
							
							renamed pretty-please-store message hint to store  
						
						
						
					 
					
						2015-12-10 23:37:38 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							15f220747f 
							
						 
					 
					
						
						
							
							some more NPE checks  
						
						
						
					 
					
						2015-12-10 23:16:39 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							55c1129a65 
							
						 
					 
					
						
						
							
							notify on mam catchup messages  
						
						
						
					 
					
						2015-12-10 23:05:11 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2262921ff4 
							
						 
					 
					
						
						
							
							properly clean up timed out mam queries  
						
						
						
					 
					
						2015-12-10 18:28:47 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ede92235d7 
							
						 
					 
					
						
						
							
							disable sm logging  
						
						
						
					 
					
						2015-12-10 18:26:31 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5bd70cfee8 
							
						 
					 
					
						
						
							
							always show conversations with pending subscription requests  
						
						
						
					 
					
						2015-12-09 12:18:06 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5e151c7311 
							
						 
					 
					
						
						
							
							wait with status change to online after all disco queries have been made  
						
						
						
					 
					
						2015-12-09 11:16:03 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							11e58607c9 
							
						 
					 
					
						
						
							
							when no avatar found show avatar of contact and not the muc user in conferences  
						
						
						
					 
					
						2015-12-09 10:30:26 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							aea664a0ec 
							
						 
					 
					
						
						
							
							show sender name for notications in conferences.  fixes   #1581  
						
						
						
					 
					
						2015-12-09 10:26:30 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1de74c2337 
							
						 
					 
					
						
						
							
							also verify sessions in CBE mode that got created by key transport messages  
						
						
						
					 
					
						2015-12-08 17:15:08 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ac06cb2e4f 
							
						 
					 
					
						
						
							
							modified contact permission dialog  
						
						
						
					 
					
						2015-12-07 13:24:41 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							739648e909 
							
						 
					 
					
						
						
							
							ask for contact permissions when first opening StartConversationActivity  
						
						
						
					 
					
						2015-12-07 13:24:41 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c3e8fb3446 
							
						 
					 
					
						
						
							
							request storage permission when needed on Android 6.0  
						
						
						
					 
					
						2015-12-07 13:24:41 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							739a2d609d 
							
						 
					 
					
						
						
							
							implement direct sharing in android 6.0.  fixes   #1321  
						
						
						
					 
					
						2015-12-07 13:24:41 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							904edf5d59 
							
						 
					 
					
						
						
							
							hide prepare file toast after preparing the file  
						
						
						
					 
					
						2015-12-06 11:57:11 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bd765c59ce 
							
						 
					 
					
						
						
							
							check availabiltiy of pgp before sharing files  
						
						
						
					 
					
						2015-12-05 19:03:17 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b7f326372d 
							
						 
					 
					
						
						
							
							be more carefull with pending uris  
						
						
						
					 
					
						2015-12-05 19:02:57 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6358f641e7 
							
						 
					 
					
						
						
							
							check for query object as condition to trigger deduplication instead of serverId  
						
						
						
					 
					
						2015-12-05 18:41:38 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							41dcd8005b 
							
						 
					 
					
						
						
							
							parse stanza-id from messages  
						
						
						
					 
					
						2015-12-04 22:03:46 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cd9a29718b 
							
						 
					 
					
						
						
							
							properly clear muc user avatar caches  
						
						
						
					 
					
						2015-12-04 21:36:48 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9d1e8a34b2 
							
						 
					 
					
						
						
							
							fixed showing avatars for contacts in muc  
						
						
						
					 
					
						2015-12-04 18:39:09 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							196c8e593f 
							
						 
					 
					
						
						
							
							Merge pull request  #1595  from fiaxh/pgp_database_signature  
						
						... 
						
						
						
						Regenerate PGP signatures once 
						
					 
					
						2015-12-04 15:35:51 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0664d6ac7b 
							
						 
					 
					
						
						
							
							avoid some NPEs  
						
						
						
					 
					
						2015-12-04 15:35:22 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3e3cb047be 
							
						 
					 
					
						
						
							
							rely on message id if message id is uuid and pgp encryption was used to deduplicate messages.  fixes   #1357  
						
						
						
					 
					
						2015-12-04 15:34:45 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							242887447c 
							
						 
					 
					
						
						
							
							use proposed nick as default nick in mucoptions  
						
						
						
					 
					
						2015-12-04 14:07:16 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6b592435cd 
							
						 
					 
					
						
						
							
							parse vcard avatars from muc presences  
						
						
						
					 
					
						2015-12-03 18:18:34 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f1c0b7372f 
							
						 
					 
					
						
						
							
							enabled previously disabled http upload  
						
						
						
					 
					
						2015-12-03 12:45:12 +01:00 
						 
				 
			
				
					
						
							
							
								fiaxh 
							
						 
					 
					
						
						
						
						
							
						
						
							e5f154316c 
							
						 
					 
					
						
						
							
							Unset all PGP signatures once  
						
						... 
						
						
						
						... so they will be redone to match the changed status. 
						
					 
					
						2015-12-02 18:06:48 +00:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							aa21797f43 
							
						 
					 
					
						
						
							
							Merge branch 'master' of github.com:siacs/Conversations  
						
						
						
					 
					
						2015-12-02 16:38:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0eaf7669f7 
							
						 
					 
					
						
						
							
							Merge pull request  #1545  from SamWhited/show_new_contact_request_messages  
						
						... 
						
						
						
						Show status message when contact requests presence 
						
					 
					
						2015-12-02 16:38:08 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							a3eb540f05 
							
						 
					 
					
						
						
							
							Show status message when contact requests presence  
						
						... 
						
						
						
						Remove presence when conversation closed 
						
					 
					
						2015-12-02 08:50:52 -06:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							025cbf7d44 
							
						 
					 
					
						
						
							
							show tor config in paranoid mode  
						
						
						
					 
					
						2015-12-02 15:34:09 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							02c6793ca9 
							
						 
					 
					
						
						
							
							fixed avatar loading for non-file uris  
						
						
						
					 
					
						2015-12-02 15:30:03 +01:00 
						 
				 
			
				
					
						
							
							
								Philip Flohr 
							
						 
					 
					
						
						
						
						
							
						
						
							0329c9c738 
							
						 
					 
					
						
						
							
							users are now able to crop their avatar pictures using the android-crop  
						
						... 
						
						
						
						library 
						
					 
					
						2015-12-02 14:25:20 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8455e5b5dd 
							
						 
					 
					
						
						
							
							hide message content in notifications in paranoia mode  
						
						
						
					 
					
						2015-12-02 12:54:55 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							dc8967d8fc 
							
						 
					 
					
						
						
							
							introduced build-time paranoia mode that disables unencrypted chats and forces TOR  
						
						
						
					 
					
						2015-12-01 22:41:58 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							65b5504e68 
							
						 
					 
					
						
						
							
							introduce config.java variable to optionally show number of connected accounts in notification  
						
						
						
					 
					
						2015-12-01 17:15:36 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2cd43f7042 
							
						 
					 
					
						
						
							
							fixed crashes when activity got destroyed when selecting pgp key  
						
						
						
					 
					
						2015-12-01 14:18:07 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d42c82abf2 
							
						 
					 
					
						
						
							
							combine multiple message receipts into single message  
						
						
						
					 
					
						2015-12-01 12:22:47 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2225b0b6d5 
							
						 
					 
					
						
						
							
							add error state for unavailable tor network  
						
						
						
					 
					
						2015-12-01 12:00:50 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b4a259837e 
							
						 
					 
					
						
						
							
							always use http proxy for http requests. (socks is leaking dns)  
						
						
						
					 
					
						2015-12-01 12:00:50 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8ffcc11f27 
							
						 
					 
					
						
						
							
							refactored socks5 connection code. make jingle transport use that new code  
						
						
						
					 
					
						2015-12-01 12:00:50 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ebccb67a72 
							
						 
					 
					
						
						
							
							do socks5 connect manually  
						
						
						
					 
					
						2015-12-01 12:00:50 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f0b1761ec3 
							
						 
					 
					
						
						
							
							initial tor support  
						
						
						
					 
					
						2015-12-01 12:00:50 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							06cadab7cc 
							
						 
					 
					
						
						
							
							changed method signature of calcSampleSize  
						
						
						
					 
					
						2015-11-30 16:03:04 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							60211a315e 
							
						 
					 
					
						
						
							
							hide subject edit button if not editable by user  
						
						
						
					 
					
						2015-11-26 17:44:29 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							23ef1c660a 
							
						 
					 
					
						
						
							
							encrypt pgp messages to self  
						
						
						
					 
					
						2015-11-26 17:44:11 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fd6ed5b989 
							
						 
					 
					
						
						
							
							detect server identity and added muc-workaround for slack  
						
						
						
					 
					
						2015-11-26 06:55:57 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							84120a341a 
							
						 
					 
					
						
						
							
							removed unnecessary configuration fetch after join  
						
						
						
					 
					
						2015-11-26 06:53:24 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							210de7d781 
							
						 
					 
					
						
						
							
							removed unecessary chat state  
						
						
						
					 
					
						2015-11-26 06:53:02 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ecb4615f2a 
							
						 
					 
					
						
						
							
							fail jingle file transfer if axolotl key message could not be created.  fixes   #1576  
						
						
						
					 
					
						2015-11-26 06:52:46 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a557d38e4d 
							
						 
					 
					
						
						
							
							pgp fixes and revert configuration changes  
						
						
						
					 
					
						2015-11-25 20:47:02 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8228e82f51 
							
						 
					 
					
						
						
							
							Merge pull request  #1569  from fiaxh/conference_one_other_occupant  
						
						... 
						
						
						
						Show own avatar in tile for conferences with only one other occupant next to theirs 
						
					 
					
						2015-11-24 07:09:12 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fbb7cb99f7 
							
						 
					 
					
						
						
							
							Merge pull request  #1558  from fiaxh/pgp_api_9.0  
						
						... 
						
						
						
						Use OpenPGP-API 9.0 
						
					 
					
						2015-11-24 06:52:24 +01:00 
						 
				 
			
				
					
						
							
							
								fiaxh 
							
						 
					 
					
						
						
						
						
							
						
						
							2c1f7e115c 
							
						 
					 
					
						
						
							
							PgpEngine: Get account from conversation instead of from contact.  fixes   #1568 ,  fixes   #1544  
						
						
						
					 
					
						2015-11-15 13:24:07 +00:00 
						 
				 
			
				
					
						
							
							
								fiaxh 
							
						 
					 
					
						
						
						
						
							
						
						
							724ca8c9a9 
							
						 
					 
					
						
						
							
							Own contact picture in tile for conferences with only one other occupant  
						
						
						
					 
					
						2015-11-15 10:34:10 +00:00 
						 
				 
			
				
					
						
							
							
								fiaxh 
							
						 
					 
					
						
						
						
						
							
						
						
							c7a519498a 
							
						 
					 
					
						
						
							
							Sign empty status  
						
						
						
					 
					
						2015-11-09 13:50:02 +00:00 
						 
				 
			
				
					
						
							
							
								fiaxh 
							
						 
					 
					
						
						
						
						
							
						
						
							fac1d4e0bd 
							
						 
					 
					
						
						
							
							Use OpenPGP-API 9.0  
						
						
						
					 
					
						2015-11-09 13:49:57 +00:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							c6e54e7e5a 
							
						 
					 
					
						
						
							
							Move migration 19 before 17  
						
						... 
						
						
						
						Migration 17 depends on Account deserialization, so any migrations that
touch the accounts table need to be applied beforehand.
Re-writing the migration to work directly on the database would lead to
a lot of code duplication, so it's not worth it at this time, but might
become necessary later on to avoid dependency cycles. 
						
					 
					
						2015-11-06 14:50:55 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fb9ba0a734 
							
						 
					 
					
						
						
							
							don't close socket on disconnect  
						
						
						
					 
					
						2015-11-01 07:45:00 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							baf76d883c 
							
						 
					 
					
						
						
							
							indicate cbe in chat message hint  
						
						
						
					 
					
						2015-10-31 22:55:04 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bca29cf7fd 
							
						 
					 
					
						
						
							
							explicitly mark verified omemo keys in UI  
						
						
						
					 
					
						2015-10-31 10:57:57 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							34bcc59f72 
							
						 
					 
					
						
						
							
							fixed session objects not being build on start up  
						
						
						
					 
					
						2015-10-30 12:05:21 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6a458b853c 
							
						 
					 
					
						
						
							
							Merge pull request  #1513  from fiaxh/pgp_background_decryption  
						
						... 
						
						
						
						PGP messages background decryption 
						
					 
					
						2015-10-30 10:18:27 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8553d5a563 
							
						 
					 
					
						
						
							
							moved db calls made from UI into serial background thread  
						
						
						
					 
					
						2015-10-29 17:20:01 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ef7857ac8d 
							
						 
					 
					
						
						
							
							avoid npe when checking for stream restart  
						
						
						
					 
					
						2015-10-29 14:38:35 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c7ff196f58 
							
						 
					 
					
						
						
							
							push CN into nick pep node when uploading certificate. subscribe to nick node  
						
						
						
					 
					
						2015-10-29 13:41:08 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7410e2023a 
							
						 
					 
					
						
						
							
							Merge branch 'master' of github.com:siacs/Conversations  
						
						
						
					 
					
						2015-10-29 12:08:32 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1221cff561 
							
						 
					 
					
						
						
							
							load avatars in message adapter in background task  
						
						
						
					 
					
						2015-10-29 12:08:15 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a7fd629c05 
							
						 
					 
					
						
						
							
							show encryption type in warned/red messages  
						
						
						
					 
					
						2015-10-28 22:40:09 +01:00 
						 
				 
			
				
					
						
							
							
								fiaxh 
							
						 
					 
					
						
						
						
						
							
						
						
							016a57f123 
							
						 
					 
					
						
						
							
							Show PGP "please wait" message only when actually decrypting  
						
						
						
					 
					
						2015-10-28 20:57:15 +00:00 
						 
				 
			
				
					
						
							
							
								fiaxh 
							
						 
					 
					
						
						
						
						
							
						
						
							29a849cb92 
							
						 
					 
					
						
						
							
							Decrypt PGP messages in background  
						
						
						
					 
					
						2015-10-28 19:57:11 +00:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							e747ecef4d 
							
						 
					 
					
						
						
							
							Don't synchronize on non-final field  
						
						
						
					 
					
						2015-10-26 20:13:48 -05:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ec473a4437 
							
						 
					 
					
						
						
							
							Merge pull request  #1520  from saqura/self_handle_orientation  
						
						... 
						
						
						
						Handle some orientation changes manually 
						
					 
					
						2015-10-26 09:30:08 +01:00 
						 
				 
			
				
					
						
							
							
								saqura 
							
						 
					 
					
						
						
						
						
							
						
						
							48f172fc9e 
							
						 
					 
					
						
						
							
							Reset the margins manually after rotating  
						
						
						
					 
					
						2015-10-26 00:59:32 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							56afdcc94a 
							
						 
					 
					
						
						
							
							invalidate menu after backend connection.  
						
						... 
						
						
						
						fixes the menu not being shown after rotation in edit account details 
						
					 
					
						2015-10-25 22:46:06 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1bd68a42b2 
							
						 
					 
					
						
						
							
							join muc even if initial conference configuration fetch failed  
						
						
						
					 
					
						2015-10-22 11:20:36 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3c45f00443 
							
						 
					 
					
						
						
							
							fixed read conversations showing up as notifications after a restart  
						
						
						
					 
					
						2015-10-21 17:41:44 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f4a33a007c 
							
						 
					 
					
						
						
							
							open unknown files with wildcard intent  
						
						
						
					 
					
						2015-10-20 17:41:07 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							569b9f4e66 
							
						 
					 
					
						
						
							
							open manage account + certificate chooser when cbe mode is enabled  
						
						
						
					 
					
						2015-10-20 15:27:33 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							53125dbccc 
							
						 
					 
					
						
						
							
							move chat state reset from background switch to foreground switch to account for chat states sent in the mean time  
						
						
						
					 
					
						2015-10-19 23:22:29 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9b07059b6e 
							
						 
					 
					
						
						
							
							update last seen in mucs.  fixes   #1508  
						
						
						
					 
					
						2015-10-19 23:20:33 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							efab290c28 
							
						 
					 
					
						
						
							
							add nick to bookmark when entering full jid in join conference dialog  
						
						
						
					 
					
						2015-10-19 23:20:00 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							adca670196 
							
						 
					 
					
						
						
							
							synchronize around the disco object  
						
						
						
					 
					
						2015-10-19 23:03:19 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							be38b1e5f4 
							
						 
					 
					
						
						
							
							disconnet in background thread  
						
						
						
					 
					
						2015-10-17 16:10:56 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e956c7b2a2 
							
						 
					 
					
						
						
							
							only try EXTERNAL auth if client certificate is set for account  
						
						
						
					 
					
						2015-10-17 16:10:31 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3c6c424d31 
							
						 
					 
					
						
						
							
							don't retry building broken omemo keys  
						
						
						
					 
					
						2015-10-17 15:51:21 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0f405c2e11 
							
						 
					 
					
						
						
							
							allow redownloading files from remote hosts.  fixes   #1504  
						
						
						
					 
					
						2015-10-17 15:23:46 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e9e31b1c9b 
							
						 
					 
					
						
						
							
							load axolotl session cache on first device update  
						
						
						
					 
					
						2015-10-17 14:44:59 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a83aae341f 
							
						 
					 
					
						
						
							
							improved error reporting in trust keys activity  
						
						
						
					 
					
						2015-10-17 14:09:26 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cfeb67d71d 
							
						 
					 
					
						
						
							
							introduced code to verify omemo device keys with x509 certificates.  
						
						... 
						
						
						
						cleaned up TrustKeysActivity to automatically close if there is nothing to do 
						
					 
					
						2015-10-16 23:48:42 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fb7359e6a3 
							
						 
					 
					
						
						
							
							block code when doing unforced disconnect  
						
						
						
					 
					
						2015-10-16 09:58:31 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c1716a35e3 
							
						 
					 
					
						
						
							
							moved other name parsing into seperate method  
						
						
						
					 
					
						2015-10-15 20:05:55 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fc96dcaa4d 
							
						 
					 
					
						
						
							
							use constants for oids in xmppdomainverifier  
						
						
						
					 
					
						2015-10-15 19:14:41 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5b271e1ed8 
							
						 
					 
					
						
						
							
							more checks for xmppdomainverifier and better wildcard handling  
						
						
						
					 
					
						2015-10-15 18:06:26 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e75c2cd731 
							
						 
					 
					
						
						
							
							use own XmppDomainVerifier instead of deprecated StrictHostnameVerifier.  fixes   #1189  
						
						
						
					 
					
						2015-10-15 17:08:38 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							30dbf97a1c 
							
						 
					 
					
						
						
							
							clear bitmap cache before running out of memory  
						
						
						
					 
					
						2015-10-14 22:55:59 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5f9476448f 
							
						 
					 
					
						
						
							
							make unread status and notifications presistent across restarts  
						
						
						
					 
					
						2015-10-14 21:18:34 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0587ba2ad2 
							
						 
					 
					
						
						
							
							work with muc services that change the message id  
						
						
						
					 
					
						2015-10-14 11:15:18 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							76828950ee 
							
						 
					 
					
						
						
							
							cleaned up some code. log last tag  
						
						
						
					 
					
						2015-10-13 23:34:09 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f24649c819 
							
						 
					 
					
						
						
							
							set cursor to end of jid in edit account  
						
						
						
					 
					
						2015-10-13 16:58:08 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							212d1a8c91 
							
						 
					 
					
						
						
							
							add config variable to enable x509 verification  
						
						
						
					 
					
						2015-10-12 13:18:20 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							933538a39d 
							
						 
					 
					
						
						
							
							code clean up  
						
						
						
					 
					
						2015-10-12 12:36:54 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b519411d34 
							
						 
					 
					
						
						
							
							enable SASL EXTERNAL (certificate login  
						
						
						
					 
					
						2015-10-11 20:45:01 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7be331bbb2 
							
						 
					 
					
						
						
							
							add menu item in account details to renew certificate  
						
						
						
					 
					
						2015-10-11 16:10:52 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							fdd88aa530 
							
						 
					 
					
						
						
							
							Clean up  
						
						... 
						
						
						
						Fixes some random linter warnings. 
						
					 
					
						2015-10-11 16:05:44 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							a7c7a42136 
							
						 
					 
					
						
						
							
							Improve InvalidJidException handling in Jid class  
						
						... 
						
						
						
						This code should never be triggered anway, so with this 'fix', we should
at least get more meaningful stack traces. Plus, it makes the linter
happy by preventing NullPointerExceptions. 
						
					 
					
						2015-10-11 16:05:44 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							da31582911 
							
						 
					 
					
						
						
							
							Merge pull request  #1461  from akallabeth/captcha_support  
						
						... 
						
						
						
						Implemented account registration with captcha 
						
					 
					
						2015-10-11 15:56:42 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9e1393bc1c 
							
						 
					 
					
						
						
							
							prevent null pointer when trying to display device fingerprints of not existing sessions  
						
						
						
					 
					
						2015-10-11 14:27:09 +02:00 
						 
				 
			
				
					
						
							
							
								Armin Novak 
							
						 
					 
					
						
						
						
						
							
						
						
							6a6cb43b17 
							
						 
					 
					
						
						
							
							Captcha support.  
						
						
						
					 
					
						2015-10-11 13:11:50 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b23cb5a9e4 
							
						 
					 
					
						
						
							
							initial UI work to allow setting up accounts from certifcates  
						
						
						
					 
					
						2015-10-09 13:37:08 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ef605e4cbd 
							
						 
					 
					
						
						
							
							do not dismiss editAccountActivity when still trying to register new account  
						
						
						
					 
					
						2015-10-09 10:49:30 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e65068d226 
							
						 
					 
					
						
						
							
							catch exception when unregistering receivers that have not been registered before  
						
						
						
					 
					
						2015-10-08 00:52:04 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f81e44d339 
							
						 
					 
					
						
						
							
							removed oob element from file messages  
						
						
						
					 
					
						2015-10-08 00:35:23 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							52a5e72b02 
							
						 
					 
					
						
						
							
							introduced expert options to set status to away and xa if screen is off or if phone is silenced  
						
						
						
					 
					
						2015-10-08 00:35:04 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							043e19dd65 
							
						 
					 
					
						
						
							
							add xhtml image tag to unencrypted image urls. add oob tag to all files that are on remote hosts  
						
						
						
					 
					
						2015-10-07 12:08:25 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8f066d00e0 
							
						 
					 
					
						
						
							
							do mam query after join  
						
						
						
					 
					
						2015-10-06 16:58:56 +02:00 
						 
				 
			
				
					
						
							
							
								saqura 
							
						 
					 
					
						
						
						
						
							
						
						
							fd61d67dab 
							
						 
					 
					
						
						
							
							Use MAM for MUC initial history retrieval  
						
						... 
						
						
						
						If the MUC supports MAM (XEP-0313), use it to retrieve the history
when joining. 
						
					 
					
						2015-10-06 16:23:45 +02:00 
						 
				 
			
				
					
						
							
							
								saqura 
							
						 
					 
					
						
						
						
						
							
						
						
							05d0c9f4fe 
							
						 
					 
					
						
						
							
							Properly check for MUC MAM support  
						
						... 
						
						
						
						Only use MAM (XEP-0313) in MUCs if it is supported.
This should fix  #1264  
						
					 
					
						2015-10-06 16:23:18 +02:00 
						 
				 
			
				
					
						
							
							
								saqura 
							
						 
					 
					
						
						
						
						
							
						
						
							403db3b080 
							
						 
					 
					
						
						
							
							Show whether MAM is supported in MUCs  
						
						... 
						
						
						
						The conference details in "Advanced Mode" now indicate whether MAM is
supported by the conference server. 
						
					 
					
						2015-10-06 16:23:05 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							32abc76689 
							
						 
					 
					
						
						
							
							changed store path for files  
						
						
						
					 
					
						2015-10-06 16:18:23 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1d2a24c9c0 
							
						 
					 
					
						
						
							
							clean up log exporting service. properly end service after exporting  
						
						
						
					 
					
						2015-10-06 14:13:07 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e6af502055 
							
						 
					 
					
						
						
							
							clear notification and activate grace period when receiving chat marker from another instance  
						
						
						
					 
					
						2015-10-06 11:44:27 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							160dfa49a0 
							
						 
					 
					
						
						
							
							try to catch plattform bugs  
						
						
						
					 
					
						2015-10-02 11:58:03 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4b62bd256d 
							
						 
					 
					
						
						
							
							properly recycle bitmaps  
						
						
						
					 
					
						2015-10-02 11:39:30 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2b9b700c96 
							
						 
					 
					
						
						
							
							don't put conference joins into pending on initial bind  
						
						
						
					 
					
						2015-10-01 16:01:19 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6a0b9971aa 
							
						 
					 
					
						
						
							
							reset muc options immediately befor join  
						
						
						
					 
					
						2015-10-01 13:03:15 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9dcf074a79 
							
						 
					 
					
						
						
							
							request stanza count after every ibb data stanza to not fill our own stanza queue  
						
						
						
					 
					
						2015-09-30 23:42:02 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							648e29db2c 
							
						 
					 
					
						
						
							
							only invoke MTM in interactive mode after direct user input  
						
						... 
						
						
						
						fixes  #1027 
fixes  #792 
fixes  #1439  
					
						2015-09-29 19:24:52 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							64dbb069ab 
							
						 
					 
					
						
						
							
							rotate thumbnails.  fixes   #1438  
						
						
						
					 
					
						2015-09-29 12:25:32 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5fb77a9739 
							
						 
					 
					
						
						
							
							fixed NPE when executing rename callback in muc  
						
						
						
					 
					
						2015-09-28 15:36:55 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8881b71079 
							
						 
					 
					
						
						
							
							do tab completion only if neither ctrl nor alt are being pressed  
						
						
						
					 
					
						2015-09-28 14:36:10 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f4d6b676e9 
							
						 
					 
					
						
						
							
							catch rare activity not found exception when opening downloaded files  
						
						
						
					 
					
						2015-09-27 21:27:07 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bbbc30e823 
							
						 
					 
					
						
						
							
							allow tab completion in conferences  
						
						
						
					 
					
						2015-09-27 19:17:44 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5a5e0e7121 
							
						 
					 
					
						
						
							
							use Conversations 1.x.y as user agent string in http upload and download  
						
						
						
					 
					
						2015-09-23 18:05:51 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8d90b3fbf1 
							
						 
					 
					
						
						
							
							swapped icons for foreground services  
						
						
						
					 
					
						2015-09-22 08:50:54 +02:00 
						 
				 
			
				
					
						
							
							
								fiaxh 
							
						 
					 
					
						
						
						
						
							
						
						
							a3a13dd9dc 
							
						 
					 
					
						
						
							
							Export logs to SD card preference  
						
						
						
					 
					
						2015-09-21 18:53:29 +01:00 
						 
				 
			
				
					
						
							
							
								fiaxh 
							
						 
					 
					
						
						
						
						
							
						
						
							024e697cee 
							
						 
					 
					
						
						
							
							Iterator to go through all messages of a conversation  
						
						
						
					 
					
						2015-09-20 22:17:32 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a954e32b16 
							
						 
					 
					
						
						
							
							let DnsHelper provide a fallback solution  
						
						
						
					 
					
						2015-09-19 17:31:24 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							069ddddbc1 
							
						 
					 
					
						
						
							
							fixed content-type indication in http upload  
						
						
						
					 
					
						2015-09-19 17:29:33 +02:00 
						 
				 
			
				
					
						
							
							
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							8f69017d5a 
							
						 
					 
					
						
						
							
							remove the from attribute from sendStartStream()  fixes   #1419  
						
						
						
					 
					
						2015-09-19 15:58:33 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b54b4ca78a 
							
						 
					 
					
						
						
							
							introduced Config variable to use legacy namespace for http upload  
						
						
						
					 
					
						2015-09-17 14:42:50 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							506b83ddc6 
							
						 
					 
					
						
						
							
							be more careful when publishing device bundle  
						
						
						
					 
					
						2015-09-17 14:18:06 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c173d78950 
							
						 
					 
					
						
						
							
							ignore spoofed stanzas in facebook chat  
						
						
						
					 
					
						2015-09-17 14:13:38 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							07c7f5bc08 
							
						 
					 
					
						
						
							
							catch IndexOutOfBoundsException when swiping away conversations  
						
						
						
					 
					
						2015-09-17 14:02:28 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7e712d9d4c 
							
						 
					 
					
						
						
							
							fixed rare NPE in DnsHelper. fixed spelling and added logging  
						
						
						
					 
					
						2015-09-17 13:55:27 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b9002d7fd5 
							
						 
					 
					
						
						
							
							added missing type='submit' to mam queries  
						
						... 
						
						
						
						fixed some nasty inheritance problems along the way
fixes  #1411  
						
					 
					
						2015-09-15 22:52:39 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b5719fd747 
							
						 
					 
					
						
						
							
							work around a NPE caused by arace condition in the http upload  
						
						
						
					 
					
						2015-09-15 22:49:43 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8d13a77bc6 
							
						 
					 
					
						
						
							
							changed http upload namespace to reflect the one in the XEP  
						
						
						
					 
					
						2015-09-14 13:22:10 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							96575d6290 
							
						 
					 
					
						
						
							
							added possibiltiy to set conferences as moderated (only visible in advanced mode)  
						
						
						
					 
					
						2015-09-13 17:13:46 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4220fa948b 
							
						 
					 
					
						
						
							
							added mp4 to well known extensions.  fixes   #1403  
						
						
						
					 
					
						2015-09-12 10:42:56 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							811e2eaeec 
							
						 
					 
					
						
						
							
							increased dns timeout  
						
						
						
					 
					
						2015-09-10 10:54:15 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							650abf1c52 
							
						 
					 
					
						
						
							
							added alt as possible modifier key. use mod+(0..9) to jump to a conversation  
						
						
						
					 
					
						2015-09-09 23:28:37 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6bb9983d58 
							
						 
					 
					
						
						
							
							added rotation detection to up/down navigation  
						
						
						
					 
					
						2015-09-07 20:45:21 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6308dcfdd4 
							
						 
					 
					
						
						
							
							added some key binding  
						
						... 
						
						
						
						* ctrl + tab will open the conversations overview (when available)
* ctrl + up / down will navigate between conversations 
						
					 
					
						2015-09-07 15:46:27 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							88cdd03f0f 
							
						 
					 
					
						
						
							
							catch npe in setupIme method  
						
						
						
					 
					
						2015-09-07 13:31:24 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							eff173ebc2 
							
						 
					 
					
						
						
							
							indicate broken pep in server info  
						
						
						
					 
					
						2015-09-06 19:40:28 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							a95c451f1e 
							
						 
					 
					
						
						
							
							Only show that have sessions in fingerprint list  
						
						... 
						
						
						
						Doesn't access database directly anymore but goes through AxolotlService
now to obtain list of fingerprints associated with an Account/Contact.
This should prevent orphaned keys littering the UI which previously
couldn't be removed through the Clear Devices function.
Together with 1c79982da84964c1d81179a0927d9cd1eadf53de this fixes  #1393  
						
					 
					
						2015-09-06 15:15:57 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							2bb033267b 
							
						 
					 
					
						
						
							
							Don't manually add keys to the store  
						
						... 
						
						
						
						There is no need to preemptively add the keys to the store oneself.
SessionBuilder will take care of this for us. What's more, this will
prevent IdentityKeys from otherwise invalid bundles to show up in our
UI. 
						
					 
					
						2015-09-06 15:15:57 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2c4a6b0912 
							
						 
					 
					
						
						
							
							add null pointer check to db migration  
						
						
						
					 
					
						2015-09-05 18:47:37 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							e2d506c96a 
							
						 
					 
					
						
						
							
							Never build a session with oneself  
						
						... 
						
						
						
						If we detect our own ID is not in our own devicelist on receiving an
update, we reannounce ourselves. This used to have the side effect of
modifying the list of devices we thought were in the update set, causing
us to accidentally build a session with ourselves.
This lead to our own key being set to TRUSTED_INACTIVE, resulting in red
lock icons on messages sent by the own device.
We fix this by having publishOwnDeviceId() operate on a copy of the
original set. This commit also includes a db migration which deletes
sessions with oneself and sets own keys back to TRUSTED. 
						
					 
					
						2015-09-05 17:29:58 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a32a577e36 
							
						 
					 
					
						
						
							
							ignore timeout exceptions on secondary dns requests  
						
						
						
					 
					
						2015-09-05 14:26:31 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7eb228d1a5 
							
						 
					 
					
						
						
							
							Issues with URLs with multiple dots in file.  fixes   #1373  
						
						
						
					 
					
						2015-09-04 19:58:53 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1848b46195 
							
						 
					 
					
						
						
							
							invoke onEnterPressed callback only if shift is not pressed  
						
						
						
					 
					
						2015-09-04 19:33:31 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9baa87e5c9 
							
						 
					 
					
						
						
							
							minimize softkeyboard only if it has been in fullscreen mode  
						
						
						
					 
					
						2015-09-04 18:02:53 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							204cee4a17 
							
						 
					 
					
						
						
							
							show an send button instead of the enter key in softkeyboards when enterIsSend and showEnterKey are both set  
						
						
						
					 
					
						2015-09-04 14:48:00 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							b265341848 
							
						 
					 
					
						
						
							
							Ensure uris is empty before onStart adds to it  
						
						... 
						
						
						
						Fixes  #1382  
					
						2015-09-02 22:03:15 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fc594e249a 
							
						 
					 
					
						
						
							
							added special error state for dns timeout  
						
						
						
					 
					
						2015-09-01 22:37:52 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							91b0605bc2 
							
						 
					 
					
						
						
							
							use same method to add message hints to otr message everywhere it is needed  
						
						
						
					 
					
						2015-09-01 22:36:56 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							74cf8320bc 
							
						 
					 
					
						
						
							
							tag axolotl messages with pretty-please-store  
						
						
						
					 
					
						2015-09-01 00:13:19 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							aaf3ecaf41 
							
						 
					 
					
						
						
							
							made useImageAsIs determination a bit more foolproof (samsung)  
						
						
						
					 
					
						2015-08-31 20:19:26 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b0c19d6bac 
							
						 
					 
					
						
						
							
							fixed bug that prevented newly opened conversations to load the entire history via mam.  fixes   #1328  
						
						
						
					 
					
						2015-08-30 11:24:37 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8f4b7686c9 
							
						 
					 
					
						
						
							
							catch invalid base64 on omemo key decoding  
						
						
						
					 
					
						2015-08-30 11:11:54 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3db7087658 
							
						 
					 
					
						
						
							
							use build in method on >= lolipop devices to discover dns servers  
						
						
						
					 
					
						2015-08-28 13:05:34 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							384c441990 
							
						 
					 
					
						
						
							
							reformating and upper bound for waiting on stanza writer  
						
						
						
					 
					
						2015-08-28 11:42:11 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5298f4e2aa 
							
						 
					 
					
						
						
							
							fixed type=timeout  
						
						
						
					 
					
						2015-08-28 11:41:41 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							eff9e417e0 
							
						 
					 
					
						
						
							
							use dedicated colors for primary and primary_dark  
						
						
						
					 
					
						2015-08-26 21:17:29 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c5abddc584 
							
						 
					 
					
						
						
							
							fixed highlight text color for white chat bubbles  
						
						
						
					 
					
						2015-08-26 21:12:19 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							1156ccbce2 
							
						 
					 
					
						
						
							
							Fix error handling for announce check retrieval  
						
						... 
						
						
						
						Only aborts when a timeout was received. Error conditions (most notably
item-not-found) are interpreted as no other devices existing. 
						
					 
					
						2015-08-26 20:52:44 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cd451856b2 
							
						 
					 
					
						
						
							
							explictitly handle iq timeouts in bind and session iqs  
						
						
						
					 
					
						2015-08-26 20:47:08 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							c4a548ada0 
							
						 
					 
					
						
						
							
							Only announce device after publishing bundle  
						
						
						
					 
					
						2015-08-26 15:45:21 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f6b7a25e29 
							
						 
					 
					
						
						
							
							moved actual iq callback out of synchronized find callback block  
						
						
						
					 
					
						2015-08-26 14:01:37 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ea2ce78d6e 
							
						 
					 
					
						
						
							
							be more restrictive about marking messages as sent_received in muc parser  
						
						
						
					 
					
						2015-08-26 12:11:12 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3e0636367a 
							
						 
					 
					
						
						
							
							Revert "improved compatibility with muc components that change the message id"  
						
						... 
						
						
						
						This reverts commit df86b0fc47 
						
					 
					
						2015-08-26 11:39:18 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							0eeaccd974 
							
						 
					 
					
						
						
							
							Fix key publishing  
						
						... 
						
						
						
						Remove invalid check for result code, which prevented publishing if the
node was empty to begin with.
Fix pepBroken check 
						
					 
					
						2015-08-26 00:27:39 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							25a9d59412 
							
						 
					 
					
						
						
							
							Add more logging to pep attemp counter logic  
						
						
						
					 
					
						2015-08-25 18:52:36 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							eafcf38ec9 
							
						 
					 
					
						
						
							
							Limit number of PEP publish tries  
						
						... 
						
						
						
						If PEP publish tries are repeatedly triggered by empty PEP updates, stop
attempting to publish after 3 tries. This should work around broken PEP
implementations in older ejabberd and OpenFire versions. 
						
					 
					
						2015-08-25 18:43:44 +02:00 
						 
				 
			
				
					
						
							
							
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							ae9de26f59 
							
						 
					 
					
						
						
							
							remove unused imports.  
						
						
						
					 
					
						2015-08-25 12:40:22 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							b84fecf51a 
							
						 
					 
					
						
						
							
							Pass through device IDs when updating own list  
						
						
						
					 
					
						2015-08-25 12:17:09 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5eae1e52d2 
							
						 
					 
					
						
						
							
							cleared up some error messages in axolotl service and execute publishOwnDevicesWhenNeeded() only if processing our own jid  
						
						
						
					 
					
						2015-08-25 11:43:10 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							25c49d5e34 
							
						 
					 
					
						
						
							
							catch some db query exceptions  
						
						
						
					 
					
						2015-08-25 11:12:10 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7617a19280 
							
						 
					 
					
						
						
							
							additonal null checks in file backend  
						
						
						
					 
					
						2015-08-25 11:11:53 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							476db24c10 
							
						 
					 
					
						
						
							
							fixed session time  
						
						
						
					 
					
						2015-08-25 11:11:32 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f6374f466b 
							
						 
					 
					
						
						
							
							increased carbon grace period to 90s  
						
						
						
					 
					
						2015-08-24 21:25:04 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							730a5c644b 
							
						 
					 
					
						
						
							
							renamed plain text to unencrypted.  fixes   #1331  
						
						
						
					 
					
						2015-08-24 21:15:47 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							865e08401b 
							
						 
					 
					
						
						
							
							fixed regression with mlinks stream managment.  fixes   #1206  
						
						
						
					 
					
						2015-08-24 20:56:36 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fb0b4bb445 
							
						 
					 
					
						
						
							
							added setting to allow for white backgrounds in incoming message bubbles  
						
						
						
					 
					
						2015-08-24 20:56:25 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d36ae091b6 
							
						 
					 
					
						
						
							
							Merge branch 'master' into development  
						
						
						
					 
					
						2015-08-24 18:18:24 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d0b8bd0f8a 
							
						 
					 
					
						
						
							
							catch invalid base64 in axolotl key parsing  
						
						
						
					 
					
						2015-08-24 18:18:01 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							deb9c20e5e 
							
						 
					 
					
						
						
							
							Merge branch 'master' into development  
						
						
						
					 
					
						2015-08-23 21:06:58 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c19adebaf0 
							
						 
					 
					
						
						
							
							open files with capital extensions as well.  fixes   #1354  
						
						
						
					 
					
						2015-08-23 21:00:51 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							91a3cee6d2 
							
						 
					 
					
						
						
							
							Merge branch 'master' into development  
						
						
						
					 
					
						2015-08-23 19:44:58 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8043833156 
							
						 
					 
					
						
						
							
							bugfix: next encryption is now being properly detected  
						
						
						
					 
					
						2015-08-23 19:40:45 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7bd0f31244 
							
						 
					 
					
						
						
							
							Merge branch 'master' into development  
						
						
						
					 
					
						2015-08-23 17:57:53 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0dfb9bd1a0 
							
						 
					 
					
						
						
							
							introduce special iq type for internal timeouts. always use != result to check for error in callbacks  
						
						
						
					 
					
						2015-08-23 17:53:23 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							777dd4b51e 
							
						 
					 
					
						
						
							
							Merge branch 'master' into development  
						
						
						
					 
					
						2015-08-23 17:29:46 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bbfd98b726 
							
						 
					 
					
						
						
							
							reformating  
						
						
						
					 
					
						2015-08-23 17:29:31 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d51c4b9655 
							
						 
					 
					
						
						
							
							deal with another set of stream:features after bind  
						
						
						
					 
					
						2015-08-23 17:26:50 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b0710cdf04 
							
						 
					 
					
						
						
							
							Merge branch 'master' into development  
						
						
						
					 
					
						2015-08-23 13:57:14 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							e1dc7f990d 
							
						 
					 
					
						
						
							
							Add error handling to OMEMO PEP code  
						
						... 
						
						
						
						Log received errors and abort processing 
						
					 
					
						2015-08-23 13:23:51 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3d6fb9b21d 
							
						 
					 
					
						
						
							
							remove callbacks directly from iterator  
						
						
						
					 
					
						2015-08-23 10:20:29 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1688b65965 
							
						 
					 
					
						
						
							
							don't make subsequent iq request when original stanza returned an error  
						
						
						
					 
					
						2015-08-23 08:27:05 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							496f531e2e 
							
						 
					 
					
						
						
							
							modified clearIqCallbacks into 2-step process  
						
						
						
					 
					
						2015-08-23 08:01:47 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9e26375d2f 
							
						 
					 
					
						
						
							
							simulate old behaviour with messages being set to waiting while offline  
						
						
						
					 
					
						2015-08-19 13:00:52 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c9b2638778 
							
						 
					 
					
						
						
							
							Merge branch 'master' into development  
						
						
						
					 
					
						2015-08-19 12:49:24 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							52f0622dd3 
							
						 
					 
					
						
						
							
							fixed nasty 'stuck at sending' bug that got introduced in  32826ec29d 
						
						
						
					 
					
						2015-08-19 12:47:50 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							dafcee6a5b 
							
						 
					 
					
						
						
							
							Merge branch 'master' into development  
						
						
						
					 
					
						2015-08-19 12:29:23 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6e1870b00a 
							
						 
					 
					
						
						
							
							check if inputstream is null before cropping avatar images  
						
						
						
					 
					
						2015-08-19 12:25:17 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9ebd6d503c 
							
						 
					 
					
						
						
							
							catch package manager has died exception  
						
						
						
					 
					
						2015-08-19 12:24:42 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9edcca1045 
							
						 
					 
					
						
						
							
							Merge branch 'master' into development  
						
						
						
					 
					
						2015-08-16 15:01:06 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5b1dda9148 
							
						 
					 
					
						
						
							
							deal with broken frameworks  
						
						
						
					 
					
						2015-08-16 14:55:40 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d7b3060fc8 
							
						 
					 
					
						
						
							
							catch broken base64 in avatars  
						
						
						
					 
					
						2015-08-16 14:55:24 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							51a2645349 
							
						 
					 
					
						
						
							
							synchronize packetCallbacks  
						
						
						
					 
					
						2015-08-16 12:12:22 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c082066118 
							
						 
					 
					
						
						
							
							catch null pointer in ScramSHA1 sasl  
						
						
						
					 
					
						2015-08-16 11:50:33 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5501502e89 
							
						 
					 
					
						
						
							
							Merge branch 'depend_on_sm' into development  
						
						
						
					 
					
						2015-08-15 19:18:38 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ecac1e5943 
							
						 
					 
					
						
						
							
							Merge branch 'development'  
						
						
						
					 
					
						2015-08-15 19:12:51 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							45d68c200e 
							
						 
					 
					
						
						
							
							Display error message if all contact keys purged  
						
						
						
					 
					
						2015-08-15 18:52:47 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							83e1e6468e 
							
						 
					 
					
						
						
							
							fully depend on sm  
						
						
						
					 
					
						2015-08-15 16:57:07 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1f34fb742c 
							
						 
					 
					
						
						
							
							Merge branch 'development'  
						
						
						
					 
					
						2015-08-15 14:26:37 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							32826ec29d 
							
						 
					 
					
						
						
							
							provide extra interface to close sockets.  fixes   #1330  
						
						
						
					 
					
						2015-08-15 14:14:33 +02:00 
						 
				 
			
				
					
						
							
							
								hlad 
							
						 
					 
					
						
						
						
						
							
						
						
							4539643f27 
							
						 
					 
					
						
						
							
							show HTTP upload availability on Edit account screen  
						
						
						
					 
					
						2015-08-14 22:24:05 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							dad90762b4 
							
						 
					 
					
						
						
							
							do not touch pictures that are already in the right format  
						
						... 
						
						
						
						fixed  #522  
					
						2015-08-11 16:50:00 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3677c6ec98 
							
						 
					 
					
						
						
							
							use same code that is used to open files for images  
						
						... 
						
						
						
						fixes  #1323  
					
						2015-08-11 15:24:06 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c0dcf4a55a 
							
						 
					 
					
						
						
							
							changed color of 'whispered' prefix  
						
						... 
						
						
						
						fixes  #1326  
					
						2015-08-11 15:13:17 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fd81491b05 
							
						 
					 
					
						
						
							
							put wake locks on out of band file transfers  
						
						
						
					 
					
						2015-08-10 19:48:36 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d30515a85a 
							
						 
					 
					
						
						
							
							report wrong file size in otr encrypted jingle file transfers to be compatible with conversations > 1.6  
						
						
						
					 
					
						2015-08-10 12:55:37 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b5e90850d8 
							
						 
					 
					
						
						
							
							provide more detailed error toasts for http file download  
						
						
						
					 
					
						2015-08-10 12:15:14 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b7f00ddac3 
							
						 
					 
					
						
						
							
							fixed image preview in notfications for images that arrived over jingle  
						
						
						
					 
					
						2015-08-08 17:19:40 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8b9b74ff7e 
							
						 
					 
					
						
						
							
							renamed multi-end / axolotl to OMEMO  
						
						
						
					 
					
						2015-08-08 13:29:21 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							efdf3b6c1c 
							
						 
					 
					
						
						
							
							removed dead code  
						
						
						
					 
					
						2015-08-08 13:13:23 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cac577fa4e 
							
						 
					 
					
						
						
							
							don't request ack for iq stanzas before stream managment is initialized  
						
						... 
						
						
						
						fixes  #1322  
					
						2015-08-08 10:26:36 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							7437d0fe0c 
							
						 
					 
					
						
						
							
							Increase number of published prekeys for release  
						
						
						
					 
					
						2015-08-07 12:30:39 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							53ce5d223e 
							
						 
					 
					
						
						
							
							request server-ACKs for iq stanzas  
						
						
						
					 
					
						2015-08-06 20:48:55 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6694af8fca 
							
						 
					 
					
						
						
							
							fail old/invalid iq stanzas on bind  
						
						
						
					 
					
						2015-08-06 14:54:37 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5c0853f302 
							
						 
					 
					
						
						
							
							hide multi-end and otr encryption in conferences  
						
						
						
					 
					
						2015-08-06 13:09:53 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							34b22dea48 
							
						 
					 
					
						
						
							
							Improve TrustKeysActivity slider responsiveness  
						
						... 
						
						
						
						Slider used to skip back on drag-and-drop action. The switch doesn't
trigger explicit whole UI refreshes anymore, it now directly adjusts the
"done" button's locked status. 
						
					 
					
						2015-08-05 22:24:13 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a1c43d8fdf 
							
						 
					 
					
						
						
							
							added config.java variable to hide openpgp as an encryption method  
						
						
						
					 
					
						2015-08-05 18:52:34 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c617cf6ef8 
							
						 
					 
					
						
						
							
							added Config.java varibale to lock account creation to specfic domain  
						
						
						
					 
					
						2015-08-03 22:58:17 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a6bbe4d4ce 
							
						 
					 
					
						
						
							
							lets try jpeg for a while  
						
						
						
					 
					
						2015-08-01 23:37:41 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5529337da3 
							
						 
					 
					
						
						
							
							use content-type in http slot request and stick with during upload  
						
						
						
					 
					
						2015-08-01 22:37:17 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f9dec7cf86 
							
						 
					 
					
						
						
							
							fixed calculated file size in http slot request  
						
						
						
					 
					
						2015-08-01 22:23:58 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							6cd9383e53 
							
						 
					 
					
						
						
							
							Let UNTRUSTED/UNDECIDED keys become INACTIVE  
						
						
						
					 
					
						2015-08-01 18:30:11 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							60cd307f73 
							
						 
					 
					
						
						
							
							enable axolotl encryption for jingle supported file transfers  
						
						
						
					 
					
						2015-08-01 01:19:16 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							6059b96456 
							
						 
					 
					
						
						
							
							Provide process function for key transport message  
						
						
						
					 
					
						2015-07-31 23:28:09 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							909f761ca1 
							
						 
					 
					
						
						
							
							Refactor axolotl message processing workflow  
						
						... 
						
						
						
						XmppAxolotlMessage is now entirely responsible for handling encryption
and decryption of messages, only leveraging XmppAxolotlSession as a
packing/unpacking primitive for payload keys.
Removed pseudo-dead session generation code step from prepareMessage
function, as sessions have been created by invoking the
TrustKeysActivity for a while now.
Added prepareKeyTransportMessage function, which creates a message with
no payload. The key that is packed into the header keyElements can then
be used for other purposes (e.g. encrypted file transfer). 
						
					 
					
						2015-07-31 21:31:45 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							50b14434ee 
							
						 
					 
					
						
						
							
							Reformat code  
						
						
						
					 
					
						2015-07-31 21:31:45 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							5c421da1e1 
							
						 
					 
					
						
						
							
							Change to new wire protocol version  
						
						
						
					 
					
						2015-07-31 21:31:45 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							26ac7c9030 
							
						 
					 
					
						
						
							
							added missing carbon column message table create statement  
						
						... 
						
						
						
						fixes  #1310  
					
						2015-07-31 13:08:35 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							658919f239 
							
						 
					 
					
						
						
							
							improved 'next encryption' selection  
						
						
						
					 
					
						2015-07-31 00:52:46 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							74ab36fda2 
							
						 
					 
					
						
						
							
							Fix session logic: enforce same type of encryption  
						
						
						
					 
					
						2015-07-30 19:18:09 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1ed550b5c5 
							
						 
					 
					
						
						
							
							fixed some colors in message adapter  
						
						
						
					 
					
						2015-07-30 12:40:50 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							58d80f58be 
							
						 
					 
					
						
						
							
							use gcm for file encryption over http  
						
						
						
					 
					
						2015-07-29 23:45:37 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							b7c64cd19d 
							
						 
					 
					
						
						
							
							Reset lock color for non-axolotl messages  
						
						
						
					 
					
						2015-07-29 20:25:14 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							2b3bb02261 
							
						 
					 
					
						
						
							
							Highlight selected message's fingerprint in list  
						
						
						
					 
					
						2015-07-29 20:21:37 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							e07853ea62 
							
						 
					 
					
						
						
							
							Rerender message bubbles on encryption change  
						
						
						
					 
					
						2015-07-29 20:10:21 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							e6df4d81d2 
							
						 
					 
					
						
						
							
							Tag carbon messages in parser, adapt session logic  
						
						... 
						
						
						
						Messages sent from another device of the own account are now explicitly
tagged as carboned message. The session detection logic now uses this
tag to find "session borders". 
						
					 
					
						2015-07-29 16:41:58 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							e10a6c5b87 
							
						 
					 
					
						
						
							
							Fix NPE: consider unknown keys UNDECIDED  
						
						
						
					 
					
						2015-07-29 02:59:41 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							77920c7aa6 
							
						 
					 
					
						
						
							
							Color plaintext messages in encrypted sessions red  
						
						... 
						
						
						
						Plaintext messages that were received while in an encrypted session are
now colored red. We define "in an encrypted session" if a) the last
message sent by our own device before the message under consideration
(or any message received between then and now) was encrypted AND b) the
next message will be sent encrypted or the next message sent after the
one under consideration was sent encrypted 
						
					 
					
						2015-07-29 02:59:41 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							a3991d59c9 
							
						 
					 
					
						
						
							
							Improve trust toggle responsiveness  
						
						... 
						
						
						
						Removed unnecessary UI refreshes, explicitly update UI where needed. 
						
					 
					
						2015-07-29 02:59:41 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							efcefc2e63 
							
						 
					 
					
						
						
							
							Refactor out inner classes, cache trust store  
						
						... 
						
						
						
						Moves SQLiteAxolotlStore and XmppAxolotlSession into proper classes.
IdentityKeys trust statuses are now cached in an LruCache to prevent
hammering the database when rendering the UI. 
						
					 
					
						2015-07-29 02:59:26 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							17bc4fb6cd 
							
						 
					 
					
						
						
							
							show http downloaded images in notification  
						
						
						
					 
					
						2015-07-29 01:57:08 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8f14d2bfbd 
							
						 
					 
					
						
						
							
							removed recursion in message.getMerged*()  
						
						
						
					 
					
						2015-07-28 23:00:30 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8924c448d1 
							
						 
					 
					
						
						
							
							changed logging. (work around logcat null pointer  
						
						
						
					 
					
						2015-07-28 22:26:29 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6b8e1ecb95 
							
						 
					 
					
						
						
							
							log reason for message failure  
						
						
						
					 
					
						2015-07-28 14:44:11 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ff0c114cd6 
							
						 
					 
					
						
						
							
							set time on resend to current time  
						
						... 
						
						
						
						fixes  #1298 
fixes  #919  
					
						2015-07-28 12:54:54 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9c94c9ad8f 
							
						 
					 
					
						
						
							
							rewrote dns fallback  
						
						
						
					 
					
						2015-07-24 19:06:47 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e5fae429fa 
							
						 
					 
					
						
						
							
							call refreshUi directly  
						
						
						
					 
					
						2015-07-24 14:43:13 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c32162c280 
							
						 
					 
					
						
						
							
							switch/case can't deal with null pointers  
						
						
						
					 
					
						2015-07-23 14:02:25 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cd204d5931 
							
						 
					 
					
						
						
							
							show warning when trying to highlight users that have left the conference  
						
						
						
					 
					
						2015-07-22 15:57:17 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f7634a85be 
							
						 
					 
					
						
						
							
							treat private, non-anonymous mucs like 1:1 chats notification wise  
						
						
						
					 
					
						2015-07-22 15:31:00 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							db05d26433 
							
						 
					 
					
						
						
							
							Always build own device session automatically  
						
						
						
					 
					
						2015-07-22 15:03:52 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9c1c86ed44 
							
						 
					 
					
						
						
							
							add no-store to chat states  
						
						
						
					 
					
						2015-07-22 14:17:02 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							63206e6d4a 
							
						 
					 
					
						
						
							
							use type=chat more often to go along with new, simple carbon and mam rules  
						
						... 
						
						
						
						* change chat states to type=chat and chat markers to type=chat
* use same type as requesting stanza for delivery receipts (which should make them type=chat most of the time) 
						
					 
					
						2015-07-22 14:15:00 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a1e63944a2 
							
						 
					 
					
						
						
							
							use 'interactive mode' when starting downloads from the context menu  
						
						
						
					 
					
						2015-07-22 12:15:09 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							c2813cea29 
							
						 
					 
					
						
						
							
							Hide regenerate keys button  
						
						... 
						
						
						
						Can re-enable it via Config.java setting 
						
					 
					
						2015-07-22 01:00:20 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							4c1c2892c7 
							
						 
					 
					
						
						
							
							Disable trust toggle completely for INACTIVE keys  
						
						
						
					 
					
						2015-07-22 00:53:54 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							456d4c8b23 
							
						 
					 
					
						
						
							
							made image file format configurable by Config.java  
						
						
						
					 
					
						2015-07-21 23:49:35 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d38228f482 
							
						 
					 
					
						
						
							
							fixed npe in error message handling  
						
						
						
					 
					
						2015-07-21 19:45:41 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f6281a182d 
							
						 
					 
					
						
						
							
							fixed npe in error message handling  
						
						
						
					 
					
						2015-07-21 19:44:25 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							92b5081b5e 
							
						 
					 
					
						
						
							
							Add INACTIVE state for removed keys  
						
						... 
						
						
						
						We introduce a new trust state: INACTIVE. This state is intended for
old keys that have been removed.
When a TRUSTED device is removed from the PEP devicelist, it's status
will be set to INACTIVE. INACTIVE keys are shown in the UI as greyed
out, non-interactible key rows. Messages are not encrypted for INACTIVE
devices.
When an INACTIVE device reappears in PEP, or a message is received from
an INACTIVE device, it is set back to trusted. 
						
					 
					
						2015-07-21 14:24:59 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							3c5c0c7d3b 
							
						 
					 
					
						
						
							
							Fill own device sessions into SessionMap  
						
						
						
					 
					
						2015-07-21 14:24:59 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1aeb5874b0 
							
						 
					 
					
						
						
							
							allow for private messages being started from muc details in anonymous mucs  
						
						
						
					 
					
						2015-07-21 13:15:59 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							32f90613a3 
							
						 
					 
					
						
						
							
							and now do that properly  
						
						
						
					 
					
						2015-07-21 12:02:15 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ffa588ba3e 
							
						 
					 
					
						
						
							
							and now do that properly  
						
						
						
					 
					
						2015-07-21 12:01:20 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							af76ad0144 
							
						 
					 
					
						
						
							
							end otr session when receiving failed otr message warnings  
						
						
						
					 
					
						2015-07-21 12:00:01 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							394486b300 
							
						 
					 
					
						
						
							
							bugfix: also add no-permanent-storage to message hints  
						
						
						
					 
					
						2015-07-21 11:59:52 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f1ee5cccf0 
							
						 
					 
					
						
						
							
							bugfix: changed condition of onOtrSessionEstablished being called  
						
						... 
						
						
						
						fixed  #1263 
fixed  #1260 
fixed  #1293  
					
						2015-07-21 11:59:30 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5c2720efd0 
							
						 
					 
					
						
						
							
							bugfix: don't crash if aes key could not be set before jingle transfer  
						
						
						
					 
					
						2015-07-21 11:55:48 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							37cbdb8b4e 
							
						 
					 
					
						
						
							
							bugfix: use sendIqPacket method in service instead of invoking XmppConnection directly  
						
						
						
					 
					
						2015-07-21 11:55:33 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							086653b649 
							
						 
					 
					
						
						
							
							bugfix: accept status code 201 on http upload  
						
						
						
					 
					
						2015-07-21 11:55:18 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							87bc9d3a31 
							
						 
					 
					
						
						
							
							end otr session when receiving failed otr message warnings  
						
						
						
					 
					
						2015-07-21 11:52:49 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a5027104fd 
							
						 
					 
					
						
						
							
							bugfix: also add no-permanent-storage to message hints  
						
						
						
					 
					
						2015-07-21 11:50:32 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f74ee765a2 
							
						 
					 
					
						
						
							
							bugfix: changed condition of onOtrSessionEstablished being called  
						
						... 
						
						
						
						fixed  #1263 
fixed  #1260 
fixed  #1293  
					
						2015-07-21 11:46:56 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							b7ff2c3461 
							
						 
					 
					
						
						
							
							Use properly fixed numeral values in Trust enum  
						
						... 
						
						
						
						Why, oh God, why?! #thanksjamesgosling 
						
					 
					
						2015-07-21 01:52:22 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							639ebd644b 
							
						 
					 
					
						
						
							
							Remove unused import  
						
						
						
					 
					
						2015-07-21 01:17:29 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							122bc97ce2 
							
						 
					 
					
						
						
							
							Switch payload encryption to AES-GCM  
						
						... 
						
						
						
						This also ensures that the IV is generated with proper randomness. 
						
					 
					
						2015-07-21 01:17:14 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							971aa3a11e 
							
						 
					 
					
						
						
							
							Also decrypt messages from UNTRUSTED sessions  
						
						
						
					 
					
						2015-07-20 23:16:06 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							d2845e9ac1 
							
						 
					 
					
						
						
							
							Refactor axolotl send processing/caching flow  
						
						
						
					 
					
						2015-07-20 23:13:28 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							8be0e8a27d 
							
						 
					 
					
						
						
							
							Start TrustKeysActivity if no keys are TRUSTED  
						
						... 
						
						
						
						If there are no UNDECIDED keys, but none of the contact's keys are
trusted, redirect the user to the TrustKeysActivity 
						
					 
					
						2015-07-20 22:35:07 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							4ee3f330f5 
							
						 
					 
					
						
						
							
							Do not display clear devices button if not online  
						
						
						
					 
					
						2015-07-20 22:19:04 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							ab2d114bbc 
							
						 
					 
					
						
						
							
							Add purge axolotl key option  
						
						... 
						
						
						
						Can now long-press a key to permanently purge it. 
						
					 
					
						2015-07-20 22:18:24 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							0ee64124fe 
							
						 
					 
					
						
						
							
							Fix getNumTrustedKeys  
						
						
						
					 
					
						2015-07-20 22:02:54 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e79f82ca72 
							
						 
					 
					
						
						
							
							attempt to fix the delay problem  
						
						
						
					 
					
						2015-07-20 18:11:33 +02:00 
						 
				 
			
				
					
						
							
							
								Raphael Pohl 
							
						 
					 
					
						
						
						
						
							
						
						
							e6cb12dfe4 
							
						 
					 
					
						
						
							
							changed message bubble appearance  
						
						
						
					 
					
						2015-07-20 16:02:17 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							504ef0b72e 
							
						 
					 
					
						
						
							
							rely on refreshUi/refreshUiReal and make sure it is being used everywhere  
						
						
						
					 
					
						2015-07-20 15:48:58 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							aaa8fe8978 
							
						 
					 
					
						
						
							
							Merge branch 'CryptoNextBeta' into development  
						
						... 
						
						
						
						* CryptoNextBeta: (60 commits)
  Lock TrustKeys if no trusted keys are available
  Optimize imports
  Use MD style for key trust toggle switch
  Fix set/remove OnUpdateBlocklistListener
  Fix axolotl database migration
  Remove device list from EditAccount
  Add clear devices to overflow menu in EditAccount
  Ask for key trust when sending messages
  Encrypt files for HTTP upload in encrypted chats
  Refactor trust key ui and show in account details
  Send correct body for HTTP files
  Handle file transmission properly in axolotl
  Remove unneccessary code
  Fix trust status for outgoing messages
  Don't merge messages with different trust statuses
  Fix copying of axolotl keys to clipboard
  Add refresh icon to v21 theme
  Disable Axolotl option if not usable
  Show trust status of messages' originating session
  Add key trust toggle to ContactDetailsActivity
  ... 
						
					 
					
						2015-07-20 15:13:14 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							19a0ae42d6 
							
						 
					 
					
						
						
							
							Lock TrustKeys if no trusted keys are available  
						
						
						
					 
					
						2015-07-20 14:56:41 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							012f036840 
							
						 
					 
					
						
						
							
							Optimize imports  
						
						
						
					 
					
						2015-07-20 14:26:29 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9c91b9036a 
							
						 
					 
					
						
						
							
							don't show 'show contact details' context menu item when contact isn not in roster  
						
						
						
					 
					
						2015-07-20 14:24:59 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							e9d7d7e12a 
							
						 
					 
					
						
						
							
							Fix set/remove OnUpdateBlocklistListener  
						
						
						
					 
					
						2015-07-20 14:12:24 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2d2da11bfa 
							
						 
					 
					
						
						
							
							Merge pull request  #1289  from kriztan/patch-2  
						
						... 
						
						
						
						show contact details in conference details ... 
						
					 
					
						2015-07-20 13:16:19 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							dd964077b9 
							
						 
					 
					
						
						
							
							Fix axolotl database migration  
						
						... 
						
						
						
						Can't call getWritableDatabase in recreateAxolotlDb() 
						
					 
					
						2015-07-20 13:15:49 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							2240066bbe 
							
						 
					 
					
						
						
							
							Remove device list from EditAccount  
						
						
						
					 
					
						2015-07-19 23:38:09 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							480b1cde81 
							
						 
					 
					
						
						
							
							Add clear devices to overflow menu in EditAccount  
						
						
						
					 
					
						2015-07-19 23:35:03 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							14010bf5a6 
							
						 
					 
					
						
						
							
							Ask for key trust when sending messages  
						
						... 
						
						
						
						If the contact (or the own account) has keys that have UNDECIDED trust,
we now drop the user into the new TrustKeysActivity, where they have to
decide for each new key whether it should be TRUSTED or UNTRUSTED. 
						
					 
					
						2015-07-19 22:27:26 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							ec0aff4ed7 
							
						 
					 
					
						
						
							
							Encrypt files for HTTP upload in encrypted chats  
						
						
						
					 
					
						2015-07-19 22:24:05 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							6f67469bda 
							
						 
					 
					
						
						
							
							Refactor trust key ui and show in account details  
						
						... 
						
						
						
						Refactored the trust key row UI element so it can be used in multiple
places. It now also uses a slider to toggle the trust state, and the
redundant trust state description was removed.
EditAccountActivity now shows the keys of other devices associated with
that account. 
						
					 
					
						2015-07-19 22:24:03 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							9c4d55f82c 
							
						 
					 
					
						
						
							
							Send correct body for HTTP files  
						
						... 
						
						
						
						When using HTTP upload to send files, take care to transmit only the URL
rather than the entire body, which contains metadata. 
						
					 
					
						2015-07-19 22:23:28 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							2045a71262 
							
						 
					 
					
						
						
							
							Handle file transmission properly in axolotl  
						
						
						
					 
					
						2015-07-19 22:23:28 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							43703870e8 
							
						 
					 
					
						
						
							
							Remove unneccessary code  
						
						
						
					 
					
						2015-07-19 22:23:28 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							4038af2f47 
							
						 
					 
					
						
						
							
							Fix trust status for outgoing messages  
						
						... 
						
						
						
						Tag sent messages with own fingerprint, set own fingerprint as always
trusted, include own fingerprint in database trust search, explicitly
reset trust colorfilter 
						
					 
					
						2015-07-19 22:23:28 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							e8ec2ee628 
							
						 
					 
					
						
						
							
							Don't merge messages with different trust statuses  
						
						
						
					 
					
						2015-07-19 22:23:28 +02:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							fca0c36757 
							
						 
					 
					
						
						
							
							Fix copying of axolotl keys to clipboard  
						
						
						
					 
					
						2015-07-19 22:23:28 +02:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							3ab59c93a6 
							
						 
					 
					
						
						
							
							Add refresh icon to v21 theme  
						
						
						
					 
					
						2015-07-19 22:23:27 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							6c38e53128 
							
						 
					 
					
						
						
							
							Disable Axolotl option if not usable  
						
						... 
						
						
						
						In MUCs or if contact is not axolotl capable, disable axolotl menu
option 
						
					 
					
						2015-07-19 22:23:27 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							9e8d9a6401 
							
						 
					 
					
						
						
							
							Show trust status of messages' originating session  
						
						... 
						
						
						
						Shade lock icon red if message was received in a session that has not
been marked trusted by the user or fingerprint is unknown 
						
					 
					
						2015-07-19 22:23:27 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							3d33946088 
							
						 
					 
					
						
						
							
							Add key trust toggle to ContactDetailsActivity  
						
						... 
						
						
						
						Can now toggle IdentityKey trust 
						
					 
					
						2015-07-19 22:23:27 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							35714d3d08 
							
						 
					 
					
						
						
							
							Ensure that available sessions are always used  
						
						... 
						
						
						
						Any time a new session is established, call syncRosterToDisk() to ensure
that on subsequent restoreFromDatabase() calls, the roster is actually
available. This is important so that initAccountServices() can properly
initialize the SessionMap. This prevents a race condition where after
adding a new account and initiating sessions with it, if the app is
killed (e.g. by reinstall) before triggering a syncRosterToDisk(),
subsequent restores will not have the roster available, leading to
missing XmppAxolotlSessions in the SessionMap cache. As a result of
this, a new session was initiated when sending a new message, and
received messages could not be tagged with the originating session's
fingerprint.
As an added sanity check, go to the database to confirm no records are
present before creating fresh XmppAxolotlSession objects (both in the
sending and receiving case). 
						
					 
					
						2015-07-19 22:23:27 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							31d375c2c3 
							
						 
					 
					
						
						
							
							Fix setIdentityKeyTrust update statement  
						
						
						
					 
					
						2015-07-19 22:23:27 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							160e4017df 
							
						 
					 
					
						
						
							
							Fix IdentityKey storage model  
						
						... 
						
						
						
						Added proper UNIQUE statement 
						
					 
					
						2015-07-19 22:23:27 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							461d0446f7 
							
						 
					 
					
						
						
							
							Fix and expand key regeneration function  
						
						... 
						
						
						
						Wipe session cache to prevent stale sessions being used. Wipe fetch
status cache to enable recreation of sessions. Regenerate deviceId, so
that foreign devices will talk to us again. 
						
					 
					
						2015-07-19 22:23:27 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							23a4e1e6fa 
							
						 
					 
					
						
						
							
							Display trust status in ContactDetailsActivity  
						
						
						
					 
					
						2015-07-19 22:23:25 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							d173913eba 
							
						 
					 
					
						
						
							
							Overhauled Message tagging  
						
						... 
						
						
						
						Messages are now tagged with the IdentityKey fingerprint of the
originating session. IdentityKeys have one of three trust states:
undecided (default), trusted, and untrusted/not yet trusted. 
						
					 
					
						2015-07-19 22:17:58 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							7f918542c8 
							
						 
					 
					
						
						
							
							Postpone initAccountService until roster loaded  
						
						... 
						
						
						
						The AxolotlService depends on the roster being loaded when it is
initialized so that it can fill its in-memory SessionMap. 
						
					 
					
						2015-07-19 22:17:57 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							03614a0262 
							
						 
					 
					
						
						
							
							Fix getSubDeviceSessions SQL query  
						
						
						
					 
					
						2015-07-19 22:17:57 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							2628662a7f 
							
						 
					 
					
						
						
							
							Display axolotl chat message hint  
						
						
						
					 
					
						2015-07-19 22:17:57 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							f1d73b9d4e 
							
						 
					 
					
						
						
							
							Use full int range for device IDs  
						
						
						
					 
					
						2015-07-19 22:17:57 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							540faeb54b 
							
						 
					 
					
						
						
							
							Clean up unused constant  
						
						
						
					 
					
						2015-07-19 22:17:57 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							bd29653a20 
							
						 
					 
					
						
						
							
							Make some fields final  
						
						
						
					 
					
						2015-07-19 22:17:57 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							3458f5bb91 
							
						 
					 
					
						
						
							
							Clean up logging  
						
						... 
						
						
						
						Add a fixed prefix to axolotl-related log messages, set log levels
sensibly. 
						
					 
					
						2015-07-19 22:17:57 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							7049904c32 
							
						 
					 
					
						
						
							
							Add basic PEP managemend UI to EditAccountActivity  
						
						... 
						
						
						
						EditAccountActivity now show own fingerprint, and gives an option to
regenerate local keying material (and wipe all sessions associated with
the old keys in the process).
It also now displays a list of other own devices, and gives an option to
remove all but the current device. 
						
					 
					
						2015-07-19 22:17:55 +02:00 
						 
				 
			
				
					
						
							
							
								Christian S 
							
						 
					 
					
						
						
						
						
							
						
						
							37b214a8a8 
							
						 
					 
					
						
						
							
							show contact details in conference details ...  
						
						
						
					 
					
						2015-07-19 22:11:51 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							968410ae33 
							
						 
					 
					
						
						
							
							Fix devicelist update handling  
						
						... 
						
						
						
						No longer store own device ID (so that we don't encrypt messages for
ourselves), verify that own device ID is present in update list
(otherwise republish), reflect update in UI. 
						
					 
					
						2015-07-19 21:32:27 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							7a962e5180 
							
						 
					 
					
						
						
							
							Refactor axolotl database recreation  
						
						
						
					 
					
						2015-07-19 21:32:27 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							8fd46d40d6 
							
						 
					 
					
						
						
							
							Adapt prettifyFingerprint() to axolotl FP sizes  
						
						
						
					 
					
						2015-07-19 21:32:27 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							491f623708 
							
						 
					 
					
						
						
							
							Fix displaying Contact IdentityKeys  
						
						... 
						
						
						
						Migrate ContactDetailsActivity to use new SQL IdentityKeys storage,
remove dead code from Contact class. 
						
					 
					
						2015-07-19 21:32:27 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							0cf64857cf 
							
						 
					 
					
						
						
							
							Only cache session if successfully established  
						
						... 
						
						
						
						When receiving a message, only remember the XmppAxolotlSession wrapper
if the prospective session was actually established. This prevents us
from erroneously adding empty sessions that are never established using
received PreKeyWhisperMessages, which would lead to errors if we try to
use them for sending. 
						
					 
					
						2015-07-19 21:32:27 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							6867b5c3ab 
							
						 
					 
					
						
						
							
							Return empty set on invalid PEP devicelist  
						
						
						
					 
					
						2015-07-19 21:32:27 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							25450bf6d3 
							
						 
					 
					
						
						
							
							Trust all IdentityKeys  
						
						... 
						
						
						
						The trust-on-first-use policy leads to problems when receiving messages
from two different devices of a contact before sending a message to them
(as their IdentityKeys will not have been added yet). Since session
trust will be managed externally anyway, this change is not a security
problem, and will allow us to decrypt messages from yet-untrusted
sessions. 
						
					 
					
						2015-07-19 21:32:27 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							bf4185ac08 
							
						 
					 
					
						
						
							
							Refresh PEP on session establish  
						
						... 
						
						
						
						We now track preKeys used to establish incoming sessions with us. On
each new established session, we remove the used prekey from PEP. We
have to do this because libaxolotl-java internally clears the used
preKey from its storage, so we will not be able to establish any future
sessions using that key. 
						
					 
					
						2015-07-19 21:32:27 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							69600502d2 
							
						 
					 
					
						
						
							
							Fix asynchronous axolotl message sending  
						
						... 
						
						
						
						XmppConnectionService.sendMessage() now dispatches messages to the
AxolotlService, where they only are prepared for sending and cached.
AxolotlService now triggers a XmppConnectionService.resendMessage(),
which then handles sending the cached message packet.
This transparently fixes, e.g., handling of messages sent while we are
offline. 
						
					 
					
						2015-07-19 21:32:27 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							ec6870307e 
							
						 
					 
					
						
						
							
							Properly track message sender  
						
						... 
						
						
						
						Previously, the sender was assumed to be the conversation counterpart.
This broke carboned own-device messages. We now track the sender
properly, and also set the status (sent by one of the own devices vs
received from the counterpart) accordingly. 
						
					 
					
						2015-07-19 21:32:27 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							18c1e15d00 
							
						 
					 
					
						
						
							
							Rework PEP content verification  
						
						... 
						
						
						
						Now checks which part(s) are out of sync w/ local storage, and updates
only those, rather than assuming the entire node corrupt and
overwriting it all (especially relevant for preKey list) 
						
					 
					
						2015-07-19 21:32:27 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							9a0232f7e7 
							
						 
					 
					
						
						
							
							Formatting fixes  
						
						
						
					 
					
						2015-07-19 21:32:27 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							992cf5652e 
							
						 
					 
					
						
						
							
							When receiving, add mock session if none exists  
						
						... 
						
						
						
						We need a session object in order to build a session from a
PreKeyWhisperMessage, so add an empty one when none exists on receiving
a message.
Warning: this will break right now if the session can not be constructed
from the received message.There will be an invalid session which will
break if we try to send using it. 
						
					 
					
						2015-07-19 21:32:26 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							1b0596d574 
							
						 
					 
					
						
						
							
							Tag messages with originating session  
						
						... 
						
						
						
						This can be used later in order to display trust status of messages, as
well as for potential resending of messages in case of preKey conflicts. 
						
					 
					
						2015-07-19 21:32:26 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							3815d4efa3 
							
						 
					 
					
						
						
							
							Fetch bundles on-demand, encrypt in background  
						
						... 
						
						
						
						Bundles are now fetched on demand when a session needs to be
established. This should lessen the chance of changes to the bundles
occuring before they're used, as well as lessen the load of fetching
bundles.
Also, the message encryption is now done in a background thread, as this
can be somewhat costly if many sessions are present. This is probably
not going to be an issue in real use, but it's good practice anyway. 
						
					 
					
						2015-07-19 21:32:26 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							cb7980c65e 
							
						 
					 
					
						
						
							
							Use bareJid for own session retrieval  
						
						
						
					 
					
						2015-07-19 21:32:26 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							c1d23b2395 
							
						 
					 
					
						
						
							
							Migrate to new PEP layout  
						
						... 
						
						
						
						Merge prekeys into bundle node 
						
					 
					
						2015-07-19 21:32:26 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							6492801b89 
							
						 
					 
					
						
						
							
							Formatting fixes  
						
						
						
					 
					
						2015-07-19 21:32:26 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							74026b742b 
							
						 
					 
					
						
						
							
							Save IdentityKeys in database  
						
						
						
					 
					
						2015-07-19 21:32:26 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							9e07fc5651 
							
						 
					 
					
						
						
							
							DatabaseBackend bugfixes  
						
						... 
						
						
						
						Don't leak cursors, initially create tables 
						
					 
					
						2015-07-19 21:32:26 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							299bbdf27f 
							
						 
					 
					
						
						
							
							Reformat code to use tabs  
						
						... 
						
						
						
						This really sucks to do it like this. Sorry. :( 
						
					 
					
						2015-07-19 21:32:26 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							065519d3f3 
							
						 
					 
					
						
						
							
							Added axolotl activation code to UI  
						
						
						
					 
					
						2015-07-19 21:32:26 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							77619b55e4 
							
						 
					 
					
						
						
							
							Added PEP and message protocol layers  
						
						... 
						
						
						
						Can now fetch/retrieve from PEP, as well as encode/decode messages 
						
					 
					
						2015-07-19 21:32:26 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							f73aa1a200 
							
						 
					 
					
						
						
							
							Reworked axolotl protocol layer  
						
						... 
						
						
						
						Numerous fixes 
						
					 
					
						2015-07-19 21:32:25 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							b8048a5538 
							
						 
					 
					
						
						
							
							CryptoNext persistance layer mockup  
						
						... 
						
						
						
						Initial sketch of the peripheral storage infrastructure for the new
axolotl-based encryption scheme. 
						
					 
					
						2015-07-19 21:32:21 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9b70c7e68c 
							
						 
					 
					
						
						
							
							bugfix: don't crash if aes key could not be set before jingle transfer  
						
						
						
					 
					
						2015-07-19 14:51:04 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5c017e5186 
							
						 
					 
					
						
						
							
							bugfix: use sendIqPacket method in service instead of invoking XmppConnection directly  
						
						
						
					 
					
						2015-07-19 14:25:30 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0166ced46c 
							
						 
					 
					
						
						
							
							bugfix: accept status code 201 on http upload  
						
						
						
					 
					
						2015-07-19 13:36:02 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f58b2afcaa 
							
						 
					 
					
						
						
							
							changed switch widget  
						
						
						
					 
					
						2015-07-18 19:38:52 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ce527c8b76 
							
						 
					 
					
						
						
							
							account for downloaded http files in dup checker  
						
						
						
					 
					
						2015-07-18 00:01:34 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							aa1b9de20c 
							
						 
					 
					
						
						
							
							code cleanup  
						
						
						
					 
					
						2015-07-17 23:58:53 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c3584a6db7 
							
						 
					 
					
						
						
							
							fixed inactive http download  
						
						
						
					 
					
						2015-07-17 23:58:33 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							13cce172ab 
							
						 
					 
					
						
						
							
							show error message in account details when info has not been edited  
						
						
						
					 
					
						2015-07-17 13:14:24 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1f43115544 
							
						 
					 
					
						
						
							
							increased ibb block size  
						
						
						
					 
					
						2015-07-17 13:06:51 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							425f0479a8 
							
						 
					 
					
						
						
							
							even less jumpy  
						
						
						
					 
					
						2015-07-16 14:06:54 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6a329c7465 
							
						 
					 
					
						
						
							
							fixed some ux glitches in editaccount  
						
						
						
					 
					
						2015-07-16 13:42:52 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7bd66549d8 
							
						 
					 
					
						
						
							
							made 'check image on http host' message more generic.  fixed   #1281  
						
						
						
					 
					
						2015-07-16 13:25:52 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b477b8f57b 
							
						 
					 
					
						
						
							
							fixed some npes  
						
						
						
					 
					
						2015-07-16 13:14:51 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b525b42e59 
							
						 
					 
					
						
						
							
							fixed crash on invalid muc bookmarks  
						
						
						
					 
					
						2015-07-15 17:42:08 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ffffca10f0 
							
						 
					 
					
						
						
							
							renamed colors  
						
						
						
					 
					
						2015-07-13 12:55:13 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							84bfe8c721 
							
						 
					 
					
						
						
							
							catch exception on broken android phones  
						
						
						
					 
					
						2015-07-12 20:17:12 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							558d065d48 
							
						 
					 
					
						
						
							
							made lock button reflect encryption status of the next messages instead of the last  
						
						
						
					 
					
						2015-07-12 17:59:22 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							58bc4cba06 
							
						 
					 
					
						
						
							
							only try to change affilations for known jids  
						
						
						
					 
					
						2015-07-11 21:24:51 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4274fe90ac 
							
						 
					 
					
						
						
							
							try to catch weird npe in android sdk  
						
						
						
					 
					
						2015-07-11 21:24:30 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5dd83a5fe6 
							
						 
					 
					
						
						
							
							null check otr fingerprint before display  
						
						
						
					 
					
						2015-07-11 21:23:58 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							78aff1329f 
							
						 
					 
					
						
						
							
							renamed HttpConnection to HttpDownloadConnection  
						
						
						
					 
					
						2015-07-10 15:14:13 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ce79f4bbe3 
							
						 
					 
					
						
						
							
							renamed downloadable to transferable  
						
						
						
					 
					
						2015-07-10 15:11:03 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							925801c14e 
							
						 
					 
					
						
						
							
							get file upload ready to work with https  
						
						
						
					 
					
						2015-07-10 14:14:45 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0f5c87ca1f 
							
						 
					 
					
						
						
							
							display toast in ui on failed http download  
						
						... 
						
						
						
						fixes  #954  
					
						2015-07-10 13:28:50 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b02ef0c62f 
							
						 
					 
					
						
						
							
							show timestamp on images in mucs  
						
						... 
						
						
						
						fixes  #1178  
					
						2015-07-10 12:42:41 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							492e387482 
							
						 
					 
					
						
						
							
							added null check in sasl response verifier  
						
						
						
					 
					
						2015-07-10 12:16:30 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7eac30d1f4 
							
						 
					 
					
						
						
							
							catch number format exception in server ack  
						
						
						
					 
					
						2015-07-10 12:09:59 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							26044ca229 
							
						 
					 
					
						
						
							
							print stack trace instead of writing error message to log in case of unknown exception in dnsutil  
						
						
						
					 
					
						2015-07-09 13:40:08 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ef1429c9a6 
							
						 
					 
					
						
						
							
							show contacts name in non anonymous mucs.  fixes   #1213  
						
						
						
					 
					
						2015-07-05 18:10:18 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bef731a3c8 
							
						 
					 
					
						
						
							
							refactored sendMessage and merged with resendMessage  
						
						
						
					 
					
						2015-07-05 11:59:38 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2fbeb0bbb2 
							
						 
					 
					
						
						
							
							make sure unread count is initialized as 0.  fixes   #1270  
						
						
						
					 
					
						2015-07-03 22:08:23 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d30fb6f0a1 
							
						 
					 
					
						
						
							
							avoid very rare npe  
						
						
						
					 
					
						2015-07-03 21:32:46 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1c86098f3b 
							
						 
					 
					
						
						
							
							Merge branch 'master' into development  
						
						
						
					 
					
						2015-07-03 13:09:05 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fc47969741 
							
						 
					 
					
						
						
							
							added fallback for non-srv dns queries  
						
						
						
					 
					
						2015-07-03 13:07:48 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c745fbb562 
							
						 
					 
					
						
						
							
							fixed share with activity to account for http file upload  
						
						
						
					 
					
						2015-07-02 23:51:59 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e4d1bd415d 
							
						 
					 
					
						
						
							
							also offer http download for some 'well known extensions'  
						
						
						
					 
					
						2015-07-02 23:19:50 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f5ba9d4223 
							
						 
					 
					
						
						
							
							refactored message context menu  
						
						
						
					 
					
						2015-07-02 23:13:00 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a2525346f4 
							
						 
					 
					
						
						
							
							moved null check for to and from in message parser  
						
						
						
					 
					
						2015-07-02 18:02:32 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c20a088ea8 
							
						 
					 
					
						
						
							
							changed mime type handling  
						
						
						
					 
					
						2015-07-01 16:01:18 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c36238141d 
							
						 
					 
					
						
						
							
							disable automatic aes encryption for the time being  
						
						
						
					 
					
						2015-06-30 20:19:18 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9190e03076 
							
						 
					 
					
						
						
							
							changed namespace of the http upload feature  
						
						
						
					 
					
						2015-06-30 20:11:50 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							aca9d8036c 
							
						 
					 
					
						
						
							
							made httpconnection (download) ready all kind of files  
						
						
						
					 
					
						2015-06-30 17:15:02 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6af97c724c 
							
						 
					 
					
						
						
							
							made storage path decision entirely based upon file extension  
						
						
						
					 
					
						2015-06-30 14:04:39 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d7de311379 
							
						 
					 
					
						
						
							
							refactored bodyContainsDownloadable to be more flexible  
						
						
						
					 
					
						2015-06-30 13:52:53 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5b42b392a1 
							
						 
					 
					
						
						
							
							always show copy original url in context menu when url is available  
						
						
						
					 
					
						2015-06-30 13:01:04 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0030bbf472 
							
						 
					 
					
						
						
							
							untested pgp support for http upload  
						
						
						
					 
					
						2015-06-29 15:38:16 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fdd46f1c91 
							
						 
					 
					
						
						
							
							added trigger to Config.java to always enable aes encryption for uploaded files  
						
						
						
					 
					
						2015-06-29 15:21:41 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							82714dedfe 
							
						 
					 
					
						
						
							
							make quick actions available in conferences when file attachment is available  
						
						
						
					 
					
						2015-06-29 15:21:41 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7e11570f2c 
							
						 
					 
					
						
						
							
							show attach button in conferences when http upload is available  
						
						
						
					 
					
						2015-06-29 15:21:41 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9eb9a52205 
							
						 
					 
					
						
						
							
							initial http upload support  
						
						... 
						
						
						
						be careful: little error handling and no encryption 
						
					 
					
						2015-06-29 15:21:41 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0d01e51da5 
							
						 
					 
					
						
						
							
							don't parse body from muc status messages  
						
						
						
					 
					
						2015-06-28 22:14:40 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							46595b6d43 
							
						 
					 
					
						
						
							
							fixed parsing of muc status messages in new message parser  
						
						
						
					 
					
						2015-06-28 20:11:28 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5a48afdd4d 
							
						 
					 
					
						
						
							
							don't perform dns lookups on domain parts that obviously look like ip addresses  
						
						
						
					 
					
						2015-06-19 16:25:08 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							58201b4408 
							
						 
					 
					
						
						
							
							changed paragraph divider  
						
						
						
					 
					
						2015-06-10 03:30:17 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9d1e8205a2 
							
						 
					 
					
						
						
							
							made i/o and memory intensive operations execute in serial order  
						
						
						
					 
					
						2015-06-05 08:46:06 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a4e9f0c9c0 
							
						 
					 
					
						
						
							
							fixed obvious bug in dns helper  
						
						
						
					 
					
						2015-06-04 16:26:51 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8f07e4c441 
							
						 
					 
					
						
						
							
							streamlined dns helper by ignoring weight  
						
						
						
					 
					
						2015-06-04 02:48:07 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6b794eca2c 
							
						 
					 
					
						
						
							
							send_received muc messages will mark a conversation a read  
						
						
						
					 
					
						2015-06-04 02:47:24 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							53e8964dc1 
							
						 
					 
					
						
						
							
							reworked handeling of system contacts  
						
						
						
					 
					
						2015-06-03 14:05:54 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3eab3291de 
							
						 
					 
					
						
						
							
							properly calculate remaining size. should  fix   #1243  
						
						
						
					 
					
						2015-06-03 03:05:20 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fe1cff016f 
							
						 
					 
					
						
						
							
							avoid unnessary muc mam queries when message count is 0 after subject  
						
						
						
					 
					
						2015-06-02 13:33:20 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8ac933be9f 
							
						 
					 
					
						
						
							
							fixed more edge cases in muc message parser  
						
						
						
					 
					
						2015-06-02 12:21:35 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							df86b0fc47 
							
						 
					 
					
						
						
							
							improved compatibility with muc components that change the message id  
						
						
						
					 
					
						2015-06-02 06:23:32 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a577ec7c31 
							
						 
					 
					
						
						
							
							let dns library take care of no-srv style hosts as well  
						
						
						
					 
					
						2015-05-28 17:31:46 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5373956e19 
							
						 
					 
					
						
						
							
							use dns library to resolve missing ipv6 or ipv4 addresses  
						
						
						
					 
					
						2015-05-28 16:55:48 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							165965bb83 
							
						 
					 
					
						
						
							
							parse nick and avatar only from available presences to avoid potential error reflection  
						
						
						
					 
					
						2015-05-27 11:44:44 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0f6f6adca0 
							
						 
					 
					
						
						
							
							removed unnecessary / inacurate debug logging  
						
						
						
					 
					
						2015-05-26 13:04:22 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							402e5363d1 
							
						 
					 
					
						
						
							
							deduplicate private muc messages  
						
						
						
					 
					
						2015-05-26 12:00:55 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6059ed4738 
							
						 
					 
					
						
						
							
							update unread count badge only when necessary  
						
						
						
					 
					
						2015-05-26 12:00:38 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9debf8037b 
							
						 
					 
					
						
						
							
							added default iq handler to print some iq error messages  
						
						
						
					 
					
						2015-05-26 11:31:33 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							997b11dbec 
							
						 
					 
					
						
						
							
							added choose picture as another quick action.  fixes   #1221  
						
						
						
					 
					
						2015-05-26 05:34:58 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							dc91ff8f29 
							
						 
					 
					
						
						
							
							renamed OtrEngine to OtrService  
						
						
						
					 
					
						2015-05-26 04:36:32 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f579602456 
							
						 
					 
					
						
						
							
							Merge branch 'master' into development  
						
						
						
					 
					
						2015-05-25 11:15:14 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							36034815ee 
							
						 
					 
					
						
						
							
							use same sm check inside xmppconnection and out  
						
						
						
					 
					
						2015-05-25 04:54:11 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a535d45ec3 
							
						 
					 
					
						
						
							
							log connection age and reshedule ping check  
						
						
						
					 
					
						2015-05-25 04:49:36 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9d1a8c607f 
							
						 
					 
					
						
						
							
							Merge branch 'development' of github.com:siacs/Conversations into development  
						
						
						
					 
					
						2015-05-21 09:19:56 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							75977818ea 
							
						 
					 
					
						
						
							
							Merge branch 'master' into development  
						
						
						
					 
					
						2015-05-21 09:19:26 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3cdac228f9 
							
						 
					 
					
						
						
							
							fixed with attaching wrong files when returning to activity and background service is still alive  
						
						
						
					 
					
						2015-05-21 05:21:22 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d908b70340 
							
						 
					 
					
						
						
							
							Merge pull request  #1212  from emdete/add_jid_to_show_location  
						
						... 
						
						
						
						fix to detect the sender jid correctly 
						
					 
					
						2015-05-20 18:31:18 +02:00 
						 
				 
			
				
					
						
							
							
								M. Dietrich 
							
						 
					 
					
						
						
						
						
							
						
						
							4759607a77 
							
						 
					 
					
						
						
							
							fix to detect the sender jid correctly  
						
						
						
					 
					
						2015-05-20 15:45:08 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bb065680e5 
							
						 
					 
					
						
						
							
							Merge pull request  #1211  from emdete/add_jid_to_show_location  
						
						... 
						
						
						
						add extra jid to intend "show location" 
						
					 
					
						2015-05-20 12:48:03 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2364710afb 
							
						 
					 
					
						
						
							
							added ShortcutBadger as a dependency to create unread counts on launcher icon  
						
						
						
					 
					
						2015-05-20 12:47:04 +02:00 
						 
				 
			
				
					
						
							
							
								M. Dietrich 
							
						 
					 
					
						
						
						
						
							
						
						
							78847d0749 
							
						 
					 
					
						
						
							
							add extra jid to intend "show location"  
						
						
						
					 
					
						2015-05-20 11:37:10 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							70ebe35ffe 
							
						 
					 
					
						
						
							
							Merge branch 'master' into development  
						
						
						
					 
					
						2015-05-20 08:25:42 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8064832dca 
							
						 
					 
					
						
						
							
							don't allow user to accidentally send empty messages  
						
						
						
					 
					
						2015-05-20 08:25:00 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							201bc158bd 
							
						 
					 
					
						
						
							
							proper error parsing. some clean up  
						
						
						
					 
					
						2015-05-20 03:48:14 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9658146575 
							
						 
					 
					
						
						
							
							fixed npe in new message parser  
						
						
						
					 
					
						2015-05-20 03:48:14 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1b5631c835 
							
						 
					 
					
						
						
							
							fixed muc mam. added a few security checks  
						
						
						
					 
					
						2015-05-20 03:48:14 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							eeebebe32a 
							
						 
					 
					
						
						
							
							fixed read/unread markers  
						
						
						
					 
					
						2015-05-20 03:48:14 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b731995a51 
							
						 
					 
					
						
						
							
							added mam stuff to new message parser  
						
						
						
					 
					
						2015-05-20 03:48:14 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d261feda74 
							
						 
					 
					
						
						
							
							rewrote parser code. mam id and possible other stuff still missing. also massivly untested  
						
						
						
					 
					
						2015-05-20 03:48:14 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e32f380dae 
							
						 
					 
					
						
						
							
							provide helper function for getting the content of a child directly  
						
						
						
					 
					
						2015-05-20 03:48:14 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							73a4ffefdf 
							
						 
					 
					
						
						
							
							added fall back package id for voice recorder plugin  
						
						
						
					 
					
						2015-05-20 03:27:52 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bb60364488 
							
						 
					 
					
						
						
							
							hide block contact from context menu when server feature is not available  fixed   #1207  
						
						
						
					 
					
						2015-05-19 08:31:56 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a0575c81ab 
							
						 
					 
					
						
						
							
							use same socket time out for jingle and xmpp connections  
						
						
						
					 
					
						2015-05-18 08:48:08 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1446a59fa5 
							
						 
					 
					
						
						
							
							use a 20s timeout on socks5 connections  
						
						
						
					 
					
						2015-05-18 08:46:04 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fbc43a8d38 
							
						 
					 
					
						
						
							
							don't offer initiator his own candidates  
						
						
						
					 
					
						2015-05-18 08:45:50 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d672d578c9 
							
						 
					 
					
						
						
							
							fixed crash on failed account registry  
						
						
						
					 
					
						2015-05-17 12:32:04 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fce30f22c9 
							
						 
					 
					
						
						
							
							made white space check in bodyContainsDownloadable less aggresive  
						
						
						
					 
					
						2015-05-16 12:49:04 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4151b72a6e 
							
						 
					 
					
						
						
							
							let jingle connection and manager handle message status  
						
						
						
					 
					
						2015-05-16 04:12:53 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b6a7e56bf6 
							
						 
					 
					
						
						
							
							call StartConversationActivity in init mode only after adding the first account  
						
						
						
					 
					
						2015-05-15 13:58:11 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							b69ee7125d 
							
						 
					 
					
						
						
							
							Force Nameprepping of JID domain parts  
						
						... 
						
						
						
						The IDN.toAscii()/IDN.toUnicode() family only namepreps the original
domain passed to it if it contained non-ASCII characters. This means
that for all-ASCII domains, no canonicalization is performed, which
leads to issues like case-sensitivity. This workaround explicitly
namepreps domain parts before calling IDN.toAscii() on them, in order to
get a canonicalized representation (most notably, case invariance). A
basic DB migration is also included. 
						
					 
					
						2015-05-14 15:52:55 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8dfa701043 
							
						 
					 
					
						
						
							
							added a few location questions  
						
						
						
					 
					
						2015-05-14 12:08:43 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8d472157a4 
							
						 
					 
					
						
						
							
							always log reason for failed file transfer  
						
						
						
					 
					
						2015-05-14 11:57:51 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4414cf3b27 
							
						 
					 
					
						
						
							
							ignore question marks in location question  
						
						
						
					 
					
						2015-05-13 17:10:11 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							82878cded1 
							
						 
					 
					
						
						
							
							show location quick action after receiving a question about the users location  
						
						
						
					 
					
						2015-05-13 16:23:20 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6489ddac6c 
							
						 
					 
					
						
						
							
							clear avatar cache when uploading new avatar  
						
						
						
					 
					
						2015-05-13 14:33:52 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							51aeeb766c 
							
						 
					 
					
						
						
							
							use zero width white space as message seperator  
						
						
						
					 
					
						2015-05-13 11:56:59 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							93e620d685 
							
						 
					 
					
						
						
							
							removed debug logging  
						
						
						
					 
					
						2015-05-12 04:40:57 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d3a6aa9f7a 
							
						 
					 
					
						
						
							
							handle conference invites differently to deal with killed activities.  fixes   #1188  
						
						
						
					 
					
						2015-05-12 04:33:04 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							93e444ac3a 
							
						 
					 
					
						
						
							
							don't set unknown error in muc  
						
						
						
					 
					
						2015-05-12 03:57:05 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fe5c4cab46 
							
						 
					 
					
						
						
							
							don't reinit conversation when coming back to activity. avoids unnecessary scrolling  
						
						
						
					 
					
						2015-05-12 03:56:13 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b6f85ba0dd 
							
						 
					 
					
						
						
							
							avoid using paragraph style breaks by accident  
						
						
						
					 
					
						2015-05-11 14:18:30 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9156665add 
							
						 
					 
					
						
						
							
							increased space between merged messages a bit  
						
						
						
					 
					
						2015-05-11 09:20:08 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							53e43daa0d 
							
						 
					 
					
						
						
							
							add a little bit of space between merged messages.  
						
						
						
					 
					
						2015-05-11 09:08:56 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							21deda7b00 
							
						 
					 
					
						
						
							
							no font padding on red hearts  
						
						
						
					 
					
						2015-05-11 08:45:38 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							22b12091a1 
							
						 
					 
					
						
						
							
							rewrote parts of message adapter to avoid using NULL views  
						
						
						
					 
					
						2015-05-11 07:57:52 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							239e86a98a 
							
						 
					 
					
						
						
							
							optimized heart render code a bit  
						
						
						
					 
					
						2015-05-10 12:04:11 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							33d1621e3b 
							
						 
					 
					
						
						
							
							added white heart to new rendering as well  
						
						
						
					 
					
						2015-05-10 11:56:23 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e6d336c293 
							
						 
					 
					
						
						
							
							Merge branch 'development' of github.com:siacs/Conversations into development  
						
						
						
					 
					
						2015-05-10 11:45:01 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1e28f60038 
							
						 
					 
					
						
						
							
							changed conversation red to material red  
						
						
						
					 
					
						2015-05-10 03:14:13 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4c486f5e58 
							
						 
					 
					
						
						
							
							paint single unicode hearts as red and slightly larger  
						
						
						
					 
					
						2015-05-10 03:12:44 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Shimokawa 
							
						 
					 
					
						
						
						
						
							
						
						
							9e78e3e09d 
							
						 
					 
					
						
						
							
							only forward incoming chat messages to Pebble App and Gadgetbridge  
						
						
						
					 
					
						2015-05-08 21:36:20 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d9e5035c08 
							
						 
					 
					
						
						
							
							config option to reset attempt counts when changing network (default=true)  
						
						
						
					 
					
						2015-05-08 06:50:28 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c4a4dd2392 
							
						 
					 
					
						
						
							
							throw proper exception before changing account into error state  
						
						
						
					 
					
						2015-05-08 06:30:06 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e0653c0371 
							
						 
					 
					
						
						
							
							fixed encrypted ibb file transfer which was broken with ART.  fixes   #1172  
						
						
						
					 
					
						2015-05-07 14:19:51 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							05f0aa614f 
							
						 
					 
					
						
						
							
							fixed npe when binval value of vcard avatar is null  
						
						
						
					 
					
						2015-05-07 11:07:15 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d74e8a8a0e 
							
						 
					 
					
						
						
							
							fixed npe when missing instructions on failed register  
						
						
						
					 
					
						2015-05-06 04:33:21 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							db726a59b8 
							
						 
					 
					
						
						
							
							fwiw don't allow stanza count to go over MAX_INT  
						
						
						
					 
					
						2015-05-06 04:29:45 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b7c672e10e 
							
						 
					 
					
						
						
							
							avoid fetching avatars multiple times in parallel  
						
						
						
					 
					
						2015-05-05 10:29:41 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5136bf9832 
							
						 
					 
					
						
						
							
							r/o support for vcard avatars. pep avatars will be prefered  
						
						
						
					 
					
						2015-05-05 06:17:34 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e6aa604ade 
							
						 
					 
					
						
						
							
							enabled sm logging by default at least for development branch  
						
						
						
					 
					
						2015-05-05 06:10:47 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							61fd5d6696 
							
						 
					 
					
						
						
							
							clean up in attachment chooser code.  fixed   #1168  
						
						
						
					 
					
						2015-05-04 09:54:10 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2582ece210 
							
						 
					 
					
						
						
							
							open market if share location plugin isn't installed  
						
						
						
					 
					
						2015-05-04 04:38:12 +02:00 
						 
				 
			
				
					
						
							
							
								Alexander Groshev 
							
						 
					 
					
						
						
						
						
							
						
						
							d15da64c5d 
							
						 
					 
					
						
						
							
							Fix typos in URL to the project  
						
						
						
					 
					
						2015-05-03 20:53:27 +03:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							43db9cdf4b 
							
						 
					 
					
						
						
							
							turn send button in cancel button while in whisper mode  
						
						
						
					 
					
						2015-05-03 09:30:30 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c4bfffe6a9 
							
						 
					 
					
						
						
							
							mark account with incompatible server when no sasl mechansim could be found  
						
						
						
					 
					
						2015-05-02 12:10:56 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							53fea9e1fe 
							
						 
					 
					
						
						
							
							replace send button with quick action button as long as no text has been entered  
						
						
						
					 
					
						2015-05-02 11:38:56 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bcdfdb9ccf 
							
						 
					 
					
						
						
							
							added config option to be a bit more verbose about stanza counts  
						
						
						
					 
					
						2015-04-29 16:15:07 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6a15bc26b6 
							
						 
					 
					
						
						
							
							npe check after reading image uri  
						
						
						
					 
					
						2015-04-28 22:23:45 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							93e942f96d 
							
						 
					 
					
						
						
							
							made material icons smaller (24dp)  
						
						
						
					 
					
						2015-04-28 14:28:51 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f3805b8bab 
							
						 
					 
					
						
						
							
							stop conference details from crashing when rotating the screen  
						
						
						
					 
					
						2015-04-28 13:56:08 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							51bf8ec98e 
							
						 
					 
					
						
						
							
							fixed npe when rotating screen in contact details activity  
						
						
						
					 
					
						2015-04-28 13:31:33 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b1843fb61a 
							
						 
					 
					
						
						
							
							print stack trace on io error  
						
						
						
					 
					
						2015-04-28 09:35:10 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b10b8e2c50 
							
						 
					 
					
						
						
							
							escape nick in highlight regex pattern  
						
						
						
					 
					
						2015-04-28 09:32:58 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f8e06d8e9a 
							
						 
					 
					
						
						
							
							revert undo timeout to a more reasonable value  
						
						
						
					 
					
						2015-04-28 09:25:58 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4caa92e8ff 
							
						 
					 
					
						
						
							
							handle returning from camera without picture  
						
						
						
					 
					
						2015-04-27 12:18:27 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e11d658f5e 
							
						 
					 
					
						
						
							
							use xmppserviceconnection to send iq packets in jingle connection  
						
						
						
					 
					
						2015-04-26 20:27:30 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c283fec0d1 
							
						 
					 
					
						
						
							
							hard code bitmap configs  
						
						
						
					 
					
						2015-04-26 20:26:59 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0fda254d48 
							
						 
					 
					
						
						
							
							Merge pull request  #1135  from BrianBlade/manage_certificates  
						
						... 
						
						
						
						Add option to remove manually approved certificates 
						
					 
					
						2015-04-25 19:09:50 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5ea1c547d5 
							
						 
					 
					
						
						
							
							fixed service discovery by properly storing and checking identities  
						
						
						
					 
					
						2015-04-25 18:24:10 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							82daf849aa 
							
						 
					 
					
						
						
							
							fixed   #1039  
						
						
						
					 
					
						2015-04-25 14:42:32 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							77caf73103 
							
						 
					 
					
						
						
							
							Merge pull request  #1146  from BrianBlade/minor_otr_tweaks  
						
						... 
						
						
						
						OTR: Fix onContactStatusChanged & dont archive OTR 
						
					 
					
						2015-04-25 14:09:38 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d07baccf97 
							
						 
					 
					
						
						
							
							cleaned up file handling  
						
						
						
					 
					
						2015-04-25 14:08:24 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5e1492fbff 
							
						 
					 
					
						
						
							
							send invite to other instanzes after creating ad hoc conference.  fixes   #1136  
						
						
						
					 
					
						2015-04-23 17:37:47 +02:00 
						 
				 
			
				
					
						
							
							
								BrianBlade 
							
						 
					 
					
						
						
						
						
							
						
						
							d6443d9b2f 
							
						 
					 
					
						
						
							
							OTR: Fix onContactStatusChanged & dont archive OTR  
						
						... 
						
						
						
						- Fix session handling on contact status change: Do not reset
  potentially active sessions; check peer's OTR-resource on disconnect
- use no-permanent-store hint instead of no-store to ensure
  finished messages are delivered to offline/disconnected clients
- add no-permanent-store to ask compliant servers not to archive
  OTR messages 
						
					 
					
						2015-04-21 22:35:35 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3a627f72fb 
							
						 
					 
					
						
						
							
							fixed direct invites  
						
						
						
					 
					
						2015-04-21 18:36:11 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5d7e1159f5 
							
						 
					 
					
						
						
							
							always hide pgp snackbar after decrypting a message.  fixes   #1075  
						
						
						
					 
					
						2015-04-20 12:13:47 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							127b7866f0 
							
						 
					 
					
						
						
							
							removed some dead code  
						
						
						
					 
					
						2015-04-20 11:49:44 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d2c9bf31cd 
							
						 
					 
					
						
						
							
							fixed weird touch on snackbar switched conversation bug  
						
						... 
						
						
						
						when touching the border of the snackbar or more precisely the space between the input field and the snackbar Conversations would switch into a random conversation for yet unknown reasons. 
						
					 
					
						2015-04-20 11:39:38 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9e20a4936e 
							
						 
					 
					
						
						
							
							some code clean up to fix some rare NPE’s  
						
						
						
					 
					
						2015-04-19 19:11:32 +02:00 
						 
				 
			
				
					
						
							
							
								BrianBlade 
							
						 
					 
					
						
						
						
						
							
						
						
							da367dd752 
							
						 
					 
					
						
						
							
							Add option to remove manually approved certificates  
						
						... 
						
						
						
						- "Remove certificates" option brings up a dialog that allows
  to delete certificates from MemorizingTrustManager's keystore
- Reconnect active accounts when certificate-settings are changed
- new preference category "Certificate options" 
						
					 
					
						2015-04-19 18:08:13 +02:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							570a22206d 
							
						 
					 
					
						
						
							
							increased undo delay  
						
						
						
					 
					
						2015-04-17 20:01:09 +02:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							c4daa08170 
							
						 
					 
					
						
						
							
							fixed a bug in DNS helper code.  fixes   #1130  
						
						
						
					 
					
						2015-04-16 21:56:03 +02:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							65e760aefd 
							
						 
					 
					
						
						
							
							some bug fixes concerning 0byte files.  fixes   #1126  
						
						
						
					 
					
						2015-04-15 15:36:16 +02:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f99e234b88 
							
						 
					 
					
						
						
							
							maintain state when rotating settings activity  
						
						
						
					 
					
						2015-04-14 15:53:50 +02:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							defb127d6e 
							
						 
					 
					
						
						
							
							Merge branch 'dont_trust_cas_preference' of  https://github.com/BrianBlade/Conversations  into BrianBlade-dont_trust_cas_preference  
						
						... 
						
						
						
						Conflicts:
	src/main/res/values-de/strings.xml
	src/main/res/values/strings.xml 
						
					 
					
						2015-04-14 15:17:06 +02:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							261b505f06 
							
						 
					 
					
						
						
							
							always show save button when account info was modified.  fixes   #918  
						
						
						
					 
					
						2015-04-14 15:00:49 +02:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							2f24b09309 
							
						 
					 
					
						
						
							
							fixed disable account when sliding and not clicking the toggle  
						
						
						
					 
					
						2015-04-13 18:19:40 +02:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							62faa163f0 
							
						 
					 
					
						
						
							
							fixed typos  
						
						
						
					 
					
						2015-04-13 18:18:25 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8486f47dd9 
							
						 
					 
					
						
						
							
							Merge pull request  #1123  from lookshe/development  
						
						... 
						
						
						
						Bugfix for issue #1121  
						
					 
					
						2015-04-13 17:57:33 +02:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							4bf09bc10b 
							
						 
					 
					
						
						
							
							shut up linter  
						
						
						
					 
					
						2015-04-13 17:35:20 +02:00 
						 
				 
			
				
					
						
							
							
								lookshe 
							
						 
					 
					
						
						
						
						
							
						
						
							6da77bdf3b 
							
						 
					 
					
						
						
							
							Bugfix for issue  #1121  
						
						... 
						
						
						
						check with lowercase to also match JPEG, JPeg ...
changed image url in comment 
						
					 
					
						2015-04-13 16:21:00 +02:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							85cb1e4a37 
							
						 
					 
					
						
						
							
							Maintain private chat on MUC.  fixes   #1097  
						
						
						
					 
					
						2015-04-13 16:00:04 +02:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							845b39cdcc 
							
						 
					 
					
						
						
							
							fixed regression where the selected conversation wasn't highlighted anymore on tabled layout  
						
						
						
					 
					
						2015-04-13 15:59:18 +02:00 
						 
				 
			
				
					
						
							
							
								BrianBlade 
							
						 
					 
					
						
						
						
						
							
						
						
							878066ca99 
							
						 
					 
					
						
						
							
							Add option to use MTM without default TrustManager  
						
						... 
						
						
						
						Add a new "Don't trust system CAs" preference under advanced options
that will change the behaviour of the MemorizingTrustManager. All
formerly unknown certificates will raise a warning if checked. 
						
					 
					
						2015-04-11 15:13:42 +02:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							37d08276a8 
							
						 
					 
					
						
						
							
							allow sharing multiple images at once.  fixes   #1090  
						
						
						
					 
					
						2015-04-11 14:53:10 +02:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							332fe0fd19 
							
						 
					 
					
						
						
							
							don't resume old session when changing resource  
						
						
						
					 
					
						2015-04-09 12:46:54 +02:00 
						 
				 
			
				
					
						
							
							
								BrianBlade 
							
						 
					 
					
						
						
						
						
							
						
						
							dace8ba3d3 
							
						 
					 
					
						
						
							
							Enable end-conversation by swipe gesture  
						
						... 
						
						
						
						Add EnhancedListView library de.timroes.android:EnhancedListView:0.3.4
to enable swipe-out for ListViews
Re-enable selectableItemBackground
Dont end selectedConversation on swipe
Call mConversationFragment.reinit() instead.
Add separate undo string for swipe MUC.
Add blacklistedConversation for undo swipe
Update title_undo_swipe_* strings
Fix undo(), rename blacklistedConversation
Fix discardUndo(); re-init selectedConversation
maintain scroll position after undo
clear notification when dismissing a conversation
modified / simplified maintain scroll position code
simplify handling of selectedConversation
change undo_muc string, remove notifyDataSetChanged() 
						
					 
					
						2015-04-08 23:29:52 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							59ea143147 
							
						 
					 
					
						
						
							
							Merge pull request  #1099  from BrianBlade/fix_otr_error_msgs  
						
						... 
						
						
						
						Fix OTR-Error messages (#1021 ) 
						
					 
					
						2015-04-02 11:11:22 +02:00 
						 
				 
			
				
					
						
							
							
								BrianBlade 
							
						 
					 
					
						
						
						
						
							
						
						
							db74cb52c4 
							
						 
					 
					
						
						
							
							Fix OTR-Error messages  
						
						... 
						
						
						
						Send out OTR-Errors on unreadableMessageReceived() as well, not only on
messageFromAnotherInstanceReceived 
						
					 
					
						2015-04-01 20:03:09 +02:00 
						 
				 
			
				
					
						
							
							
								BrianBlade 
							
						 
					 
					
						
						
						
						
							
						
						
							e64049c4fc 
							
						 
					 
					
						
						
							
							Add toggle account-state switch  
						
						... 
						
						
						
						Add a switch to AccountAdapter that allows self-contained enabling/disabling of
accounts without the need to bring up the context-menu 
						
					 
					
						2015-04-01 12:47:59 +02:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							c47d1e83c1 
							
						 
					 
					
						
						
							
							properly set chat states when receiving otr status messages  
						
						
						
					 
					
						2015-03-21 16:43:03 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							99b2ef7e9d 
							
						 
					 
					
						
						
							
							respond to unreadable OTR messages with error message.  fixed   #1021  
						
						
						
					 
					
						2015-03-21 16:07:17 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							da099e5fa4 
							
						 
					 
					
						
						
							
							wait for session iq to return sucessfully before sending other stanzas.  fixed   #1017  
						
						
						
					 
					
						2015-03-20 21:48:45 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							442ae12ee5 
							
						 
					 
					
						
						
							
							don't update presence for muc messages  
						
						
						
					 
					
						2015-03-19 19:40:24 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							382bcc4cb5 
							
						 
					 
					
						
						
							
							Merge pull request  #1042  from BrianBlade/FIXES_muc-dlrs_muc-lastseen  
						
						... 
						
						
						
						add delivery receipts for private muc msgs & enable update last-seen for muc-msgs 
						
					 
					
						2015-03-19 18:47:33 +01:00 
						 
				 
			
				
					
						
							
							
								BrianBlade 
							
						 
					 
					
						
						
						
						
							
						
						
							1c600fefcf 
							
						 
					 
					
						
						
							
							# add delivery receipts for private muc msgs  
						
						... 
						
						
						
						# enable update last-seen for muc-msgs 
						
					 
					
						2015-03-18 21:49:41 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a13c59fa1b 
							
						 
					 
					
						
						
							
							Merge pull request  #1043  from strb/choose_contact_multiple_squashed  
						
						... 
						
						
						
						Added multiple select to Choose Contact Activity (squashed) 
						
					 
					
						2015-03-18 17:36:23 +01:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							f76baa5658 
							
						 
					 
					
						
						
							
							Added multiple select to Choose Contact Activity  
						
						... 
						
						
						
						When passing the Choose Contact Activity a boolean called "multiple"
set to true, it now allows the user to select multiple contacts. Long
pressing a contact enters multiple selection mode and the selection is
confirmed using a button in the CAB. The Activity returns whether or not
multiple contacts were selected using the same boolean. If multiple
contacts were selected, an array of JID strings called "contacts" is
returned. The Choose Contact Activity now also honors "filter_contacts",
an array of strings containing JIDs that should not be displayed in
the picker.
The invite to conference dialog now uses this feature to enable inviting
multiple contacts at once. Additionally, Invite Contact uses
"filter_contacts" to only display contacts that are not yet
participating in the conversation 
						
					 
					
						2015-03-18 17:11:50 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7ae357f863 
							
						 
					 
					
						
						
							
							Merge pull request  #1036  from QuentinC/development  
						
						... 
						
						
						
						Green led color is better with "full-green" 
						
					 
					
						2015-03-18 17:11:43 +01:00 
						 
				 
			
				
					
						
							
							
								Holger Weiß 
							
						 
					 
					
						
						
						
						
							
						
						
							52af62d298 
							
						 
					 
					
						
						
							
							Set file size also for cached avatars  
						
						
						
					 
					
						2015-03-17 17:36:17 +01:00 
						 
				 
			
				
					
						
							
							
								Mateusz "maxmati" Nowoty?ski 
							
						 
					 
					
						
						
						
						
							
						
						
							74e5317095 
							
						 
					 
					
						
						
							
							Do not Strigprep JIDs from database  
						
						
						
					 
					
						2015-03-11 15:59:31 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							4ee4eeb5e7 
							
						 
					 
					
						
						
							
							add context menu entries for geo uris  
						
						
						
					 
					
						2015-03-11 15:48:43 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							db6a63bcf6 
							
						 
					 
					
						
						
							
							open location directly from notification  
						
						
						
					 
					
						2015-03-10 21:46:13 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							5132cd7234 
							
						 
					 
					
						
						
							
							show geo uris as 'location' in overview  
						
						
						
					 
					
						2015-03-10 17:20:50 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1a5321e41f 
							
						 
					 
					
						
						
							
							Merge pull request  #1022  from Boris-de/cipher_blacklist  
						
						... 
						
						
						
						disable all really weak cipher suites 
						
					 
					
						2015-03-08 11:28:39 +01:00 
						 
				 
			
				
					
						
							
							
								Boris Wachtmeister 
							
						 
					 
					
						
						
						
						
							
						
						
							67f8ed44bd 
							
						 
					 
					
						
						
							
							disable all really weak cipher suites  
						
						... 
						
						
						
						With #959  all ciphers of the platform were enabled, but this also
includes several suites that are considered as very weak, even down to
NULL- and anon-ciphers which disable completely disable encryption
and/or authentication. Especially the anon-ciphers could be easily used
for a mitm-attack.
To remove all weak ciphers a blacklist with patterns of cipher-names was
added to Config.java. The blacklist is based on the "mandatory discards"
that Mozilla suggests to not use for TLS-servers because they are weak
or known to be broken.
https://wiki.mozilla.org/Security/Server_Side_TLS#Mandatory_discards  
						
					 
					
						2015-03-07 15:48:29 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							87a048fe6f 
							
						 
					 
					
						
						
							
							display geo uris as location. show 'send loction' in share menu if request location intent can be resolved  
						
						
						
					 
					
						2015-03-07 14:15:38 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							cbca92d209 
							
						 
					 
					
						
						
							
							fixed enter is send option  
						
						
						
					 
					
						2015-03-06 22:22:50 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							44028a547f 
							
						 
					 
					
						
						
							
							fixed npe in message parser  
						
						
						
					 
					
						2015-03-06 21:14:55 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f25a824610 
							
						 
					 
					
						
						
							
							avoid unnecessary thread creation  
						
						
						
					 
					
						2015-03-05 15:46:33 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							c5230e081c 
							
						 
					 
					
						
						
							
							added config option to disable string prep in jids  
						
						
						
					 
					
						2015-03-05 10:15:04 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							e10c4e78f1 
							
						 
					 
					
						
						
							
							experimantal in memory jid caching  
						
						
						
					 
					
						2015-03-04 19:56:24 +01:00 
						 
				 
			
				
					
						
							
							
								Quentin 
							
						 
					 
					
						
						
						
						
							
						
						
							fb3740f07b 
							
						 
					 
					
						
						
							
							Green led color is better with "full-green"  
						
						
						
					 
					
						2015-03-04 00:57:34 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ac577fe4fd 
							
						 
					 
					
						
						
							
							added methods to count number of unread messages  
						
						
						
					 
					
						2015-03-02 11:53:15 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ff86fa6049 
							
						 
					 
					
						
						
							
							mark all sent messages up to a marker as displayed  
						
						
						
					 
					
						2015-03-01 14:15:40 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							d318af098d 
							
						 
					 
					
						
						
							
							merge messages with related status (unsend, send, send_received)  
						
						
						
					 
					
						2015-03-01 12:05:54 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							864c709c96 
							
						 
					 
					
						
						
							
							catching out of memory run time exception in hasEnabledAccounts()  
						
						
						
					 
					
						2015-02-28 12:03:53 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							98df008bce 
							
						 
					 
					
						
						
							
							use conversations green in notification led  
						
						
						
					 
					
						2015-02-27 17:16:28 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c2ddd74d7f 
							
						 
					 
					
						
						
							
							Merge pull request  #1006  from QuentinC/development  
						
						... 
						
						
						
						Some changes to the LED color in notifications ! 
						
					 
					
						2015-02-27 17:07:30 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f3be0d99cc 
							
						 
					 
					
						
						
							
							don't add users with null nicks to muc user list  
						
						
						
					 
					
						2015-02-27 17:04:13 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							6ad4865d96 
							
						 
					 
					
						
						
							
							hide change password menu item if server feature is unavailable  
						
						
						
					 
					
						2015-02-27 17:03:13 +01:00 
						 
				 
			
				
					
						
							
							
								QuentinC 
							
						 
					 
					
						
						
						
						
							
						
						
							c67a481e4b 
							
						 
					 
					
						
						
							
							Update NotificationService.java  
						
						... 
						
						
						
						Revert led light color 
						
					 
					
						2015-02-27 11:18:15 +01:00 
						 
				 
			
				
					
						
							
							
								Quentin 
							
						 
					 
					
						
						
						
						
							
						
						
							71ce73a271 
							
						 
					 
					
						
						
							
							- Update mBuilder in NotificationService.java to ensure that the led is displayed at the right color.  
						
						... 
						
						
						
						CF: http://stackoverflow.com/questions/14953793/android-notification-led-doesnt-use-my-color#comment20991762_14953793 
- Changed led Color to green to remember the icon color and led times 
						
					 
					
						2015-02-27 00:33:49 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							a022e4b41a 
							
						 
					 
					
						
						
							
							reset error status in edit account when reconnecting  
						
						
						
					 
					
						2015-02-26 17:17:40 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							9e10c3841e 
							
						 
					 
					
						
						
							
							check for null in jid parser  
						
						
						
					 
					
						2015-02-26 16:56:07 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							fa45ceabc9 
							
						 
					 
					
						
						
							
							initilize keys with jsonobject value on parse error  
						
						
						
					 
					
						2015-02-26 16:55:49 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							b8bc70aaa0 
							
						 
					 
					
						
						
							
							prevent next button from showing up too early on account setup  
						
						
						
					 
					
						2015-02-25 23:48:45 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							8319446c03 
							
						 
					 
					
						
						
							
							reset incoming chat state when going into background  
						
						
						
					 
					
						2015-02-23 21:47:35 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							7a62fbbeae 
							
						 
					 
					
						
						
							
							get rid of some useless debugging  
						
						
						
					 
					
						2015-02-23 12:05:18 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							da2da75756 
							
						 
					 
					
						
						
							
							init mode (first start) for StartConversationActivity (no up button) and avoid being started multiple times.  fixed   #995  
						
						
						
					 
					
						2015-02-22 13:24:29 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							7259e666ea 
							
						 
					 
					
						
						
							
							look at 5 muc users instead of 4 for tile cache clearing  
						
						
						
					 
					
						2015-02-22 13:16:07 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f52bc4f0be 
							
						 
					 
					
						
						
							
							properly remove invalid avatar  
						
						
						
					 
					
						2015-02-22 13:15:27 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							3db5a48529 
							
						 
					 
					
						
						
							
							clear muc tiles cache only when necessary  
						
						
						
					 
					
						2015-02-21 22:19:10 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							7ee5e95959 
							
						 
					 
					
						
						
							
							added typing notifications through XEP-0085.  fixed   #210  
						
						
						
					 
					
						2015-02-21 11:06:52 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f26f6e9a00 
							
						 
					 
					
						
						
							
							fixed   #993  
						
						
						
					 
					
						2015-02-19 14:36:52 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							2e596c0bd4 
							
						 
					 
					
						
						
							
							launch edit account activity when starting Conversations for the first time (fixed regression)  
						
						
						
					 
					
						2015-02-19 13:48:40 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							5003d1f549 
							
						 
					 
					
						
						
							
							made xmpp uris case insensitive  
						
						
						
					 
					
						2015-02-18 18:23:13 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							9c2e6392ec 
							
						 
					 
					
						
						
							
							always call to cancel before loading new avatars  
						
						
						
					 
					
						2015-02-18 18:12:43 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							b128b33e56 
							
						 
					 
					
						
						
							
							always go through reconnect method instead of just starting XmppConnection threads  
						
						
						
					 
					
						2015-02-18 13:37:26 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							da2bc6db23 
							
						 
					 
					
						
						
							
							avoid weird npe.  fixed   #991  
						
						
						
					 
					
						2015-02-18 13:11:41 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							a8ec36cda8 
							
						 
					 
					
						
						
							
							limit ui refresh rate  
						
						
						
					 
					
						2015-02-17 14:18:35 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							67d5ee6b71 
							
						 
					 
					
						
						
							
							moved roster loading to async task as well  
						
						
						
					 
					
						2015-02-17 11:51:11 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							62b15a5d26 
							
						 
					 
					
						
						
							
							refresh list view more often  
						
						
						
					 
					
						2015-02-17 09:53:16 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							4e14c89ff8 
							
						 
					 
					
						
						
							
							support for XEP-0092: Software Version  
						
						
						
					 
					
						2015-02-16 10:06:09 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							5aa600c638 
							
						 
					 
					
						
						
							
							fixed avatar cache lookup in ListItemAdapter  
						
						
						
					 
					
						2015-02-16 00:58:31 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							178004996b 
							
						 
					 
					
						
						
							
							Merge pull request  #986  from singpolyma/vitelity-s.ms-compatability  
						
						... 
						
						
						
						Vitelity's s.ms service requires <body> first 
						
					 
					
						2015-02-15 23:28:22 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							146edb8c81 
							
						 
					 
					
						
						
							
							made image view background more colorful while waiting on actual avatar to load  
						
						
						
					 
					
						2015-02-15 23:25:35 +01:00 
						 
				 
			
				
					
						
							
							
								Stephen Paul Weber 
							
						 
					 
					
						
						
						
						
							
						
						
							00fa6f89d6 
							
						 
					 
					
						
						
							
							Vitelity's s.ms service requires <body> first  
						
						... 
						
						
						
						If the <body> tag is not first, their bot just silently drops the
stanza.  I know we shouldn't have to care about order, and I'm trying to
get them to fix it, but it's not high-priority for them since "most"
clients seem to work, so I'd like this workaround in. 
						
					 
					
						2015-02-15 14:18:41 -05:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							0485da8488 
							
						 
					 
					
						
						
							
							loading avatars in seperate tasks  
						
						
						
					 
					
						2015-02-15 18:48:05 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							e68c6a1b74 
							
						 
					 
					
						
						
							
							load messages asynchronously  
						
						
						
					 
					
						2015-02-12 18:53:00 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							45de788773 
							
						 
					 
					
						
						
							
							use time instead of uptime for unmute  
						
						
						
					 
					
						2015-02-12 18:52:10 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							44ee746681 
							
						 
					 
					
						
						
							
							added actions to error notification  
						
						
						
					 
					
						2015-02-10 17:13:34 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							6c8b82dd66 
							
						 
					 
					
						
						
							
							strip fractional seconds from timestamp before parsing  
						
						
						
					 
					
						2015-02-10 11:11:01 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							af0c979f45 
							
						 
					 
					
						
						
							
							disabled cipher logging  
						
						
						
					 
					
						2015-02-09 16:41:13 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c3260d620e 
							
						 
					 
					
						
						
							
							Merge pull request  #959  from SamWhited/ciphers_fix  
						
						... 
						
						
						
						Ciphers fix 
						
					 
					
						2015-02-09 16:04:54 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							026be61b72 
							
						 
					 
					
						
						
							
							don't show 'enter pgp key' in non encrypted chats  
						
						
						
					 
					
						2015-02-09 16:01:30 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							16dc13e4df 
							
						 
					 
					
						
						
							
							always add a non resolved SRV record to the list  
						
						
						
					 
					
						2015-02-09 11:54:20 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							ac309efcc8 
							
						 
					 
					
						
						
							
							made delay timestamp parser accept nano seconds  
						
						
						
					 
					
						2015-02-09 11:53:35 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ae8c021c16 
							
						 
					 
					
						
						
							
							sort users in muc  
						
						
						
					 
					
						2015-02-07 12:29:32 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							00b2e30938 
							
						 
					 
					
						
						
							
							trim message bodys on display  
						
						
						
					 
					
						2015-02-07 12:29:17 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e1e09d5cba 
							
						 
					 
					
						
						
							
							refactored how snackbar is displayed  
						
						
						
					 
					
						2015-02-07 12:17:03 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							03d30e4fdb 
							
						 
					 
					
						
						
							
							Use platform ciphers as well, just prefer ours  
						
						
						
					 
					
						2015-02-02 11:16:22 -05:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							bd3fccd2dc 
							
						 
					 
					
						
						
							
							don't disable any ciphers  
						
						
						
					 
					
						2015-02-02 14:22:49 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							6674a3d757 
							
						 
					 
					
						
						
							
							added more ciphers for old openssl versions  
						
						
						
					 
					
						2015-02-02 13:55:56 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							d0e764c1a5 
							
						 
					 
					
						
						
							
							fixed text preview for images  
						
						
						
					 
					
						2015-02-01 12:32:19 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							3216813e49 
							
						 
					 
					
						
						
							
							made version codes ready for release candidate in beta channel  
						
						
						
					 
					
						2015-01-29 23:56:04 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							3a52f31824 
							
						 
					 
					
						
						
							
							don't count when attempt failed completly  
						
						
						
					 
					
						2015-01-29 23:35:31 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							6c3ea7f2bd 
							
						 
					 
					
						
						
							
							Merge branch 'development' of  https://github.com/siacs/Conversations  into development  
						
						
						
					 
					
						2015-01-29 23:26:41 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f2bf64d19d 
							
						 
					 
					
						
						
							
							Merge branch 'development' of  https://github.com/siacs/Conversations  into development  
						
						
						
					 
					
						2015-01-29 23:20:01 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							48604a6620 
							
						 
					 
					
						
						
							
							Use Material Design Icons on API 21+  
						
						
						
					 
					
						2015-01-29 15:28:26 -05:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							0eeead495f 
							
						 
					 
					
						
						
							
							properly clear notifications.  fixed   #921  
						
						
						
					 
					
						2015-01-29 13:20:18 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c237a55093 
							
						 
					 
					
						
						
							
							Merge pull request  #941  from SamWhited/snackbar_ordering  
						
						... 
						
						
						
						Show errors before mute snackbar 
						
					 
					
						2015-01-28 13:08:26 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							3c64839daf 
							
						 
					 
					
						
						
							
							fixed broken caps  
						
						
						
					 
					
						2015-01-28 00:28:00 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							8cbf610bb2 
							
						 
					 
					
						
						
							
							Show errors before mute snackbar  
						
						... 
						
						
						
						See #939  
						
					 
					
						2015-01-27 08:49:03 -05:00 
						 
				 
			
				
					
						
							
							
								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