Johannes Morgenroth 
							
						 
					 
					
						
						
						
						
							
						
						
							403eff3d19 
							
						 
					 
					
						
						
							
							Add Android Auto support to notifications  
						
						 
						
						... 
						
						
						
						This patch adds required additions in order to show notifications
in Android Auto. Messages are read aloud and voice reply is
offered. The functionaliy has been tested with the Android Auto
standalone app as well as with the DHU simulator as describes
here:
https://developer.android.com/training/auto/testing/index.html  
						
					 
					
						2017-04-14 13:32:01 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bf07196707 
							
						 
					 
					
						
						
							
							don't count >number% as quote  
						
						 
						
						
						
					 
					
						2017-04-13 17:29:11 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0904ba42f8 
							
						 
					 
					
						
						
							
							use async message loading only when called from UI  
						
						 
						
						
						
					 
					
						2017-04-13 00:12:23 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0229a1605e 
							
						 
					 
					
						
						
							
							properly unregister bookmark from conversations when deleting bookmark  
						
						 
						
						
						
					 
					
						2017-04-12 23:41:59 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8742194f4b 
							
						 
					 
					
						
						
							
							fixed message merge logic. merge only messages with lower status  
						
						 
						
						
						
					 
					
						2017-04-12 22:24:29 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4fd11a4c2b 
							
						 
					 
					
						
						
							
							show first instead of last message in notification preview  
						
						 
						
						
						
					 
					
						2017-04-12 20:54:32 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4bbf2dab99 
							
						 
					 
					
						
						
							
							include RSM max in mam query in case server doesn't specify own max  
						
						 
						
						
						
					 
					
						2017-04-12 20:53:19 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								cijo-saju 
							
						 
					 
					
						
						
						
						
							
						
						
							3467a67e75 
							
						 
					 
					
						
						
							
							Removed unused imports from entire project.  
						
						 
						
						
						
					 
					
						2017-04-12 20:24:36 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								cijo-saju 
							
						 
					 
					
						
						
						
						
							
						
						
							5a27da848b 
							
						 
					 
					
						
						
							
							Clean up  
						
						 
						
						
						
					 
					
						2017-04-08 11:04:20 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								cijo-saju 
							
						 
					 
					
						
						
						
						
							
						
						
							41112d29bd 
							
						 
					 
					
						
						
							
							Removed unnecessary string builder  
						
						 
						
						
						
					 
					
						2017-04-08 10:12:40 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								cijo-saju 
							
						 
					 
					
						
						
						
						
							
						
						
							ed8336ee54 
							
						 
					 
					
						
						
							
							Made variable local  
						
						 
						
						
						
					 
					
						2017-04-08 10:08:28 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								cijo-saju 
							
						 
					 
					
						
						
						
						
							
						
						
							11e26e71f6 
							
						 
					 
					
						
						
							
							Code clean up  
						
						 
						
						
						
					 
					
						2017-04-08 10:05:13 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e98f7e57b0 
							
						 
					 
					
						
						
							
							be more careful with corner cases when mentioning multiple people  
						
						 
						
						
						
					 
					
						2017-04-07 19:47:33 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cc1aa9e431 
							
						 
					 
					
						
						
							
							exclude >= from being recognized as quote  
						
						 
						
						
						
					 
					
						2017-04-07 14:30:30 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							56f202d4b8 
							
						 
					 
					
						
						
							
							do not linkify urls starting with a dot  
						
						 
						
						
						
					 
					
						2017-04-07 14:29:55 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d91c314ac2 
							
						 
					 
					
						
						
							
							use comma seperation for multiple mentions  
						
						 
						
						
						
					 
					
						2017-04-06 18:06:07 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							649d1243d5 
							
						 
					 
					
						
						
							
							avoid crash on urls with missing protocols  
						
						 
						
						
						
					 
					
						2017-04-06 11:59:15 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							99565a6876 
							
						 
					 
					
						
						
							
							treat URL as file if URL is in oob or contains key  
						
						 
						
						
						
					 
					
						2017-04-05 22:35:42 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							26badb7f4c 
							
						 
					 
					
						
						
							
							send urls pointing to pgp encrypted files directly in body+oob  
						
						 
						
						
						
					 
					
						2017-04-05 21:01:29 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							401329caaa 
							
						 
					 
					
						
						
							
							use aesgcm:// uri scheme for omemo encrypted http upload  
						
						 
						
						
						
					 
					
						2017-04-05 18:46:56 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f75eb6bc43 
							
						 
					 
					
						
						
							
							unread badge: show >999 as infinity symbol  
						
						 
						
						
						
					 
					
						2017-04-05 18:39:27 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							081c33b886 
							
						 
					 
					
						
						
							
							do not parse bodies with http urls as downloadable in omemo encrypted message.  fixes   #1756  
						
						 
						
						
						
					 
					
						2017-04-04 22:20:05 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b34a1f7f5e 
							
						 
					 
					
						
						
							
							parse message that only contain oob tag.  fixes   #2359  
						
						 
						
						
						
					 
					
						2017-04-04 22:15:38 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							75749d7c7b 
							
						 
					 
					
						
						
							
							Merge branch 'develop' of  https://github.com/cijo7/Conversations  into cijo7-develop  
						
						 
						
						
						
					 
					
						2017-03-31 09:34:38 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9682f4d454 
							
						 
					 
					
						
						
							
							Merge branch 'deprecated-method' of  https://github.com/hareshkh/Conversations  into hareshkh-deprecated-method  
						
						 
						
						
						
					 
					
						2017-03-31 09:27:22 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4bfc54e51d 
							
						 
					 
					
						
						
							
							show file size for files smaller 1024 bytes.  fixes   #2415  
						
						 
						
						
						
					 
					
						2017-03-31 09:26:55 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								cijo-saju 
							
						 
					 
					
						
						
						
						
							
						
						
							3171dcac8d 
							
						 
					 
					
						
						
							
							Fixed deprecated call  
						
						 
						
						
						
					 
					
						2017-03-30 16:27:11 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								cijo-saju 
							
						 
					 
					
						
						
						
						
							
						
						
							4e898fa4f2 
							
						 
					 
					
						
						
							
							Run in background instead of writing instantaneously  
						
						 
						
						
						
					 
					
						2017-03-30 16:27:11 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Haresh Khanna 
							
						 
					 
					
						
						
						
						
							
						
						
							c7912ed7ef 
							
						 
					 
					
						
						
							
							Changes the deprecated getColor() method  
						
						 
						
						
						
					 
					
						2017-03-29 22:05:35 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								cijo-saju 
							
						 
					 
					
						
						
						
						
							
						
						
							37465db817 
							
						 
					 
					
						
						
							
							Fixed package access  
						
						 
						
						
						
					 
					
						2017-03-28 21:02:20 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								cijo-saju 
							
						 
					 
					
						
						
						
						
							
						
						
							024dbd1c32 
							
						 
					 
					
						
						
							
							Removed unused import and fixed some annotations  
						
						 
						
						
						
					 
					
						2017-03-28 20:46:20 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								cijo-saju 
							
						 
					 
					
						
						
						
						
							
						
						
							cb96911da3 
							
						 
					 
					
						
						
							
							Saves some memory  
						
						 
						
						
						
					 
					
						2017-03-28 20:43:14 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								cijo-saju 
							
						 
					 
					
						
						
						
						
							
						
						
							d8901441f6 
							
						 
					 
					
						
						
							
							Deleted unused variable  
						
						 
						
						
						
					 
					
						2017-03-28 20:41:08 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								cijo-saju 
							
						 
					 
					
						
						
						
						
							
						
						
							b4318996ac 
							
						 
					 
					
						
						
							
							Fixed typo in comment  
						
						 
						
						
						
					 
					
						2017-03-26 22:07:39 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3af30d7563 
							
						 
					 
					
						
						
							
							omemo: put auth tag into key (verify auth tag as well)  
						
						 
						
						
						
					 
					
						2017-03-26 12:39:18 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2302122d8e 
							
						 
					 
					
						
						
							
							made a few exceptions to quote parser for emoticons and quotes  
						
						 
						
						
						
					 
					
						2017-03-26 12:29:12 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							00e8ba00c4 
							
						 
					 
					
						
						
							
							count messages in backlog to not renotify on prior notifications  
						
						 
						
						
						
					 
					
						2017-03-23 15:34:52 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							010b341251 
							
						 
					 
					
						
						
							
							do not pipeline first SM request because that might fail when resume fails  
						
						 
						
						
						
					 
					
						2017-03-21 18:08:20 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c97c5def2c 
							
						 
					 
					
						
						
							
							experimental: wait for SM catchup before triggering notifications  
						
						 
						
						... 
						
						
						
						wait for a first SM ACK before calculating if we need to trigger any notifications
