Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							904edf5d59 
							
						 
					 
					
						
						
							
							hide prepare file toast after preparing the file  
						
						
						
					 
					
						2015-12-06 11:57:11 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bd765c59ce 
							
						 
					 
					
						
						
							
							check availabiltiy of pgp before sharing files  
						
						
						
					 
					
						2015-12-05 19:03:17 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b7f326372d 
							
						 
					 
					
						
						
							
							be more carefull with pending uris  
						
						
						
					 
					
						2015-12-05 19:02:57 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6358f641e7 
							
						 
					 
					
						
						
							
							check for query object as condition to trigger deduplication instead of serverId  
						
						
						
					 
					
						2015-12-05 18:41:38 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							41dcd8005b 
							
						 
					 
					
						
						
							
							parse stanza-id from messages  
						
						
						
					 
					
						2015-12-04 22:03:46 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cd9a29718b 
							
						 
					 
					
						
						
							
							properly clear muc user avatar caches  
						
						
						
					 
					
						2015-12-04 21:36:48 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9d1e8a34b2 
							
						 
					 
					
						
						
							
							fixed showing avatars for contacts in muc  
						
						
						
					 
					
						2015-12-04 18:39:09 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							196c8e593f 
							
						 
					 
					
						
						
							
							Merge pull request  #1595  from fiaxh/pgp_database_signature  
						
						... 
						
						
						
						Regenerate PGP signatures once 
						
					 
					
						2015-12-04 15:35:51 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0664d6ac7b 
							
						 
					 
					
						
						
							
							avoid some NPEs  
						
						
						
					 
					
						2015-12-04 15:35:22 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3e3cb047be 
							
						 
					 
					
						
						
							
							rely on message id if message id is uuid and pgp encryption was used to deduplicate messages.  fixes   #1357  
						
						
						
					 
					
						2015-12-04 15:34:45 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							242887447c 
							
						 
					 
					
						
						
							
							use proposed nick as default nick in mucoptions  
						
						
						
					 
					
						2015-12-04 14:07:16 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6b592435cd 
							
						 
					 
					
						
						
							
							parse vcard avatars from muc presences  
						
						
						
					 
					
						2015-12-03 18:18:34 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f1c0b7372f 
							
						 
					 
					
						
						
							
							enabled previously disabled http upload  
						
						
						
					 
					
						2015-12-03 12:45:12 +01:00 
						 
				 
			
				
					
						
							
							
								fiaxh 
							
						 
					 
					
						
						
						
						
							
						
						
							e5f154316c 
							
						 
					 
					
						
						
							
							Unset all PGP signatures once  
						
						... 
						
						
						
						... so they will be redone to match the changed status. 
						
					 
					
						2015-12-02 18:06:48 +00:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b60c902810 
							
						 
					 
					
						
						
							
							pulled new translations from transifex  
						
						
						
					 
					
						2015-12-02 17:27:56 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3553b15c9f 
							
						 
					 
					
						
						
							
							renamed x509 verified omemo to v\OMEMO  
						
						
						
					 
					
						2015-12-02 17:24:56 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							aa21797f43 
							
						 
					 
					
						
						
							
							Merge branch 'master' of github.com:siacs/Conversations  
						
						
						
					 
					
						2015-12-02 16:38:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0eaf7669f7 
							
						 
					 
					
						
						
							
							Merge pull request  #1545  from SamWhited/show_new_contact_request_messages  
						
						... 
						
						
						
						Show status message when contact requests presence 
						
					 
					
						2015-12-02 16:38:08 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							a3eb540f05 
							
						 
					 
					
						
						
							
							Show status message when contact requests presence  
						
						... 
						
						
						
						Remove presence when conversation closed 
						
					 
					
						2015-12-02 08:50:52 -06:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							025cbf7d44 
							
						 
					 
					
						
						
							
							show tor config in paranoid mode  
						
						
						
					 
					
						2015-12-02 15:34:09 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							02c6793ca9 
							
						 
					 
					
						
						
							
							fixed avatar loading for non-file uris  
						
						
						
					 
					
						2015-12-02 15:30:03 +01:00 
						 
				 
			
				
					
						
							
							
								Philip Flohr 
							
						 
					 
					
						
						
						
						
							
						
						
							0329c9c738 
							
						 
					 
					
						
						
							
							users are now able to crop their avatar pictures using the android-crop  
						
						... 
						
						
						
						library 
						
					 
					
						2015-12-02 14:25:20 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8455e5b5dd 
							
						 
					 
					
						
						
							
							hide message content in notifications in paranoia mode  
						
						
						
					 
					
						2015-12-02 12:54:55 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							e1aeb376ac 
							
						 
					 
					
						
						
							
							s/.../…/ in default strings  
						
						
						
					 
					
						2015-12-01 21:59:44 -06:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							dc8967d8fc 
							
						 
					 
					
						
						
							
							introduced build-time paranoia mode that disables unencrypted chats and forces TOR  
						
						
						
					 
					
						2015-12-01 22:41:58 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							65b5504e68 
							
						 
					 
					
						
						
							
							introduce config.java variable to optionally show number of connected accounts in notification  
						
						
						
					 
					
						2015-12-01 17:15:36 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2cd43f7042 
							
						 
					 
					
						
						
							
							fixed crashes when activity got destroyed when selecting pgp key  
						
						
						
					 
					
						2015-12-01 14:18:07 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d42c82abf2 
							
						 
					 
					
						
						
							
							combine multiple message receipts into single message  
						
						
						
					 
					
						2015-12-01 12:22:47 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2225b0b6d5 
							
						 
					 
					
						
						
							
							add error state for unavailable tor network  
						
						
						
					 
					
						2015-12-01 12:00:50 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b4a259837e 
							
						 
					 
					
						
						
							
							always use http proxy for http requests. (socks is leaking dns)  
						
						
						
					 
					
						2015-12-01 12:00:50 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8ffcc11f27 
							
						 
					 
					
						
						
							
							refactored socks5 connection code. make jingle transport use that new code  
						
						
						
					 
					
						2015-12-01 12:00:50 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ebccb67a72 
							
						 
					 
					
						
						
							
							do socks5 connect manually  
						
						
						
					 
					
						2015-12-01 12:00:50 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f0b1761ec3 
							
						 
					 
					
						
						
							
							initial tor support  
						
						
						
					 
					
						2015-12-01 12:00:50 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							06cadab7cc 
							
						 
					 
					
						
						
							
							changed method signature of calcSampleSize  
						
						
						
					 
					
						2015-11-30 16:03:04 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							60211a315e 
							
						 
					 
					
						
						
							
							hide subject edit button if not editable by user  
						
						
						
					 
					
						2015-11-26 17:44:29 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							23ef1c660a 
							
						 
					 
					
						
						
							
							encrypt pgp messages to self  
						
						
						
					 
					
						2015-11-26 17:44:11 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fd6ed5b989 
							
						 
					 
					
						
						
							
							detect server identity and added muc-workaround for slack  
						
						
						
					 
					
						2015-11-26 06:55:57 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							84120a341a 
							
						 
					 
					
						
						
							
							removed unnecessary configuration fetch after join  
						
						
						
					 
					
						2015-11-26 06:53:24 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							210de7d781 
							
						 
					 
					
						
						
							
							removed unecessary chat state  
						
						
						
					 
					
						2015-11-26 06:53:02 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ecb4615f2a 
							
						 
					 
					
						
						
							
							fail jingle file transfer if axolotl key message could not be created.  fixes   #1576  
						
						
						
					 
					
						2015-11-26 06:52:46 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a557d38e4d 
							
						 
					 
					
						
						
							
							pgp fixes and revert configuration changes  
						
						
						
					 
					
						2015-11-25 20:47:02 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8228e82f51 
							
						 
					 
					
						
						
							
							Merge pull request  #1569  from fiaxh/conference_one_other_occupant  
						
						... 
						
						
						
						Show own avatar in tile for conferences with only one other occupant next to theirs 
						
					 
					
						2015-11-24 07:09:12 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fbb7cb99f7 
							
						 
					 
					
						
						
							
							Merge pull request  #1558  from fiaxh/pgp_api_9.0  
						
						... 
						
						
						
						Use OpenPGP-API 9.0 
						
					 
					
						2015-11-24 06:52:24 +01:00 
						 
				 
			
				
					
						
							
							
								fiaxh 
							
						 
					 
					
						
						
						
						
							
						
						
							2c1f7e115c 
							
						 
					 
					
						
						
							
							PgpEngine: Get account from conversation instead of from contact.  fixes   #1568 ,  fixes   #1544  
						
						
						
					 
					
						2015-11-15 13:24:07 +00:00 
						 
				 
			
				
					
						
							
							
								fiaxh 
							
						 
					 
					
						
						
						
						
							
						
						
							724ca8c9a9 
							
						 
					 
					
						
						
							
							Own contact picture in tile for conferences with only one other occupant  
						
						
						
					 
					
						2015-11-15 10:34:10 +00:00 
						 
				 
			
				
					
						
							
							
								fiaxh 
							
						 
					 
					
						
						
						
						
							
						
						
							c7a519498a 
							
						 
					 
					
						
						
							
							Sign empty status  
						
						
						
					 
					
						2015-11-09 13:50:02 +00:00 
						 
				 
			
				
					
						
							
							
								fiaxh 
							
						 
					 
					
						
						
						
						
							
						
						
							fac1d4e0bd 
							
						 
					 
					
						
						
							
							Use OpenPGP-API 9.0  
						
						
						
					 
					
						2015-11-09 13:49:57 +00:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							c6e54e7e5a 
							
						 
					 
					
						
						
							
							Move migration 19 before 17  
						
						... 
						
						
						
						Migration 17 depends on Account deserialization, so any migrations that
