Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								1d572c61d0
								
							
						 | 
						
							
							
								
								cache server caps
							
							
							
							
							
						 | 
						
							2016-02-03 17:19:05 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								0911669b07
								
							
						 | 
						
							
							
								
								count all messages in a query
							
							
							
							
							
						 | 
						
							2016-02-03 16:04:21 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								1274b0ef39
								
							
						 | 
						
							
							
								
								Revert "get rid of broken totalMessageCount for mam queries"
							
							
							
							
							
							
							
							This reverts commit 58c6f9bfb2. 
							
						 | 
						
							2016-02-03 10:40:44 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								01bad12708
								
							
						 | 
						
							
							
								
								fixed 'unencrypted' not showing up for conferences when encryption is forced
							
							
							
							
							
						 | 
						
							2016-02-02 18:15:57 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								58c6f9bfb2
								
							
						 | 
						
							
							
								
								get rid of broken totalMessageCount for mam queries
							
							
							
							
							
						 | 
						
							2016-02-02 15:39:46 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								fab0a45955
								
							
						 | 
						
							
							
								
								re-read common name from certificates on startup
							
							
							
							
							
						 | 
						
							2016-02-02 13:43:20 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								ba9ba8ffe2
								
							
						 | 
						
							
							
								
								avoid npe when accessing the pgp connection service
							
							
							
							
							
						 | 
						
							2016-02-02 11:21:29 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								f30df7a535
								
							
						 | 
						
							
							
								
								catch a few NPE when parsing invalid pep nodes
							
							
							
							
							
						 | 
						
							2016-02-02 11:21:07 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								ae83efe4a6
								
							
						 | 
						
							
							
								
								version bump to 1.9.3
							
							
							
							
							
						 | 
						
							2016-02-01 14:25:59 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								3978c04782
								
							
						 | 
						
							
							
								
								respect autojoin setting on newly created bookmarks as well
							
							
							
							
							
						 | 
						
							2016-02-01 14:22:52 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								1e7647e385
								
							
						 | 
						
							
							
								
								opt out handling of the autojoin flag. fixes #1666
							
							
							
							
							
						 | 
						
							2016-02-01 13:54:08 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								d1fc90f981
								
							
						 | 
						
							
							
								
								Merge branch 'master' of github.com:siacs/Conversations
							
							
							
							
							
						 | 
						
							2016-02-01 12:33:03 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								336daea875
								
							
						 | 
						
							
							
								
								made create context menu call in StartConversationsActivity more failsafe
							
							
							
							
							
						 | 
						
							2016-02-01 12:31:46 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								2eef37174e
								
							
						 | 
						
							
							
								
								fixed false set of subject in conference with empty body tag
							
							
							
							
							
						 | 
						
							2016-01-31 14:42:35 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								19c2ca520c
								
							
						 | 
						
							
							
								
								Update README.md
							
							
							
							
							
						 | 
						
							2016-01-31 11:25:17 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								82870b27ed
								
							
						 | 
						
							
							
								
								prefer dns servers from networsk with the default route
							
							
							
							
							
						 | 
						
							2016-01-29 12:12:23 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								c416948f8b
								
							
						 | 
						
							
							
								
								be more careful with resetting the stream id
							
							
							
							
							
						 | 
						
							2016-01-29 12:09:55 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								28ebf927fb
								
							
						 | 
						
							
							
								
								try to make in-valid-session detection work for pgp
							
							
							
							
							
						 | 
						
							2016-01-29 12:09:31 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								d2c5a939ed
								
							
						 | 
						
							
							
								
								show values in formfieldwrappers and allow form to be set to read only
							
							
							
							
							
						 | 
						
							2016-01-26 17:23:24 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								edc6ce4ff2
								
							
						 | 
						
							
							
								
								hide jid row in list item list when jid is  null
							
							
							
							
							
						 | 
						
							2016-01-26 14:47:34 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								7c0eae8059
								
							
						 | 
						
							
							
								
								expert setting to trigger extended connection options
							
							
							
							
							
						 | 
						
							2016-01-25 21:17:53 +01:00 | 
						
					
				
					
						
							
							
								 
								Stephen Paul Weber
							
						 | 
						
							
							
							
							
							
								
							
							
								ae84ff2f0c
								
							
						 | 
						
							
							
								
								Do disco for caps hashes we have never seen
							
							
							
							
							
							
							
							Then cache it 
							
						 | 
						
							2016-01-24 17:46:08 -05: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 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								31fd425c9a
								
							
						 | 
						
							
							
								
								changed FileBackend API to allow files instead of messages to be copied and resized
							
							
							
							
							
						 | 
						
							2016-01-24 12:17:00 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								8850a1fbe3
								
							
						 | 
						
							
							
								
								added FormWrapper and form field validation
							
							
							
							
							
						 | 
						
							2016-01-23 20:32:00 +01: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
							
						 | 
						
							
							
							
							
							
								
							
							
								0569a1e769
								
							
						 | 
						
							
							
								
								introduced boolean form field wrapper
							
							
							
							
							
						 | 
						
							2016-01-23 16:23:23 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								39fdf4a333
								
							
						 | 
						
							
							
								
								added support for field types jid-single and text-private
							
							
							
							
							
						 | 
						
							2016-01-23 12:44:08 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								6140861143
								
							
						 | 
						
							
							
								
								reset stanza queue when resetting xmppconnection
							
							
							
							
							
						 | 
						
							2016-01-23 11:40:32 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								43521891f0
								
							
						 | 
						
							
							
								
								show fetch errors in trust keys activity
							
							
							
							
							
						 | 
						
							2016-01-23 11:39:02 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								ba98fe4f86
								
							
						 | 
						
							
							
								
								use extract account from intent method and final EXTRA_ACCOUNT variable
							
							
							
							
							
						 | 
						
							2016-01-22 20:46:24 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								a6c5430cdd
								
							
						 | 
						
							
							
								
								added UI wrapper for (some) form fields
							
							
							
							
							
						 | 
						
							2016-01-22 20:22:47 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								a47430c2f7
								
							
						 | 
						
							
							
								
								added convenience method to extract account from intent
							
							
							
							
							
						 | 
						
							2016-01-22 20:21:45 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								40005cec1b
								
							
						 | 
						
							
							
								
								added config variable to allow non-tls connections
							
							
							
							
							
						 | 
						
							2016-01-22 11:20:31 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								77c0fb0b2a
								
							
						 | 
						
							
							
								
								changed spacing in create dialogs and notify user when no accounts are activated
							
							
							
							
							
						 | 
						
							2016-01-22 11:14:56 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								3ff40a9733
								
							
						 | 
						
							
							
								
								increased padding in create contact/conference dialog
							
							
							
							
							
						 | 
						
							2016-01-21 18:10:19 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								eacc7ed1e6
								
							
						 | 
						
							
							
								
								add convenience to get an account object from a spinner
							
							
							
							
							
						 | 
						
							2016-01-21 17:57:24 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								62a88a4db8
								
							
						 | 
						
							
							
								
								version bump to 1.9.2 + changelog
							
							
							
							
							
						 | 
						
							2016-01-20 17:30:33 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								20f6a4704c
								
							
						 | 
						
							
							
								
								pulled translations from transifex
							
							
							
							
							
						 | 
						
							2016-01-20 17:18:53 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								e71acdef29
								
							
						 | 
						
							
							
								
								catch security exception when user prevents access to address book
							
							
							
							
							
						 | 
						
							2016-01-20 16:18:15 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								0619685e55
								
							
						 | 
						
							
							
								
								add intent!=null check in onActivityResultin PublishProfilePicture
							
							
							
							
							
						 | 
						
							2016-01-20 16:11:17 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								ba143a2730
								
							
						 | 
						
							
							
								
								Merge branch 'master' of github.com:siacs/Conversations
							
							
							
							
							
						 | 
						
							2016-01-16 22:48:27 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								0b239243d9
								
							
						 | 
						
							
							
								
								Merge pull request #1655 from adithyaphilip/pgp-fix
							
							
							
							
							
							
							
							Fixes having to choose PGP twice, upgrades openpgp-api to 10 
							
						 | 
						
							2016-01-16 21:35:38 +01:00 |