might have to be changed to an XEP-0199 ping later on. for now sending <r/> after resume seems to work outfine 
						
					 
					
						2017-03-21 17:58:08 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							76b9010c39 
							
						 
					 
					
						
						
							
							rework last activity logic to something that should work pretty well in Conversations only enviroments  
						
						 
						
						
						
					 
					
						2017-03-20 17:58:58 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							644a3a729d 
							
						 
					 
					
						
						
							
							define strangers as people not in roster instead of no mutual presence subscription  
						
						 
						
						
						
					 
					
						2017-03-20 13:25:36 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e58f72c20f 
							
						 
					 
					
						
						
							
							show strangers with jid instead of name in conversation list  
						
						 
						
						
						
					 
					
						2017-03-20 13:24:33 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c2c6904eda 
							
						 
					 
					
						
						
							
							offer to block entire domain in message from stranger snackbar.  fixes   #2391  
						
						 
						
						
						
					 
					
						2017-03-20 12:55:48 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4171e2b90e 
							
						 
					 
					
						
						
							
							do not show block stranger snackbar when blocking command is unavailable.  fixes   #2393  
						
						 
						
						
						
					 
					
						2017-03-20 12:16:25 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4d2a1afaf9 
							
						 
					 
					
						
						
							
							call EditText.setText() instead of clear because clear causes problems on some keyboards  
						
						 
						
						
						
					 
					
						2017-03-20 00:09:23 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6167ddb4a8 
							
						 
					 
					
						
						
							
							don't mark message as delivery_failed when cancel didn't work.  fixes   #2387  
						
						 
						
						
						
					 
					
						2017-03-19 20:16:11 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							30ed6b3cec 
							
						 
					 
					
						
						
							
							call messageSent() from UI thread after encrypting pgp message  
						
						 
						
						
						
					 
					
						2017-03-19 20:15:07 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							91a69d7d85 
							
						 
					 
					
						
						
							
							use qr codes instead of aztec. Barcode Scanner is terrible at reading aztec.  fixes   #2375  
						
						 
						
						
						
					 
					
						2017-03-17 12:56:55 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							935ac25cbd 
							
						 
					 
					
						
						
							
							update unread counter for image messages.  fixes   #2376  
						
						 
						
						
						
					 
					
						2017-03-17 12:55:33 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							95e33b5a97 
							
						 
					 
					
						
						
							
							never mark conversation w/ own server as stranger  
						
						 
						
						
						
					 
					
						2017-03-14 11:09:34 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							09d68ae603 
							
						 
					 
					
						
						
							
							fixed entity time for timezones with minutes !=0  
						
						 
						
						
						
					 
					
						2017-03-10 17:25:43 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0ee13bbecb 
							
						 
					 
					
						
						
							
							send chat states only to private and non-anon mucs  
						
						 
						
						
						
					 
					
						2017-03-09 15:42:27 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1fd3bbfe25 
							
						 
					 
					
						
						
							
							display chat states in conferences  
						
						 
						
						
						
					 
					
						2017-03-09 10:58:44 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5ea4322d3f 
							
						 
					 
					
						
						
							
							send and parse Chat States to and from conferences  
						
						 
						
						
						
					 
					
						2017-03-09 10:58:44 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cdf2bd07df 
							
						 
					 
					
						
						
							
							use async avatar loading in AccountAdapter  
						
						 
						
						
						
					 
					
						2017-03-09 10:58:11 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c3b2f33956 
							
						 
					 
					
						
						
							
							hide keyboard after setting up account  
						
						 
						
						
						
					 
					
						2017-03-09 10:57:33 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7747fc0ea1 
							
						 
					 
					
						
						
							
							notify for muc messages after mam catchup  
						
						 
						
						
						
					 
					
						2017-03-08 22:02:09 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6b72e18982 
							
						 
					 
					
						
						
							
							add <x/> element to outgoing MUC PM  
						
						 
						
						
						
					 
					
						2017-03-08 22:01:20 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1f3be1597c 
							
						 
					 
					
						
						
							
							add origin-id to outgoing messages  
						
						 
						
						
						
					 
					
						2017-03-08 21:30:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9d043076e8 
							
						 
					 
					
						
						
							
							only take 1:1 conversations into account when determining catchup timestamp  
						
						 
						
						
						
					 
					
						2017-03-08 20:54:13 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8ca16a6f63 
							
						 
					 
					
						
						
							
							do not interpret grin >< as quote  
						
						 
						
						
						
					 
					
						2017-03-08 20:21:04 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							064926a18b 
							
						 
					 
					
						
						
							
							fixed regression that caused stanza-ids not to be saved  
						
						 
						
						
						
					 
					
						2017-03-08 20:20:34 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a3b51f7654 
							
						 
					 
					
						
						
							
							do not show 'block stranger' snackbar in empty conversations  
						
						 
						
						
						
					 
					
						2017-03-08 11:54:52 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8502d519c1 
							
						 
					 
					
						
						
							
							changed string from unread conversation to messages in notification  
						
						 
						
						
						
					 
					
						2017-03-07 18:12:33 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5b17734287 
							
						 
					 
					
						
						
							
							Merge branch 'dev' of  https://github.com/badarsh2/Conversations  into badarsh2-dev  
						
						 
						
						
						
					 
					
						2017-03-07 17:21:14 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							254edc48f5 
							
						 
					 
					
						
						
							
							show conversation time as last clear date when empty  
						
						 
						
						
						
					 
					
						2017-03-07 11:46:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3c951ce2cd 
							
						 
					 
					
						
						
							
							set last clear date to time of last message  
						
						 
						
						
						
					 
					
						2017-03-07 11:45:35 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								B Adarsh 
							
						 
					 
					
						
						
						
						
							
						
						
							87f0c4a646 
							
						 
					 
					
						
						
							
							Modifies notification for MUC conversations  
						
						 
						
						... 
						
						
						
						Minor fixes
