Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							10398cab51
							
						
					 | 
					
						
						
							
							don't leave low timeout mode prematurely
						
						
						
						
						
					 | 
					
						2016-10-20 20:04:16 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							f2696b66ba
							
						
					 | 
					
						
						
							
							Merge branch 'feature-remove-merge-separator' of https://github.com/Mishiranu/Conversations into Mishiranu-feature-remove-merge-separator
						
						
						
						
						
					 | 
					
						2016-10-20 18:18:25 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							52d4be4249
							
						
					 | 
					
						
						
							
							Merge branch 'feature-remove-spans' of https://github.com/Mishiranu/Conversations into Mishiranu-feature-remove-spans
						
						
						
						
						
					 | 
					
						2016-10-20 18:10:52 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							0f62ff6736
							
						
					 | 
					
						
						
							
							introduced low ping timeout mode after gcm push
						
						
						
						
						
					 | 
					
						2016-10-20 18:02:11 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							44ce5df359
							
						
					 | 
					
						
						
							
							write prepped string to db. use display version everywhere else
						
						
						
						
						
					 | 
					
						2016-10-20 17:31:46 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mishiranu
							
						 
					 | 
					
						
						
						
						
							
						
						
							fd4e15ba97
							
						
					 | 
					
						
						
							
							Remove MERGE_SEPARATOR
						
						
						
						
						
					 | 
					
						2016-10-20 01:03:51 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mishiranu
							
						 
					 | 
					
						
						
						
						
							
						
						
							8835f08cf7
							
						
					 | 
					
						
						
							
							Remove spans on copying or pasting a text
						
						
						
						
						
					 | 
					
						2016-10-19 20:47:41 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							c3423d6ffe
							
						
					 | 
					
						
						
							
							include pgp signature only in non anonymous mucs
						
						
						
						
						
					 | 
					
						2016-10-19 12:31:11 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							dce8149aae
							
						
					 | 
					
						
						
							
							retrigger key selection if openpgp key was deleted
						
						
						
						
						
					 | 
					
						2016-10-19 11:53:55 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							7226fc0010
							
						
					 | 
					
						
						
							
							update conversation in database background thread
						
						
						
						
						
					 | 
					
						2016-10-18 13:06:24 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							50780debf7
							
						
					 | 
					
						
						
							
							don't trigger context menu in message adapter manually. fixes #2077
						
						
						
						
						
					 | 
					
						2016-10-18 11:16:43 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							f8c21caec9
							
						
					 | 
					
						
						
							
							Merge branch 'feature-selection' of https://github.com/Mishiranu/Conversations into Mishiranu-feature-selection
						
						
						
						
						
					 | 
					
						2016-10-17 09:53:32 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							22d13a3dcd
							
						
					 | 
					
						
						
							
							add exception handling when loading default resource
						
						
						
						
						
					 | 
					
						2016-10-17 09:53:08 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							dc02e2b498
							
						
					 | 
					
						
						
							
							small code reformation in pgp decryption service
						
						
						
						
						
					 | 
					
						2016-10-17 09:52:43 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							f6cfa27741
							
						
					 | 
					
						
						
							
							synchronize access to json key storage in account model
						
						
						
						
						
					 | 
					
						2016-10-13 11:27:26 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							9e54fd5c92
							
						
					 | 
					
						
						
							
							don't use sending state on muc pms without smacks
						
						
						
						
						
					 | 
					
						2016-10-09 19:40:30 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							cd1c05a7c3
							
						
					 | 
					
						
						
							
							add password to direct muc invite
						
						
						
						
						
					 | 
					
						2016-10-09 19:40:03 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							74087b873f
							
						
					 | 
					
						
						
							
							added disclaimer that conversations.im account is 8 euro / year
						
						
						
						
						
					 | 
					
						2016-10-08 18:24:20 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							f3ef8d4978
							
						
					 | 
					
						
						
							
							fetch new conference configuration on every conf update
						
						
						
						
						
					 | 
					
						2016-10-08 12:10:53 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							9efef24a04
							
						
					 | 
					
						
						
							
							reset sending to waiting on every error
						
						
						
						
						
					 | 
					
						2016-10-07 14:54:35 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							5a73a6b139
							
						
					 | 
					
						
						
							
							fixed account hash calculation
						
						
						
						
						
					 | 
					
						2016-10-07 14:54:06 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							1f7f82da7b
							
						
					 | 
					
						
						
							
							respond to chat marker request only when mutual presence subscription exists
						
						
						
						
						
					 | 
					
						2016-10-07 10:05:08 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							26e33de79a
							
						
					 | 
					
						
						
							
							create new instances of key manager every time it's used
						
						
						
						
						
					 | 
					
						2016-10-07 10:04:36 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							187825d6c6
							
						
					 | 
					
						
						
							
							warn user if account is offline during avatar publication
						
						
						
						
						
					 | 
					
						2016-10-06 22:06:09 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							6d5f23213b
							
						
					 | 
					
						
						
							
							refresh error notification after 'try again'
						
						
						
						
						
					 | 
					
						2016-10-06 22:05:40 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							0af13fc746
							
						
					 | 
					
						
						
							
							be more careful parsing integers in omemo
						
						
						
						
						
					 | 
					
						2016-10-06 22:05:18 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							40e5090bdd
							
						
					 | 
					
						
						
							
							issue ping after push was received
						
						
						
						
						
					 | 
					
						2016-10-06 18:09:55 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							9f060f477f
							
						
					 | 
					
						
						
							
							parse smacks delay from messages
						
						
						
						
						
					 | 
					
						2016-10-06 18:09:44 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							8d8cb92e43
							
						
					 | 
					
						
						
							
							try to fix messages stuck at sending
						
						
						
						
						
					 | 
					
						2016-10-06 17:23:35 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							082c06a486
							
						
					 | 
					
						
						
							
							make error notification dismissable. fixes #1815
						
						
						
						
						
					 | 
					
						2016-10-04 11:16:59 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							5ac0e9267d
							
						
					 | 
					
						
						
							
							fixed omemo shown as unavailable in 1:1 chats
						
						
						
						
						
					 | 
					
						2016-10-03 21:04:10 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							cea52b0722
							
						
					 | 
					
						
						
							
							resolve take photo uri for internal use
						
						
						
						
						
					 | 
					
						2016-10-03 18:26:11 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							f4a883848c
							
						
					 | 
					
						
						
							
							properly index take photo uris from file provider
						
						
						
						
						
					 | 
					
						2016-10-03 11:25:15 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							b6e7def9db
							
						
					 | 
					
						
						
							
							add more logging to attaching file process
						
						
						
						
						
					 | 
					
						2016-10-03 11:13:04 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							7c6d1d19d5
							
						
					 | 
					
						
						
							
							when activating omemo in conference always check preferences
						
						
						
						
						
					 | 
					
						2016-10-03 10:42:43 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							dcd6ef8f84
							
						
					 | 
					
						
						
							
							explicit logging when copying files to storage
						
						
						
						
						
					 | 
					
						2016-10-03 10:13:45 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							e275fd8143
							
						
					 | 
					
						
						
							
							Merge pull request #2027 from danielegobbetti/wear-reply-dismiss-notification
						
						
						
						
						
						
						
						Dismiss the notification when replying from a wear notification [needs review!] 
						
					 | 
					
						2016-09-28 12:39:00 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							43f5dfe174
							
						
					 | 
					
						
						
							
							simplified code that invokes the export logs service
						
						
						
						
						
					 | 
					
						2016-09-28 12:35:52 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							f0dbcce58f
							
						
					 | 
					
						
						
							
							expert 'setting' to remove omemo identity. fixes #2038
						
						
						
						
						
					 | 
					
						2016-09-28 12:24:50 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniele Gobbetti
							
						 
					 | 
					
						
						
						
						
							
						
						
							41db773b08
							
						
					 | 
					
						
						
							
							Allow to dismiss the notification from a wear reply.
						
						
						
						
						
						
						
						- use different IDs in the same method for the PendingIntent
