Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							635210d278 
							
						 
					 
					
						
						
							
							pulled translations for 1.9.0 release from transifex  
						
						
						
					 
					
						2016-01-14 21:52:17 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							aa6955a0d6 
							
						 
					 
					
						
						
							
							fixed typo when reading battery_op setting  
						
						
						
					 
					
						2016-01-14 20:38:16 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							12fd5c46ef 
							
						 
					 
					
						
						
							
							show /me messages in conference notifications without the name of the sender  
						
						
						
					 
					
						2016-01-13 17:36:04 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							14428da108 
							
						 
					 
					
						
						
							
							show key fetch error in activity when there are no keys to be used  
						
						
						
					 
					
						2016-01-13 12:19:56 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							571eb2f7f9 
							
						 
					 
					
						
						
							
							check for file storage permission before selecting avatar  
						
						
						
					 
					
						2016-01-13 12:05:59 +01:00 
						 
				 
			
				
					
						
							
							
								Dheeraj CVR 
							
						 
					 
					
						
						
						
						
							
						
						
							ffb49c7217 
							
						 
					 
					
						
						
							
							use batch transactions when writing roster  
						
						... 
						
						
						
						Fixes https://github.com/siacs/Conversations/issues/1648  
						
					 
					
						2016-01-13 11:56:35 +04:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3e9fd0185a 
							
						 
					 
					
						
						
							
							throw security exception instead of going to next srv entry  
						
						
						
					 
					
						2016-01-12 23:42:47 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							da298cfe59 
							
						 
					 
					
						
						
							
							Merge branch 'master' of github.com:siacs/Conversations  
						
						
						
					 
					
						2016-01-12 23:41:35 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							a6b729df43 
							
						 
					 
					
						
						
							
							s/TOR/Tor/g  
						
						
						
					 
					
						2016-01-12 15:41:39 -06:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d122d224bb 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2016-01-12 16:43:38 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							893751a1d2 
							
						 
					 
					
						
						
							
							move some ssl socket modifiers into a seperate helper class  
						
						
						
					 
					
						2016-01-12 16:33:15 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5f1e30288a 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/moparisthebest/Conversations  into moparisthebest-master  
						
						
						
					 
					
						2016-01-12 15:35:50 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							921d567dcb 
							
						 
					 
					
						
						
							
							use match_parent as height in conversations overview  
						
						
						
					 
					
						2016-01-12 15:35:23 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							da6076028f 
							
						 
					 
					
						
						
							
							Revert "Add additional warnings to OMEMO purge key function"  
						
						... 
						
						
						
						This reverts commit 3bea5b25cd 
						
					 
					
						2016-01-12 09:48:49 +01:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							3bea5b25cd 
							
						 
					 
					
						
						
							
							Add additional warnings to OMEMO purge key function  
						
						... 
						
						
						
						People continue to press the "don't press this" button. Maybe adding
