Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f21fda1421 
							
						 
					 
					
						
						
							
							scanned results are always a trusted source  
						
						
						
					 
					
						2018-03-13 16:55:25 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0c58e7cc30 
							
						 
					 
					
						
						
							
							migrated conference details to binding  
						
						
						
					 
					
						2018-03-13 12:26:26 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							25a49a28ce 
							
						 
					 
					
						
						
							
							disable caches in HttpUrlConnections  
						
						
						
					 
					
						2018-03-13 11:59:32 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ca625f1e8e 
							
						 
					 
					
						
						
							
							fix register account checkbox glitch  
						
						
						
					 
					
						2018-03-13 11:54:34 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							22d98bd162 
							
						 
					 
					
						
						
							
							do not highlight users when not participating.  fixes   #2865  
						
						
						
					 
					
						2018-03-12 16:00:02 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8dc17a96ba 
							
						 
					 
					
						
						
							
							fixed rare crash on jolla devices  
						
						
						
					 
					
						2018-03-12 15:59:35 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							72388e37f5 
							
						 
					 
					
						
						
							
							fixed some issues with jid escaping  
						
						
						
					 
					
						2018-03-11 18:32:16 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b2a9c63568 
							
						 
					 
					
						
						
							
							hide keyboard when stopping ConversationFragment  
						
						
						
					 
					
						2018-03-11 18:14:26 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c1135ad592 
							
						 
					 
					
						
						
							
							use escaped form of jid where approriate  
						
						
						
					 
					
						2018-03-11 14:14:56 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4bb45996c5 
							
						 
					 
					
						
						
							
							return contact and account.getServer() as String  
						
						
						
					 
					
						2018-03-11 12:13:56 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							dbcc54799d 
							
						 
					 
					
						
						
							
							cache bookmark jid in bookmark  
						
						
						
					 
					
						2018-03-11 12:06:07 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fe338a540a 
							
						 
					 
					
						
						
							
							make unicode detector work on labels  
						
						
						
					 
					
						2018-03-09 21:39:10 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e2e5c04ef7 
							
						 
					 
					
						
						
							
							detect irregular unicode in domain part  
						
						
						
					 
					
						2018-03-08 22:02:19 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7ae3bdd3c6 
							
						 
					 
					
						
						
							
							use scripts instead of blocks on Android >= N  
						
						
						
					 
					
						2018-03-08 20:45:30 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							216cf1805f 
							
						 
					 
					
						
						
							
							stop scrolling in tablet view after switching conversations  
						
						
						
					 
					
						2018-03-08 17:01:45 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4227c63e5d 
							
						 
					 
					
						
						
							
							decrease delay when scrolling to position  
						
						
						
					 
					
						2018-03-08 16:37:45 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e89378ceae 
							
						 
					 
					
						
						
							
							hide register account checkbox in magic mode  
						
						
						
					 
					
						2018-03-08 15:18:44 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6944c12186 
							
						 
					 
					
						
						
							
							display irregular unicode code points  
						
						
						
					 
					
						2018-03-08 14:02:48 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							52135625d8 
							
						 
					 
					
						
						
							
							do not enable encryption for bug reports  
						
						
						
					 
					
						2018-03-07 22:30:36 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							94bb7c423c 
							
						 
					 
					
						
						
							
							added splash screen  
						
						
						
					 
					
						2018-03-07 22:30:36 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							28467c4775 
							
						 
					 
					
						
						
							
							don’t show 'change status' icon during setup  
						
						
						
					 
					
						2018-03-07 22:30:36 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7e963820a5 
							
						 
					 
					
						
						
							
							made qr code scanner work in choose contact  
						
						
						
					 
					
						2018-03-07 22:30:36 +01:00 
						 
				 
			
				
					
						
							
							
								iamharsshit 
							
						 
					 
					
						
						
						
						
							
						
						
							69374f3e5f 
							
						 
					 
					
						
						
							
							remove deprecated method  
						
						
						
					 
					
						2018-03-07 22:30:36 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1efaecf745 
							
						 
					 
					
						
						
							
							use fab in choose contact activity. scan qr not yet working  
						
						
						
					 
					
						2018-03-07 22:30:36 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ed0ba89551 
							
						 
					 
					
						
						
							
							make omemo default  
						
						
						
					 
					
						2018-03-07 22:30:36 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							13a4a78025 
							
						 
					 
					
						
						
							
							removed unused otr fingerprint methods  
						
						
						
					 
					
						2018-03-07 22:30:36 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1accf9d961 
							
						 
					 
					
						
						
							
							migrate to xmpp-addr  
						
						
						
					 
					
						2018-03-07 22:30:36 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0add9a0ea2 
							
						 
					 
					
						
						
							
							audio player now requests permission when hitting play  
						
						
						
					 
					
						2018-03-07 22:30:36 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b5e1bbbdc1 
							
						 
					 
					
						
						
							
							request storage permission when opening message  
						
						
						
					 
					
						2018-03-07 22:30:36 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6aee638432 
							
						 
					 
					
						
						
							
							refactor disable notifications dialog to make use of timeframeutils  
						
						
						
					 
					
						2018-03-07 22:30:36 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							89992f541c 
							
						 
					 
					
						
						
							
							calculate automatic timeout labels dynamically  
						
						
						
					 
					
						2018-03-07 22:30:36 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							de2f5e7a83 
							
						 
					 
					
						
						
							
							reorder and scroll down after resending a message  
						
						
						
					 
					
						2018-03-07 22:30:36 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3bff110587 
							
						 
					 
					
						
						
							
							use translated version of subject if available  
						
						
						
					 
					
						2018-03-07 22:30:36 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							194b8d419b 
							
						 
					 
					
						
						
							
							fix change password activity for magic created accounts  
						
						
						
					 
					
						2018-03-07 22:30:36 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1ae6042ca8 
							
						 
					 
					
						
						
							
							show password field only on non-logged in or magic created accounts  
						
						
						
					 
					
						2018-03-07 22:30:36 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a4f4c80743 
							
						 
					 
					
						
						
							
							fixed 'mark read' icon on android ~4 devices  
						
						
						
					 
					
						2018-03-07 22:30:36 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							78fd19195d 
							
						 
					 
					
						
						
							
							finished 'Set Status Message' dialog  
						
						
						
					 
					
						2018-03-07 22:30:36 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							76732af63d 
							
						 
					 
					
						
						
							
							add missing permission result handling in StartConversationActivity  
						
						
						
					 
					
						2018-03-07 22:30:36 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c1c314f47a 
							
						 
					 
					
						
						
							
							delegate mime type from intent  
						
						
						
					 
					
						2018-03-07 22:30:36 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2f71c0cb79 
							
						 
					 
					
						
						
							
							wip: new status message dialog  
						
						
						
					 
					
						2018-03-07 22:30:36 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							57bcf824e9 
							
						 
					 
					
						
						
							
							finished app compat themeing  
						
						
						
					 
					
						2018-03-07 22:30:36 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							51fcb7de31 
							
						 
					 
					
						
						
							
							scroll in post  
						
						
						
					 
					
						2018-03-07 22:30:35 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							157ca65b0a 
							
						 
					 
					
						
						
							
							use text styles in more places  
						
						
						
					 
					
						2018-03-07 22:30:35 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a283d00013 
							
						 
					 
					
						
						
							
							request camera permissions when attaching taking picture or recording video  
						
						
						
					 
					
						2018-03-07 22:30:35 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							363c39a873 
							
						 
					 
					
						
						
							
							fixed take photo for activties that do not get destroyed  
						
						
						
					 
					
						2018-03-07 22:30:35 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							71beb92dd3 
							
						 
					 
					
						
						
							
							migrated some views over to app compat text styles  
						
						
						
					 
					
						2018-03-07 22:30:35 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3130d40262 
							
						 
					 
					
						
						
							
							changed some of the jid entering dialogs to textinputlayout  
						
						
						
					 
					
						2018-03-07 22:30:35 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9d15d3b408 
							
						 
					 
					
						
						
							
							introduced expert setting to not scroll down after sending a message  
						
						
						
					 
					
						2018-03-07 22:30:35 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ac22007e28 
							
						 
					 
					
						
						
							
							removed 'preemptive grant' setting  
						
						
						
					 
					
						2018-03-07 22:30:35 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b393f54a03 
							
						 
					 
					
						
						
							
							get rid of customizable resources  
						
						
						
					 
					
						2018-03-07 22:30:35 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e3ca4ca485 
							
						 
					 
					
						
						
							
							made conference invite work again  
						
						
						
					 
					
						2018-03-07 22:30:35 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5ed94d5ab0 
							
						 
					 
					
						
						
							
							made publish pgp work from conversation view  
						
						
						
					 
					
						2018-03-07 22:30:35 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6b55f05e27 
							
						 
					 
					
						
						
							
							don't send messages in callback  
						
						
						
					 
					
						2018-03-07 22:30:35 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							521a711fbc 
							
						 
					 
					
						
						
							
							use cards views in about and publish avatar activity  
						
						
						
					 
					
						2018-03-07 22:30:35 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							12031515d1 
							
						 
					 
					
						
						
							
							bring scan button to StartConversationActivity  
						
						
						
					 
					
						2018-03-07 22:30:35 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3bd42230f2 
							
						 
					 
					
						
						
							
							do not redirect to StarConversationActivity when scanning invalid jid  
						
						
						
					 
					
						2018-03-07 22:30:35 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							13322a568a 
							
						 
					 
					
						
						
							
							jump to first unread message if was scrolled to bottom earlier  
						
						
						
					 
					
						2018-03-07 22:30:35 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							acc47fbeda 
							
						 
					 
					
						
						
							
							add scan action to contact details  
						
						
						
					 
					
						2018-03-07 22:30:35 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							89bfae14b1 
							
						 
					 
					
						
						
							
							fixe scan in OmemoActivities  
						
						
						
					 
					
						2018-03-07 22:30:35 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9a76aff8f9 
							
						 
					 
					
						
						
							
							skip background connect when changing theme  
						
						
						
					 
					
						2018-03-07 22:30:35 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fe8e131e3a 
							
						 
					 
					
						
						
							
							simplified reInit logic  
						
						
						
					 
					
						2018-03-07 22:30:35 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bd2417e792 
							
						 
					 
					
						
						
							
							fixed openDialogs call when poping back stack  
						
						
						
					 
					
						2018-03-07 22:30:35 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							74336fa165 
							
						 
					 
					
						
						
							
							always scroll if viewing intent  
						
						
						
					 
					
						2018-03-07 22:30:35 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							dfb4e4eb46 
							
						 
					 
					
						
						
							
							integrate qr code scanner. temporarily break omemo activity scan  
						
						
						
					 
					
						2018-03-07 22:30:35 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6652135746 
							
						 
					 
					
						
						
							
							updated manage account activity to new colors  
						
						
						
					 
					
						2018-03-07 22:30:35 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ae2536adff 
							
						 
					 
					
						
						
							
							made a few callbacks save to activity being detached  
						
						
						
					 
					
						2018-03-07 22:30:35 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1236c6a139 
							
						 
					 
					
						
						
							
							save scroll state across rotations  
						
						
						
					 
					
						2018-03-07 22:30:35 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							21c9ffd8b2 
							
						 
					 
					
						
						
							
							skip refresh if binding is missing  
						
						
						
					 
					
						2018-03-07 22:30:35 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8aba540717 
							
						 
					 
					
						
						
							
							fixed take photo + do not reint twice  
						
						
						
					 
					
						2018-03-07 22:30:35 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							108edbe314 
							
						 
					 
					
						
						
							
							show warning dialogs  
						
						
						
					 
					
						2018-03-07 22:30:35 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							743543ad90 
							
						 
					 
					
						
						
							
							fix permission handling  
						
						
						
					 
					
						2018-03-07 22:30:35 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b5fa9b77c9 
							
						 
					 
					
						
						
							
							skip unnecessary loading of conversation overview fragment  
						
						
						
					 
					
						2018-03-07 22:30:35 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							759498ac3a 
							
						 
					 
					
						
						
							
							fixed showing QR code on long press  
						
						
						
					 
					
						2018-03-07 22:30:35 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e11fafcf52 
							
						 
					 
					
						
						
							
							don't show qr scan in conversation view  
						
						
						
					 
					
						2018-03-07 22:30:35 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3b75161113 
							
						 
					 
					
						
						
							
							fixed onActivityResult handling for pgp  
						
						
						
					 
					
						2018-03-07 22:30:34 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b0bec2c390 
							
						 
					 
					
						
						
							
							added dedicated scan button  
						
						
						
					 
					
						2018-03-07 22:30:34 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e0317cfa14 
							
						 
					 
					
						
						
							
							made download button in message adapter work  
						
						
						
					 
					
						2018-03-07 22:30:34 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e93b06f45c 
							
						 
					 
					
						
						
							
							redirect on empty conversation list  
						
						
						
					 
					
						2018-03-07 22:30:34 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7bc7853d1a 
							
						 
					 
					
						
						
							
							register open conversation with notification service  
						
						
						
					 
					
						2018-03-07 22:30:34 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e68fe13a22 
							
						 
					 
					
						
						
							
							process intents  
						
						
						
					 
					
						2018-03-07 22:30:34 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4c8cbfe966 
							
						 
					 
					
						
						
							
							make archive menu item work  
						
						
						
					 
					
						2018-03-07 22:30:34 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5e28a8f8d5 
							
						 
					 
					
						
						
							
							make read markers work  
						
						
						
					 
					
						2018-03-07 22:30:34 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							46feb7bf42 
							
						 
					 
					
						
						
							
							handle view conversation action when ConversationFragment is already open  
						
						
						
					 
					
						2018-03-07 22:30:34 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6cfc6af886 
							
						 
					 
					
						
						
							
							change font size in conversation overview  
						
						
						
					 
					
						2018-03-07 22:30:34 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cd75e55e3f 
							
						 
					 
					
						
						
							
							handle view intent  
						
						
						
					 
					
						2018-03-07 22:30:34 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6b689edb52 
							
						 
					 
					
						
						
							
							move new activity back to original name  
						
						
						
					 
					
						2018-03-07 22:30:34 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							02c78bb1fb 
							
						 
					 
					
						
						
							
							made refresh work  
						
						
						
					 
					
						2018-03-07 22:30:34 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							354b182968 
							
						 
					 
					
						
						
							
							made swipe and select work  
						
						
						
					 
					
						2018-03-07 22:30:34 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6bd0abcd8e 
							
						 
					 
					
						
						
							
							fragment voodoo  
						
						
						
					 
					
						2018-03-07 22:30:34 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							dd21f5d072 
							
						 
					 
					
						
						
							
							wip  
						
						
						
					 
					
						2018-03-07 22:30:34 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e9e616ebc7 
							
						 
					 
					
						
						
							
							switch conversations fragment to data binder  
						
						
						
					 
					
						2018-03-07 22:30:34 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8d9d96d4e1 
							
						 
					 
					
						
						
							
							vastly untested refactor. pushing for backup purposes  
						
						
						
					 
					
						2018-03-07 22:30:34 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c17f902be2 
							
						 
					 
					
						
						
							
							refactoring. move functionality from activity to fragment  
						
						
						
					 
					
						2018-03-07 22:30:34 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d55a3842d3 
							
						 
					 
					
						
						
							
							more otr cleanup  
						
						
						
					 
					
						2018-03-07 22:30:34 +01:00 
						 
				 
			
				
					
						
							
							
								SoyaLeaf 
							
						 
					 
					
						
						
						
						
							
						
						
							c7fd54a17e 
							
						 
					 
					
						
						
							
							Moved the error message to TextInputLayout in the ChangePasswordActivity  
						
						
						
					 
					
						2018-03-07 22:30:34 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							235275ba91 
							
						 
					 
					
						
						
							
							more cleanup  
						
						
						
					 
					
						2018-03-07 22:30:34 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bf6b54a7aa 
							
						 
					 
					
						
						
							
							get rid of OTR  
						
						
						
					 
					
						2018-03-07 22:30:34 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fc5a2922e9 
							
						 
					 
					
						
						
							
							use data binder for list item adapater  
						
						
						
					 
					
						2018-03-07 22:30:34 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							595757fe00 
							
						 
					 
					
						
						
							
							use data binder for inflating muc items  
						
						
						
					 
					
						2018-03-07 22:30:34 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fb383c7881 
							
						 
					 
					
						
						
							
							use async avatar loader in conference details  
						
						
						
					 
					
						2018-03-07 22:30:34 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c0b95a9d1c 
							
						 
					 
					
						
						
							
							add fab to start conversations activity  
						
						
						
					 
					
						2018-03-07 22:30:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2df1aaaed2 
							
						 
					 
					
						
						
							
							use data binder for contact key item  
						
						
						
					 
					
						2018-03-07 22:30:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1b8a437b1e 
							
						 
					 
					
						
						
							
							create dedicated button to enable undecided accounts  
						
						
						
					 
					
						2018-03-07 22:30:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0262975635 
							
						 
					 
					
						
						
							
							started to change text style to app compat  
						
						
						
					 
					
						2018-03-07 22:30:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5ebcb1ae71 
							
						 
					 
					
						
						
							
							ported presence activity to cardview  
						
						
						
					 
					
						2018-03-07 22:30:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d0e58330e9 
							
						 
					 
					
						
						
							
							switch account activity to card view. started using data binder  
						
						
						
					 
					
						2018-03-07 22:30:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1c441a57e8 
							
						 
					 
					
						
						
							
							only show one error at once  
						
						
						
					 
					
						2018-03-07 22:30:33 +01:00 
						 
				 
			
				
					
						
							
							
								SoyaLeaf 
							
						 
					 
					
						
						
						
						
							
						
						
							f334349cd6 
							
						 
					 
					
						
						
							
							Moved the error message to TextInputLayout  
						
						
						
					 
					
						2018-03-07 22:30:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							30776a86c4 
							
						 
					 
					
						
						
							
							change key activities to cards  
						
						
						
					 
					
						2018-03-07 22:30:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							58ec5ced8a 
							
						 
					 
					
						
						
							
							use data binder for contact details activity  
						
						
						
					 
					
						2018-03-07 22:30:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							eb25643d94 
							
						 
					 
					
						
						
							
							migrate to CardView in contact and muc details  
						
						
						
					 
					
						2018-03-07 22:30:33 +01:00 
						 
				 
			
				
					
						
							
							
								SoyaLeaf 
							
						 
					 
					
						
						
						
						
							
						
						
							63fb5d98cc 
							
						 
					 
					
						
						
							
							Change ShowHidePasswordEditText to TextInputEditText.  
						
						... 
						
						
						
						change the input fields in the AccountActivity to use the TextInputLayout.