Replaces html.fromHTML with SpannableString 
						
					 
					
						2017-03-07 16:10:45 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5fae9465d1 
							
						 
					 
					
						
						
							
							show snackbar in conversations with stranger to block.  fixes   #2358  
						
						 
						
						
						
					 
					
						2017-03-07 11:07:57 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7306e0286f 
							
						 
					 
					
						
						
							
							do not notify for messages from strangers by default  
						
						 
						
						
						
					 
					
						2017-03-07 10:50:46 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							857c761c68 
							
						 
					 
					
						
						
							
							fixed sender label for empty conversations  
						
						 
						
						
						
					 
					
						2017-03-07 09:22:42 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							79b2f34685 
							
						 
					 
					
						
						
							
							added colon to seperate sender and message preview. only show first name  
						
						 
						
						
						
					 
					
						2017-03-06 19:42:27 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9f3543a650 
							
						 
					 
					
						
						
							
							Merge branch 'message-marker' of  https://github.com/hareshkh/Conversations  into hareshkh-message-marker  
						
						 
						
						
						
					 
					
						2017-03-06 19:07:27 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9ba5335ae7 
							
						 
					 
					
						
						
							
							cleaned code of muc name generator  
						
						 
						
						
						
					 
					
						2017-03-06 19:06:16 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Haresh Khanna 
							
						 
					 
					
						
						
						
						
							
						
						
							633aad3193 
							
						 
					 
					
						
						
							
							Adds a message sender label in each conversation for text messages  
						
						 
						
						
						
					 
					
						2017-03-06 23:25:13 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1c56b74e41 
							
						 
					 
					
						
						
							
							closing the corresponding conversations after blocking a contact.  fixes   #2347  
						
						 
						
						
						
					 
					
						2017-03-06 16:53:54 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5a00b11594 
							
						 
					 
					
						
						
							
							extract stanza-id from muc reflections  
						
						 
						
						
						
					 
					
						2017-03-06 13:30:13 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4a7dbaab1e 
							
						 
					 
					
						
						
							
							deduplicate every message with a stanza-id from the server  
						
						 
						
						
						
					 
					
						2017-03-06 11:24:04 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6088913fb6 
							
						 
					 
					
						
						
							
							fixed multi-session-nick renaming behaviour  
						
						 
						
						
						
					 
					
						2017-03-05 17:42:17 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cae993a95f 
							
						 
					 
					
						
						
							
							renamed enter jid menu item id  
						
						 
						
						
						
					 
					
						2017-03-05 11:40:48 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bb7780eae6 
							
						 
					 
					
						
						
							
							Merge branch 'issue_#2336' of  https://github.com/vikiCoder/Conversations  into vikiCoder-issue_#2336  
						
						 
						
						
						
					 
					
						2017-03-05 08:48:01 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f414998307 
							
						 
					 
					
						
						
							
							use default priority notifications. disables heads up notifications  
						
						 
						
						
						
					 
					
						2017-03-04 21:19:55 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								vikiCoder 
							
						 
					 
					
						
						
						
						
							
						
						
							72537b76c5 
							
						 
					 
					
						
						
							
							fixes   #2336  : added an option to directly add a jid to block list from blocklist activity  
						
						 
						
						
						
					 
					
						2017-03-05 01:01:41 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cb203f5fd3 
							
						 
					 
					
						
						
							
							Keep draft even when correcting previously sent msg  
						
						 
						
						... 
						
						
						
						fixes  #1822 . Thank you @singhalok641 
						
					 
					
						2017-03-04 08:05:42 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Haresh Khanna 
							
						 
					 
					
						
						
						
						
							
						
						
							f2d2966b31 
							
						 
					 
					
						
						
							
							Squash : Adds number of unread messages for every conversation.  Fixes   #2181  
						
						 
						
						
						
					 
					
						2017-03-04 04:26:19 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5c789b75cc 
							
						 
					 
					
						
						
							
							fixed messages vanishing after pgp raised error on editing a message  
						
						 
						
						
						
					 
					
						2017-03-03 15:21:42 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							58595fccfe 
							
						 
					 
					
						
						
							
							show icons in pop menu with reflection. imagespan was not centred vertically  
						
						 
						
						
						
					 
					
						2017-03-03 12:26:33 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							768d79c621 
							
						 
					 
					
						
						
							
							Merge branch 'issue_#1200' of  https://github.com/vikiCoder/Conversations  into vikiCoder-issue_#1200  
						
						 
						
						
						
					 
					
						2017-03-03 12:01:00 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							afa34ce15a 
							
						 
					 
					
						
						
							
							block send action while encrypting pgp message  
						
						 
						
						
						
					 
					
						2017-03-03 11:56:08 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								vikiCoder 
							
						 
					 
					
						
						
						
						
							
						
						
							51ef096e01 
							
						 
					 
					
						
						
							
							fixes   #1200  : Added icons for the attach options according to material design guidlines  
						
						 
						
						
						
					 
					
						2017-03-03 16:01:44 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8cce653a1f 
							
						 
					 
					
						
						
							
							changed default setting for enter_is_send on devices with keyboard  
						
						 
						
						
						
					 
					
						2017-03-02 13:03:30 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c740386297 
							
						 
					 
					
						
						
							
							rename the Xmlns class to Namespace  
						
						 
						
						
						
					 
					
						2017-03-01 13:01:46 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ea1e28267b 
							
						 
					 
					
						
						
							
							bump mam namespace to :2  
						
						 
						
						
						
					 
					
						2017-03-01 12:50:58 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ecd53580c0 
							
						 
					 
					
						
						
							
							show 'show inactive keys' button also when there are no active keys  
						
						 
						
						
						
					 
					
						2017-03-01 12:50:46 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							23a91e5019 
							
						 
					 
					
						
						
							
							use priority low when creating notification without sound/vibration.  
						
						 
						
						... 
						
						
						
						should prevent notifcations showing up in ambient display 
						
					 
					
						2017-02-28 15:32:57 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4cddf31ad2 
							
						 
					 
					
						
						
							
							properly handle onNewIntent() in StartConversations activity  
						
						 
						
						... 
						
						
						
						* fixes a glitch a caused xmpp uris not to open when activiy was already started 
						
					 
					
						2017-02-28 11:48:28 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1f4c5ff97c 
							
						 
					 
					
						
						
							
							properly trim() incoming imto: uris  
						
						 
						
						
						
					 
					
						2017-02-27 22:48:25 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c7ec82679f 
							
						 
					 
					
						
						
							
							Merge branch 'master' of github.com:siacs/Conversations  
						
						 
						
						
						
					 
					
						2017-02-24 20:00:54 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8e0e81a603 
							
						 
					 
					
						
						
							
							bump notification priority to high as per android design guidelines  
						
						 
						
						
						
					 
					
						2017-02-24 19:59:13 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0c0ff882a9 
							
						 
					 
					
						
						
							
							make x509 verification node world readable  
						
						 
						
						
						
					 
					
						2017-02-24 19:58:46 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a28116753a 
							
						 
					 
					
						
						
							
							Merge pull request  #2315  from licaon-kter/lecagy-typo  
						
						 
						
						... 
						
						
						
						Fix a typo in legacy 
						
					 
					
						2017-02-19 18:43:21 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								licaon-kter 
							
						 
					 
					
						
						
						
						
							
						
						
							d3dd80eec9 
							
						 
					 
					
						
						
							
							Fix a typo in legacy  
						
						 
						
						
						
					 
					
						2017-02-19 15:47:57 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0d00ff0c15 
							
						 
					 
					
						
						
							
							migrate domain and host exemption into seperate class  
						
						 
						
						
						
					 
					
						2017-02-19 13:05:40 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							abaabae853 
							
						 
					 
					
						
						
							
							only change actionbar display options when changed  
						
						 
						
						
						
					 
					
						2017-02-18 18:08:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c69ad8f52c 
							
						 
					 
					
						
						
							
							npe checks  
						
						 
						
						
						
					 
					
						2017-02-17 10:26:42 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cf9ab4d302 
							
						 
					 
					
						
						
							
							synchronize modifications of output stream in tag writer  
						
						 
						
						
						
					 
					
						2017-02-17 10:26:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4f0e1b71c0 
							
						 
					 
					
						
						
							
							explicitly turn off vibration when disabled.  fixes   #1255  
						
						 
						
						
						
					 
					
						2017-02-16 13:31:26 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							caa16a8517 
							
						 
					 
					
						
						
							
							experimental mam legacy compat layer  
						
						 
						
						
						
					 
					
						2017-02-15 16:42:35 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6e62b62b80 
							
						 
					 
					
						
						
							
							respond to xep-0184 requests in muc pms  
						
						 
						
						
						
					 
					
						2017-02-15 12:09:36 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c7e95d105c 
							
						 
					 
					
						
						
							
							fixed behaviour in message parser when doing mam catchup  
						
						 
						
						
						
					 
					
						2017-02-15 00:08:49 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bb249e0881 
							
						 
					 
					
						
						
							
							only extract stanza-id from live messages when disco feature is set  
						
						 
						
						
						
					 
					
						2017-02-14 23:16:51 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b90a1fe1db 
							
						 
					 
					
						
						
							
							bump mam namespace  
						
						 
						
						
						
					 
					
						2017-02-14 17:19:45 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2665c3a1e0 
							
						 
					 
					
						
						
							
							rethink mam catchup strategies  
						
						 
						
						
						
					 
					
						2017-02-14 16:50:33 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9116782cdc 
							
						 
					 
					
						
						
							
							fixed adhoc conference creation behaviour. properly show errors.  fixes   #2290  
						
						 
						
						
						
					 
					
						2017-02-13 17:32:26 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c8f97be68e 
							
						 
					 
					
						
						
							
							only force close tagwriter before creating a new one  
						
						 
						
						
						
					 
					
						2017-02-13 13:01:00 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6b81ff70e5 
							
						 
					 
					
						
						
							
							clear avatar cache when system name changes  
						
						 
						
						
						
					 
					
						2017-02-10 20:26:21 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							54ae8abcb7 
							
						 
					 
					
						
						
							
							add no_padding, no_wrap to file upload slots  
						
						 
						
						
						
					 
					
						2017-02-10 13:50:20 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							55e9067b27 
							
						 
					 
					
						
						
							
							do not auto link non-http URLs  
						
						 
						
						
						
					 
					
						2017-02-09 20:14:36 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c76b073b8e 
							
						 
					 
					
						
						
							
							do not sync thumbnail creation on cache.  fixes   #2283  
						
						 
						
						
						
					 
					
						2017-02-09 14:32:50 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d9e2ab62b2 
							
						 
					 
					
						
						
							
							add index to message.conversationUuid  
						
						 
						
						
						
					 
					
						2017-02-07 21:17:08 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							24fab162e2 
							
						 
					 
					
						
						
							
							renamed omemo:// to aesgcm://  
						
						 
						
						
						
					 
					
						2017-02-07 20:07:57 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							71ad18beb9 
							
						 
					 
					
						
						
							
							support omemo:// style urls  
						
						 
						
						
						
					 
					
						2017-02-07 19:32:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c37117b940 
							
						 
					 
					
						
						
							
							update copyright information  
						
						 
						
						
						
					 
					
						2017-02-07 19:31:54 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e35ada4997 
							
						 
					 
					
						
						
							
							only store messages up to a length of 1M chars  
						
						 
						
						
						
					 
					
						2017-02-07 17:45:01 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6313c3c92e 
							
						 
					 
					
						
						
							
							Merge pull request  #2270  from moparisthebest/master  
						
						 
						
						... 
						
						
						
						Stop Conversations force closing over sqlite errors due to long messages 
						
					 
					
						2017-02-07 17:35:25 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8ab166e817 
							
						 
					 
					
						
						
							
							fixed scrolling and async loading of message of new conversation start  
						
						 
						
						
						
					 
					
						2017-02-07 14:03:23 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d7198bd68c 
							
						 
					 
					
						
						
							
							fixed rare npe when doing file migration  
						
						 
						
						
						
					 
					
						2017-02-07 10:20:13 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6fc67d9a60 
							
						 
					 
					
						
						
							
							catch all throwables when working with content provider to retrieve mime  
						
						 
						
						
						
					 
					
						2017-02-07 10:19:45 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								moparisthebest 
							
						 
					 
					
						
						
						
						
							
						
						
							2a34ece571 
							
						 
					 
					
						
						
							
							Stop Conversations force closing over sqlite errors due to long messages  
						
						 
						
						
						
					 
					
						2017-01-30 00:03:51 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							53241f2ef1 
							
						 
					 
					
						
						
							
							add explicit encryption hints to outgoing messages  
						
						 
						
						
						
					 
					
						2017-01-26 19:19:08 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c9e6d05fa0 
							
						 
					 
					
						
						
							
							use base64 encoding for file names uploaded with http  
						
						 
						
						
						
					 
					
						2017-01-26 18:39:25 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							40ee1a0bfc 
							
						 
					 
					
						
						
							
							reset messagesLoaded when changing retention settings  
						
						 
						
						
						
					 
					
						2017-01-25 18:35:22 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a86b2fefd9 
							
						 
					 
					
						
						
							
							add database and file migrations for 1.16.0  
						
						 
						
						
						
					 
					
						2017-01-25 13:22:20 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f2d9539d90 
							
						 
					 
					
						
						
							
							share uri for bookmark direclty from Start Conversation  
						
						 
						
						
						
					 
					
						2017-01-25 00:15:50 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							66457c9f2e 
							
						 
					 
					
						
						
							
							transcode videos before sharing. change storage location  
						
						 
						
						
						
					 
					
						2017-01-24 20:17:36 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9b6ae6d75f 
							
						 
					 
					
						
						
							
							configurable local message retention period. (untested)  
						
						 
						
						
						
					 
					
						2017-01-23 17:14:30 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4c6ef3b24e 
							
						 
					 
					
						
						
							
							cleaning up crypto targets when conference member is getting removed  
						
						 
						
						
						
					 
					
						2017-01-22 18:58:49 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b48bf39e08 
							
						 
					 
					
						
						
							
							change behaviour of back button to close finish activity.  fixes   #704  
						
						 
						
						
						
					 
					
						2017-01-22 18:26:47 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d53c813408 
							
						 
					 
					
						
						
							
							make sure to set open conversations after connection with background service  
						
						 
						
						
						
					 
					
						2017-01-22 13:08:21 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b72d7ec8d0 
							
						 
					 
					
						
						
							
							make sure to properly stop tagwriter  
						
						 
						
						
						
					 
					
						2017-01-22 12:54:39 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							96a6460744 
							
						 
					 
					
						
						
							
							don't quote text when '>' is followed by numeber  
						
						 
						
						
						
					 
					
						2017-01-21 11:07:23 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							780d1daf7e 
							
						 
					 
					
						
						
							
							fixed some issues around ibb  
						
						 
						
						
						
					 
					
						2017-01-20 22:37:50 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							97ba0a0d49 
							
						 
					 
					
						
						
							
							write text in bold when highlighted in received muc message  
						
						 
						
						
						
					 
					
						2017-01-20 14:54:59 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cb9c4d4327 
							
						 
					 
					
						
						
							
							disable automatic foreground enabler.  fixes   #2239  
						
						 
						
						
						
					 
					
						2017-01-20 14:21:59 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c324f0c8df 
							
						 
					 
					
						
						
							
							modified highlight nick behaviour to better work with quotes  
						
						 
						
						
						
					 
					
						2017-01-20 13:45:09 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							59f82cbd34 
							
						 
					 
					
						
						
							
							fixed regression introduced in previous commit.  
						
						 
						
						
						
					 
					
						2017-01-20 13:44:29 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							143ad48be1 
							
						 
					 
					
						
						
							
							don't prematurly mark conversation as read during activity start.  fixes   #2245  
						
						 
						
						
						
					 
					
						2017-01-20 10:43:50 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1dcf804618 
							
						 
					 
					
						
						
							
							fixed pgp encrypted text quick sharing.  fixes   #2237  
						
						 
						
						
						
					 
					
						2017-01-17 15:56:21 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ac2eee8e81 
							
						 
					 
					
						
						
							
							Merge pull request  #2233  from SamWhited/scram-sha-2  
						
						 
						
						... 
						
						
						
						Add SCRAM-SHA-2 support 
						
					 
					
						2017-01-16 13:14:48 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							764026b87e 
							
						 
					 
					
						
						
							
							fixed behaviour with non-default encryption masks  
						
						 
						
						
						
					 
					
						2017-01-16 13:09:36 +01:00