some warnings indicating that this button will not fix their problems
will help... 
						
					 
					
						2016-01-12 09:33:54 +01:00 
						 
				 
			
				
					
						
							
							
								moparisthebest 
							
						 
					 
					
						
						
						
						
							
						
						
							217f6603c0 
							
						 
					 
					
						
						
							
							Implement XEP-0368: SRV records for XMPP over TLS  
						
						
						
					 
					
						2016-01-11 17:25:16 -05:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							20ec9ff2c6 
							
						 
					 
					
						
						
							
							reworked that loop that iterates over various servers  
						
						
						
					 
					
						2016-01-11 19:05:25 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a85bba0010 
							
						 
					 
					
						
						
							
							new art renders  
						
						
						
					 
					
						2016-01-11 18:29:02 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7f1de73784 
							
						 
					 
					
						
						
							
							don't use the word phone in strings  
						
						
						
					 
					
						2016-01-11 15:34:26 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4d38ba906f 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2016-01-11 11:19:41 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c296d6f446 
							
						 
					 
					
						
						
							
							ask to be excluded from battery optimization  
						
						
						
					 
					
						2016-01-11 11:17:45 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4ab8fe13de 
							
						 
					 
					
						
						
							
							let the user decide on whether or not to compress pictures  
						
						
						
					 
					
						2016-01-09 16:17:39 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							708d7c5b98 
							
						 
					 
					
						
						
							
							automatically adjust image compression to keep files under 512MiB  
						
						
						
					 
					
						2016-01-09 16:16:18 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6acb80a83a 
							
						 
					 
					
						
						
							
							added Config.java variable to change the default notification behaviour to always  
						
						
						
					 
					
						2016-01-08 22:07:23 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9dce42ac7f 
							
						 
					 
					
						
						
							
							don't show snackbar when notifications are disabled or paused  
						
						
						
					 
					
						2016-01-08 21:35:20 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a3e136b550 
							
						 
					 
					
						
						
							
							show per conference notification settings in details activity  
						
						
						
					 
					
						2016-01-08 21:30:46 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0bb3ae37f0 
							
						 
					 
					
						
						
							
							show icon in conversations overview when notifications are disabled  
						
						
						
					 
					
						2016-01-08 14:41:55 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5dd5685885 
							
						 
					 
					
						
						
							
							Merge pull request  #1641  from fiaxh/uuid-fix  
						
						... 
						
						
						
						Correct uuid check according to RFC 4122 
						
					 
					
						2016-01-08 00:17:21 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c59eb75a59 
							
						 
					 
					
						
						
							
							avoid duplicate messages when sending files to mucs.  fixes   #1635  
						
						
						
					 
					
						2016-01-06 12:59:13 +01:00 
						 
				 
			
				
					
						
							
							
								fiaxh 
							
						 
					 
					
						
						
						
						
							
						
						
							62d0eebe5c 
							
						 
					 
					
						
						
							
							Correct uuid check according to RFC 4122  
						
						
						
					 
					
						2016-01-05 20:07:29 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c3e2d2cfba 
							
						 
					 
					
						
						
							
							added missing synchronize when pushing messages from mam backlog  
						
						
						
					 
					
						2016-01-04 20:14:29 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fb97f9d18f 
							
						 
					 
					
						
						
							
							null check in getOriginalPath  
						
						
						
					 
					
						2016-01-04 20:14:08 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							501034fe0e 
							
						 
					 
					
						
						
							
							Allow entering a JID from 'choose contact'. thanks @singpolyma  
						
						... 
						
						
						
						fixes  #1611 
fixes  #1602  
					
						2016-01-04 17:27:54 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fdb6b0e30d 
							
						 
					 
					
						
						
							
							only report error after third unsuccesful attempt to connect  
						
						
						
					 
					
						2016-01-04 15:33:11 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f815a7cd26 
							
						 
					 
					
						
						
							
							properly rotate avatars  
						
						
						
					 
					
						2016-01-04 15:17:02 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							95bf0630f0 
							
						 
					 
					
						
						
							
							show trust keys activties if own keys are undecided  
						
						
						
					 
					
						2016-01-04 12:11:58 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c116f735dc 
							
						 
					 
					
						
						
							
							add obb url to unencrypted messages  
						
						
						
					 
					
						2016-01-03 19:39:06 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a319446d41 
							
						 
					 
					
						
						
							
							edit account activity was still showing the omemo key with leading 0x05.  fixes   #1631  
						
						
						
					 
					
						2016-01-03 19:38:48 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d875061407 
							
						 
					 
					
						
						
							
							removed xhtml body.  fixes   #1594  
						
						
						
					 
					
						2016-01-01 16:52:32 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							73e2389eee 
							
						 
					 
					
						
						
							
							use actual message timestamp instead of delay when updating last seen.  fixes   #1618  
						
						
						
					 
					
						2015-12-31 18:06:11 +01:00 
						 
				 
			
				
					
						
							
							
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							58d213f291 
							
						 
					 
					
						
						
							
							Fix OMEMO session creating loggin  
						
						... 
						
						
						
						Now prints the correct JID to the log when finding devices without