Rollback format and change toggle tint 
						
					 
					
						2018-03-07 22:30:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							63c4fe6f02 
							
						 
					 
					
						
						
							
							do not use pop up menus for encryption and attachment selection  
						
						
						
					 
					
						2018-03-07 22:30:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6f5076e8c4 
							
						 
					 
					
						
						
							
							fixed crash when selecting participants  
						
						
						
					 
					
						2018-03-07 22:30:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							df82e7689d 
							
						 
					 
					
						
						
							
							removed unused resources  
						
						
						
					 
					
						2018-03-07 22:30:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1307cfe728 
							
						 
					 
					
						
						
							
							switch to switchcompat  
						
						
						
					 
					
						2018-03-07 22:30:33 +01:00 
						 
				 
			
				
					
						
							
							
								daivat15 
							
						 
					 
					
						
						
						
						
							
						
						
							54dadfd7cd 
							
						 
					 
					
						
						
							
							AppCompat Migration contribution  
						
						
						
					 
					
						2018-03-07 22:30:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5775223653 
							
						 
					 
					
						
						
							
							fixed code comment  
						
						
						
					 
					
						2018-03-07 22:30:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a25c5ed401 
							
						 
					 
					
						
						
							
							rewrite how preference screens are invokved  
						
						
						
					 
					
						2018-03-07 22:30:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							de0272fd1a 
							
						 
					 
					
						
						
							
							integrate trust manager into conversations  
						
						
						
					 
					
						2018-03-07 22:30:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bd90f2140d 
							
						 
					 
					
						
						
							
							fixed search in abstractsearchablelistitem  
						
						
						
					 
					
						2018-03-07 22:30:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bf85d30421 
							
						 
					 
					
						
						
							
							fixed hint color for edit message  
						
						
						
					 
					
						2018-03-07 22:30:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f81fbb36f1 
							
						 
					 
					
						
						
							
							migrated alert dialogs to app compat  
						
						
						
					 
					
						2018-03-07 22:30:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d49fb5873e 
							
						 
					 
					
						
						
							
							switch about activity to appcompat  
						
						
						
					 
					
						2018-03-07 22:30:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fe4ebb6244 
							
						 
					 
					
						
						
							
							reference support actionbar in all activities  
						
						
						
					 
					
						2018-03-07 22:30:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6e89427d5e 
							
						 
					 
					
						
						
							
							started work on migrating to appcompat  
						
						
						
					 
					
						2018-03-07 22:30:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0deffef8da 
							
						 
					 
					
						
						
							
							fixed concurrent modification when killing mam queries  
						
						
						
					 
					
						2018-03-01 08:27:30 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7e09fac1da 
							
						 
					 
					
						
						
							
							do not merge bug reports  
						
						
						
					 
					
						2018-02-25 14:28:14 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							63cd8e5981 
							
						 
					 
					
						
						
							
							added config param to use a random resource at every bind  
						
						
						
					 
					
						2018-02-24 20:47:02 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4013123279 
							
						 
					 
					
						
						
							
							MAM: rework hasMessagesLeft to account for prosody’s missing count  
						
						
						
					 
					
						2018-02-24 10:57:11 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							90ace36b18 
							
						 
					 
					
						
						
							
							only explicitly request device list for users not in roster fixups  
						
						
						
					 
					
						2018-02-24 10:03:22 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a09d63d9a4 
							
						 
					 
					
						
						
							
							only explicitly request device list for users not in roster  
						
						
						
					 
					
						2018-02-24 09:47:07 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							03fa58634b 
							
						 
					 
					
						
						
							
							kill mam query when archiving conversation  
						
						
						
					 
					
						2018-02-24 09:39:17 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7725cb8311 
							
						 
					 
					
						
						
							
							MAM: look at total count for completness. parse fin correctly  
						
						
						
					 
					
						2018-02-23 23:11:54 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f81e5e471e 
							
						 
					 
					
						
						
							
							request disco items before disco#info on first connect  
						
						... 
						
						
						
						should make initial connect faster because code is not waiting for omemo code to run 
						
					 
					
						2018-02-20 17:36:07 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e7094af9d5 
							
						 
					 
					
						
						
							
							warn when attempting to write stanza to an unbound stream  
						
						
						
					 
					
						2018-02-20 17:03:44 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							72cf702e75 
							
						 
					 
					
						
						
							
							mark error notifications as sensitve and local only.  fixes   #2795  
						
						
						
					 
					
						2018-02-20 08:22:08 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c35ac11a42 
							
						 
					 
					
						
						
							
							check if axolotl service is initialized before displaying keys  
						
						
						
					 
					
						2018-02-19 17:26:38 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							742727504f 
							
						 
					 
					
						
						
							
							fixed handling of self address messages w/o remoteMsgId  
						
						
						
					 
					
						2018-02-19 15:52:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							014cf66c87 
							
						 
					 
					
						
						
							
							do not allow insecure bind  
						
						
						
					 
					
						2018-02-18 21:54:03 +01:00 
						 
				 
			
				
					
						
							
							
								Marc Schink 
							
						 
					 
					
						
						
						
						
							
						
						
							17c6d8827c 
							
						 
					 
					
						
						
							
							Make use of Namespace.DATA constant  
						
						
						
					 
					
						2018-02-16 16:12:53 +01:00 
						 
				 
			
				
					
						
							
							
								Marc Schink 
							
						 
					 
					
						
						
						
						
							
						
						
							9af7b7ae1e 
							
						 
					 
					
						
						
							
							Namespace: Add constant for 'jabber ❌ data'  
						
						
						
					 
					
						2018-02-16 16:12:53 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a3f3cfa0bb 
							
						 
					 
					
						
						
							
							only allow a number of white listed headers according to http upload v0.5  
						
						
						
					 
					
						2018-02-16 11:14:16 +01:00 
						 
				 
			
				
					
						
							
							
								Marc Schink 
							
						 
					 
					
						
						
						
						
							
						
						
							3fa205d463 
							
						 
					 
					
						
						
							
							Don't add account if user cancels.  Fixes   #2797  
						
						
						
					 
					
						2018-02-15 14:40:21 +01:00 
						 
				 
			
				
					
						
							
							
								Marc Schink 
							
						 
					 
					
						
						
						
						
							
						
						
							3b7d9b39f7 
							
						 
					 
					
						
						
							
							Pass invite XMPP URI along instead of JID  
						
						
						
					 
					
						2018-02-14 17:03:43 +01:00 
						 
				 
			
				
					
						
							
							
								Marc Schink 
							
						 
					 
					
						
						
						
						
							
						
						
							c7d2b65982 
							
						 
					 
					
						
						
							
							XmppUri: Add toString() method  
						
						
						
					 
					
						2018-02-14 17:03:43 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d3e755ceb1 
							
						 
					 
					
						
						
							
							null check on invite object  
						
						
						
					 
					
						2018-02-13 15:20:30 +01:00 
						 
				 
			
				
					
						
							
							
								Christoph Scholz 
							
						 
					 
					
						
						
						
						
							
						
						
							9360f5c960 
							
						 
					 
					
						
						
							
							allow roster action with name  
						
						
						
					 
					
						2018-02-12 20:00:42 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6650c0bd57 
							
						 
					 
					
						
						
							
							always copy firefoxe’s shared files  
						
						
						
					 
					
						2018-02-12 12:31:59 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							eed2d93145 
							
						 
					 
					
						
						
							
							integrate intent integrator to finish activity when needed  
						
						
						
					 
					
						2018-02-12 11:22:51 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							64928d0ff1 
							
						 
					 
					
						
						
							
							http upload: do not crash on invalid slot responses  
						
						
						
					 
					
						2018-02-11 17:54:59 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e2ac1db225 
							
						 
					 
					
						
						
							
							do not cross reference bookmarks and conversations  
						
						
						
					 
					
						2018-02-10 19:06:31 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2eb2513615 
							
						 
					 
					
						
						
							
							always persist current nick (in bookmark and database)  
						
						
						
					 
					
						2018-02-10 16:24:55 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							64c956904d 
							
						 
					 
					
						
						
							
							don't cancel animation when switching accounts w/o init  
						
						
						
					 
					
						2018-02-10 13:32:37 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f828b89cbd 
							
						 
					 
					
						
						
							
							skip empty srv records  
						
						
						
					 
					
						2018-02-10 12:16:18 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							facc56bc7b 
							
						 
					 
					
						
						
							
							return to welcome activity after deleting last account  
						
						
						
					 
					
						2018-02-10 10:45:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							97406ecf51 
							
						 
					 
					
						
						
							
							skip animations for startup activities  
						
						
						
					 
					
						2018-02-09 22:19:13 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d33fca09cf 
							
						 
					 
					
						
						
							
							add null checks to huawei settings code  
						
						
						
					 
					
						2018-02-09 22:11:11 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5335cda50c 
							
						 
					 
					
						
						
							
							do not put setup activites on stack twice  
						
						
						
					 
					
						2018-02-09 20:09:58 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							012653f7ed 
							
						 
					 
					
						
						
							
							SM saftey checks  
						
						
						
					 
					
						2018-02-02 16:52:40 +01:00 
						 
				 
			
				
					
						
							
							
								Christian Schneppe 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							40878350c7 
							
						 
					 
					
						
						
							
							fixed crash on receiving files  
						
						
						
					 
					
						2018-02-01 19:47:51 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bcd00bb517 
							
						 
					 
					
						
						
							
							discover file extension in original filename from pgp  
						
						
						
					 
					
						2018-01-29 01:40:02 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2f1f9f2c2c 
							
						 
					 
					
						
						
							
							do not explicitly request MAM archive for blocked contacts  
						
						
						
					 
					
						2018-01-29 01:39:46 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e48788e821 
							
						 
					 
					
						
						
							
							support new http upload namespace  
						
						
						
					 
					
						2018-01-28 14:17:42 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4541ac8b7b 
							
						 
					 
					
						
						
							
							direct link from settings to huaweis protected apps  
						
						
						
					 
					
						2018-01-28 13:31:12 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3e9224bde9 
							
						 
					 
					
						
						
							
							add snooze button to notification  
						
						
						
					 
					
						2018-01-28 13:14:30 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c7bdc343ec 
							
						 
					 
					
						
						
							
							show account details when clicking avatar picture in self chat  
						
						
						
					 
					
						2018-01-27 21:34:32 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8f9640a9e1 
							
						 
					 
					
						
						
							
							just switch to conversations & do not creat when 'creating' self contact  
						
						
						
					 
					
						2018-01-27 21:04:42 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a33984acc5 
							
						 
					 
					
						
						
							
							encrypt muc PM only to actual recipient  
						
						
						
					 
					
						2018-01-27 20:55:43 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							be70eb5650 
							
						 
					 
					
						
						
							
							improvements for self messages  
						
						... 
						
						
						
						* fix omemo in group chats w/o participants