- fix reply for GPG encrypted replies (untested) 
						
					 | 
					
						2016-09-27 17:39:23 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							bb48f67a30
							
						
					 | 
					
						
						
							
							always use ipv4 localhost for Orbot connections
						
						
						
						
						
					 | 
					
						2016-09-27 11:44:50 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							1339b9c464
							
						
					 | 
					
						
						
							
							don't reset encryption choice to auto on archiving
						
						
						
						
						
					 | 
					
						2016-09-24 21:29:00 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							343d895a26
							
						
					 | 
					
						
						
							
							don't react to null and empty voice replies
						
						
						
						
						
					 | 
					
						2016-09-21 19:04:16 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							13ed27f91e
							
						
					 | 
					
						
						
							
							don't use file provider for photo uris on android < N. fixes #2030
						
						
						
						
						
					 | 
					
						2016-09-21 18:20:53 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							401759cdc7
							
						
					 | 
					
						
						
							
							don't wait for disco when not having stream managment
						
						
						
						
						
					 | 
					
						2016-09-21 12:55:40 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							61f58b3dbd
							
						
					 | 
					
						
						
							
							add timeouts to HTTPUrlConnections and allow cancelation of all sending files
						
						
						
						
						
					 | 
					
						2016-09-20 20:02:25 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							de7c0c5121
							
						
					 | 
					
						
						
							
							Merge pull request #2028 from Mishiranu/feature-more-tables
						
						
						
						
						
						
						
						Fix "Server info" table layout 
						
					 | 
					
						2016-09-20 16:43:51 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mishiranu
							
						 
					 | 
					
						
						
						
						
							
						
						
							18ab826413
							
						
					 | 
					
						
						
							
							Fix "More table" layout
						
						
						
						
						
						
						
						Retain "More table" visibility on screen orientation change 
						
					 | 
					
						2016-09-20 16:10:25 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							5790d4c4ab
							
						
					 | 
					
						
						
							
							fixed styling in blocking dialog
						
						
						
						
						
					 | 
					
						2016-09-20 14:21:41 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							7eac903277
							
						
					 | 
					
						
						
							
							add support for XEP-0377: Spam Reporting
						
						
						
						
						
					 | 
					
						2016-09-18 23:21:05 +02:00 | 
					
					
						
						
							
							
							
						
					 |