Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							9e0466d1e6
							
						
					 | 
					
						
						
							
							refactored omemo to take multiple recipients
						
						
						
						
						
					 | 
					
						2016-02-29 13:18:07 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							4ba41540fd
							
						
					 | 
					
						
						
							
							made hashtable in roster store jids instead of strings
						
						
						
						
						
					 | 
					
						2016-02-28 20:45:50 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							bbede8bbeb
							
						
					 | 
					
						
						
							
							optionally lock conference domains as well and hide known domains in ui
						
						
						
						
						
					 | 
					
						2016-02-24 16:53:19 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							d1a456f3e3
							
						
					 | 
					
						
						
							
							made hard coded choice for encryptions more flexible and disable parsing
						
						
						
						
						
					 | 
					
						2016-02-24 14:47:49 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							ddafa65849
							
						
					 | 
					
						
						
							
							Merge pull request #1715 from fiaxh/gpg_decryption_failed
						
						
						
						
						
						
						
						PGP Retry decryption from message menu 
						
					 | 
					
						2016-02-24 09:23:30 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							0298f0181e
							
						
					 | 
					
						
						
							
							reset pending subscription request when receiving roster update
						
						
						
						
						
					 | 
					
						2016-02-23 16:14:55 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								fiaxh
							
						 
					 | 
					
						
						
						
						
							
						
						
							894b5892a9
							
						
					 | 
					
						
						
							
							Retry decryption from message menu
						
						
						
						
						
					 | 
					
						2016-02-23 16:05:42 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							beb216c300
							
						
					 | 
					
						
						
							
							made presences object final in contact
						
						
						
						
						
					 | 
					
						2016-02-23 14:25:01 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							a0d0ed34ae
							
						
					 | 
					
						
						
							
							turned muc errors into enum. added error codes for service shutdown
						
						
						
						
						
					 | 
					
						2016-02-22 20:19:58 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							ed740b4868
							
						
					 | 
					
						
						
							
							some mucs may grant voice to visitors in unmoderated rooms
						
						
						
						
						
					 | 
					
						2016-02-21 11:42:41 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							49a3f6f281
							
						
					 | 
					
						
						
							
							never parse show in presences as offline
						
						
						
						
						
					 | 
					
						2016-02-19 11:09:28 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							59978e157c
							
						
					 | 
					
						
						
							
							only offer message correction for the very last message
						
						
						
						
						
					 | 
					
						2016-02-17 16:51:36 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							0ca4a33bfb
							
						
					 | 
					
						
						
							
							added some OTR logging
						
						
						
						
						
					 | 
					
						2016-02-16 09:15:41 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							c0b3a3ff0c
							
						
					 | 
					
						
						
							
							basic support for XEP-0308: Last Message Correction. fixes #864
						
						
						
						
						
					 | 
					
						2016-02-15 23:15:04 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							91ec4839ac
							
						
					 | 
					
						
						
							
							prepend instead off append mam messages to conversations when going in reverse
						
						
						
						
						
					 | 
					
						2016-02-04 16:40:18 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							4fdb0d92fe
							
						
					 | 
					
						
						
							
							prevent previoulsly cleared messages from reloading. fixes #1110
						
						
						
						
						
					 | 
					
						2016-02-04 14:39:16 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							f88b8c703e
							
						
					 | 
					
						
						
							
							add more fault tolerant checks for messages left on server
						
						
						
						
						
					 | 
					
						2016-02-04 11:55:42 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							1d572c61d0
							
						
					 | 
					
						
						
							
							cache server caps
						
						
						
						
						
					 | 
					
						2016-02-03 17:19:05 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							f0798216d5
							
						
					 | 
					
						
						
							
							refactored disco cache. avoid making duplicate call. check hash
						
						
						
						
						
					 | 
					
						2016-02-03 10:40:02 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							4a1a59f0c8
							
						
					 | 
					
						
						
							
							Merge branch 'disco-caps' of https://github.com/singpolyma/Conversations into singpolyma-disco-caps
						
						
						
						
						
					 | 
					
						2016-02-02 18:19:26 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							fab0a45955
							
						
					 | 
					
						
						
							
							re-read common name from certificates on startup
						
						
						
						
						
					 | 
					
						2016-02-02 13:43:20 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							a3e11415ec
							
						
					 | 
					
						
						
							
							refactored user handling in conferences. show try again button when conference has errors
						
						
						
						
						
					 | 
					
						2016-02-01 12:11:40 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							28ebf927fb
							
						
					 | 
					
						
						
							
							try to make in-valid-session detection work for pgp
						
						
						
						
						
					 | 
					
						2016-01-29 12:09:31 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stephen Paul Weber
							
						 
					 | 
					
						
						
						
						
							
						
						
							000f59d614
							
						
					 | 
					
						
						
							
							Fetch cached caps result on new presence
						
						
						
						
						
					 | 
					
						2016-01-24 17:46:08 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stephen Paul Weber
							
						 
					 | 
					
						
						
						
						
							
						
						
							bf5b2f73f5
							
						
					 | 
					
						
						
							
							Use a Presence class for presence information
						
						
						
						
						
						
						
						Only has status for now, but doing it so I can add disco to it 
						
					 | 
					
						2016-01-24 17:46:08 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stephen Paul Weber
							
						 
					 | 
					
						
						
						
						
							
						
						
							ad36a4ba89
							
						
					 | 
					
						
						
							
							Persisitence and loading for ServiceDiscoveryResult
						
						
						
						
						
					 | 
					
						2016-01-23 10:53:56 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stephen Paul Weber
							
						 
					 | 
					
						
						
						
						
							
						
						
							56f8fff935
							
						
					 | 
					
						
						
							
							Implement toJSON on ServiceDiscoveryResult
						
						
						
						
						
					 | 
					
						2016-01-23 10:52:45 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stephen Paul Weber
							
						 
					 | 
					
						
						
						
						
							
						
						
							1e335d527b
							
						
					 | 
					
						
						
							
							Generate capHash from any discovery result
						
						
						
						
						
					 | 
					
						2016-01-23 10:52:44 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Stephen Paul Weber
							
						 
					 | 
					
						
						
						
						
							
						
						
							fccce229c6
							
						
					 | 
					
						
						
							
							Factor out a representation of XEP-0030 results
						
						
						
						
						
						
						
						And the parser from Element to this representation. 
						
					 | 
					
						2016-01-23 10:52:40 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							40005cec1b
							
						
					 | 
					
						
						
							
							added config variable to allow non-tls connections
						
						
						
						
						
					 | 
					
						2016-01-22 11:20:31 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							41ae4af1b8
							
						
					 | 
					
						
						
							
							made constructor private in Account entity
						
						
						
						
						
					 | 
					
						2016-01-16 18:57:47 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							a3e136b550
							
						
					 | 
					
						
						
							
							show per conference notification settings in details activity
						
						
						
						
						
					 | 
					
						2016-01-08 21:30:46 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							fdb6b0e30d
							
						
					 | 
					
						
						
							
							only report error after third unsuccesful attempt to connect
						
						
						
						
						
					 | 
					
						2016-01-04 15:33:11 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							ade89beb96
							
						
					 | 
					
						
						
							
							use presence name not server name when verification is being used
						
						
						
						
						
					 | 
					
						2015-12-19 13:07:38 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							f6b22dad20
							
						
					 | 
					
						
						
							
							splite PARANOIA_MODE into three different options
						
						
						
						
						
					 | 
					
						2015-12-14 10:54:55 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							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
							
						 
					 | 
					
						
						
						
						
							
						
						
							cd9a29718b
							
						
					 | 
					
						
						
							
							properly clear muc user avatar caches
						
						
						
						
						
					 | 
					
						2015-12-04 21:36:48 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							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 | 
					
					
						
						
							
							
							
						
					 |