sessions. 
						
					 
					
						2015-12-31 15:48:43 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cfccf5e90d 
							
						 
					 
					
						
						
							
							handle null names in getColorForName  
						
						
						
					 
					
						2015-12-29 10:32:54 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7bb67ee660 
							
						 
					 
					
						
						
							
							strip leading 0x05 off omemo fingerprints  
						
						
						
					 
					
						2015-12-27 18:37:31 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							703d95fcf8 
							
						 
					 
					
						
						
							
							lower case all fingerprints.  fixes   #1521  
						
						
						
					 
					
						2015-12-27 18:37:12 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c3bdec1ce9 
							
						 
					 
					
						
						
							
							dedublicate bookmarks  
						
						
						
					 
					
						2015-12-27 17:29:32 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bcf99db3df 
							
						 
					 
					
						
						
							
							fixed stuck at omemo encryption when x509 verification is being used  
						
						
						
					 
					
						2015-12-27 17:29:19 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f49158a44b 
							
						 
					 
					
						
						
							
							register context menu long click listener on message text.  fixes   #1614  
						
						
						
					 
					
						2015-12-27 17:28:42 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							be91c0741f 
							
						 
					 
					
						
						
							
							made text selectable again unless text contains more than 1 link  
						
						... 
						
						
						
						fixes  #1615  
					
						2015-12-26 19:18:37 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c40372fc0d 
							
						 
					 
					
						
						
							
							code cleanup  
						
						
						
					 
					
						2015-12-23 22:30:14 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f46cbb38a9 
							
						 
					 
					
						
						
							
							show certificate information  
						
						
						
					 
					
						2015-12-23 19:18:53 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d0bad09f13 
							
						 
					 
					
						
						
							
							save certificate when verifying with x509  
						
						
						
					 
					
						2015-12-23 17:41:26 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ae491764f2 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2015-12-20 19:37:27 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							534013fd0c 
							
						 
					 
					
						
						
							
							store identity key in XmppAxolotlSession instead of the fingerprint  
						
						
						
					 
					
						2015-12-19 15:44:11 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ade89beb96 
							
						 
					 
					
						
						
							
							use presence name not server name when verification is being used  
						
						
						
					 
					
						2015-12-19 13:07:38 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							15c8cb8ac6 
							
						 
					 
					
						
						
							
							add more debugging to certificate checks after new omemo session was established  
						
						
						
					 
					
						2015-12-19 12:44:55 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e8bf5cada4 
							
						 
					 
					
						
						
							
							only offer plain and omemo encryption when x509 verification is enabled  
						
						
						
					 
					
						2015-12-19 12:44:12 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f05f97251c 
							
						 
					 
					
						
						
							
							prefer server name over address book name when x509 verification is being used  
						
						
						
					 
					
						2015-12-19 12:43:09 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							20b4e756fe 
							
						 
					 
					
						
						
							
							add 'store' message hint to displayed chat markers  
						
						
						
					 
					
						2015-12-17 15:32:03 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f510b2ba2d 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2015-12-17 15:20:28 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0f9058ffef 
							
						 
					 
					
						
						
							
							throw exception at the end of the stream  
						
						
						
					 
					
						2015-12-17 15:20:06 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e10a0b0c4c 
							
						 
					 
					
						
						
							
							let message parser not artifically fail on messages with no to attribute  
						
						
						
					 
					
						2015-12-17 14:30:00 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							43dd681239 
							
						 
					 
					
						
						
							
							timeout service discovery after 20s  
						
						
						
					 
					
						2015-12-15 19:24:05 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							85f36e9dbc 
							
						 
					 
					
						
						
							
							default force encryption to false  
						
						
						
					 
					
						2015-12-14 10:58:55 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f6b22dad20 
							
						 
					 
					
						
						
							
							splite PARANOIA_MODE into three different options  
						
						
						
					 
					
						2015-12-14 10:54:55 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							042939e44d 
							
						 
					 
					
						
						
							
							make message text non-selectable.  fixes   #1606  
						
						
						
					 
					
						2015-12-14 10:44:43 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							aa472a0098 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2015-12-13 11:09:42 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							50817956c2 
							
						 
					 
					
						
						
							
							changed order of send presence and execute mam queries  
						
						
						
					 
					
						2015-12-12 16:01:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							88523bbb50 
							
						 
					 
					
						
						
							
							more detailed logging  
						
						
						
					 
					
						2015-12-12 15:58:22 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5e4b55a0ff 
							
						 
					 
					
						
						
							
							notfiy after mam catchup only if message count > 0  
						
						
						
					 
					
						2015-12-11 20:43:50 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a1ac4fd665 
							
						 
					 
					
						
						
							
							fix cancelation of http downloads and enable resume  
						
						
						
					 
					
						2015-12-11 20:33:41 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b2c278c91b 
							
						 
					 
					
						
						
							
							set bookmark name to room subject if no subject has been set before  
						
						
						
					 
					
						2015-12-11 19:28:44 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							293e820a58 
							
						 
					 
					
						
						
							
							get rid of lastMessageTransmitted in favor of db query  
						
						
						
					 
					
						2015-12-11 13:52:04 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							61b0681109 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2015-12-11 13:27:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5ffb87059c 
							
						 
					 
					
						
						
							
							renamed pretty-please-store message hint to store  
						
						
						
					 
					
						2015-12-10 23:37:38 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							15f220747f 
							
						 
					 
					
						
						
							
							some more NPE checks  
						
						
						
					 
					
						2015-12-10 23:16:39 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							55c1129a65 
							
						 
					 
					
						
						
							
							notify on mam catchup messages  
						
						
						
					 
					
						2015-12-10 23:05:11 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2262921ff4 
							
						 
					 
					
						
						
							
							properly clean up timed out mam queries  
						
						
						
					 
					
						2015-12-10 18:28:47 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ede92235d7 
							
						 
					 
					
						
						
							
							disable sm logging  
						
						
						
					 
					
						2015-12-10 18:26:31 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5bd70cfee8 
							
						 
					 
					
						
						
							
							always show conversations with pending subscription requests  
						
						
						
					 
					
						2015-12-09 12:18:06 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5e151c7311 
							
						 
					 
					
						
						
							
							wait with status change to online after all disco queries have been made  
						
						
						
					 
					
						2015-12-09 11:16:03 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							11e58607c9 
							
						 
					 
					
						
						
							
							when no avatar found show avatar of contact and not the muc user in conferences  
						
						
						
					 
					
						2015-12-09 10:30:26 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							aea664a0ec 
							
						 
					 
					
						
						
							
							show sender name for notications in conferences.  fixes   #1581  
						
						
						
					 
					
						2015-12-09 10:26:30 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1de74c2337 
							
						 
					 
					
						
						
							
							also verify sessions in CBE mode that got created by key transport messages  
						
						
						
					 
					
						2015-12-08 17:15:08 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b9fc7ebe24 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2015-12-07 13:54:59 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ac06cb2e4f 
							
						 
					 
					
						
						
							
							modified contact permission dialog  
						
						
						
					 
					
						2015-12-07 13:24:41 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							739648e909 
							
						 
					 
					
						
						
							
							ask for contact permissions when first opening StartConversationActivity  
						
						
						
					 
					
						2015-12-07 13:24:41 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c3e8fb3446 
							
						 
					 
					
						
						
							
							request storage permission when needed on Android 6.0  
						
						
						
					 
					
						2015-12-07 13:24:41 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							739a2d609d 
							
						 
					 
					
						
						
							
							implement direct sharing in android 6.0.  fixes   #1321  
						
						
						
					 
					
						2015-12-07 13:24:41 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							904edf5d59 
							
						 
					 
					
						
						
							
							hide prepare file toast after preparing the file  
						
						
						
					 
					
						2015-12-06 11:57:11 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bd765c59ce 
							
						 
					 
					
						
						
							
							check availabiltiy of pgp before sharing files  
						
						
						
					 
					
						2015-12-05 19:03:17 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b7f326372d 
							
						 
					 
					
						
						
							
							be more carefull with pending uris  
						
						
						
					 
					
						2015-12-05 19:02:57 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6358f641e7 
							
						 
					 
					
						
						
							
							check for query object as condition to trigger deduplication instead of serverId  
						
						
						
					 
					
						2015-12-05 18:41:38 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							41dcd8005b 
							
						 
					 
					
						
						
							
							parse stanza-id from messages  
						
						
						
					 
					
						2015-12-04 22:03:46 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cd9a29718b 
							
						 
					 
					
						
						
							
							properly clear muc user avatar caches  
						
						
						
					 
					
						2015-12-04 21:36:48 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9d1e8a34b2 
							
						 
					 
					
						
						
							
							fixed showing avatars for contacts in muc  
						
						
						
					 
					
						2015-12-04 18:39:09 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							196c8e593f 
							
						 
					 
					
						
						
							
							Merge pull request  #1595  from fiaxh/pgp_database_signature  
						
						... 
						
						
						
						Regenerate PGP signatures once 
						
					 
					
						2015-12-04 15:35:51 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0664d6ac7b 
							
						 
					 
					
						
						
							
							avoid some NPEs  
						
						
						
					 
					
						2015-12-04 15:35:22 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3e3cb047be 
							
						 
					 
					
						
						
							
							rely on message id if message id is uuid and pgp encryption was used to deduplicate messages.  fixes   #1357  
						
						
						
					 
					
						2015-12-04 15:34:45 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							242887447c 
							
						 
					 
					
						
						
							
							use proposed nick as default nick in mucoptions  
						
						
						
					 
					
						2015-12-04 14:07:16 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6b592435cd 
							
						 
					 
					
						
						
							
							parse vcard avatars from muc presences  
						
						
						
					 
					
						2015-12-03 18:18:34 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f1c0b7372f 
							
						 
					 
					
						
						
							
							enabled previously disabled http upload  
						
						
						
					 
					
						2015-12-03 12:45:12 +01:00 
						 
				 
			
				
					
						
							
							
								fiaxh 
							
						 
					 
					
						
						
						
						
							
						
						
							e5f154316c 
							
						 
					 
					
						
						
							
							Unset all PGP signatures once  
						
						... 
						
						
						
						... so they will be redone to match the changed status. 
						
					 
					
						2015-12-02 18:06:48 +00:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							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