* don't create two axolotl messages when messaging self
* fix read marker for self messages 
						
					 
					
						2018-01-27 10:45:05 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3e111e7f58 
							
						 
					 
					
						
						
							
							allow axolotl header to be empty in empty mucs  
						
						
						
					 
					
						2018-01-27 09:15:47 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a5256c3e83 
							
						 
					 
					
						
						
							
							show self messages from other devices as received  
						
						
						
					 
					
						2018-01-27 09:15:02 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							294e19d962 
							
						 
					 
					
						
						
							
							fixed sharing multiple images  
						
						
						
					 
					
						2018-01-25 12:48:04 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							676ac32a97 
							
						 
					 
					
						
						
							
							delegate uri permission to service when processing files  
						
						
						
					 
					
						2018-01-23 22:02:28 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							44ce90ccf2 
							
						 
					 
					
						
						
							
							respond to message receipts request when processing carbon copy  
						
						
						
					 
					
						2018-01-23 22:00:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							eee5d885ba 
							
						 
					 
					
						
						
							
							make chat markers opportunistic in private mucs  
						
						
						
					 
					
						2018-01-22 23:21:24 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e62b0ca320 
							
						 
					 
					
						
						
							
							fix NPE when writing Resolver.Result to disk  
						
						
						
					 
					
						2018-01-22 23:20:58 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1e0f288e6a 
							
						 
					 
					
						
						
							
							avoid some unnecessary notification updates  
						
						
						
					 
					
						2018-01-22 12:24:10 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							78c5c508b3 
							
						 
					 
					
						
						
							
							permanently cache last resolver result  
						
						
						
					 
					
						2018-01-21 20:41:30 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3c4ba7e0ce 
							
						 
					 
					
						
						
							
							keep screen on during audio playback.  fixes   #2733  
						
						
						
					 
					
						2018-01-21 16:04:31 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f2bbb6087c 
							
						 
					 
					
						
						
							
							remove wakelocks in XmlReader  
						
						
						
					 
					
						2018-01-21 12:30:31 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6458351f6c 
							
						 
					 
					
						
						
							
							use countdownlatch to check if TagWriter has finished  
						
						
						
					 
					
						2018-01-20 23:13:36 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3a8855a672 
							
						 
					 
					
						
						
							
							fixed interupt handling  
						
						
						
					 
					
						2018-01-20 21:57:09 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2b39acf352 
							
						 
					 
					
						
						
							
							postpone notification actions (mark as read, reply) until after messages are loaded  
						
						
						
					 
					
						2018-01-20 20:05:39 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4600b3982e 
							
						 
					 
					
						
						
							
							treat key transport messages differently to not open empty conversations  
						
						
						
					 
					
						2018-01-20 09:36:37 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3ff37511d4 
							
						 
					 
					
						
						
							
							sent message receipts after mam catchup  
						
						
						
					 
					
						2018-01-20 08:54:44 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6009b8ebf0 
							
						 
					 
					
						
						
							
							disable offline messages. postpone prekey handling until after mam catchup  
						
						
						
					 
					
						2018-01-19 18:17:13 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							036dd82698 
							
						 
					 
					
						
						
							
							properly handle key transport messages. use prekeyparsing only when that attribute is set  
						
						
						
					 
					
						2018-01-18 20:58:55 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6663eb0a12 
							
						 
					 
					
						
						
							
							show warning toast if PM is disabled in MUC  
						
						
						
					 
					
						2018-01-18 17:35:42 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5d11fe7dc6 
							
						 
					 
					
						
						
							
							added a few todos to source code  
						
						
						
					 
					
						2018-01-15 11:13:35 +01:00 
						 
				 
			
				
					
						
							
							
								Christoph Scholz 
							
						 
					 
					
						
						
						
						
							
						
						
							d6bbcbd866 
							
						 
					 
					
						
						
							
							setting room subject also sets room name  
						
						
						
					 
					
						2018-01-13 21:02:06 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8b10f96272 
							
						 
					 
					
						
						
							
							disable copy in password field  
						
						
						
					 
					
						2018-01-10 16:57:54 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d68a610ac6 
							
						 
					 
					
						
						
							
							change edit button in quick edit dialog to accept  
						
						
						
					 
					
						2018-01-09 10:30:32 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7ab8ed625d 
							
						 
					 
					
						
						
							
							fix wrong avatar shown when true jid doesn't match in muc  
						
						
						
					 
					
						2018-01-09 10:13:34 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2c2e77a168 
							
						 
					 
					
						
						
							
							ShareWithActivity: refactor for java 8  
						
						
						
					 
					
						2018-01-01 11:56:31 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							97bc93aeb0 
							
						 
					 
					
						
						
							
							do not use theme in uri activity  
						
						
						
					 
					
						2017-12-19 12:50:19 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							127557df56 
							
						 
					 
					
						
						
							
							show pep as available if omemo_all_access has been installed on server  
						
						
						
					 
					
						2017-12-18 13:47:53 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c5ee541906 
							
						 
					 
					
						
						
							
							clear muc avatar after going online  
						
						
						
					 
					
						2017-12-18 13:19:11 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e0ec6ad8b6 
							
						 
					 
					
						
						
							
							fixed omemo device list not getting annouced on empty list  
						
						
						
					 
					
						2017-12-18 13:18:58 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1753dcac76 
							
						 
					 
					
						
						
							
							save muc subject to disk and use crypto targets for offline name generation  
						
						
						
					 
					
						2017-12-17 16:23:19 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2b0551a522 
							
						 
					 
					
						
						
							
							store new intent in welcome account activity  
						
						
						
					 
					
						2017-12-16 21:05:56 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							21615477ed 
							
						 
					 
					
						
						
							
							transport invitee from welcome activity to start conversations activity  
						
						
						
					 
					
						2017-12-16 20:38:14 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c58fcb1dc6 
							
						 
					 
					
						
						
							
							create avatar in background thread  
						
						
						
					 
					
						2017-12-16 14:22:57 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9b95f1102c 
							
						 
					 
					
						
						
							
							PublishProfilePictureActivity: refresh on status change  
						
						
						
					 
					
						2017-12-16 11:00:49 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ccf75ef45a 
							
						 
					 
					
						
						
							
							removed 'contact-only' hint from publish avtar screen  
						
						
						
					 
					
						2017-12-15 21:47:16 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bb6d5463fe 
							
						 
					 
					
						
						
							
							use JPEG as file format for avatar and compress to <9400 chars  
						
						
						
					 
					
						2017-12-15 20:49:48 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0be41e0aab 
							
						 
					 
					
						
						
							
							refactor StartConversationsActivity  
						
						
						
					 
					
						2017-12-15 19:13:58 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cc6a001ac2 
							
						 
					 
					
						
						
							
							remove NFC handling + let edit account handle own jids  
						
						
						
					 
					
						2017-12-15 18:25:21 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							6a9abd0e49 
							
						 
					 
					
						
						
							
							Merge pull request  #2720  from af8a524db1/uri_message  
						
						... 
						
						
						
						Handle 'message action' XMPP URIs 
						
					 
					
						2017-12-15 16:17:05 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8d339b6521 
							
						 
					 
					
						
						
							
							remove NFC + light refactoring of XmppActivity  
						
						
						
					 
					
						2017-12-15 16:14:04 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							df37e34e02 
							
						 
					 
					
						
						
							
							use show password widget in Change Password Activity  
						
						
						
					 
					
						2017-12-15 12:31:31 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4d4586eaea 
							
						 
					 
					
						
						
							
							Conference Details: hide settings in offline mucs  
						
						
						
					 
					
						2017-12-15 02:53:52 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							60ae269870 
							
						 
					 
					
						
						
							
							removed password repeat field in favor of show password field  
						
						
						
					 
					
						2017-12-15 02:51:54 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							38797177c7 
							
						 
					 
					
						
						
							
							ChatMarkers: parse own account from true counterpart  
						
						
						
					 
					
						2017-12-14 19:34:35 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							120ddcf8c9 
							
						 
					 
					
						
						
							
							fixed treatAsDownload() for empty messages  
						
						
						
					 
					
						2017-12-14 12:25:21 +01:00 
						 
				 
			
				
					
						
							
							
								Marc Schink 
							
						 
					 
					
						
						
						
						
							
						
						
							7dc68522a2 
							
						 
					 
					
						
						
							
							Handle NFC action in UriHandlerActivity  
						
						
						
					 
					
						2017-12-13 21:20:30 +01:00 
						 
				 
			
				
					
						
							
							
								Marc Schink 
							
						 
					 
					
						
						
						
						
							
						
						
							d5f8a4dacb 
							
						 
					 
					
						
						
							
							StartConversationActivity: Scan QR codes via UriHandlerActivity  
						
						
						
					 
					
						2017-12-13 21:20:30 +01:00 
						 
				 
			
				
					
						
							
							
								Marc Schink 
							
						 
					 
					
						
						
						
						
							
						
						
							75e16d0f54 
							
						 
					 
					
						
						
							
							UriHandlerActivity: Handle 'message action' XMPP URI  
						
						
						
					 
					
						2017-12-13 21:20:30 +01:00 
						 
				 
			
				
					
						
							
							
								Marc Schink 
							
						 
					 
					
						
						
						
						
							
						
						
							0fac4be94d 
							
						 
					 
					
						
						
							
							XmppUri: Parse 'message action' query  
						
						
						
					 
					
						2017-12-13 21:16:31 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							782b8fb744 
							
						 
					 
					
						
						
							
							fixup for pep omemo notification dedup  
						
						
						
					 
					
						2017-12-13 20:28:30 +01:00 
						 
				 
			
				
					
						
							
							
								Marc Schink 
							
						 
					 
					
						
						
						
						
							
						
						
							edf3c41e58 
							
						 
					 
					
						
						
							
							Add ShareViaAccountActivity  
						
						
						
					 
					
						2017-12-12 17:15:16 +01:00 
						 
				 
			
				
					
						
							
							
								Marc Schink 
							
						 
					 
					
						
						
						
						
							
						
						
							a7927d181b 
							
						 
					 
					
						
						
							
							AccountAdapter: Allow hiding of state button  
						
						
						
					 
					
						2017-12-12 17:15:13 +01:00 
						 
				 
			
				
					
						
							
							
								Marc Schink 
							
						 
					 
					
						
						
						
						
							
						
						
							b8b7cc2635 
							
						 
					 
					
						
						
							
							Implement simple URI handler activity  
						
						
						
					 
					
						2017-12-12 14:05:14 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9a796df2a3 
							
						 
					 
					
						
						
							
							add getAccountJids to DatabaseBackend  
						
						
						
					 
					
						2017-12-11 15:56:15 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							37bd26c75f 
							
						 
					 
					
						
						
							
							save changed server id in replaced messages  
						
						
						
					 
					
						2017-12-11 15:55:55 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							946d97074f 
							
						 
					 
					
						
						
							
							try to detect invalid nick (w/ emoji) in MUCs  
						
						
						
					 
					
						2017-12-11 15:55:10 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a973833a4f 
							
						 
					 
					
						
						
							
							support error messages in quick edit dialog  
						
						
						
					 
					
						2017-12-09 18:46:21 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d349f634d0 
							
						 
					 
					
						
						
							
							ignore data uri after aesgcm uri  
						
						
						
					 
					
						2017-12-09 14:45:54 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							665c5da8ae 
							
						 
					 
					
						
						
							
							fix xmpp uri regression  
						
						
						
					 
					
						2017-12-08 18:44:08 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							172d249369 
							
						 
					 
					
						
						
							
							initialize emoji helper in StartConversationActivity  
						
						
						
					 
					
						2017-12-08 18:43:58 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cdee6523e4 
							
						 
					 
					
						
						
							
							fix XmppUri for empty uris  
						
						
						
					 
					
						2017-12-08 14:24:26 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1b0cd77c57 
							
						 
					 
					
						
						
							
							XmppConnection: refactor registration code. 'Open Website' on PAYMENT_REQUIRED failure  
						
						
						
					 
					
						2017-12-08 14:23:38 +01:00 
						 
				 
			
				
					
						
							
							
								Georg Lukas 
							
						 
					 
					
						
						
						
						
							
						
						
							d96180f0ee 
							
						 
					 
					
						
						
							
							XEP-0393: fix off-by-one error in block detector ('`ii`ii')  
						
						
						
					 
					
						2017-12-07 14:48:41 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							328c6dea0f 
							
						 
					 
					
						
						
							
							fixed workaround that allowed us to expire devices  
						
						
						
					 
					
						2017-12-07 14:47:21 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a4b44ee730 
							
						 
					 
					
						
						
							
							Styler: do not style across multiple messages  
						
						
						
					 
					
						2017-12-06 16:58:08 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c489b6a8eb 
							
						 
					 
					
						
						
							
							put device id into setting for doze  
						
						
						
					 
					
						2017-12-06 16:57:43 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							97821f0633 
							
						 
					 
					
						
						
							
							possible fix for retry loop on pgp key annoucement  
						
						
						
					 
					
						2017-12-05 19:16:53 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0e6d3db926 
							
						 
					 
					
						
						
							
							Do not show xmpp uris as links that have invalid jids  
						
						
						
					 
					
						2017-12-05 19:02:23 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5885bc7f25 
							
						 
					 
					
						
						
							
							show warning when opening invalid jid  
						
						
						
					 
					
						2017-12-05 17:29:05 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b5fe8789e9 
							
						 
					 
					
						
						
							
							Refined avatar generation a bit  
						
						
						
					 
					
						2017-12-05 14:15:10 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							614372dcbb 
							
						 
					 
					
						
						
							
							ConversationsAdapter: Do not show image preview. Show pictogram instead  
						
						
						
					 
					
						2017-12-05 14:14:52 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9869310699 
							
						 
					 
					
						
						
							
							avoid some false positive quotes  
						
						
						
					 
					
						2017-12-04 16:50:15 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							95553750a3 
							
						 
					 
					
						
						
							
							Conference Options: fix context menus for people not in roster  
						
						
						
					 
					
						2017-12-03 18:09:14 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4b5db2fb45 
							
						 
					 
					
						
						
							
							read marker from mam. only trust true counterpart when mam:2 is being used  
						
						
						
					 
					
						2017-12-02 22:13:59 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ffb3eeb913 
							
						 
					 
					
						
						
							
							MAM: update previously sent messages with server msg id during mam query  
						
						
						
					 
					
						2017-12-02 20:52:30 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fc8a5641db 
							
						 
					 
					
						
						
							
							MAM: assume true counterpart is safe to extract when using mam:2  
						
						
						
					 
					
						2017-12-02 18:11:03 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							61f3539839 
							
						 
					 
					
						
						
							
							MAM: do not use private messages when finding last id in muc  
						
						
						
					 
					
						2017-12-02 17:48:54 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							97df4a682b 
							
						 
					 
					
						
						
							
							MessageParser: ignore groupchat messages retrieved from user archive  
						
						
						
					 
					
						2017-12-02 17:48:26 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							75b4926025 
							
						 
					 
					
						
						
							
							fixed publish-options migration  
						
						
						
					 
					
						2017-12-01 18:54:39 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							23e9c73c94 
							
						 
					 
					
						
						
							
							attempt to enable MAM(ejabberd) on muc configuration  
						
						
						
					 
					
						2017-12-01 17:36:50 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b158e9fd42 
							
						 
					 
					
						
						
							
							do not return muc whispers as last markable message  
						
						
						
					 
					
						2017-11-30 17:26:50 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							86f09dd9b9 
							
						 
					 
					
						
						
							
							PresenceParser: work around for ejabberd not including status code 110 in shut down presence  
						
						
						
					 
					
						2017-11-30 13:21:03 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							64dd622d32 
							
						 
					 
					
						
						
							
							make 'markable' attribute persistent  
						
						
						
					 
					
						2017-11-25 20:55:43 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7f4f30c849 
							
						 
					 
					
						
						
							
							ListItemAdapter: use ViewHolder  
						
						
						
					 
					
						2017-11-23 23:26:19 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9381c1d3e2 
							
						 
					 
					
						
						
							
							fixed content description for previous ViewHolder refactor  
						
						
						
					 
					
						2017-11-23 20:32:51 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							333e7a6510 
							
						 
					 
					
						
						
							
							deduplicate read markers if one with real jid is found  
						
						
						
					 
					
						2017-11-23 18:19:05 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							513427c8a8 
							
						 
					 
					
						
						
							
							MAM: start muc catchup with last sent message if serverId is available  
						
						
						
					 
					
						2017-11-23 18:18:30 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7d04e6331a 
							
						 
					 
					
						
						
							
							ConversationAdapter: use view holder  
						
						
						
					 
					
						2017-11-23 09:59:49 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							900ad2f7ef 
							
						 
					 
					
						
						
							
							ConversationsAdapter: Use EmojiWrapper instead of EmojiTextView  
						
						
						
					 
					
						2017-11-23 09:36:51 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d7c5937c20 
							
						 
					 
					
						
						
							
							process emoji charsequence instead of using EmojiTextView  
						
						
						
					 
					
						2017-11-22 21:17:38 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							03c34649b4 
							
						 
					 
					
						
						
							
							shorten >4 names to a, b, c +n more  
						
						
						
					 
					
						2017-11-22 17:57:28 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8696cf2235 
							
						 
					 
					
						
						
							
							PgpService: feed result intent back into decryption  
						
						
						
					 
					
						2017-11-22 13:36:10 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4596cad3cb 
							
						 
					 
					
						
						
							
							MessageParser: don't refresh view after parsing chat state when combined with message  
						
						
						
					 
					
						2017-11-21 16:17:27 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							381fe82b01 
							
						 
					 
					
						
						
							
							save full jid when sending in muc. check chat markers against 'sender'  
						
						
						
					 
					
						2017-11-21 15:42:46 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							79ea0713bb 
							
						 
					 
					
						
						
							
							MessageAdapter: code reformat  
						
						
						
					 
					
						2017-11-21 13:26:45 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							702d6cf2a5 
							
						 
					 
					
						
						
							
							MessageParser: dismiss notification when receiving read marker from another client  
						
						
						
					 
					
						2017-11-21 13:26:23 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							05b6fdb9f1 
							
						 
					 
					
						
						
							
							use empty wake lock tag  
						
						
						
					 
					
						2017-11-21 13:25:18 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							52e09d17e8 
							
						 
					 
					
						
						
							
							MessageAdapter: do not apply empty size spans  
						
						
						
					 
					
						2017-11-21 12:41:05 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9548a4f6af 
							
						 
					 
					
						
						
							
							ConversationAdapter: do not show file icon when file has been deleted  
						
						
						
					 
					
						2017-11-21 12:40:42 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							28e005f926 
							
						 
					 
					
						
						
							
							send and show read markers in private, non-anonymous groups  
						
						
						
					 
					
						2017-11-20 11:26:20 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1780a4257f 
							
						 
					 
					
						
						
							
							ConversationsAdapter: code cleanup  
						
						
						
					 
					
						2017-11-20 11:12:11 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e452d5d46d 
							
						 
					 
					
						
						
							
							stop scrolling before changing conversations.  fixes   #2700  
						
						
						
					 
					
						2017-11-17 21:00:01 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5e15c48206 
							
						 
					 
					
						
						
							
							refactore phone helper to ignore security exception  
						
						
						
					 
					
						2017-11-17 10:28:51 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							013822fe82 
							
						 
					 
					
						
						
							
							excute db read and writes on different threads  
						
						
						
					 
					
						2017-11-16 15:53:03 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3dbe5db44b 
							
						 
					 
					
						
						
							
							Rename 'conference' to 'group chat'  
						
						
						
					 
					
						2017-11-16 13:30:27 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2d42646893 
							
						 
					 
					
						
						
							
							JingleConnection: fixed rare npe when canceling jingle  
						
						
						
					 
					
						2017-11-16 12:49:15 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c52492ada0 
							
						 
					 
					
						
						
							
							apperently some servers will ommit the from even for stanzas not going to them  
						
						
						
					 
					
						2017-11-16 12:48:26 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							75a485cbc1 
							
						 
					 
					
						
						
							
							catch all sorts of date parsing errors  
						
						
						
					 
					
						2017-11-16 12:47:49 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8e4440a49a 
							
						 
					 
					
						
						
							
							fixed ImStyleParser to not style '**test**'  
						
						
						
					 
					
						2017-11-14 17:57:22 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3efa1c46ab 
							
						 
					 
					
						
						
							
							remove numeric hint from captcha  
						
						
						
					 
					
						2017-11-14 09:14:03 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fced4a454e 
							
						 
					 
					
						
						
							
							ConversationsAdapter: Do not show attachment icon + text if attachment is audio or location  
						
						
						
					 
					
						2017-11-13 18:37:12 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8e4df80619 
							
						 
					 
					
						
						
							
							Merge branch 'patch-1' of  https://github.com/Kandr0s/Conversations  into Kandr0s-patch-1  
						
						
						
					 
					
						2017-11-13 14:51:56 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3faf951f47 
							
						 
					 
					
						
						
							
							disable swipe to left to dismiss conversation  
						
						
						
					 
					
						2017-11-13 14:51:45 +01:00 
						 
				 
			
				
					
						
							
							
								Kandr0s 
							
						 
					 
					
						
						
						
						
							
						
						
							308f451959 
							
						 
					 
					
						
						
							
							Show Drawable if Location/File/Voice  
						
						
						
					 
					
						2017-11-13 13:39:06 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bc9da1fbf4 
							
						 
					 
					
						
						
							
							remove prosody push from blacklist  
						
						
						
					 
					
						2017-11-12 19:22:39 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							49365511e4 
							
						 
					 
					
						
						
							
							trying to catch various dead system exception when scheduling new alarms and such  
						
						
						
					 
					
						2017-11-12 19:22:07 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7e93f4519a 
							
						 
					 
					
						
						
							
							catch all RuntimeExceptions when using MetadataRetriever  
						
						
						
					 
					
						2017-11-12 19:20:35 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a6d1559755 
							
						 
					 
					
						
						
							
							styler: ignore closing keyword when preceded by whitespace  
						
						
						
					 
					
						2017-11-10 20:19:22 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							513795fdf8 
							
						 
					 
					
						
						
							
							use view context instead activity to show toast in ConversationFragment  
						
						
						
					 
					
						2017-11-10 20:18:47 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d6eb08e0ed 
							
						 
					 
					
						
						
							
							catch rare exception when transforming download uri to real path  
						
						
						
					 
					
						2017-11-10 20:18:09 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f4638d7eec 
							
						 
					 
					
						
						
							
							catch some more exception when retrieving media runtime  
						
						
						
					 
					
						2017-11-10 20:17:42 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							949d3280d3 
							
						 
					 
					
						
						
							
							open links in new tabs  
						
						
						
					 
					
						2017-11-09 20:49:44 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a5c33abe88 
							
						 
					 
					
						
						
							
							MessageAdapter: code cleanup  
						
						
						
					 
					
						2017-11-09 20:23:31 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							459cf09f06 
							
						 
					 
					
						
						
							
							FileProvider: attempt to work with sd cards  
						
						
						
					 
					
						2017-11-08 20:34:08 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							676f181cad 
							
						 
					 
					
						
						
							
							lower priority for error notification  
						
						
						
					 
					
						2017-11-08 20:33:05 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e393de6832 
							
						 
					 
					
						
						
							
							disable auto fill on edit message box  
						
						
						
					 
					
						2017-11-08 13:25:38 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e9587f73ce 
							
						 
					 
					
						
						
							
							styling: introduce support for code blocks  
						
						
						
					 
					
						2017-11-07 23:28:14 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2e3b5de6b6 
							
						 
					 
					
						
						
							
							do not quote quotes  
						
						
						
					 
					
						2017-11-07 22:22:28 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e5210bbaa0 
							
						 
					 
					
						
						
							
							brought back 'copy to clipboard' and 'quote' context menu options  
						
						
						
					 
					
						2017-11-07 15:58:27 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							49b4153fb5 
							
						 
					 
					
						
						
							
							make keyword styling work in quotes  
						
						
						
					 
					
						2017-11-07 13:23:49 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							22c37bd430 
							
						 
					 
					
						
						
							
							changed text styling to keep the keyword  
						
						
						
					 
					
						2017-11-06 23:44:00 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							af3c9be700 
							
						 
					 
					
						
						
							
							fix take photo with pending keys  
						
						
						
					 
					
						2017-11-06 17:27:48 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							894ffc6488 
							
						 
					 
					
						
						
							
							ExceptionHelper: code clean up  
						
						
						
					 
					
						2017-11-06 14:20:58 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							aa10b9ff05 
							
						 
					 
					
						
						
							
							code refactoring to provide shorter account enabled check  
						
						
						
					 
					
						2017-11-06 13:57:25 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ebd3330037 
							
						 
					 
					
						
						
							
							changed preview alpha to 0.6f  
						
						
						
					 
					
						2017-11-06 12:17:43 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4d896cc3ab 
							
						 
					 
					
						
						
							
							initialize emoji compat in share activity  
						
						
						
					 
					
						2017-11-06 12:16:55 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c262cd5d6e 
							
						 
					 
					
						
						
							
							support for basic IM styling  
						
						
						
					 
					
						2017-11-05 21:34:40 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7984100e54 
							
						 
					 
					
						
						
							
							delete unneeded class  
						
						
						
					 
					
						2017-11-05 16:32:57 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							435d1ef5bd 
							
						 
					 
					
						
						
							
							SASL: don't prefer PLAIN auth over DIGEST-MD5 for nimbuzz.com  
						
						
						
					 
					
						2017-11-05 16:21:59 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8f0cd86090 
							
						 
					 
					
						
						
							
							Resync has_enabled_account setting after delete and on start  
						
						
						
					 
					
						2017-10-28 17:49:51 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3205d763cf 
							
						 
					 
					
						
						
							
							MessageAdapter: Display emojis slightly larger in text  
						
						
						
					 
					
						2017-10-28 13:15:31 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							aeec76d68b 
							
						 
					 
					
						
						
							
							Resolver: active network gets high priority  
						
						
						
					 
					
						2017-10-28 13:12:11 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4d0986ee91 
							
						 
					 
					
						
						
							
							Resolver: Only prefer VPN connections when network is active  
						
						
						
					 
					
						2017-10-27 21:57:31 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							962add97f9 
							
						 
					 
					
						
						
							
							XmppConnection: throw bind failure when server tries to reassign domain  
						
						
						
					 
					
						2017-10-27 18:26:06 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							82e5a28f49 
							
						 
					 
					
						
						
							
							Sharing: request permission  
						
						
						
					 
					
						2017-10-27 17:25:01 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							08aad7d0aa 
							
						 
					 
					
						
						
							
							black list certain local parts and show domain instead  
						
						
						
					 
					
						2017-10-27 15:46:12 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3c2aa8a4d2 
							
						 
					 
					
						
						
							
							Config.java: removed dead code  
						
						
						
					 
					
						2017-10-27 15:30:08 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6f802b88d2 
							
						 
					 
					
						
						
							
							XmppConnection: do not count stanzas before smacks session has started  
						
						
						
					 
					
						2017-10-27 11:35:55 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							dc5d504edd 
							
						 
					 
					
						
						
							
							MessageAdapter: round file sizes  
						
						
						
					 
					
						2017-10-27 11:35:19 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ad6f6183b8 
							
						 
					 
					
						
						
							
							video processing: pick smaller file after transcoding. do not transcode very small files  
						
						
						
					 
					
						2017-10-27 11:34:53 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							396ad3361f 
							
						 
					 
					
						
						
							
							Jingle: create output stream on demand  
						
						
						
					 
					
						2017-10-26 18:42:10 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							73db0bd19f 
							
						 
					 
					
						
						
							
							MessageAdapter: Do not display muc whispers as emoji only  
						
						
						
					 
					
						2017-10-26 18:41:40 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ac50b367b7 
							
						 
					 
					
						
						
							
							don't share video twice after transcoding exception.  fixes   #2652  
						
						
						
					 
					
						2017-10-14 02:38:05 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							48baf56622 
							
						 
					 
					
						
						
							
							save message drafts across restarts.  fixes   #2642  
						
						
						
					 
					
						2017-10-01 22:52:21 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							50d436fd81 
							
						 
					 
					
						
						
							
							EventReceiver: use setting to store enabled accounts  
						
						
						
					 
					
						2017-10-01 18:44:28 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							874c1f4c74 
							
						 
					 
					
						
						
							
							MessageAdapter: trim but don't replace all whitespaces before displaying emoji message  
						
						
						
					 
					
						2017-10-01 10:42:01 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6713431986 
							
						 
					 
					
						
						
							
							Emoticons: support subdivision-flags  
						
						
						
					 
					
						2017-09-30 18:58:35 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							39a54838fa 
							
						 
					 
					
						
						
							
							Emoticons: detect keycaps  
						
						
						
					 
					
						2017-09-30 17:38:48 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bbfabaf930 
							
						 
					 
					
						
						
							
							FileBackend: close cursor after retrieving file size  
						
						
						
					 
					
						2017-09-30 15:50:01 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							014052b991 
							
						 
					 
					
						
						
							
							added a few codepoints with emoji variants  
						
						
						
					 
					
						2017-09-30 01:18:08 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f53e44a291 
							
						 
					 
					
						
						
							
							refactor emoji detector and fix fitzpatrick followed by zwj  
						
						
						
					 
					
						2017-09-29 23:27:08 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f0e48c8af5 
							
						 
					 
					
						
						
							
							use own algorithm to count emoji instead of using emoji-java  
						
						
						
					 
					
						2017-09-29 22:56:17 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							42b4528d03 
							
						 
					 
					
						
						
							
							use emoji compat  
						
						
						
					 
					
						2017-09-29 19:44:30 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							acd4b149f5 
							
						 
					 
					
						
						
							
							slight refactoring in MessageAdapter  
						
						
						
					 
					
						2017-09-27 10:21:00 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							129b84bda8 
							
						 
					 
					
						
						
							
							add maintanence intent to renewe instance id  
						
						
						
					 
					
						2017-09-22 13:31:00 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c3dcc74b23 
							
						 
					 
					
						
						
							
							select presence if necessary when resending file  
						
						
						
					 
					
						2017-09-22 11:14:56 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a3be1e964c 
							
						 
					 
					
						
						
							
							execute video compression on seperate thread  
						
						
						
					 
					
						2017-09-21 21:54:10 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e5becc2e12 
							
						 
					 
					
						
						
							
							slightly refactor dns resolver  
						
						
						
					 
					
						2017-09-21 21:46:11 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							881d4ad5b7 
							
						 
					 
					
						
						
							
							give exec resolver a lower priority over reflection.  fixes   #2629  
						
						
						
					 
					
						2017-09-21 10:31:21 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2eb7197e04 
							
						 
					 
					
						
						
							
							removed unnecessary padding restrictions around emoji messages  
						
						
						
					 
					
						2017-09-20 21:04:41 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							20b14091d6 
							
						 
					 
					
						
						
							
							play audio files inline  
						
						
						
					 
					
						2017-09-20 15:35:35 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							30b6201b95 
							
						 
					 
					
						
						
							
							reworked file params to store audio runtime amoung other things  
						
						
						
					 
					
						2017-09-19 22:42:22 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							acc78145db 
							
						 
					 
					
						
						
							
							unified share with menu.  fixes   #2630  
						
						
						
					 
					
						2017-09-19 16:28:01 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							dbd489cbcb 
							
						 
					 
					
						
						
							
							show correct tooltip when long pressing start conversations.  fixes   #2635  
						
						
						
					 
					
						2017-09-19 10:43:25 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4e864935fe 
							
						 
					 
					
						
						
							
							ignore http upload file size constraints for videos that will be compressed  
						
						
						
					 
					
						2017-09-18 22:42:25 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0603378c75 
							
						 
					 
					
						
						
							
							show permanent notification while transcoding video  
						
						
						
					 
					
						2017-09-18 17:56:25 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							17e70f55a0 
							
						 
					 
					
						
						
							
							made video thumbnail available during upload  
						
						
						
					 
					
						2017-09-18 12:31:57 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c2105dfe46 
							
						 
					 
					
						
						
							
							use lower resolution for videos longer than 8s  
						
						
						
					 
					
						2017-09-18 11:54:14 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d4c16b5a85 
							
						 
					 
					
						
						
							
							added dedicated 'record video' attachment button.  fixes   #2592  
						
						... 
						
						
						
						thank you @BlauerHunger 
						
					 
					
						2017-09-18 11:51:47 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							22a058ff61 
							
						 
					 
					
						
						
							
							show block menu after long press on allow/add back  
						
						
						
					 
					
						2017-09-11 09:53:14 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							63817ecda1 
							
						 
					 
					
						
						
							
							removed unused 'disable foreground' button  
						
						
						
					 
					
						2017-09-11 09:27:39 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							32b1e5b306 
							
						 
					 
					
						
						
							
							additional null checks around 'read by' intent  
						
						
						
					 
					
						2017-09-11 09:23:14 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5cc92acbee 
							
						 
					 
					
						
						
							
							use 'partial' in server info if publish-options is n/a  
						
						... 
						
						
						
						fixes  #2621  
					
						2017-09-09 13:34:51 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8126bc98b4 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/invisiblek/Conversations  into invisiblek-master  
						
						
						
					 
					
						2017-08-31 12:43:34 +02:00 
						 
				 
			
				
					
						
							
							
								Dan Pasanen 
							
						 
					 
					
						
						
						
						
							
						
						
							bbce690d4f 
							
						 
					 
					
						
						
							
							NotificationService: add button to mark conversation as read  
						
						
						
					 
					
						2017-08-30 11:15:03 -05:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0f39ad0f04 
							
						 
					 
					
						
						
							
							make filtered list item activity survive roations  
						
						
						
					 
					
						2017-08-28 18:30:39 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ccb47c5727 
							
						 
					 
					
						
						
							
							get rid of uneccessary 'own omemo fingerprint' string.  fixes   #2599  
						
						
						
					 
					
						2017-08-28 18:15:39 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							617425e7ff 
							
						 
					 
					
						
						
							
							link jid in trust keys activity to contact details  
						
						
						
					 
					
						2017-08-24 10:09:16 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f4ff644338 
							
						 
					 
					
						
						
							
							reintroduced fixed IV mode for OTR file transfer.  fixes   #2595  
						
						
						
					 
					
						2017-08-23 22:37:13 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e6a67a6c26 
							
						 
					 
					
						
						
							
							made avatar cache cleaning more efficent after name changes  
						
						
						
					 
					
						2017-08-23 21:49:25 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d348780dfc 
							
						 
					 
					
						
						
							
							wait up to 2s to let server close socket before force closing  
						
						
						
					 
					
						2017-08-23 12:33:40 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							94e0c6b38c 
							
						 
					 
					
						
						
							
							don’t use xmpp or jabber as default muc nick  
						
						
						
					 
					
						2017-08-23 10:06:32 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							26f7702c39 
							
						 
					 
					
						
						
							
							request storage permission when sending gif.  fixes   #2589  
						
						
						
					 
					
						2017-08-22 16:51:42 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							85b502cff9 
							
						 
					 
					
						
						
							
							use proper defaults for notification. fix sound playing twice on Android 8  
						
						
						
					 
					
						2017-08-22 12:19:18 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6777ecdb00 
							
						 
					 
					
						
						
							
							set status=received on status messages  
						
						
						
					 
					
						2017-08-21 16:19:35 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e0fa820436 
							
						 
					 
					
						
						
							
							improved error messages on missing omemo keys  
						
						
						
					 
					
						2017-08-21 14:08:20 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6afa5653cb 
							
						 
					 
					
						
						
							
							fixed jingle state machine being thrown off by iq-result coming after session-accept  
						
						... 
						
						
						
						fixes  #2587  
					
						2017-08-18 14:33:56 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							dd5e321247 
							
						 
					 
					
						
						
							
							fixed conference naming for joined people not in your contact list  
						
						
						
					 
					
						2017-08-15 12:56:32 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4ed74eafc8 
							
						 
					 
					
						
						
							
							reset attempt counts on enable  
						
						
						
					 
					
						2017-08-12 22:17:49 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							699e845e6d 
							
						 
					 
					
						
						
							
							default input type to numbers on captcha dialog  
						
						
						
					 
					
						2017-08-12 22:17:24 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							097fe3e1b6 
							
						 
					 
					
						
						
							
							no automatic reconnect on registration failures  
						
						
						
					 
					
						2017-08-12 22:17:04 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							57c11d42d5 
							
						 
					 
					
						
						
							
							create a new axolotl service when the account jid changes  
						
						
						
					 
					
						2017-08-10 22:34:03 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0da2f1ed3f 
							
						 
					 
					
						
						
							
							prevent users from editing their account jid after successful login  
						
						
						
					 
					
						2017-08-10 22:34:03 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							26765a8a0d 
							
						 
					 
					
						
						
							
							send unavailable presence before join  
						
						
						
					 
					
						2017-08-10 22:33:40 +02:00 
						 
				 
			
				
					
						
							
							
								moparisthebest 
							
						 
					 
					
						
						
						
						
							
						
						
							197352b669 
							
						 
					 
					
						
						
							
							Read support for 12-byte IVs in addition to 16-byte IVs  
						
						
						
					 
					
						2017-08-09 23:42:35 -04:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d8d1c1192f 
							
						 
					 
					
						
						
							
							code cleanup and synchronized getMarkableMessage()  
						
						
						
					 
					
						2017-08-09 09:43:41 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							995d975127 
							
						 
					 
					
						
						
							
							removed support for fixed IV mode in otr jingle file transfer that hasn't been used since v0.4 or something  
						
						
						
					 
					
						2017-08-09 09:43:12 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cce5a7b39f 
							
						 
					 
					
						
						
							
							parse jid from CN in client certs if nothing else is available  
						
						
						
					 
					
						2017-08-07 16:02:48 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4a43df8c97 
							
						 
					 
					
						
						
							
							do not crash on some very rare logging  
						
						
						
					 
					
						2017-08-07 15:55:56 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1ab391931d 
							
						 
					 
					
						
						
							
							some code cleanup. and avoid scheduling reconnect task for negative interval  
						
						
						
					 
					
						2017-08-05 19:13:29 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							490115d20e 
							
						 
					 
					
						
						
							
							do not run file observer on hidden directories  
						
						
						
					 
					
						2017-08-05 19:12:44 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							911e392006 
							
						 
					 
					
						
						
							
							update mini dns  
						
						
						
					 
					
						2017-08-05 15:17:10 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b925f436fd 
							
						 
					 
					
						
						
							
							add more logging to http download connection and reset file params after setting expected size  
						
						
						
					 
					
						2017-08-04 11:58:12 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c3cbb21133 
							
						 
					 
					
						
						
							
							cache some information generated from body like isEmojiOnly, fileParams and isGeoUri  
						
						
						
					 
					
						2017-08-03 13:24:41 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7bcf173866 
							
						 
					 
					
						
						
							
							remove all whitespaces in emoji only messages  
						
						
						
					 
					
						2017-08-03 10:55:14 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							225cca4566 
							
						 
					 
					
						
						
							
							provide extra 'network is unreachable' account state  
						
						
						
					 
					
						2017-08-02 18:58:51 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							768eadde36 
							
						 
					 
					
						
						
							
							use random string generator instead of BigInteger in DigestMd5  
						
						
						
					 
					
						2017-08-01 12:27:26 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							82c5924434 
							
						 
					 
					
						
						
							
							display messages that only contain emoji slightly larger  
						
						
						
					 
					
						2017-07-30 22:04:58 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e11277c70f 
							
						 
					 
					
						
						
							
							use base64 instead of base36 when creating random strings  
						
						
						
					 
					
						2017-07-30 11:39:47 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							01b207d44d 
							
						 
					 
					
						
						
							
							avoid empty strings when figuring out display name  
						
						
						
					 
					
						2017-07-30 11:39:16 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f5da4791ad 
							
						 
					 
					
						
						
							
							avoid unnecessary roster sync in OMEMO code. fixed startup performance regression  
						
						
						
					 
					
						2017-07-29 13:50:32 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							837c212931 
							
						 
					 
					
						
						
							
							refresh omemo activity after failing to fetch keys due to lack of ids  
						
						
						
					 
					
						2017-07-28 18:37:07 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ad601e47c8 
							
						 
					 
					
						
						
							
							fixed roster items w/o subscription (request) not being shown  
						
						
						
					 
					
						2017-07-28 18:34:55 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d6e51288c3 
							
						 
					 
					
						
						
							
							Merge pull request  #2564  from yushijinhun/fix-decryption-blocked  
						
						... 
						
						
						
						Give up PGP decryption when intent is cancelled 
						
					 
					
						2017-07-25 09:20:51 +02:00 
						 
				 
			
				
					
						
							
							
								yushijinhun 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							48147b7fd1 
							
						 
					 
					
						
						
							
							Give up PGP decryption when intent is cancelled  
						
						... 
						
						
						
						When receiving a PGP message which is not encrypted with YOUR key,