touch the accounts table need to be applied beforehand.
Re-writing the migration to work directly on the database would lead to
a lot of code duplication, so it's not worth it at this time, but might
become necessary later on to avoid dependency cycles. 
						
					 
					
						2015-11-06 14:50:55 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fb9ba0a734 
							
						 
					 
					
						
						
							
							don't close socket on disconnect  
						
						
						
					 
					
						2015-11-01 07:45:00 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							baf76d883c 
							
						 
					 
					
						
						
							
							indicate cbe in chat message hint  
						
						
						
					 
					
						2015-10-31 22:55:04 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bca29cf7fd 
							
						 
					 
					
						
						
							
							explicitly mark verified omemo keys in UI  
						
						
						
					 
					
						2015-10-31 10:57:57 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							34bcc59f72 
							
						 
					 
					
						
						
							
							fixed session objects not being build on start up  
						
						
						
					 
					
						2015-10-30 12:05:21 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6a458b853c 
							
						 
					 
					
						
						
							
							Merge pull request  #1513  from fiaxh/pgp_background_decryption  
						
						... 
						
						
						
						PGP messages background decryption 
						
					 
					
						2015-10-30 10:18:27 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8553d5a563 
							
						 
					 
					
						
						
							
							moved db calls made from UI into serial background thread  
						
						
						
					 
					
						2015-10-29 17:20:01 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ef7857ac8d 
							
						 
					 
					
						
						
							
							avoid npe when checking for stream restart  
						
						
						
					 
					
						2015-10-29 14:38:35 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c7ff196f58 
							
						 
					 
					
						
						
							
							push CN into nick pep node when uploading certificate. subscribe to nick node  
						
						
						
					 
					
						2015-10-29 13:41:08 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7410e2023a 
							
						 
					 
					
						
						
							
							Merge branch 'master' of github.com:siacs/Conversations  
						
						
						
					 
					
						2015-10-29 12:08:32 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1221cff561 
							
						 
					 
					
						
						
							
							load avatars in message adapter in background task  
						
						
						
					 
					
						2015-10-29 12:08:15 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a7fd629c05 
							
						 
					 
					
						
						
							
							show encryption type in warned/red messages  
						
						
						
					 
					
						2015-10-28 22:40:09 +01:00 
						 
				 
			
				
					
						
							
							
								fiaxh 
							
						 
					 
					
						
						
						
						
							
						
						
							016a57f123 
							
						 
					 
					
						
						
							
							Show PGP "please wait" message only when actually decrypting  
						
						
						
					 
					
						2015-10-28 20:57:15 +00:00 
						 
				 
			
				
					
						
							
							
								fiaxh 
							
						 
					 
					
						
						
						
						
							
						
						
							29a849cb92 
							
						 
					 
					
						
						
							
							Decrypt PGP messages in background  
						
						
						
					 
					
						2015-10-28 19:57:11 +00:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							e747ecef4d 
							
						 
					 
					
						
						
							
							Don't synchronize on non-final field  
						
						
						
					 
					
						2015-10-26 20:13:48 -05:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ec473a4437 
							
						 
					 
					
						
						
							
							Merge pull request  #1520  from saqura/self_handle_orientation  
						
						... 
						
						
						
						Handle some orientation changes manually 
						
					 
					
						2015-10-26 09:30:08 +01:00 
						 
				 
			
				
					
						
							
							
								saqura 
							
						 
					 
					
						
						
						
						
							
						
						
							48f172fc9e 
							
						 
					 
					
						
						
							
							Reset the margins manually after rotating  
						
						
						
					 
					
						2015-10-26 00:59:32 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							56afdcc94a 
							
						 
					 
					
						
						
							
							invalidate menu after backend connection.  
						
						... 
						
						
						
						fixes the menu not being shown after rotation in edit account details 
						
					 
					
						2015-10-25 22:46:06 +01:00 
						 
				 
			
				
					
						
							
							
								saqura 
							
						 
					 
					
						
						
						
						
							
						
						
							1f2b2c8834 
							
						 
					 
					
						
						
							
							Handle some orientation changes manually  
						
						... 
						
						
						
						Currently most activities get destroyed/recreated when rotating the
