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 
							
						 
					 
					
						
						
						
						
							
						
						
							5e7d1f7bcc 
							
						 
					 
					
						
						
							
							stop settings from crashing when building with different package id  
						
						
						
					 
					
						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 
							
						 
					 
					
						
						
						
						
							
						
						
							b9f6b792a9 
							
						 
					 
					
						
						
							
							fixed paddings  
						
						
						
					 
					
						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 
							
						 
					 
					
						
						
						
						
							
						
						
							22a722c06d 
							
						 
					 
					
						
						
							
							change image button background  
						
						
						
					 
					
						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 
							
						 
					 
					
						
						
						
						
							
						
						
							9d25ecc21b 
							
						 
					 
					
						
						
							
							remove pre api 21 theme  
						
						
						
					 
					
						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 
							
						 
					 
					
						
						
						
						
							
						
						
							454f68799e 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2018-03-07 12:35:28 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0deffef8da 
							
						 
					 
					
						
						
							
							fixed concurrent modification when killing mam queries  
						
						
						
					 
					
						2018-03-01 08:27:30 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7557de5479 
							
						 
					 
					
						
						
							
							use java 8 in push management service  
						
						
						
					 
					
						2018-02-25 14:39:55 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d4ac8b3122 
							
						 
					 
					
						
						
							
							fixed push registration  
						
						
						
					 
					
						2018-02-25 14:31:31 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7e09fac1da 
							
						 
					 
					
						
						
							
							do not merge bug reports  
						
						
						
					 
					
						2018-02-25 14:28:14 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							47dfe3c2e2 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2018-02-25 14:22:34 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							1a1d5c2a3e 
							
						 
					 
					
						
						
							
							Merge branch 'master' of github.com:siacs/Conversations  
						
						
						
					 
					
						2018-02-23 23:12:13 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7725cb8311 
							
						 
					 
					
						
						
							
							MAM: look at total count for completness. parse fin correctly  
						
						
						
					 
					
						2018-02-23 23:11:54 +01:00 
						 
				 
			
				
					
						
							
							
								Marc Schink 
							
						 
					 
					
						
						
						
						
							
						
						
							8713fc8a06 
							
						 
					 
					
						
						
							
							Use 'Jabber' instead of 'XMPP' in the welcome message  
						
						
						
					 
					
						2018-02-22 22:04:03 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							b3561e80f2 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2018-02-10 12:21:36 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							0e8e8be82c 
							
						 
					 
					
						
						
							
							Merge pull request  #2780  from linkmauve/patch-1  
						
						... 
						
						
						
						Fix the French translation for the add_back string 
						
					 
					
						2018-02-10 12:19:18 +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 
						 
				 
			
				
					
						
							
							
								linkmauve 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							4e373d82dc 
							
						 
					 
					
						
						
							
							Fix the French translation for the add_back string  
						
						... 
						
						
						
						It was translated to something like “add again”, which doesn’t carry the same meaning and can be confusing for users.
It would be useful to also check how it has been translated in other languages, and add a source comment for future translators. 
						
					 
					
						2018-02-05 19:30:32 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							1217faec60 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2018-01-25 12:48:54 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							0dbad2eea5 
							
						 
					 
					
						
						
							
							updated year in copyright info  
						
						
						
					 
					
						2018-01-23 22:01:56 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							74048593ff 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2018-01-22 21:09:33 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							42c807ead8 
							
						 
					 
					
						
						
							
							Merge branch 'soft-keyboard-bug' of  https://github.com/harshitbansal05/Conversations  into harshitbansal05-soft-keyboard-bug  
						
						
						
					 
					
						2018-01-21 12:26:57 +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 
						 
				 
			
				
					
						
							
							
								iamharsshit 
							
						 
					 
					
						
						
						
						
							
						
						
							a3bb7c346b 
							
						 
					 
					
						
						
							
							add soft keyboard next button functionality  
						
						
						
					 
					
						2018-01-20 22:43:11 +05:30 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								daivat15 
							
						 
					 
					
						
						
						
						
							
						
						
							de23b37ee2 
							
						 
					 
					
						
						
							
							Gradle Update to 3.0.1 with aapt  
						
						... 
						
						
						
						Gradle Update to 3.0.1 with aapt
Gradle Update to 3.0.1 with aapt fix try 
						
					 
					
						2018-01-11 18:30:09 +05:30 
						 
				 
			
				
					
						
							
							
								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 
							
						 
					 
					
						
						
						
						
							
						
						
							965c8cbbd5 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2018-01-09 10:14:00 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							55016f10e6 
							
						 
					 
					
						
						
							
							fix color of show password button  
						
						
						
					 
					
						2018-01-09 10:13:53 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							4d7d7623a0 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2018-01-01 12:02:15 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							b5828127ee 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2017-12-18 13:48:30 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							0cc6ff05f8 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2017-12-16 20:45:26 +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