OpenKeychain shows a dialog, which tells you the private key to decrypt
the message is unavailable. However, Conversations won't give up
decrypting the message. So whether the subsequent messages are
decryptable or not, the decryption is blocked at the current message.
The commit fixes the bug in this way: Give up the current message when
the decryption intent is cancelled, so that subsequent messages can be
handled. 
						
					 
					
						2017-07-25 15:09:18 +08:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							432598f896 
							
						 
					 
					
						
						
							
							Merge branch 'bugfixes'  
						
						
						
					 
					
						2017-07-23 07:53:09 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c8bd5bc1f5 
							
						 
					 
					
						
						
							
							made OF selfSigned() workaround only available >=kitkat  
						
						... 
						
						
						
						this undos 8a729061d5 
						
					 
					
						2017-07-23 07:47:39 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2fc216bfc4 
							
						 
					 
					
						
						
							
							skip initial socket closing if thread was already interrupted  
						
						
						
					 
					
						2017-07-21 08:30:16 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							74cde1d60a 
							
						 
					 
					
						
						
							
							incorporate support for publish-options into server info  
						
						
						
					 
					
						2017-07-18 12:51:15 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							85dc0c284d 
							
						 
					 
					
						
						
							
							made omemo always available but in public mucs  
						
						
						
					 
					
						2017-07-18 12:51:15 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							002dbf2e17 
							
						 
					 
					
						
						
							
							enable all encryption options  
						
						
						
					 
					
						2017-07-18 12:51:15 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							da87eac48e 
							
						 
					 
					
						
						
							
							provide upgrade path for accounts with publish-options  
						
						
						
					 
					
						2017-07-18 12:51:15 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9a57673130 
							
						 
					 
					
						
						
							
							use publish-options instead of always pushing node configuration  
						
						
						
					 
					
						2017-07-18 12:51:15 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8d6b2074cb 
							
						 
					 
					
						
						
							
							let hasPendingFetches() return true when fetching device ids  
						
						
						
					 
					
						2017-07-18 12:51:15 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7a2856ac86 
							
						 
					 
					
						
						
							
							fetch required device ids on demand  
						
						
						
					 
					
						2017-07-18 12:51:15 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f7258d16e1 
							
						 
					 
					
						
						
							
							explicitly fetch device ids before building sessions in single mode conversation  
						
						
						
					 
					
						2017-07-18 12:51:15 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							25e993693f 
							
						 
					 
					
						
						
							
							change access model of omemo pep nodes after every publish  
						
						
						
					 
					
						2017-07-18 12:51:15 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6c95897f09 
							
						 
					 
					
						
						
							
							fetch device ids for muc members w/o known devices  
						
						
						
					 
					
						2017-07-18 12:51:15 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2a198793b1 
							
						 
					 
					
						
						
							
							fixed otr jingle file size reporting  
						
						
						
					 
					
						2017-07-18 12:43:53 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8a729061d5 
							
						 
					 
					
						
						
							
							use CN-workaround for pre-kitkat  
						
						
						
					 
					
						2017-07-17 23:13:55 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							217335703c 
							
						 
					 
					
						
						
							
							fix regression introduces with OF fix. properly fall back to common name  
						
						
						
					 
					
						2017-07-17 21:11:15 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0a20b87ebe 
							
						 
					 
					
						
						
							
							check length first in timestamp parser  
						
						
						
					 
					
						2017-07-16 21:03:59 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							febee9863f 
							
						 
					 
					
						
						
							
							catch IllegalArgumentException caused by invalid custom hostname  
						
						
						
					 
					
						2017-07-16 21:02:56 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8afe7efc2c 
							
						 
					 
					
						
						
							
							workaround for OpenFire: check CN first in self signed certs  
						
						... 
						
						
						
						The self signed certificates created by OpenFire (Not sure if other
certs are affected as well) will crash the Java/Android TLS stack when
accessing getSubjectAlternativeNames() on the the peer certificate.
This usually goes unnoticed in other applications since the
DefaultHostnameVerifier checkes the CN first. That however is a
violation of RFC6125 section 6.4.4 which requires us to check for the
existence of SAN first.
This commit adds a work around where in self signed certificates we
check for the CN first as well. (Avoiding the call to
getSubjectAlternativeNames()) 
						
					 
					
						2017-07-16 11:05:25 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							dfa17d1339 
							
						 
					 
					
						
						
							
							more migration fixes for updating from 1.6.0 to 1.19.3  
						
						
						
					 
					
						2017-07-14 10:34:01 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							91119ab691 
							
						 
					 
					
						
						
							
							add reminder to remove minidns workarounds once those are fixed  
						
						
						
					 
					
						2017-07-14 09:09:26 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ea6b756c0f 
							
						 
					 
					
						
						
							
							fixed bug in db migrations when going from <15 to something recent  
						
						
						
					 
					
						2017-07-13 19:28:16 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3d0b127a8f 
							
						 
					 
					
						
						
							
							verify with hostname in direct tls connections  
						
						
						
					 
					
						2017-07-13 19:27:43 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7623accfd5 
							
						 
					 
					
						
						
							
							prefer DNS servers from VPNs  
						
						
						
					 
					
						2017-07-12 22:19:45 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ecc0ef45c5 
							
						 
					 
					
						
						
							
							disable foreground service if all accounts are disabled  
						
						
						
					 
					
						2017-07-12 11:03:32 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							edb28ccb31 
							
						 
					 
					
						
						
							
							throw state changing exception on failed tls only if no more connection options left  
						
						
						
					 
					
						2017-07-11 23:25:59 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							19c1484053 
							
						 
					 
					
						
						
							
							catch runtime exceptions from minidns  
						
						
						
					 
					
						2017-07-11 23:24:09 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8de81e0bc8 
							
						 
					 
					
						
						
							
							sync around Conversation.getLatestMessage()  
						
						
						
					 
					
						2017-07-11 23:09:51 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c5824a3b2a 
							
						 
					 
					
						
						
							
							catch all exceptions around minidns :(  
						
						
						
					 
					
						2017-07-10 12:33:04 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							abf84e065d 
							
						 
					 
					
						
						
							
							made DNSEC hostname validation opt-in  
						
						
						
					 
					
						2017-07-10 09:59:25 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							da00a58902 
							
						 
					 
					
						
						
							
							work around idn short comings in minidns  
						
						
						
					 
					
						2017-07-10 08:50:01 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7cbef529ae 
							
						 
					 
					
						
						
							
							resolve non-srv domains in resolver class as well  
						
						... 
						
						
						
						this allows us to prefer ipv4 
						
					 
					
						2017-07-10 08:49:22 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c400f74918 
							
						 
					 
					
						
						
							
							prefer ipv4 over ipv6  
						
						
						
					 
					
						2017-07-09 19:05:23 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							67bc032ccc 
							
						 
					 
					
						
						
							
							fixed fallback to normal DNS query after DNSSEC failed  
						
						
						
					 
					
						2017-07-09 18:03:26 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ef980ff5cf 
							
						 
					 
					
						
						
							
							show date separators.  fixes   #2271  
						
						
						
					 
					
						2017-07-04 11:01:20 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2ada4d5cfe 
							
						 
					 
					
						
						
							
							allow users to send PMs in mucs w/o voice  
						
						
						
					 
					
						2017-07-03 23:58:34 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f2409ed95e 
							
						 
					 
					
						
						
							
							set focusable=false instead of enabled=false for rooms w/o voice  
						
						
						
					 
					
						2017-07-03 19:55:21 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5cac4397dd 
							
						 
					 
					
						
						
							
							catch state changing error when sending timeout to iq callbacks  
						
						
						
					 
					
						2017-07-03 19:44:01 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7cf360fabf 
							
						 
					 
					
						
						
							
							do not keep files in waiting when file size exceeds http upload limit in groups.  fixes   #2533  
						
						
						
					 
					
						2017-07-01 19:31:48 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2b9cdde558 
							
						 
					 
					
						
						
							
							refactored retrieval of default preferences  
						
						
						
					 
					
						2017-07-01 13:41:24 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							311c99bb6d 
							
						 
					 
					
						
						
							
							put settings defaults into resource file  
						
						
						
					 
					
						2017-06-30 21:22:35 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4a2e222b34 
							
						 
					 
					
						
						
							
							deduplicate disco items before disco#info  
						
						
						
					 
					
						2017-06-30 08:45:16 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7c1e1132b0 
							
						 
					 
					
						
						
							
							make scan barcode icon survive rotations  
						
						
						
					 
					
						2017-06-29 20:23:28 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b2aae44645 
							
						 
					 
					
						
						
							
							show scan button in TrustKeys only if there is something to scan  
						
						
						
					 
					
						2017-06-29 14:01:12 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cbbf6f439b 
							
						 
					 
					
						
						
							
							add publish-options helper class  
						
						
						
					 
					
						2017-06-27 22:50:39 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							59e39304dd 
							
						 
					 
					
						
						
							
							use DND instead of XA when phone is silent  
						
						
						
					 
					
						2017-06-27 12:24:26 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c85b3bbacc 
							
						 
					 
					
						
						
							
							revised resolver strategy  
						
						
						
					 
					
						2017-06-26 14:03:38 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6dad1c0dde 
							
						 
					 
					
						
						
							
							refactored resolver to fall back to DNS and use reliable method  
						
						
						
					 
					
						2017-06-25 22:46:56 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4faf0f2ec9 
							
						 
					 
					
						
						
							
							use ResolverApi.reliable(..)  
						
						
						
					 
					
						2017-06-25 19:30:03 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2c5250a82c 
							
						 
					 
					
						
						
							
							new resolver fall back to normal dns if dnssec verfication fails  
						
						
						
					 
					
						2017-06-25 18:35:40 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cbce73c301 
							
						 
					 
					
						
						
							
							fixed fingerprint trust (was messed up after library upgrade)  
						
						
						
					 
					
						2017-06-25 18:18:13 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							14fd41cd7f 
							
						 
					 
					
						
						
							
							fixed patterns source code url  
						
						
						
					 
					
						2017-06-25 12:03:26 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							19b4207c3a 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/BlauerHunger/Conversations  into BlauerHunger-master  
						
						
						
					 
					
						2017-06-24 16:16:34 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d24022d755 
							
						 
					 
					
						
						
							
							cleanup nameWithoutVersion() code  
						
						
						
					 
					
						2017-06-24 16:13:55 +02:00 
						 
				 
			
				
					
						
							
							
								Ferdinand Pöll 
							
						 
					 
					
						
						
						
						
							
						
						
							f8e031ac86 
							
						 
					 
					
						
						
							
							Added preference to control Heads-up Notifications (turned off by default)  
						
						
						
					 
					
						2017-06-24 15:38:16 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5fd4169720 
							
						 
					 
					
						
						
							
							don't use version part of identity name in presence selection.  fixes   #2519  
						
						
						
					 
					
						2017-06-23 14:51:08 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3c90dbe723 
							
						 
					 
					
						
						
							
							fixed ip reporting for dns look ups  
						
						
						
					 
					
						2017-06-22 00:09:59 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2ed71df01a 
							
						 
					 
					
						
						
							
							also check for hostname in in certs if hostname is from trusted source  
						
						
						
					 
					
						2017-06-21 23:40:01 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2e380ed792 
							
						 
					 
					
						
						
							
							upgrade minidns. refactored dns utils  
						
						
						
					 
					
						2017-06-21 23:28:01 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5d9d725446 
							
						 
					 
					
						
						
							
							offer to open website if ibb offers oob redirect.  fixes   #2503  
						
						
						
					 
					
						2017-06-19 20:02:41 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							95405fde5f 
							
						 
					 
					
						
						
							
							mark message as failed after canceling ft w/o transferable.  fixes   #2513  
						
						
						
					 
					
						2017-06-19 13:23:20 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							24768d051d 
							
						 
					 
					
						
						
							
							upgrade to signal-protocol-java. thanks @ysangkok  
						
						... 
						
						
						
						fixes  #1384 
closes  #2509  
					
						2017-06-18 16:36:30 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f67baab983 
							
						 
					 
					
						
						
							
							revised strategy for http upload read timeout  
						
						
						
					 
					
						2017-06-18 16:32:01 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a1fe8f1c87 
							
						 
					 
					
						
						
							
							make http upload read timeout depend on file size  
						
						
						
					 
					
						2017-06-14 16:27:38 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							00bb527333 
							
						 
					 
					
						
						
							
							recreate settingsactivity when theme changed  
						
						
						
					 
					
						2017-06-05 14:57:09 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f7f6e8dfd5 
							
						 
					 
					
						
						
							
							make launching app shortcuts work with disabled accounts  
						
						
						
					 
					
						2017-06-05 10:18:02 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							012f60be56 
							
						 
					 
					
						
						
							
							use proper alpha for dark themed icons  
						
						
						
					 
					
						2017-06-04 00:05:02 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							51badfa721 
							
						 
					 
					
						
						
							
							enable forground service for sony smartphones by default  
						
						
						
					 
					
						2017-06-02 13:00:20 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e722ef6477 
							
						 
					 
					
						
						
							
							do not accept LMC for files  
						
						
						
					 
					
						2017-06-02 13:00:02 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							612e0afa63 
							
						 
					 
					
						
						
							
							do not parse delay tag for unavailable presences when it comes form own server  
						
						
						
					 
					
						2017-06-01 16:45:00 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ed7882fe69 
							
						 
					 
					
						
						
							
							fix NPE when bookmark jid is null on creating suggestions  
						
						
						
					 
					
						2017-06-01 16:44:35 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3889c0eb01 
							
						 
					 
					
						
						
							
							use application/pgp-encrypted mime type when necessary for http upload  
						
						
						
					 
					
						2017-06-01 07:35:18 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2cf05528b4 
							
						 
					 
					
						
						
							
							add the 4 most frequently contacted contacts as app shortcuts  
						
						
						
					 
					
						2017-05-31 16:45:51 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							50f61a4d91 
							
						 
					 
					
						
						
							
							do not check if namespace equals prefix for attributes  
						
						
						
					 
					
						2017-05-30 19:05:36 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6ccdd1227e 
							
						 
					 
					
						
						
							
							parse all delayed tags. use min date  
						
						
						
					 
					
						2017-05-30 08:39:04 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e973117aed 
							
						 
					 
					
						
						
							
							deal with namespace attributes.  fixes   #2495  
						
						
						
					 
					
						2017-05-30 08:38:33 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3ece613a5d 
							
						 
					 
					
						
						
							
							rename resource on bind conflict  
						
						
						
					 
					
						2017-05-25 14:40:59 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fe29b51290 
							
						 
					 
					
						
						
							
							rename downgrade attack to downgraded sasl mechanism  
						
						
						
					 
					
						2017-05-24 19:12:37 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							51d1223198 
							
						 
					 
					
						
						
							
							invoke statusChanged callback after syncronization  
						
						
						
					 
					
						2017-05-19 15:28:25 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5a5eb5bdd3 
							
						 
					 
					
						
						
							
							do not turn send button green unless history is caught up.  fixes   #1232  
						
						
						
					 
					
						2017-05-19 13:39:44 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7cd4ed78b2 
							
						 
					 
					
						
						
							
							synchronize on dedicated lock for catchup instead of account  
						
						
						
					 
					
						2017-05-19 13:30:57 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9fd6539534 
							
						 
					 
					
						
						
							
							clean up client cert selection code  
						
						
						
					 
					
						2017-05-18 11:31:31 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							41b3df0d43 
							
						 
					 
					
						
						
							
							fall back to jingle only in 1:1.  fixes   #2482  
						
						
						
					 
					
						2017-05-13 08:11:24 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2f577097d1 
							
						 
					 
					
						
						
							
							work around for brokens ROMs that expose file uris as notification sound  
						
						
						
					 
					
						2017-05-13 08:10:47 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5056a28553 
							
						 
					 
					
						
						
							
							differentiate starttls failure and sasl failure  
						
						
						
					 
					
						2017-05-13 08:08:05 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							91db2023d3 
							
						 
					 
					
						
						
							
							use mam reference instead of timestamp  
						
						
						
					 
					
						2017-05-07 21:05:35 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							185dac6953 
							
						 
					 
					
						
						
							
							synchronize around adding query to query map  
						
						
						
					 
					
						2017-05-07 15:47:18 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b0a8da35db 
							
						 
					 
					
						
						
							
							add ability to distrust inactive/trusted keys  
						
						
						
					 
					
						2017-05-06 18:38:23 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9a7d925b97 
							
						 
					 
					
						
						
							
							do not synchronize startXmpp() and sendPacket() on the same object as this can block the ui  
						
						
						
					 
					
						2017-05-06 15:37:22 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							be371ac5df 
							
						 
					 
					
						
						
							
							reset resource after bind failure  
						
						
						
					 
					
						2017-05-05 09:38:58 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7b6d49f329 
							
						 
					 
					
						
						
							
							unified all account state exceptions  
						
						
						
					 
					
						2017-05-05 09:33:05 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							404cf808b0 
							
						 
					 
					
						
						
							
							set catchup flag on mam only when doing that  
						
						
						
					 
					
						2017-05-04 22:11:46 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f98888d796 
							
						 
					 
					
						
						
							
							display open pgp key id in account details and allow to delete.  fixes   #2470  
						
						
						
					 
					
						2017-05-04 13:02:46 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							839178b269 
							
						 
					 
					
						
						
							
							suggest bookmarked conferences servers in join conference dialog  
						
						
						
					 
					
						2017-05-04 11:28:54 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cc1402442a 
							
						 
					 
					
						
						
							
							don't load signed prekeys on startup  
						
						
						
					 
					
						2017-05-04 11:03:58 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f47cf7ae67 
							
						 
					 
					
						
						
							
							make jingle implementation send file hash when using ft5  
						
						
						
					 
					
						2017-05-03 11:03:04 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ef78721f94 
							
						 
					 
					
						
						
							
							fixed regression from previous commit and brought back 'select text'  
						
						
						
					 
					
						2017-05-02 10:42:50 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7c31a981bb 
							
						 
					 
					
						
						
							
							unified copy text and share with context menu entries  
						
						
						
					 
					
						2017-04-30 21:03:44 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cec9b9b35a 
							
						 
					 
					
						
						
							
							send read marker after reading message in android auto  
						
						
						
					 
					
						2017-04-30 21:02:50 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5cadc81de4 
							
						 
					 
					
						
						
							
							support for jingle ft:5.  fixes   #2458  
						
						
						
					 
					
						2017-04-30 16:21:13 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							84baa3ae68 
							
						 
					 
					
						
						
							
							avoid race conditions when downloading files or decrypting pgp messages and waiting for sm catchup  
						
						
						
					 
					
						2017-04-30 16:19:39 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							15e5ccd1f4 
							
						 
					 
					
						
						
							
							avoid race condition that lead to double notification sound  
						
						
						
					 
					
						2017-04-30 13:59:45 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1a72683b52 
							
						 
					 
					
						
						
							
							close http download connection after download  
						
						
						
					 
					
						2017-04-29 22:59:36 +02:00 
						 
				 
			
				
					
						
							
							
								Johannes Morgenroth 
							
						 
					 
					
						
						
						
						
							
						
						
							adff2baa4a 
							
						 
					 
					
						
						
							
							Add messages to Notification for Android Auto on Android M and older  
						
						... 
						
						
						
						In the previous implementation for Android Auto, messages are only added
on Android N and above. In order to support older Android versions, the
messages need to be added always. 
						
					 
					
						2017-04-29 19:25:57 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a5e15d5a10 
							
						 
					 
					
						
						
							
							code cleanup: made conversation property final in message object  
						
						
						
					 
					
						2017-04-26 12:43:52 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a55d0a691c 
							
						 
					 
					
						
						
							
							while restoring state deal with conversations that don't have accounts  
						
						
						
					 
					
						2017-04-25 18:17:23 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8e0fb6a23a 
							
						 
					 
					
						
						
							
							avoid rare race condition when saving draft message  
						
						
						
					 
					
						2017-04-25 18:16:55 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4d1308e138 
							
						 
					 
					
						
						
							
							fixed click area for pgp key in contact details  
						
						
						
					 
					
						2017-04-25 15:23:01 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e6eb58f2d7 
							
						 
					 
					
						
						
							
							send pgp signature when creating ad hoc conferences  
						
						
						
					 
					
						2017-04-25 15:22:31 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2cfa3ce288 
							
						 
					 
					
						
						
							
							limited offline support for pgp group chats  
						
						... 
						
						
						
						use pgp key from contact if not set in muc
fixes  #283  
						
					 
					
						2017-04-25 15:19:54 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							848c339c8d 
							
						 
					 
					
						
						
							
							make sure context is not null before setting content description on send button  
						
						
						
					 
					
						2017-04-25 14:11:45 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c837e0616a 
							
						 
					 
					
						
						
							
							make sure tag writer thread shuts down  
						
						
						
					 
					
						2017-04-22 10:08:51 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9f5a089d5c 
							
						 
					 
					
						
						
							
							reworked unique id generation for notification intents  
						
						
						
					 
					
						2017-04-21 15:13:08 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c33f4b704c 
							
						 
					 
					
						
						
							
							Merge branch 'android-auto-support' of  https://github.com/morgenroth/Conversations  into morgenroth-android-auto-support  
						
						
						
					 
					
						2017-04-20 13:03:18 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9cc37a7bdb 
							
						 
					 
					
						
						
							
							re-add redownload context menu entry for deleted files.  fixes   #2453  
						
						
						
					 
					
						2017-04-20 11:52:54 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ae85a9e87b 
							
						 
					 
					
						
						
							
							made nimbuzz work around work with newly created conferences as well  
						
						
						
					 
					
						2017-04-20 11:35:38 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							067daa81f4 
							
						 
					 
					
						
						
							
							Merge pull request  #2445  from SamWhited/send_content_description  
						
						... 
						
						
						
						Add content description to send button 
						
					 
					
						2017-04-17 12:56:36 +02:00 
						 
				 
			
				
					
						
							
							
								Johannes Morgenroth 
							
						 
					 
					
						
						
						
						
							
						
						
							a4454bcff2 
							
						 
					 
					
						
						
							
							Add reply button in wear design  
						
						... 
						
						
						
						The existing reply button for Android wear has been re-used from the action
bar. Instead of a 'send' icon, a 'reply' icon better matches the intended
action. Moreover, action icons for Android wear are solid white instead of
half transparent. 
						
					 
					
						2017-04-17 12:19:14 +02:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							4a915c60e9 
							
						 
					 
					
						
						
							
							Add content description to send button  
						
						... 
						
						
						
						This can be used by screen readers and other accessibility aids. 
						
					 
					
						2017-04-16 16:37:32 -05:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6c34763d32 
							
						 
					 
					
						
						
							
							transform aesgcm:// links back to https:// before connecting through Tor  
						
						... 
						
						
						
						fixes  #2444  
					
						2017-04-16 08:44:26 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1ac0c2f453 
							
						 
					 
					
						
						
							
							show 'try again' button when remote server wasn't found in previously active muc  
						
						
						
					 
					
						2017-04-15 17:18:15 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							483304c697 
							
						 
					 
					
						
						
							
							recognize muc self presence on nimbuzz.com  
						
						... 
						
						
						
						Apparently nimbuzz.com doesn't include status code 110 in muc self presence
It does however include the full real jid in the presence’s item.
We can use that as a work around to detect a self presence. 
						
					 
					
						2017-04-15 15:14:12 +02:00 
						 
				 
			
				
					
						
							
							
								Johannes Morgenroth 
							
						 
					 
					
						
						
						
						
							
						
						
							403eff3d19 
							
						 
					 
					
						
						
							
							Add Android Auto support to notifications  
						
						... 
						
						
						
						This patch adds required additions in order to show notifications
in Android Auto. Messages are read aloud and voice reply is
offered. The functionaliy has been tested with the Android Auto
standalone app as well as with the DHU simulator as describes
here:
https://developer.android.com/training/auto/testing/index.html  
						
					 
					
						2017-04-14 13:32:01 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bf07196707 
							
						 
					 
					
						
						
							
							don't count >number% as quote  
						
						
						
					 
					
						2017-04-13 17:29:11 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0904ba42f8 
							
						 
					 
					
						
						
							
							use async message loading only when called from UI  
						
						
						
					 
					
						2017-04-13 00:12:23 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0229a1605e 
							
						 
					 
					
						
						
							
							properly unregister bookmark from conversations when deleting bookmark  
						
						
						
					 
					
						2017-04-12 23:41:59 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8742194f4b 
							
						 
					 
					
						
						
							
							fixed message merge logic. merge only messages with lower status  
						
						
						
					 
					
						2017-04-12 22:24:29 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4fd11a4c2b 
							
						 
					 
					
						
						
							
							show first instead of last message in notification preview  
						
						
						
					 
					
						2017-04-12 20:54:32 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4bbf2dab99 
							
						 
					 
					
						
						
							
							include RSM max in mam query in case server doesn't specify own max  
						
						
						
					 
					
						2017-04-12 20:53:19 +02:00 
						 
				 
			
				
					
						
							
							
								cijo-saju 
							
						 
					 
					
						
						
						
						
							
						
						
							3467a67e75 
							
						 
					 
					
						
						
							
							Removed unused imports from entire project.  
						
						
						
					 
					
						2017-04-12 20:24:36 +05:30 
						 
				 
			
				
					
						
							
							
								cijo-saju 
							
						 
					 
					
						
						
						
						
							
						
						
							5a27da848b 
							
						 
					 
					
						
						
							
							Clean up  
						
						
						
					 
					
						2017-04-08 11:04:20 +05:30 
						 
				 
			
				
					
						
							
							
								cijo-saju 
							
						 
					 
					
						
						
						
						
							
						
						
							41112d29bd 
							
						 
					 
					
						
						
							
							Removed unnecessary string builder  
						
						
						
					 
					
						2017-04-08 10:12:40 +05:30 
						 
				 
			
				
					
						
							
							
								cijo-saju 
							
						 
					 
					
						
						
						
						
							
						
						
							ed8336ee54 
							
						 
					 
					
						
						
							
							Made variable local  
						
						
						
					 
					
						2017-04-08 10:08:28 +05:30 
						 
				 
			
				
					
						
							
							
								cijo-saju 
							
						 
					 
					
						
						
						
						
							
						
						
							11e26e71f6 
							
						 
					 
					
						
						
							
							Code clean up  
						
						
						
					 
					
						2017-04-08 10:05:13 +05:30 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e98f7e57b0 
							
						 
					 
					
						
						
							
							be more careful with corner cases when mentioning multiple people  
						
						
						
					 
					
						2017-04-07 19:47:33 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cc1aa9e431 
							
						 
					 
					
						
						
							
							exclude >= from being recognized as quote  
						
						
						
					 
					
						2017-04-07 14:30:30 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							56f202d4b8 
							
						 
					 
					
						
						
							
							do not linkify urls starting with a dot  
						
						
						
					 
					
						2017-04-07 14:29:55 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d91c314ac2 
							
						 
					 
					
						
						
							
							use comma seperation for multiple mentions  
						
						
						
					 
					
						2017-04-06 18:06:07 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							649d1243d5 
							
						 
					 
					
						
						
							
							avoid crash on urls with missing protocols  
						
						
						
					 
					
						2017-04-06 11:59:15 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							99565a6876 
							
						 
					 
					
						
						
							
							treat URL as file if URL is in oob or contains key  
						
						
						
					 
					
						2017-04-05 22:35:42 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							26badb7f4c 
							
						 
					 
					
						
						
							
							send urls pointing to pgp encrypted files directly in body+oob  
						
						
						
					 
					
						2017-04-05 21:01:29 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							401329caaa 
							
						 
					 
					
						
						
							
							use aesgcm:// uri scheme for omemo encrypted http upload  
						
						
						
					 
					
						2017-04-05 18:46:56 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f75eb6bc43 
							
						 
					 
					
						
						
							
							unread badge: show >999 as infinity symbol  
						
						
						
					 
					
						2017-04-05 18:39:27 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							081c33b886 
							
						 
					 
					
						
						
							
							do not parse bodies with http urls as downloadable in omemo encrypted message.  fixes   #1756  
						
						
						
					 
					
						2017-04-04 22:20:05 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b34a1f7f5e 
							
						 
					 
					
						
						
							
							parse message that only contain oob tag.  fixes   #2359  
						
						
						
					 
					
						2017-04-04 22:15:38 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							75749d7c7b 
							
						 
					 
					
						
						
							
							Merge branch 'develop' of  https://github.com/cijo7/Conversations  into cijo7-develop  
						
						
						
					 
					
						2017-03-31 09:34:38 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9682f4d454 
							
						 
					 
					
						
						
							
							Merge branch 'deprecated-method' of  https://github.com/hareshkh/Conversations  into hareshkh-deprecated-method  
						
						
						
					 
					
						2017-03-31 09:27:22 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4bfc54e51d 
							
						 
					 
					
						
						
							
							show file size for files smaller 1024 bytes.  fixes   #2415  
						
						
						
					 
					
						2017-03-31 09:26:55 +02:00 
						 
				 
			
				
					
						
							
							
								cijo-saju 
							
						 
					 
					
						
						
						
						
							
						
						
							3171dcac8d 
							
						 
					 
					
						
						
							
							Fixed deprecated call  
						
						
						
					 
					
						2017-03-30 16:27:11 +05:30 
						 
				 
			
				
					
						
							
							
								cijo-saju 
							
						 
					 
					
						
						
						
						
							
						
						
							4e898fa4f2 
							
						 
					 
					
						
						
							
							Run in background instead of writing instantaneously  
						
						
						
					 
					
						2017-03-30 16:27:11 +05:30 
						 
				 
			
				
					
						
							
							
								Haresh Khanna 
							
						 
					 
					
						
						
						
						
							
						
						
							c7912ed7ef 
							
						 
					 
					
						
						
							
							Changes the deprecated getColor() method  
						
						
						
					 
					
						2017-03-29 22:05:35 +05:30 
						 
				 
			
				
					
						
							
							
								cijo-saju 
							
						 
					 
					
						
						
						
						
							
						
						
							37465db817 
							
						 
					 
					
						
						
							
							Fixed package access  
						
						
						
					 
					
						2017-03-28 21:02:20 +05:30 
						 
				 
			
				
					
						
							
							
								cijo-saju 
							
						 
					 
					
						
						
						
						
							
						
						
							024dbd1c32 
							
						 
					 
					
						
						
							
							Removed unused import and fixed some annotations  
						
						
						
					 
					
						2017-03-28 20:46:20 +05:30 
						 
				 
			
				
					
						
							
							
								cijo-saju 
							
						 
					 
					
						
						
						
						
							
						
						
							cb96911da3 
							
						 
					 
					
						
						
							
							Saves some memory  
						
						
						
					 
					
						2017-03-28 20:43:14 +05:30 
						 
				 
			
				
					
						
							
							
								cijo-saju 
							
						 
					 
					
						
						
						
						
							
						
						
							d8901441f6 
							
						 
					 
					
						
						
							
							Deleted unused variable  
						
						
						
					 
					
						2017-03-28 20:41:08 +05:30 
						 
				 
			
				
					
						
							
							
								cijo-saju 
							
						 
					 
					
						
						
						
						
							
						
						
							b4318996ac 
							
						 
					 
					
						
						
							
							Fixed typo in comment  
						
						
						
					 
					
						2017-03-26 22:07:39 +05:30 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3af30d7563 
							
						 
					 
					
						
						
							
							omemo: put auth tag into key (verify auth tag as well)  
						
						
						
					 
					
						2017-03-26 12:39:18 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2302122d8e 
							
						 
					 
					
						
						
							
							made a few exceptions to quote parser for emoticons and quotes  
						
						
						
					 
					
						2017-03-26 12:29:12 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							00e8ba00c4 
							
						 
					 
					
						
						
							
							count messages in backlog to not renotify on prior notifications  
						
						
						
					 
					
						2017-03-23 15:34:52 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							010b341251 
							
						 
					 
					
						
						
							
							do not pipeline first SM request because that might fail when resume fails  
						
						
						
					 
					
						2017-03-21 18:08:20 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c97c5def2c 
							
						 
					 
					
						
						
							
							experimental: wait for SM catchup before triggering notifications  
						
						... 
						
						
						
						wait for a first SM ACK before calculating if we need to trigger any notifications
might have to be changed to an XEP-0199 ping later on. for now sending <r/> after resume seems to work outfine 
						
					 
					
						2017-03-21 17:58:08 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							76b9010c39 
							
						 
					 
					
						
						
							
							rework last activity logic to something that should work pretty well in Conversations only enviroments  
						
						
						
					 
					
						2017-03-20 17:58:58 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							644a3a729d 
							
						 
					 
					
						
						
							
							define strangers as people not in roster instead of no mutual presence subscription  
						
						
						
					 
					
						2017-03-20 13:25:36 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e58f72c20f 
							
						 
					 
					
						
						
							
							show strangers with jid instead of name in conversation list  
						
						
						
					 
					
						2017-03-20 13:24:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c2c6904eda 
							
						 
					 
					
						
						
							
							offer to block entire domain in message from stranger snackbar.  fixes   #2391  
						
						
						
					 
					
						2017-03-20 12:55:48 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4171e2b90e 
							
						 
					 
					
						
						
							
							do not show block stranger snackbar when blocking command is unavailable.  fixes   #2393  
						
						
						
					 
					
						2017-03-20 12:16:25 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4d2a1afaf9 
							
						 
					 
					
						
						
							
							call EditText.setText() instead of clear because clear causes problems on some keyboards  
						
						
						
					 
					
						2017-03-20 00:09:23 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6167ddb4a8 
							
						 
					 
					
						
						
							
							don't mark message as delivery_failed when cancel didn't work.  fixes   #2387  
						
						
						
					 
					
						2017-03-19 20:16:11 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							30ed6b3cec 
							
						 
					 
					
						
						
							
							call messageSent() from UI thread after encrypting pgp message  
						
						
						
					 
					
						2017-03-19 20:15:07 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							91a69d7d85 
							
						 
					 
					
						
						
							
							use qr codes instead of aztec. Barcode Scanner is terrible at reading aztec.  fixes   #2375  
						
						
						
					 
					
						2017-03-17 12:56:55 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							935ac25cbd 
							
						 
					 
					
						
						
							
							update unread counter for image messages.  fixes   #2376  
						
						
						
					 
					
						2017-03-17 12:55:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							95e33b5a97 
							
						 
					 
					
						
						
							
							never mark conversation w/ own server as stranger  
						
						
						
					 
					
						2017-03-14 11:09:34 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							09d68ae603 
							
						 
					 
					
						
						
							
							fixed entity time for timezones with minutes !=0  
						
						
						
					 
					
						2017-03-10 17:25:43 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0ee13bbecb 
							
						 
					 
					
						
						
							
							send chat states only to private and non-anon mucs  
						
						
						
					 
					
						2017-03-09 15:42:27 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1fd3bbfe25 
							
						 
					 
					
						
						
							
							display chat states in conferences  
						
						
						
					 
					
						2017-03-09 10:58:44 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5ea4322d3f 
							
						 
					 
					
						
						
							
							send and parse Chat States to and from conferences  
						
						
						
					 
					
						2017-03-09 10:58:44 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cdf2bd07df 
							
						 
					 
					
						
						
							
							use async avatar loading in AccountAdapter  
						
						
						
					 
					
						2017-03-09 10:58:11 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c3b2f33956 
							
						 
					 
					
						
						
							
							hide keyboard after setting up account  
						
						
						
					 
					
						2017-03-09 10:57:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7747fc0ea1 
							
						 
					 
					
						
						
							
							notify for muc messages after mam catchup  
						
						
						
					 
					
						2017-03-08 22:02:09 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6b72e18982 
							
						 
					 
					
						
						
							
							add <x/> element to outgoing MUC PM  
						
						
						
					 
					
						2017-03-08 22:01:20 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1f3be1597c 
							
						 
					 
					
						
						
							
							add origin-id to outgoing messages  
						
						
						
					 
					
						2017-03-08 21:30:12 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9d043076e8 
							
						 
					 
					
						
						
							
							only take 1:1 conversations into account when determining catchup timestamp  
						
						
						
					 
					
						2017-03-08 20:54:13 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8ca16a6f63 
							
						 
					 
					
						
						
							
							do not interpret grin >< as quote  
						
						
						
					 
					
						2017-03-08 20:21:04 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							064926a18b 
							
						 
					 
					
						
						
							
							fixed regression that caused stanza-ids not to be saved  
						
						
						
					 
					
						2017-03-08 20:20:34 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a3b51f7654 
							
						 
					 
					
						
						
							
							do not show 'block stranger' snackbar in empty conversations  
						
						
						
					 
					
						2017-03-08 11:54:52 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8502d519c1 
							
						 
					 
					
						
						
							
							changed string from unread conversation to messages in notification  
						
						
						
					 
					
						2017-03-07 18:12:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5b17734287 
							
						 
					 
					
						
						
							
							Merge branch 'dev' of  https://github.com/badarsh2/Conversations  into badarsh2-dev  
						
						
						
					 
					
						2017-03-07 17:21:14 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							254edc48f5 
							
						 
					 
					
						
						
							
							show conversation time as last clear date when empty  
						
						
						
					 
					
						2017-03-07 11:46:12 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3c951ce2cd 
							
						 
					 
					
						
						
							
							set last clear date to time of last message  
						
						
						
					 
					
						2017-03-07 11:45:35 +01:00 
						 
				 
			
				
					
						
							
							
								B Adarsh 
							
						 
					 
					
						
						
						
						
							
						
						
							87f0c4a646 
							
						 
					 
					
						
						
							
							Modifies notification for MUC conversations  
						
						... 
						
						
						
						Minor fixes
Replaces html.fromHTML with SpannableString 
						
					 
					
						2017-03-07 16:10:45 +05:30 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5fae9465d1 
							
						 
					 
					
						
						
							
							show snackbar in conversations with stranger to block.  fixes   #2358  
						
						
						
					 
					
						2017-03-07 11:07:57 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7306e0286f 
							
						 
					 
					
						
						
							
							do not notify for messages from strangers by default  
						
						
						
					 
					
						2017-03-07 10:50:46 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							857c761c68 
							
						 
					 
					
						
						
							
							fixed sender label for empty conversations  
						
						
						
					 
					
						2017-03-07 09:22:42 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							79b2f34685 
							
						 
					 
					
						
						
							
							added colon to seperate sender and message preview. only show first name  
						
						
						
					 
					
						2017-03-06 19:42:27 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9f3543a650 
							
						 
					 
					
						
						
							
							Merge branch 'message-marker' of  https://github.com/hareshkh/Conversations  into hareshkh-message-marker  
						
						
						
					 
					
						2017-03-06 19:07:27 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9ba5335ae7 
							
						 
					 
					
						
						
							
							cleaned code of muc name generator  
						
						
						
					 
					
						2017-03-06 19:06:16 +01:00 
						 
				 
			
				
					
						
							
							
								Haresh Khanna 
							
						 
					 
					
						
						
						
						
							
						
						
							633aad3193 
							
						 
					 
					
						
						
							
							Adds a message sender label in each conversation for text messages  
						
						
						
					 
					
						2017-03-06 23:25:13 +05:30 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1c56b74e41 
							
						 
					 
					
						
						
							
							closing the corresponding conversations after blocking a contact.  fixes   #2347  
						
						
						
					 
					
						2017-03-06 16:53:54 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5a00b11594 
							
						 
					 
					
						
						
							
							extract stanza-id from muc reflections  
						
						
						
					 
					
						2017-03-06 13:30:13 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4a7dbaab1e 
							
						 
					 
					
						
						
							
							deduplicate every message with a stanza-id from the server  
						
						
						
					 
					
						2017-03-06 11:24:04 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6088913fb6 
							
						 
					 
					
						
						
							
							fixed multi-session-nick renaming behaviour  
						
						
						
					 
					
						2017-03-05 17:42:17 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cae993a95f 
							
						 
					 
					
						
						
							
							renamed enter jid menu item id  
						
						
						
					 
					
						2017-03-05 11:40:48 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bb7780eae6 
							
						 
					 
					
						
						
							
							Merge branch 'issue_#2336' of  https://github.com/vikiCoder/Conversations  into vikiCoder-issue_#2336  
						
						
						
					 
					
						2017-03-05 08:48:01 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f414998307 
							
						 
					 
					
						
						
							
							use default priority notifications. disables heads up notifications  
						
						
						
					 
					
						2017-03-04 21:19:55 +01:00 
						 
				 
			
				
					
						
							
							
								vikiCoder 
							
						 
					 
					
						
						
						
						
							
						
						
							72537b76c5 
							
						 
					 
					
						
						
							
							fixes   #2336  : added an option to directly add a jid to block list from blocklist activity  
						
						
						
					 
					
						2017-03-05 01:01:41 +05:30 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cb203f5fd3 
							
						 
					 
					
						
						
							
							Keep draft even when correcting previously sent msg  
						
						... 
						
						
						
						fixes  #1822 . Thank you @singhalok641 
					
						2017-03-04 08:05:42 +01:00 
						 
				 
			
				
					
						
							
							
								Haresh Khanna 
							
						 
					 
					
						
						
						
						
							
						
						
							f2d2966b31 
							
						 
					 
					
						
						
							
							Squash : Adds number of unread messages for every conversation.  Fixes   #2181  
						
						
						
					 
					
						2017-03-04 04:26:19 +05:30 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5c789b75cc 
							
						 
					 
					
						
						
							
							fixed messages vanishing after pgp raised error on editing a message  
						
						
						
					 
					
						2017-03-03 15:21:42 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							58595fccfe 
							
						 
					 
					
						
						
							
							show icons in pop menu with reflection. imagespan was not centred vertically  
						
						
						
					 
					
						2017-03-03 12:26:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							768d79c621 
							
						 
					 
					
						
						
							
							Merge branch 'issue_#1200' of  https://github.com/vikiCoder/Conversations  into vikiCoder-issue_#1200  
						
						
						
					 
					
						2017-03-03 12:01:00 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							afa34ce15a 
							
						 
					 
					
						
						
							
							block send action while encrypting pgp message  
						
						
						
					 
					
						2017-03-03 11:56:08 +01:00 
						 
				 
			
				
					
						
							
							
								vikiCoder 
							
						 
					 
					
						
						
						
						
							
						
						
							51ef096e01 
							
						 
					 
					
						
						
							
							fixes   #1200  : Added icons for the attach options according to material design guidlines  
						
						
						
					 
					
						2017-03-03 16:01:44 +05:30 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8cce653a1f 
							
						 
					 
					
						
						
							
							changed default setting for enter_is_send on devices with keyboard  
						
						
						
					 
					
						2017-03-02 13:03:30 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c740386297 
							
						 
					 
					
						
						
							
							rename the Xmlns class to Namespace  
						
						
						
					 
					
						2017-03-01 13:01:46 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ea1e28267b 
							
						 
					 
					
						
						
							
							bump mam namespace to :2  
						
						
						
					 
					
						2017-03-01 12:50:58 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ecd53580c0 
							
						 
					 
					
						
						
							
							show 'show inactive keys' button also when there are no active keys  
						
						
						
					 
					
						2017-03-01 12:50:46 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							23a91e5019 
							
						 
					 
					
						
						
							
							use priority low when creating notification without sound/vibration.  
						
						... 
						
						
						
						should prevent notifcations showing up in ambient display 
						
					 
					
						2017-02-28 15:32:57 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4cddf31ad2 
							
						 
					 
					
						
						
							
							properly handle onNewIntent() in StartConversations activity  
						
						... 
						
						
						
						* fixes a glitch a caused xmpp uris not to open when activiy was already started 
						
					 
					
						2017-02-28 11:48:28 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1f4c5ff97c 
							
						 
					 
					
						
						
							
							properly trim() incoming imto: uris  
						
						
						
					 
					
						2017-02-27 22:48:25 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c7ec82679f 
							
						 
					 
					
						
						
							
							Merge branch 'master' of github.com:siacs/Conversations  
						
						
						
					 
					
						2017-02-24 20:00:54 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8e0e81a603 
							
						 
					 
					
						
						
							
							bump notification priority to high as per android design guidelines  
						
						
						
					 
					
						2017-02-24 19:59:13 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0c0ff882a9 
							
						 
					 
					
						
						
							
							make x509 verification node world readable  
						
						
						
					 
					
						2017-02-24 19:58:46 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a28116753a 
							
						 
					 
					
						
						
							
							Merge pull request  #2315  from licaon-kter/lecagy-typo  
						
						... 
						
						
						
						Fix a typo in legacy 
						
					 
					
						2017-02-19 18:43:21 +01:00 
						 
				 
			
				
					
						
							
							
								licaon-kter 
							
						 
					 
					
						
						
						
						
							
						
						
							d3dd80eec9 
							
						 
					 
					
						
						
							
							Fix a typo in legacy  
						
						
						
					 
					
						2017-02-19 15:47:57 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0d00ff0c15 
							
						 
					 
					
						
						
							
							migrate domain and host exemption into seperate class  
						
						
						
					 
					
						2017-02-19 13:05:40 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							abaabae853 
							
						 
					 
					
						
						
							
							only change actionbar display options when changed  
						
						
						
					 
					
						2017-02-18 18:08:37 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c69ad8f52c 
							
						 
					 
					
						
						
							
							npe checks  
						
						
						
					 
					
						2017-02-17 10:26:42 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cf9ab4d302 
							
						 
					 
					
						
						
							
							synchronize modifications of output stream in tag writer  
						
						
						
					 
					
						2017-02-17 10:26:12 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4f0e1b71c0 
							
						 
					 
					
						
						
							
							explicitly turn off vibration when disabled.  fixes   #1255  
						
						
						
					 
					
						2017-02-16 13:31:26 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							caa16a8517 
							
						 
					 
					
						
						
							
							experimental mam legacy compat layer  
						
						
						
					 
					
						2017-02-15 16:42:35 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6e62b62b80 
							
						 
					 
					
						
						
							
							respond to xep-0184 requests in muc pms  
						
						
						
					 
					
						2017-02-15 12:09:36 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c7e95d105c 
							
						 
					 
					
						
						
							
							fixed behaviour in message parser when doing mam catchup  
						
						
						
					 
					
						2017-02-15 00:08:49 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bb249e0881 
							
						 
					 
					
						
						
							
							only extract stanza-id from live messages when disco feature is set  
						
						
						
					 
					
						2017-02-14 23:16:51 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b90a1fe1db 
							
						 
					 
					
						
						
							
							bump mam namespace  
						
						
						
					 
					
						2017-02-14 17:19:45 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2665c3a1e0 
							
						 
					 
					
						
						
							
							rethink mam catchup strategies  
						
						
						
					 
					
						2017-02-14 16:50:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9116782cdc 
							
						 
					 
					
						
						
							
							fixed adhoc conference creation behaviour. properly show errors.  fixes   #2290  
						
						
						
					 
					
						2017-02-13 17:32:26 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c8f97be68e 
							
						 
					 
					
						
						
							
							only force close tagwriter before creating a new one  
						
						
						
					 
					
						2017-02-13 13:01:00 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6b81ff70e5 
							
						 
					 
					
						
						
							
							clear avatar cache when system name changes  
						
						
						
					 
					
						2017-02-10 20:26:21 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							54ae8abcb7 
							
						 
					 
					
						
						
							
							add no_padding, no_wrap to file upload slots  
						
						
						
					 
					
						2017-02-10 13:50:20 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							55e9067b27 
							
						 
					 
					
						
						
							
							do not auto link non-http URLs  
						
						
						
					 
					
						2017-02-09 20:14:36 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c76b073b8e 
							
						 
					 
					
						
						
							
							do not sync thumbnail creation on cache.  fixes   #2283  
						
						
						
					 
					
						2017-02-09 14:32:50 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d9e2ab62b2 
							
						 
					 
					
						
						
							
							add index to message.conversationUuid  
						
						
						
					 
					
						2017-02-07 21:17:08 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							24fab162e2 
							
						 
					 
					
						
						
							
							renamed omemo:// to aesgcm://  
						
						
						
					 
					
						2017-02-07 20:07:57 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							71ad18beb9 
							
						 
					 
					
						
						
							
							support omemo:// style urls  
						
						
						
					 
					
						2017-02-07 19:32:12 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c37117b940 
							
						 
					 
					
						
						
							
							update copyright information  
						
						
						
					 
					
						2017-02-07 19:31:54 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e35ada4997 
							
						 
					 
					
						
						
							
							only store messages up to a length of 1M chars  
						
						
						
					 
					
						2017-02-07 17:45:01 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6313c3c92e 
							
						 
					 
					
						
						
							
							Merge pull request  #2270  from moparisthebest/master  
						
						... 
						
						
						
						Stop Conversations force closing over sqlite errors due to long messages 
						
					 
					
						2017-02-07 17:35:25 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8ab166e817 
							
						 
					 
					
						
						
							
							fixed scrolling and async loading of message of new conversation start  
						
						
						
					 
					
						2017-02-07 14:03:23 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d7198bd68c 
							
						 
					 
					
						
						
							
							fixed rare npe when doing file migration  
						
						
						
					 
					
						2017-02-07 10:20:13 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6fc67d9a60 
							
						 
					 
					
						
						
							
							catch all throwables when working with content provider to retrieve mime  
						
						
						
					 
					
						2017-02-07 10:19:45 +01:00 
						 
				 
			
				
					
						
							
							
								moparisthebest 
							
						 
					 
					
						
						
						
						
							
						
						
							2a34ece571 
							
						 
					 
					
						
						
							
							Stop Conversations force closing over sqlite errors due to long messages  
						
						
						
					 
					
						2017-01-30 00:03:51 -05:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							53241f2ef1 
							
						 
					 
					
						
						
							
							add explicit encryption hints to outgoing messages  
						
						
						
					 
					
						2017-01-26 19:19:08 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c9e6d05fa0 
							
						 
					 
					
						
						
							
							use base64 encoding for file names uploaded with http  
						
						
						
					 
					
						2017-01-26 18:39:25 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							40ee1a0bfc 
							
						 
					 
					
						
						
							
							reset messagesLoaded when changing retention settings  
						
						
						
					 
					
						2017-01-25 18:35:22 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a86b2fefd9 
							
						 
					 
					
						
						
							
							add database and file migrations for 1.16.0  
						
						
						
					 
					
						2017-01-25 13:22:20 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f2d9539d90 
							
						 
					 
					
						
						
							
							share uri for bookmark direclty from Start Conversation  
						
						
						
					 
					
						2017-01-25 00:15:50 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							66457c9f2e 
							
						 
					 
					
						
						
							
							transcode videos before sharing. change storage location  
						
						
						
					 
					
						2017-01-24 20:17:36 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9b6ae6d75f 
							
						 
					 
					
						
						
							
							configurable local message retention period. (untested)  
						
						
						
					 
					
						2017-01-23 17:14:30 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4c6ef3b24e 
							
						 
					 
					
						
						
							
							cleaning up crypto targets when conference member is getting removed  
						
						
						
					 
					
						2017-01-22 18:58:49 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b48bf39e08 
							
						 
					 
					
						
						
							
							change behaviour of back button to close finish activity.  fixes   #704  
						
						
						
					 
					
						2017-01-22 18:26:47 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d53c813408 
							
						 
					 
					
						
						
							
							make sure to set open conversations after connection with background service  
						
						
						
					 
					
						2017-01-22 13:08:21 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b72d7ec8d0 
							
						 
					 
					
						
						
							
							make sure to properly stop tagwriter  
						
						
						
					 
					
						2017-01-22 12:54:39 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							96a6460744 
							
						 
					 
					
						
						
							
							don't quote text when '>' is followed by numeber  
						
						
						
					 
					
						2017-01-21 11:07:23 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							780d1daf7e 
							
						 
					 
					
						
						
							
							fixed some issues around ibb  
						
						
						
					 
					
						2017-01-20 22:37:50 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							97ba0a0d49 
							
						 
					 
					
						
						
							
							write text in bold when highlighted in received muc message  
						
						
						
					 
					
						2017-01-20 14:54:59 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cb9c4d4327 
							
						 
					 
					
						
						
							
							disable automatic foreground enabler.  fixes   #2239  
						
						
						
					 
					
						2017-01-20 14:21:59 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c324f0c8df 
							
						 
					 
					
						
						
							
							modified highlight nick behaviour to better work with quotes  
						
						
						
					 
					
						2017-01-20 13:45:09 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							59f82cbd34 
							
						 
					 
					
						
						
							
							fixed regression introduced in previous commit.  
						
						
						
					 
					
						2017-01-20 13:44:29 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							143ad48be1 
							
						 
					 
					
						
						
							
							don't prematurly mark conversation as read during activity start.  fixes   #2245  
						
						
						
					 
					
						2017-01-20 10:43:50 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1dcf804618 
							
						 
					 
					
						
						
							
							fixed pgp encrypted text quick sharing.  fixes   #2237  
						
						
						
					 
					
						2017-01-17 15:56:21 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ac2eee8e81 
							
						 
					 
					
						
						
							
							Merge pull request  #2233  from SamWhited/scram-sha-2  
						
						... 
						
						
						
						Add SCRAM-SHA-2 support 
						
					 
					
						2017-01-16 13:14:48 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							764026b87e 
							
						 
					 
					
						
						
							
							fixed behaviour with non-default encryption masks  
						
						
						
					 
					
						2017-01-16 13:09:36 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							bfc2cffc2f 
							
						 
					 
					
						
						
							
							Add SCRAM-SHA-2 support  
						
						
						
					 
					
						2017-01-15 23:43:44 -06:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d028f4b398 
							
						 
					 
					
						
						
							
							refactored whispermessage processing  
						
						
						
					 
					
						2017-01-15 18:54:47 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b085426d22 
							
						 
					 
					
						
						
							
							fixed linkifier  
						
						
						
					 
					
						2017-01-15 18:54:15 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8f39a594ff 
							
						 
					 
					
						
						
							
							partially improved logging for receiving omemo messages  
						
						
						
					 
					
						2017-01-14 18:10:04 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8e025cbb9e 
							
						 
					 
					
						
						
							
							show doze warning when push is running on prosody  
						
						
						
					 
					
						2017-01-12 23:22:02 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1876b444fa 
							
						 
					 
					
						
						
							
							refactor getServerIdentity() to parse disco result directly  
						
						
						
					 
					
						2017-01-12 23:17:52 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c03e3b5965 
							
						 
					 
					
						
						
							
							don't include 'before' reference in mam queries bound by timestamp  
						
						
						
					 
					
						2017-01-12 20:56:55 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fd7216b6a0 
							
						 
					 
					
						
						
							
							finish of backlog only for one particular account  
						
						
						
					 
					
						2017-01-12 20:56:27 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							585a538340 
							
						 
					 
					
						
						
							
							don't show key tile in contact details when there are no keys  
						
						
						
					 
					
						2017-01-12 20:50:53 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b050ff2576 
							
						 
					 
					
						
						
							
							only call UI thread from downloading thread every 250ms  
						
						
						
					 
					
						2017-01-12 16:02:09 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bfacc180c5 
							
						 
					 
					
						
						
							
							don't allow to purge keys. offer distrut instead  
						
						
						
					 
					
						2017-01-12 15:59:13 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2c1d3ef968 
							
						 
					 
					
						
						
							
							fixed avatar republish missing the mime type  
						
						
						
					 
					
						2017-01-12 12:20:10 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f0c3b31a42 
							
						 
					 
					
						
						
							
							treat omemo keys >= 32 bytes as containing auth tag. add config flag to put auth tag in key  
						
						
						
					 
					
						2017-01-09 21:47:07 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a1cb855739 
							
						 
					 
					
						
						
							
							adding prekey='true' to omemo messages if applicable  
						
						
						
					 
					
						2017-01-09 20:20:02 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							39bb8ad05f 
							
						 
					 
					
						
						
							
							automatically bookmark private, non-anonymous mucs where inviter is trusted.  fixes   #2035   #937  
						
						
						
					 
					
						2017-01-09 19:54:27 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a994d8f847 
							
						 
					 
					
						
						
							
							fixed typo in variable name  
						
						
						
					 
					
						2017-01-09 18:05:58 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b19572ba8c 
							
						 
					 
					
						
						
							
							use 7.1 web url pattern matching on old platforms as well.  fixes   #2228  
						
						
						
					 
					
						2017-01-09 17:58:11 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d192c529e0 
							
						 
					 
					
						
						
							
							add spaces to otr fingerprints copied to clipboard.  fixes   #2226  
						
						
						
					 
					
						2017-01-09 17:57:37 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b116926bb1 
							
						 
					 
					
						
						
							
							unify getFileUri across share and open intents  
						
						
						
					 
					
						2017-01-09 17:00:08 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							39c8867ed7 
							
						 
					 
					
						
						
							
							add more punctuations to message preview  
						
						
						
					 
					
						2017-01-06 20:56:44 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4a299920dc 
							
						 
					 
					
						
						
							
							add overlay to indicate that image is gif  
						
						
						
					 
					
						2017-01-03 14:05:10 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							470d244414 
							
						 
					 
					
						
						
							
							Merge branch 'feature-gboardgifs' of  https://github.com/illegalprime/Conversations  into illegalprime-feature-gboardgifs  
						
						
						
					 
					
						2017-01-03 11:44:14 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2bb7bc1455 
							
						 
					 
					
						
						
							
							show offline contacts as grayed out in conference details  
						
						
						
					 
					
						2017-01-03 11:40:29 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Eden 
							
						 
					 
					
						
						
						
						
							
						
						
							5a670c88b0 
							
						 
					 
					
						
						
							
							Do not compress GIFs, allow GBoard to send GIFs  
						
						
						
					 
					
						2017-01-01 16:16:35 -05:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fa70bd7536 
							
						 
					 
					
						
						
							
							disable automatic foreground service activation if related config paramaters are set to zero  
						
						
						
					 
					
						2016-12-30 20:24:35 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b8b2051f4c 
							
						 
					 
					
						
						
							
							get rid of unecessary config debug paramater that has been replaced by exepert setting  
						
						
						
					 
					
						2016-12-30 20:23:50 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8c34bb3c6f 
							
						 
					 
					
						
						
							
							hide inactive devices by default in contact details  
						
						
						
					 
					
						2016-12-30 13:17:45 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							40a9f70478 
							
						 
					 
					
						
						
							
							always open account details when scanning one of our own keys.  fixes   #2211  
						
						
						
					 
					
						2016-12-29 12:50:18 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fcd9ab17fe 
							
						 
					 
					
						
						
							
							don't throw assertion error when building session with same device id from other contact  
						
						
						
					 
					
						2016-12-28 22:15:24 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b8f67bfaa3 
							
						 
					 
					
						
						
							
							deduplicate corrected messages  
						
						
						
					 
					
						2016-12-26 15:13:38 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							82c2e89d21 
							
						 
					 
					
						
						
							
							stop using broken parallax distance in sliding pane layout  
						
						
						
					 
					
						2016-12-25 18:57:30 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9972f5eabc 
							
						 
					 
					
						
						
							
							fixed npe cause by race condition when axolotl service isn't initialized  
						
						
						
					 
					
						2016-12-23 21:19:38 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							28c64c2bd1 
							
						 
					 
					
						
						
							
							skip empty lines in message preview. prevents indexoutofbounds exception  
						
						
						
					 
					
						2016-12-23 21:19:11 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d03c431137 
							
						 
					 
					
						
						
							
							use original message to parse pep  
						
						
						
					 
					
						2016-12-23 21:16:58 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b011d46ff2 
							
						 
					 
					
						
						
							
							don't show quoted text in message preview  
						
						
						
					 
					
						2016-12-20 16:35:08 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e5fff42b10 
							
						 
					 
					
						
						
							
							added omemo padding but disabled by Config.java flag  
						
						
						
					 
					
						2016-12-20 16:12:12 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fbbf1a37b4 
							
						 
					 
					
						
						
							
							disable removing of broken devices by default  
						
						
						
					 
					
						2016-12-18 11:49:27 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							dbda2afd6d 
							
						 
					 
					
						
						
							
							remove broken devices only once to prevent loops  
						
						
						
					 
					
						2016-12-18 11:47:42 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							87746ca2ba 
							
						 
					 
					
						
						
							
							remove own fetch errors from device announcement  
						
						
						
					 
					
						2016-12-16 17:12:26 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							da914ba09c 
							
						 
					 
					
						
						
							
							make sure to display encryption indicatior  
						
						
						
					 
					
						2016-12-16 11:30:51 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							75ee14cfdf 
							
						 
					 
					
						
						
							
							don't reconnect accout when system reports no internet connection  
						
						
						
					 
					
						2016-12-10 13:20:05 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							55b60f6b0f 
							
						 
					 
					
						
						
							
							don't correct a message if that would create a duplicate  
						
						
						
					 
					
						2016-12-09 20:03:48 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8abfbf82fa 
							
						 
					 
					
						
						
							
							use verified symbol instead of colored lock icons  
						
						
						
					 
					
						2016-12-09 18:46:32 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8eb292d16a 
							
						 
					 
					
						
						
							
							don't show unavailable quick actions in settings  
						
						
						
					 
					
						2016-12-06 23:44:39 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1739af2a41 
							
						 
					 
					
						
						
							
							fixed http resume  
						
						
						
					 
					
						2016-12-06 23:27:29 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cbc9c1fb20 
							
						 
					 
					
						
						
							
							add support for RFC7711 to MTM  
						
						
						
					 
					
						2016-12-05 21:52:44 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1e7b4030bb 
							
						 
					 
					
						
						
							
							show jid monospaced in verify dialog  
						
						
						
					 
					
						2016-12-04 13:39:08 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1a89915b31 
							
						 
					 
					
						
						
							
							disable 'show blocklist' if blocklist is empty.  fixes   #2164  
						
						
						
					 
					
						2016-12-03 23:49:00 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a5b3c579c4 
							
						 
					 
					
						
						
							
							redraw options menu after rotation in muc details.  fixes   #2161  
						
						
						
					 
					
						2016-12-03 23:25:31 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							56991bbaeb 
							
						 
					 
					
						
						
							
							add omemo fingerprints to web links as well  
						
						
						
					 
					
						2016-12-03 13:37:26 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6e289b8738 
							
						 
					 
					
						
						
							
							show warning dialog beforing verifying keys via a link  
						
						
						
					 
					
						2016-12-03 13:19:56 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							599f7dad2c 
							
						 
					 
					
						
						
							
							Merge branch 'feature-quotation' of  https://github.com/Mishiranu/Conversations  into Mishiranu-feature-quotation  
						
						
						
					 
					
						2016-12-02 14:01:26 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d4b1119240 
							
						 
					 
					
						
						
							
							default using internal storage to false  
						
						
						
					 
					
						2016-12-02 11:35:00 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6b0242523b 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/Fenisu/Conversations  into Fenisu-master  
						
						
						
					 
					
						2016-12-02 11:25:14 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5d4aa04e5d 
							
						 
					 
					
						
						
							
							support for jid escapting when displaying localpart only  
						
						
						
					 
					
						2016-12-01 20:49:18 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							58de10bcab 
							
						 
					 
					
						
						
							
							use prepped string when building axolotl session  
						
						
						
					 
					
						2016-12-01 20:48:39 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e127ba9361 
							
						 
					 
					
						
						
							
							don't use own jid joined from another client to generate muc title  
						
						
						
					 
					
						2016-12-01 19:57:40 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6e95ad4bdf 
							
						 
					 
					
						
						
							
							don't show share button before account is setup  
						
						
						
					 
					
						2016-12-01 13:07:18 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							168ad50ddd 
							
						 
					 
					
						
						
							
							only show contact related snackbars when conversation is single  
						
						
						
					 
					
						2016-12-01 12:50:40 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f0f2aab92d 
							
						 
					 
					
						
						
							
							made provider authorities relativ to deal with different package ids  
						
						
						
					 
					
						2016-12-01 12:09:49 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							96a992353b 
							
						 
					 
					
						
						
							
							avoid binding multiple times from BarcodeService  
						
						
						
					 
					
						2016-12-01 11:34:04 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1b9a91eb2f 
							
						 
					 
					
						
						
							
							renamed foreground service preference  
						
						
						
					 
					
						2016-11-30 10:45:39 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9e7a54849d 
							
						 
					 
					
						
						
							
							better handle the case when same user is joined with multiple nicks in the same room  
						
						
						
					 
					
						2016-11-29 13:43:52 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e5d7357e6e 
							
						 
					 
					
						
						
							
							mark conversations as read after receiving blocklist push for that conversations  
						
						
						
					 
					
						2016-11-28 15:51:11 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							84a2fa0041 
							
						 
					 
					
						
						
							
							allow fingerprint verification via context menu  
						
						
						
					 
					
						2016-11-28 15:11:44 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bbe01c9a6a 
							
						 
					 
					
						
						
							
							add support for body paramater in xmpp uri  
						
						
						
					 
					
						2016-11-28 15:09:02 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fb6f0649c3 
							
						 
					 
					
						
						
							
							sent messages from unverified devices show red lock  
						
						
						
					 
					
						2016-11-28 15:08:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d983f0bc71 
							
						 
					 
					
						
						
							
							fixed migrations from pre-btbv phase  
						
						
						
					 
					
						2016-11-25 17:04:23 +01:00 
						 
				 
			
				
					
						
							
							
								Mishiranu 
							
						 
					 
					
						
						
						
						
							
						
						
							f4a769080b 
							
						 
					 
					
						
						
							
							Add quotation support  
						
						
						
					 
					
						2016-11-25 17:06:43 +03:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a87f7903c6 
							
						 
					 
					
						
						
							
							always force close a connection when disabling from error state  
						
						
						
					 
					
						2016-11-24 12:44:24 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cbd45d3ee5 
							
						 
					 
					
						
						
							
							changed design language to match BTBV proposal  
						
						... 
						
						
						
						* untrusted messages have red background
* unverified message have normal background and red lock 
						
					 
					
						2016-11-24 11:29:26 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2ec7165381 
							
						 
					 
					
						
						
							
							update the conversations view (and the lock icon) after receiving device list  
						
						
						
					 
					
						2016-11-24 11:28:04 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							20d3a41b52 
							
						 
					 
					
						
						
							
							explictly scan for aztec and qr codes only  
						
						
						
					 
					
						2016-11-23 11:01:58 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							839ef8e14b 
							
						 
					 
					
						
						
							
							introduced blind trust before verification mode  
						
						... 
						
						
						
						read more about the concept on https://gultsch.de/trust.html  
						
					 
					
						2016-11-23 10:42:27 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							07fe434cc7 
							
						 
					 
					
						
						
							
							added share button to account details  
						
						
						
					 
					
						2016-11-22 22:31:46 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d2268c6a6f 
							
						 
					 
					
						
						
							
							show proper avatar for 'self' contact.  fixes   #2138  
						
						
						
					 
					
						2016-11-22 12:34:16 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d76b0a3104 
							
						 
					 
					
						
						
							
							offer verification directly from the trust keys screen  
						
						
						
					 
					
						2016-11-22 12:03:21 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1a7e0fd153 
							
						 
					 
					
						
						
							
							use aztec code instead of qr  
						
						
						
					 
					
						2016-11-21 12:01:01 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6631705aea 
							
						 
					 
					
						
						
							
							use constants for some preferences  
						
						
						
					 
					
						2016-11-21 11:03:38 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7b99346a4b 
							
						 
					 
					
						
						
							
							when swiping don't clean startup counter entirely. just don't count last startup  
						
						
						
					 
					
						2016-11-21 10:48:59 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							64e8035f6d 
							
						 
					 
					
						
						
							
							introduced custom tls socket factory to make tls1.2 work for http connections  
						
						
						
					 
					
						2016-11-20 00:39:01 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b71aa6d3a4 
							
						 
					 
					
						
						
							
							remove omemo devices from annoucement after 7 days of inactivity  
						
						
						
					 
					
						2016-11-19 21:39:16 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cb639f3fdd 
							
						 
					 
					
						
						
							
							don't use xmpp uri for self verification if account is disabled  
						
						
						
					 
					
						2016-11-19 21:31:41 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6362799d56 
							
						 
					 
					
						
						
							
							save last activation time in fingerprint status  
						
						
						
					 
					
						2016-11-19 13:34:54 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							40c747660d 
							
						 
					 
					
						
						
							
							removed some unecessary locking  
						
						
						
					 
					
						2016-11-19 13:34:27 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8132480b82 
							
						 
					 
					
						
						
							
							close socket after failed stream open  
						
						
						
					 
					
						2016-11-19 12:20:31 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3bf2876e09 
							
						 
					 
					
						
						
							
							check if thread was interrupted before doing operations on socket  
						
						
						
					 
					
						2016-11-19 10:44:40 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1820b163a1 
							
						 
					 
					
						
						
							
							fixed regression that would crash create contact dialog.  fixes   #2131  
						
						
						
					 
					
						2016-11-19 10:29:08 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2b9b3be3f1 
							
						 
					 
					
						
						
							
							show 'clear devices' button underneath own devices  
						
						
						
					 
					
						2016-11-18 21:49:52 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a86a36f570 
							
						 
					 
					
						
						
							
							removed some unecessary logging from omemo message generation  
						
						
						
					 
					
						2016-11-18 20:13:09 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							01f92ef4ee 
							
						 
					 
					
						
						
							
							lower own otr fingerprint  
						
						
						
					 
					
						2016-11-18 20:12:45 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d68b7cfcfc 
							
						 
					 
					
						
						
							
							issue ping after network change  
						
						
						
					 
					
						2016-11-18 14:00:05 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fef601b4ae 
							
						 
					 
					
						
						
							
							lower reconnection time  
						
						
						
					 
					
						2016-11-18 13:58:01 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0303c28ad9 
							
						 
					 
					
						
						
							
							synchronzie on xmpp service around all state changes  
						
						
						
					 
					
						2016-11-18 13:58:01 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1ed2445c1d 
							
						 
					 
					
						
						
							
							don't reset last connect time on network change  
						
						
						
					 
					
						2016-11-18 13:55:02 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a7ee8f8a74 
							
						 
					 
					
						
						
							
							use lower case otr fingerprints for comparison  
						
						
						
					 
					
						2016-11-18 13:13:29 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9d9a9e63ad 
							
						 
					 
					
						
						
							
							removed some very verbose logging from axolotl service  
						
						
						
					 
					
						2016-11-18 13:03:02 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							99a41265b8 
							
						 
					 
					
						
						
							
							lower casing fingerprints when parsing URI  
						
						
						
					 
					
						2016-11-18 13:02:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							211354ee26 
							
						 
					 
					
						
						
							
							put omemo fingerprint in own uri (qr code / nfc)  
						
						
						
					 
					
						2016-11-17 22:28:45 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7e2e42cb11 
							
						 
					 
					
						
						
							
							parse omemo fingerprints from uris  
						
						
						
					 
					
						2016-11-17 20:09:42 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3f3b360eee 
							
						 
					 
					
						
						
							
							fixed back and forth between Welcome- and EditAccountActivity  
						
						
						
					 
					
						2016-11-17 11:40:29 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ad9a8c2281 
							
						 
					 
					
						
						
							
							use base64.nowrap for omemo keys  
						
						
						
					 
					
						2016-11-17 10:58:44 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4d965e96ed 
							
						 
					 
					
						
						
							
							reset startup count when swiped away (only count kills)  
						
						
						
					 
					
						2016-11-17 10:58:26 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d8bff08f1f 
							
						 
					 
					
						
						
							
							slightly darken verified icon + mark inactive  
						
						
						
					 
					
						2016-11-16 09:39:44 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ec63900ef3 
							
						 
					 
					
						
						
							
							work around -1 in next encryption  
						
						
						
					 
					
						2016-11-15 21:11:35 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							48afeb571b 
							
						 
					 
					
						
						
							
							refactor omemo fingerprint UI code  
						
						
						
					 
					
						2016-11-15 20:00:52 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e84af51272 
							
						 
					 
					
						
						
							
							distinguish between general i/o error and write exception when copying files  
						
						
						
					 
					
						2016-11-15 15:43:04 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d61b00604d 
							
						 
					 
					
						
						
							
							fixed enabling trust toggle. unknown->untrusted  
						
						
						
					 
					
						2016-11-15 15:14:21 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							05fc15be3d 
							
						 
					 
					
						
						
							
							refactore trust enum to be FingerprintStatus class with trust and active  
						
						
						
					 
					
						2016-11-14 22:27:41 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6da8b50d95 
							
						 
					 
					
						
						
							
							increase restart threshold  
						
						
						
					 
					
						2016-11-14 19:49:17 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1d3167b520 
							
						 
					 
					
						
						
							
							extract affiliations from unavailable presence  
						
						
						
					 
					
						2016-11-13 19:25:58 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							035d0c7957 
							
						 
					 
					
						
						
							
							Stop automagically select default encryption  
						
						... 
						
						
						
						Selecting a default encryption (in our case OMEMO) has several down sides.
First of all users might have perfectly valid reasons not to use encryption
at all such as using the same private server. Second of all the way it was
implemented Conversations would automatically fall back to plain text as soon
as the conditions changed (recipient switches to device with no encryption)
which lead to unexpected situations.
Thirdly having a default encryptions speaks against the 'mission
statement' of Conversations of not forcing its security and privacey
aspects upon the user.
And last but not least the goal of implementing this feature in the
first place: Be encrypted by default didn't work at all. I don't think
there was a single user that we succesfully 'tricked' into using OMEMO
who otherwise wouldn't have used it. 
						
					 
					
						2016-11-13 17:11:13 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bec048407a 
							
						 
					 
					
						
						
							
							offer message correction in private convs  
						
						
						
					 
					
						2016-11-12 20:25:02 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fe62ef32ae 
							
						 
					 
					
						
						
							
							don't add outcasts or non-members in members-only rooms back to list  
						
						
						
					 
					
						2016-11-12 20:21:11 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e8cc959a7f 
							
						 
					 
					
						
						
							
							don't offer message correction in anonymous mucs  
						
						
						
					 
					
						2016-11-11 15:01:15 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							698ddadbee 
							
						 
					 
					
						
						
							
							brought restart threshold down to 8 times in 8h  
						
						
						
					 
					
						2016-11-08 21:37:44 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1ef8d0a746 
							
						 
					 
					
						
						
							
							don't mark previous conversation as read when processing pending intent.  fixes   #2079  
						
						
						
					 
					
						2016-11-08 12:42:13 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bca8f11c9c 
							
						 
					 
					
						
						
							
							add frequent restart detection  
						
						
						
					 
					
						2016-11-08 12:20:07 +01:00 
						 
				 
			
				
					
						
							
							
								Ignacio Quezada 
							
						 
					 
					
						
						
						
						
							
						
						
							297c0a792f 
							
						 
					 
					
						
						
							
							Private files using a boolean flag from Config.java.  
						
						
						
					 
					
						2016-11-08 11:45:20 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1a57599da2 
							
						 
					 
					
						
						
							
							lower case incoming dns records  
						
						
						
					 
					
						2016-11-08 10:14:34 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7978fd768e 
							
						 
					 
					
						
						
							
							fixed regression of showing delivery failed after receipt  
						
						
						
					 
					
						2016-11-07 21:57:08 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9edbddd7e1 
							
						 
					 
					
						
						
							
							show warning in account details when data saver is enabled  
						
						
						
					 
					
						2016-11-07 10:49:43 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2c004857f6 
							
						 
					 
					
						
						
							
							handle file attachment when missing connection  
						
						
						
					 
					
						2016-11-02 15:21:26 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							544c5b4a21 
							
						 
					 
					
						
						
							
							removed unnecessary push_mode  
						
						
						
					 
					
						2016-11-02 11:04:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e582b9fc10 
							
						 
					 
					
						
						
							
							leaving low ping timeout mode after coming online  
						
						
						
					 
					
						2016-11-02 09:36:14 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							20ddba2aa9 
							
						 
					 
					
						
						
							
							fixed npe when jingle partner is using unknown candidate  
						
						
						
					 
					
						2016-11-01 10:27:01 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							07a71d312a 
							
						 
					 
					
						
						
							
							extracting stanza-id where by=account  
						
						
						
					 
					
						2016-10-31 12:07:08 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a5181b22e0 
							
						 
					 
					
						
						
							
							always use ipv4 localhost when using orbot http proxy  
						
						
						
					 
					
						2016-10-31 09:53:14 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ffebb4677a 
							
						 
					 
					
						
						
							
							Revert "use file provider on android M as well"  
						
						... 
						
						
						
						This reverts commit a4020e85f6 
						
					 
					
						2016-10-30 20:27:39 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a44f35ed69 
							
						 
					 
					
						
						
							
							schedule correct wakeup call when in low ping timeout mode  
						
						
						
					 
					
						2016-10-29 21:45:01 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8557120ef8 
							
						 
					 
					
						
						
							
							add error message to failed messages. accessible via context menu  
						
						
						
					 
					
						2016-10-26 12:26:04 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a4020e85f6 
							
						 
					 
					
						
						
							
							use file provider on android M as well  
						
						
						
					 
					
						2016-10-23 09:03:36 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8c1bb058da 
							
						 
					 
					
						
						
							
							connect instantly in low ping mode after going offline  
						
						
						
					 
					
						2016-10-23 09:03:17 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							10398cab51 
							
						 
					 
					
						
						
							
							don't leave low timeout mode prematurely  
						
						
						
					 
					
						2016-10-20 20:04:16 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f2696b66ba 
							
						 
					 
					
						
						
							
							Merge branch 'feature-remove-merge-separator' of  https://github.com/Mishiranu/Conversations  into Mishiranu-feature-remove-merge-separator  
						
						
						
					 
					
						2016-10-20 18:18:25 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							52d4be4249 
							
						 
					 
					
						
						
							
							Merge branch 'feature-remove-spans' of  https://github.com/Mishiranu/Conversations  into Mishiranu-feature-remove-spans  
						
						
						
					 
					
						2016-10-20 18:10:52 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0f62ff6736 
							
						 
					 
					
						
						
							
							introduced low ping timeout mode after gcm push  
						
						
						
					 
					
						2016-10-20 18:02:11 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							44ce5df359 
							
						 
					 
					
						
						
							
							write prepped string to db. use display version everywhere else  
						
						
						
					 
					
						2016-10-20 17:31:46 +02:00 
						 
				 
			
				
					
						
							
							
								Mishiranu 
							
						 
					 
					
						
						
						
						
							
						
						
							fd4e15ba97 
							
						 
					 
					
						
						
							
							Remove MERGE_SEPARATOR  
						
						
						
					 
					
						2016-10-20 01:03:51 +03:00 
						 
				 
			
				
					
						
							
							
								Mishiranu 
							
						 
					 
					
						
						
						
						
							
						
						
							8835f08cf7 
							
						 
					 
					
						
						
							
							Remove spans on copying or pasting a text  
						
						
						
					 
					
						2016-10-19 20:47:41 +03:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c3423d6ffe 
							
						 
					 
					
						
						
							
							include pgp signature only in non anonymous mucs  
						
						
						
					 
					
						2016-10-19 12:31:11 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							dce8149aae 
							
						 
					 
					
						
						
							
							retrigger key selection if openpgp key was deleted  
						
						
						
					 
					
						2016-10-19 11:53:55 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7226fc0010 
							
						 
					 
					
						
						
							
							update conversation in database background thread  
						
						
						
					 
					
						2016-10-18 13:06:24 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							50780debf7 
							
						 
					 
					
						
						
							
							don't trigger context menu in message adapter manually.  fixes   #2077  
						
						
						
					 
					
						2016-10-18 11:16:43 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f8c21caec9 
							
						 
					 
					
						
						
							
							Merge branch 'feature-selection' of  https://github.com/Mishiranu/Conversations  into Mishiranu-feature-selection  
						
						
						
					 
					
						2016-10-17 09:53:32 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							22d13a3dcd 
							
						 
					 
					
						
						
							
							add exception handling when loading default resource  
						
						
						
					 
					
						2016-10-17 09:53:08 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							dc02e2b498 
							
						 
					 
					
						
						
							
							small code reformation in pgp decryption service  
						
						
						
					 
					
						2016-10-17 09:52:43 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f6cfa27741 
							
						 
					 
					
						
						
							
							synchronize access to json key storage in account model  
						
						
						
					 
					
						2016-10-13 11:27:26 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9e54fd5c92 
							
						 
					 
					
						
						
							
							don't use sending state on muc pms without smacks  
						
						
						
					 
					
						2016-10-09 19:40:30 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cd1c05a7c3 
							
						 
					 
					
						
						
							
							add password to direct muc invite  
						
						
						
					 
					
						2016-10-09 19:40:03 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							74087b873f 
							
						 
					 
					
						
						
							
							added disclaimer that conversations.im account is 8 euro / year  
						
						
						
					 
					
						2016-10-08 18:24:20 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f3ef8d4978 
							
						 
					 
					
						
						
							
							fetch new conference configuration on every conf update  
						
						
						
					 
					
						2016-10-08 12:10:53 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9efef24a04 
							
						 
					 
					
						
						
							
							reset sending to waiting on every error  
						
						
						
					 
					
						2016-10-07 14:54:35 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5a73a6b139 
							
						 
					 
					
						
						
							
							fixed account hash calculation  
						
						
						
					 
					
						2016-10-07 14:54:06 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1f7f82da7b 
							
						 
					 
					
						
						
							
							respond to chat marker request only when mutual presence subscription exists  
						
						
						
					 
					
						2016-10-07 10:05:08 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							26e33de79a 
							
						 
					 
					
						
						
							
							create new instances of key manager every time it's used  
						
						
						
					 
					
						2016-10-07 10:04:36 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							187825d6c6 
							
						 
					 
					
						
						
							
							warn user if account is offline during avatar publication  
						
						
						
					 
					
						2016-10-06 22:06:09 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6d5f23213b 
							
						 
					 
					
						
						
							
							refresh error notification after 'try again'  
						
						
						
					 
					
						2016-10-06 22:05:40 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0af13fc746 
							
						 
					 
					
						
						
							
							be more careful parsing integers in omemo  
						
						
						
					 
					
						2016-10-06 22:05:18 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							40e5090bdd 
							
						 
					 
					
						
						
							
							issue ping after push was received  
						
						
						
					 
					
						2016-10-06 18:09:55 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9f060f477f 
							
						 
					 
					
						
						
							
							parse smacks delay from messages  
						
						
						
					 
					
						2016-10-06 18:09:44 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8d8cb92e43 
							
						 
					 
					
						
						
							
							try to fix messages stuck at sending  
						
						
						
					 
					
						2016-10-06 17:23:35 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							082c06a486 
							
						 
					 
					
						
						
							
							make error notification dismissable.  fixes   #1815  
						
						
						
					 
					
						2016-10-04 11:16:59 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5ac0e9267d 
							
						 
					 
					
						
						
							
							fixed omemo shown as unavailable in 1:1 chats  
						
						
						
					 
					
						2016-10-03 21:04:10 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cea52b0722 
							
						 
					 
					
						
						
							
							resolve take photo uri for internal use  
						
						
						
					 
					
						2016-10-03 18:26:11 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f4a883848c 
							
						 
					 
					
						
						
							
							properly index take photo uris from file provider  
						
						
						
					 
					
						2016-10-03 11:25:15 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b6e7def9db 
							
						 
					 
					
						
						
							
							add more logging to attaching file process  
						
						
						
					 
					
						2016-10-03 11:13:04 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7c6d1d19d5 
							
						 
					 
					
						
						
							
							when activating omemo in conference always check preferences  
						
						
						
					 
					
						2016-10-03 10:42:43 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							dcd6ef8f84 
							
						 
					 
					
						
						
							
							explicit logging when copying files to storage  
						
						
						
					 
					
						2016-10-03 10:13:45 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e275fd8143 
							
						 
					 
					
						
						
							
							Merge pull request  #2027  from danielegobbetti/wear-reply-dismiss-notification  
						
						... 
						
						
						
						Dismiss the notification when replying from a wear notification [needs review!] 
						
					 
					
						2016-09-28 12:39:00 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							43f5dfe174 
							
						 
					 
					
						
						
							
							simplified code that invokes the export logs service  
						
						
						
					 
					
						2016-09-28 12:35:52 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f0dbcce58f 
							
						 
					 
					
						
						
							
							expert 'setting' to remove omemo identity.  fixes   #2038  
						
						
						
					 
					
						2016-09-28 12:24:50 +02:00 
						 
				 
			
				
					
						
							
							
								Daniele Gobbetti 
							
						 
					 
					
						
						
						
						
							
						
						
							41db773b08 
							
						 
					 
					
						
						
							
							Allow to dismiss the notification from a wear reply.  
						
						... 
						
						
						
						- use different IDs in the same method for the PendingIntent
- fix reply for GPG encrypted replies (untested) 
						
					 
					
						2016-09-27 17:39:23 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bb48f67a30 
							
						 
					 
					
						
						
							
							always use ipv4 localhost for Orbot connections  
						
						
						
					 
					
						2016-09-27 11:44:50 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1339b9c464 
							
						 
					 
					
						
						
							
							don't reset encryption choice to auto on archiving  
						
						
						
					 
					
						2016-09-24 21:29:00 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							343d895a26 
							
						 
					 
					
						
						
							
							don't react to null and empty voice replies  
						
						
						
					 
					
						2016-09-21 19:04:16 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							13ed27f91e 
							
						 
					 
					
						
						
							
							don't use file provider for photo uris on android < N.  fixes   #2030  
						
						
						
					 
					
						2016-09-21 18:20:53 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							401759cdc7 
							
						 
					 
					
						
						
							
							don't wait for disco when not having stream managment  
						
						
						
					 
					
						2016-09-21 12:55:40 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							61f58b3dbd 
							
						 
					 
					
						
						
							
							add timeouts to HTTPUrlConnections and allow cancelation of all sending files  
						
						
						
					 
					
						2016-09-20 20:02:25 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							de7c0c5121 
							
						 
					 
					
						
						
							
							Merge pull request  #2028  from Mishiranu/feature-more-tables  
						
						... 
						
						
						
						Fix "Server info" table layout 
						
					 
					
						2016-09-20 16:43:51 +02:00 
						 
				 
			
				
					
						
							
							
								Mishiranu 
							
						 
					 
					
						
						
						
						
							
						
						
							18ab826413 
							
						 
					 
					
						
						
							
							Fix "More table" layout  
						
						... 
						
						
						
						Retain "More table" visibility on screen orientation change 
						
					 
					
						2016-09-20 16:10:25 +03:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5790d4c4ab 
							
						 
					 
					
						
						
							
							fixed styling in blocking dialog  
						
						
						
					 
					
						2016-09-20 14:21:41 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7eac903277 
							
						 
					 
					
						
						
							
							add support for XEP-0377: Spam Reporting  
						
						
						
					 
					
						2016-09-18 23:21:05 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							badc97e280 
							
						 
					 
					
						
						
							
							don't simply ignore null in message body but try to avoid it  
						
						
						
					 
					
						2016-09-18 22:15:02 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7c608c8862 
							
						 
					 
					
						
						
							
							recreate activities when theme changed  
						
						
						
					 
					
						2016-09-18 20:26:47 +02:00 
						 
				 
			
				
					
						
							
							
								Mishiranu 
							
						 
					 
					
						
						
						
						
							
						
						
							858a327299 
							
						 
					 
					
						
						
							
							Retain TextView selection after list updating  
						
						
						
					 
					
						2016-09-18 16:35:14 +03:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7bdd4166c0 
							
						 
					 
					
						
						
							
							catch all throwables when loading contacts  
						
						
						
					 
					
						2016-09-17 11:31:35 +02:00 
						 
				 
			
				
					
						
							
							
								Mishiranu 
							
						 
					 
					
						
						
						
						
							
						
						
							3e6747c880 
							
						 
					 
					
						
						
							
							Add "Select text" context menu option  
						
						
						
					 
					
						2016-09-17 01:18:34 +03:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							521469a57d 
							
						 
					 
					
						
						
							
							dont show delete file button when outside conversations directory.  fixes   #2007  
						
						
						
					 
					
						2016-09-16 12:29:12 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							15c807730e 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/Mishiranu/Conversations  into Mishiranu-master  
						
						
						
					 
					
						2016-09-16 11:08:37 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7b445bc4c7 
							
						 
					 
					
						
						
							
							use history clear date as minimum date for mam  
						
						
						
					 
					
						2016-09-16 11:07:52 +02:00 
						 
				 
			
				
					
						
							
							
								Mishiranu 
							
						 
					 
					
						
						
						
						
							
						
						
							8ca5eb4429 
							
						 
					 
					
						
						
							
							Allow text selection with multiple links in message  
						
						
						
					 
					
						2016-09-16 02:15:07 +03:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ab63dba8aa 
							
						 
					 
					
						
						
							
							deal with null bodys in message preview  
						
						
						
					 
					
						2016-09-15 18:51:51 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4359afacb4 
							
						 
					 
					
						
						
							
							store jid if it was changed during bind  
						
						
						
					 
					
						2016-09-14 12:26:38 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7b52e6984c 
							
						 
					 
					
						
						
							
							Merge pull request  #2018  from SamWhited/sasl_anonymous  
						
						... 
						
						
						
						SASL ANONYMOUS (no UI) 
						
					 
					
						2016-09-14 09:34:20 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							869ee3d438 
							
						 
					 
					
						
						
							
							Merge branch 'pebble-notification' of  https://github.com/danielegobbetti/Conversations  into danielegobbetti-pebble-notification  
						
						
						
					 
					
						2016-09-12 22:49:22 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d3dfecae8a 
							
						 
					 
					
						
						
							
							don't use display version of jids  
						
						
						
					 
					
						2016-09-12 22:48:51 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6cb2b0b5d1 
							
						 
					 
					
						
						
							
							remember scroll position on rotate.  fixes   #2011  
						
						
						
					 
					
						2016-09-12 21:18:56 +02:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							1a0b538166 
							
						 
					 
					
						
						
							
							Use JID returned by the server during bind  
						
						... 
						
						
						
						Not just the resourcepart 
						
					 
					
						2016-09-12 11:33:36 -05:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							805717673c 
							
						 
					 
					
						
						
							
							Support ANONYMOUS SASL  
						
						
						
					 
					
						2016-09-12 11:30:03 -05:00 
						 
				 
			
				
					
						
							
							
								Daniele Gobbetti 
							
						 
					 
					
						
						
						
						
							
						
						
							e6e46651c9 
							
						 
					 
					
						
						
							
							Use the last message in the content text instead of the first.  
						
						... 
						
						
						
						This fixes the issue where the first message in the notification was sent to pebble
(and possibly to other wear devices) for every update in the conversation, as
reported in #1249 .
This is the same patch propoed in https://github.com/siacs/Conversations/issues/1249#issuecomment-245878335  
						
					 
					
						2016-09-11 18:42:05 +02:00 
						 
				 
			
				
					
						
							
							
								licaon-kter 
							
						 
					 
					
						
						
						
						
							
						
						
							59b2e281a3 
							
						 
					 
					
						
						
							
							Fix typo  
						
						
						
					 
					
						2016-09-10 22:16:14 +03:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c3b11e515e 
							
						 
					 
					
						
						
							
							download own vcard avatar if none is set.  fixes   #2008  
						
						
						
					 
					
						2016-09-09 11:04:05 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ac9f13a9f2 
							
						 
					 
					
						
						
							
							provide hint on why conference can not be encrypted  
						
						
						
					 
					
						2016-09-08 11:01:27 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							416481bb65 
							
						 
					 
					
						
						
							
							be a bit more careful when deleting and deactivating accounts  
						
						
						
					 
					
						2016-09-07 14:34:58 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e1d2c32e63 
							
						 
					 
					
						
						
							
							show server not found muc error  
						
						
						
					 
					
						2016-09-06 12:15:08 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							257d1e42d8 
							
						 
					 
					
						
						
							
							remove explicit pebble support. treat as wear device  
						
						
						
					 
					
						2016-09-06 12:14:49 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7e81149869 
							
						 
					 
					
						
						
							
							show reply action on wear devices  
						
						
						
					 
					
						2016-09-06 12:13:50 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1dc55f72e3 
							
						 
					 
					
						
						
							
							don't use fileprovider when opening files on android M and below  
						
						
						
					 
					
						2016-09-04 22:59:40 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d2c475d501 
							
						 
					 
					
						
						
							
							don't crash when correcting waiting pgp encrypted messages  
						
						
						
					 
					
						2016-09-04 22:59:15 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							aca7054174 
							
						 
					 
					
						
						
							
							fixed recreation issues in StartConversationActivity  
						
						
						
					 
					
						2016-08-31 17:04:43 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f7d8580969 
							
						 
					 
					
						
						
							
							fixed typo  
						
						
						
					 
					
						2016-08-31 17:02:50 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f14ab4c391 
							
						 
					 
					
						
						
							
							don't show duplicate nofications on android 4  
						
						
						
					 
					
						2016-08-31 17:02:42 +02:00 
						 
				 
			
				
					
						
							
							
								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