device. This commit prevents this from happening where it is not
necessary.
The most obvious improvements are:
 * The options menu in the EditAccountActivity does not disappear when
   rotating the device.
 * CSI inactive/active states are no longer sent on every rotate. 
						
					 
					
						2015-10-25 21:34:16 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1bd68a42b2 
							
						 
					 
					
						
						
							
							join muc even if initial conference configuration fetch failed  
						
						
						
					 
					
						2015-10-22 11:20:36 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3c45f00443 
							
						 
					 
					
						
						
							
							fixed read conversations showing up as notifications after a restart  
						
						
						
					 
					
						2015-10-21 17:41:44 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f4a33a007c 
							
						 
					 
					
						
						
							
							open unknown files with wildcard intent  
						
						
						
					 
					
						2015-10-20 17:41:07 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							569b9f4e66 
							
						 
					 
					
						
						
							
							open manage account + certificate chooser when cbe mode is enabled  
						
						
						
					 
					
						2015-10-20 15:27:33 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							53125dbccc 
							
						 
					 
					
						
						
							
							move chat state reset from background switch to foreground switch to account for chat states sent in the mean time  
						
						
						
					 
					
						2015-10-19 23:22:29 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9b07059b6e 
							
						 
					 
					
						
						
							
							update last seen in mucs.  fixes   #1508  
						
						
						
					 
					
						2015-10-19 23:20:33 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							efab290c28 
							
						 
					 
					
						
						
							
							add nick to bookmark when entering full jid in join conference dialog  
						
						
						
					 
					
						2015-10-19 23:20:00 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							adca670196 
							
						 
					 
					
						
						
							
							synchronize around the disco object  
						
						
						
					 
					
						2015-10-19 23:03:19 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							be38b1e5f4 
							
						 
					 
					
						
						
							
							disconnet in background thread  
						
						
						
					 
					
						2015-10-17 16:10:56 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e956c7b2a2 
							
						 
					 
					
						
						
							
							only try EXTERNAL auth if client certificate is set for account  
						
						
						
					 
					
						2015-10-17 16:10:31 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3c6c424d31 
							
						 
					 
					
						
						
							
							don't retry building broken omemo keys  
						
						
						
					 
					
						2015-10-17 15:51:21 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0f405c2e11 
							
						 
					 
					
						
						
							
							allow redownloading files from remote hosts.  fixes   #1504  
						
						
						
					 
					
						2015-10-17 15:23:46 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e9e31b1c9b 
							
						 
					 
					
						
						
							
							load axolotl session cache on first device update  
						
						
						
					 
					
						2015-10-17 14:44:59 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a83aae341f 
							
						 
					 
					
						
						
							
							improved error reporting in trust keys activity  
						
						
						
					 
					
						2015-10-17 14:09:26 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cfeb67d71d 
							
						 
					 
					
						
						
							
							introduced code to verify omemo device keys with x509 certificates.  
						
						... 
						
						
						
						cleaned up TrustKeysActivity to automatically close if there is nothing to do 
						
					 
					
						2015-10-16 23:48:42 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fb7359e6a3 
							
						 
					 
					
						
						
							
							block code when doing unforced disconnect  
						
						
						
					 
					
						2015-10-16 09:58:31 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c1716a35e3 
							
						 
					 
					
						
						
							
							moved other name parsing into seperate method  
						
						
						
					 
					
						2015-10-15 20:05:55 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fc96dcaa4d 
							
						 
					 
					
						
						
							
							use constants for oids in xmppdomainverifier  
						
						
						
					 
					
						2015-10-15 19:14:41 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5b271e1ed8 
							
						 
					 
					
						
						
							
							more checks for xmppdomainverifier and better wildcard handling  
						
						
						
					 
					
						2015-10-15 18:06:26 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e75c2cd731 
							
						 
					 
					
						
						
							
							use own XmppDomainVerifier instead of deprecated StrictHostnameVerifier.  fixes   #1189  
						
						
						
					 
					
						2015-10-15 17:08:38 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1738673c53 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2015-10-14 23:05:00 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4b93351f8f 
							
						 
					 
					
						
						
							
							changed some source strings  
						
						
						
					 
					
						2015-10-14 23:03:01 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							30dbf97a1c 
							
						 
					 
					
						
						
							
							clear bitmap cache before running out of memory  
						
						
						
					 
					
						2015-10-14 22:55:59 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5f9476448f 
							
						 
					 
					
						
						
							
							make unread status and notifications presistent across restarts  
						
						
						
					 
					
						2015-10-14 21:18:34 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0587ba2ad2 
							
						 
					 
					
						
						
							
							work with muc services that change the message id  
						
						
						
					 
					
						2015-10-14 11:15:18 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							beca748634 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2015-10-13 23:36:16 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							76828950ee 
							
						 
					 
					
						
						
							
							cleaned up some code. log last tag  
						
						
						
					 
					
						2015-10-13 23:34:09 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f24649c819 
							
						 
					 
					
						
						
							
							set cursor to end of jid in edit account  
						
						
						
					 
					
						2015-10-13 16:58:08 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							212d1a8c91 
							
						 
					 
					
						
						
							
							add config variable to enable x509 verification  
						
						
						
					 
					
						2015-10-12 13:18:20 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							933538a39d 
							
						 
					 
					
						
						
							
							code clean up  
						
						
						
					 
					
						2015-10-12 12:36:54 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b519411d34 
							
						 
					 
					
						
						
							
							enable SASL EXTERNAL (certificate login  
						
						
						
					 
					
						2015-10-11 20:45:01 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7be331bbb2 
							
						 
					 
					
						
						
							
							add menu item in account details to renew certificate  
						
						
						
					 
					
						2015-10-11 16:10:52 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							09816b61df 
							
						 
					 
					
						
						
							
							make add account from key visible  
						
						
						
					 
					
						2015-10-11 16:10:52 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							fdd88aa530 
							
						 
					 
					
						
						
							
							Clean up  
						
						... 
						
						
						
						Fixes some random linter warnings. 
						
					 
					
						2015-10-11 16:05:44 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							a7c7a42136 
							
						 
					 
					
						
						
							
							Improve InvalidJidException handling in Jid class  
						
						... 
						
						
						
						This code should never be triggered anway, so with this 'fix', we should
at least get more meaningful stack traces. Plus, it makes the linter
happy by preventing NullPointerExceptions. 
						
					 
					
						2015-10-11 16:05:44 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							da31582911 
							
						 
					 
					
						
						
							
							Merge pull request  #1461  from akallabeth/captcha_support  
						
						... 
						
						
						
						Implemented account registration with captcha 
						
					 
					
						2015-10-11 15:56:42 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							540f6510de 
							
						 
					 
					
						
						
							
							Merge branch 'master' of github.com:siacs/Conversations  
						
						
						
					 
					
						2015-10-11 14:27:41 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9e1393bc1c 
							
						 
					 
					
						
						
							
							prevent null pointer when trying to display device fingerprints of not existing sessions  
						
						
						
					 
					
						2015-10-11 14:27:09 +02:00 
						 
				 
			
				
					
						
							
							
								Armin Novak 
							
						 
					 
					
						
						
						
						
							
						
						
							6a6cb43b17 
							
						 
					 
					
						
						
							
							Captcha support.  
						
						
						
					 
					
						2015-10-11 13:11:50 +02:00 
						 
				 
			
				
					
						
							
							
								Safwat Halaby 
							
						 
					 
					
						
						
						
						
							
						
						
							08174e3b05 
							
						 
					 
					
						
						
							
							Fixed a typo in string.xml  
						
						
						
					 
					
						2015-10-10 12:03:25 +03:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b23cb5a9e4 
							
						 
					 
					
						
						
							
							initial UI work to allow setting up accounts from certifcates  
						
						
						
					 
					
						2015-10-09 13:37:08 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ef605e4cbd 
							
						 
					 
					
						
						
							
							do not dismiss editAccountActivity when still trying to register new account  
						
						
						
					 
					
						2015-10-09 10:49:30 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e65068d226 
							
						 
					 
					
						
						
							
							catch exception when unregistering receivers that have not been registered before  
						
						
						
					 
					
						2015-10-08 00:52:04 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f81e44d339 
							
						 
					 
					
						
						
							
							removed oob element from file messages  
						
						
						
					 
					
						2015-10-08 00:35:23 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							52a5e72b02 
							
						 
					 
					
						
						
							
							introduced expert options to set status to away and xa if screen is off or if phone is silenced  
						
						
						
					 
					
						2015-10-08 00:35:04 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							043e19dd65 
							
						 
					 
					
						
						
							
							add xhtml image tag to unencrypted image urls. add oob tag to all files that are on remote hosts  
						
						
						
					 
					
						2015-10-07 12:08:25 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8f066d00e0 
							
						 
					 
					
						
						
							
							do mam query after join  
						
						
						
					 
					
						2015-10-06 16:58:56 +02:00 
						 
				 
			
				
					
						
							
							
								saqura 
							
						 
					 
					
						
						
						
						
							
						
						
							fd61d67dab 
							
						 
					 
					
						
						
							
							Use MAM for MUC initial history retrieval  
						
						... 
						
						
						
						If the MUC supports MAM (XEP-0313), use it to retrieve the history
when joining. 
						
					 
					
						2015-10-06 16:23:45 +02:00 
						 
				 
			
				
					
						
							
							
								saqura 
							
						 
					 
					
						
						
						
						
							
						
						
							05d0c9f4fe 
							
						 
					 
					
						
						
							
							Properly check for MUC MAM support  
						
						... 
						
						
						
						Only use MAM (XEP-0313) in MUCs if it is supported.
This should fix  #1264  
						
					 
					
						2015-10-06 16:23:18 +02:00 
						 
				 
			
				
					
						
							
							
								saqura 
							
						 
					 
					
						
						
						
						
							
						
						
							403db3b080 
							
						 
					 
					
						
						
							
							Show whether MAM is supported in MUCs  
						
						... 
						
						
						
						The conference details in "Advanced Mode" now indicate whether MAM is
supported by the conference server. 
						
					 
					
						2015-10-06 16:23:05 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							32abc76689 
							
						 
					 
					
						
						
							
							changed store path for files  
						
						
						
					 
					
						2015-10-06 16:18:23 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1d2a24c9c0 
							
						 
					 
					
						
						
							
							clean up log exporting service. properly end service after exporting  
						
						
						
					 
					
						2015-10-06 14:13:07 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e6af502055 
							
						 
					 
					
						
						
							
							clear notification and activate grace period when receiving chat marker from another instance  
						
						
						
					 
					
						2015-10-06 11:44:27 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							89edd83609 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2015-10-05 16:45:33 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							160dfa49a0 
							
						 
					 
					
						
						
							
							try to catch plattform bugs  
						
						
						
					 
					
						2015-10-02 11:58:03 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4b62bd256d 
							
						 
					 
					
						
						
							
							properly recycle bitmaps  
						
						
						
					 
					
						2015-10-02 11:39:30 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2b9b700c96 
							
						 
					 
					
						
						
							
							don't put conference joins into pending on initial bind  
						
						
						
					 
					
						2015-10-01 16:01:19 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6a0b9971aa 
							
						 
					 
					
						
						
							
							reset muc options immediately befor join  
						
						
						
					 
					
						2015-10-01 13:03:15 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9dcf074a79 
							
						 
					 
					
						
						
							
							request stanza count after every ibb data stanza to not fill our own stanza queue  
						
						
						
					 
					
						2015-09-30 23:42:02 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							648e29db2c 
							
						 
					 
					
						
						
							
							only invoke MTM in interactive mode after direct user input  
						
						... 
						
						
						
						fixes  #1027 
fixes  #792 
fixes  #1439  
					
						2015-09-29 19:24:52 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							64dbb069ab 
							
						 
					 
					
						
						
							
							rotate thumbnails.  fixes   #1438  
						
						
						
					 
					
						2015-09-29 12:25:32 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5fb77a9739 
							
						 
					 
					
						
						
							
							fixed NPE when executing rename callback in muc  
						
						
						
					 
					
						2015-09-28 15:36:55 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8881b71079 
							
						 
					 
					
						
						
							
							do tab completion only if neither ctrl nor alt are being pressed  
						
						
						
					 
					
						2015-09-28 14:36:10 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f4d6b676e9 
							
						 
					 
					
						
						
							
							catch rare activity not found exception when opening downloaded files  
						
						
						
					 
					
						2015-09-27 21:27:07 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bbbc30e823 
							
						 
					 
					
						
						
							
							allow tab completion in conferences  
						
						
						
					 
					
						2015-09-27 19:17:44 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5a5e0e7121 
							
						 
					 
					
						
						
							
							use Conversations 1.x.y as user agent string in http upload and download  
						
						
						
					 
					
						2015-09-23 18:05:51 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8d90b3fbf1 
							
						 
					 
					
						
						
							
							swapped icons for foreground services  
						
						
						
					 
					
						2015-09-22 08:50:54 +02:00 
						 
				 
			
				
					
						
							
							
								fiaxh 
							
						 
					 
					
						
						
						
						
							
						
						
							a3a13dd9dc 
							
						 
					 
					
						
						
							
							Export logs to SD card preference  
						
						
						
					 
					
						2015-09-21 18:53:29 +01:00 
						 
				 
			
				
					
						
							
							
								fiaxh 
							
						 
					 
					
						
						
						
						
							
						
						
							024e697cee 
							
						 
					 
					
						
						
							
							Iterator to go through all messages of a conversation  
						
						
						
					 
					
						2015-09-20 22:17:32 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a954e32b16 
							
						 
					 
					
						
						
							
							let DnsHelper provide a fallback solution  
						
						
						
					 
					
						2015-09-19 17:31:24 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							069ddddbc1 
							
						 
					 
					
						
						
							
							fixed content-type indication in http upload  
						
						
						
					 
					
						2015-09-19 17:29:33 +02:00 
						 
				 
			
				
					
						
							
							
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							8f69017d5a 
							
						 
					 
					
						
						
							
							remove the from attribute from sendStartStream()  fixes   #1419  
						
						
						
					 
					
						2015-09-19 15:58:33 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b54b4ca78a 
							
						 
					 
					
						
						
							
							introduced Config variable to use legacy namespace for http upload  
						
						
						
					 
					
						2015-09-17 14:42:50 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							506b83ddc6 
							
						 
					 
					
						
						
							
							be more careful when publishing device bundle  
						
						
						
					 
					
						2015-09-17 14:18:06 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c173d78950 
							
						 
					 
					
						
						
							
							ignore spoofed stanzas in facebook chat  
						
						
						
					 
					
						2015-09-17 14:13:38 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							07c7f5bc08 
							
						 
					 
					
						
						
							
							catch IndexOutOfBoundsException when swiping away conversations  
						
						
						
					 
					
						2015-09-17 14:02:28 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7e712d9d4c 
							
						 
					 
					
						
						
							
							fixed rare NPE in DnsHelper. fixed spelling and added logging  
						
						
						
					 
					
						2015-09-17 13:55:27 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b1b13ba0e5 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2015-09-15 22:56:02 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4a4ced1e69 
							
						 
					 
					
						
						
							
							Merge branch 'master' of github.com:siacs/Conversations  
						
						
						
					 
					
						2015-09-15 22:53:06 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b9002d7fd5 
							
						 
					 
					
						
						
							
							added missing type='submit' to mam queries  
						
						... 
						
						
						
						fixed some nasty inheritance problems along the way
fixes  #1411  
						
					 
					
						2015-09-15 22:52:39 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b5719fd747 
							
						 
					 
					
						
						
							
							work around a NPE caused by arace condition in the http upload  
						
						
						
					 
					
						2015-09-15 22:49:43 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							183dad281c 
							
						 
					 
					
						
						
							
							Merge pull request  #1409  from sespivak/master  
						
						... 
						
						
						
						some string localization for russian language 
						
					 
					
						2015-09-14 17:06:27 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							999d65c187 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2015-09-14 16:53:39 +02:00 
						 
				 
			
				
					
						
							
							
								Sergey Spivak 
							
						 
					 
					
						
						
						
						
							
						
						
							7e06065df2 
							
						 
					 
					
						
						
							
							some string localization for russian language  
						
						
						
					 
					
						2015-09-14 18:36:58 +04:00