Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a55d0a691c 
							
						 
					 
					
						
						
							
							while restoring state deal with conversations that don't have accounts  
						
						
						
					 
					
						2017-04-25 18:17:23 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8e0fb6a23a 
							
						 
					 
					
						
						
							
							avoid rare race condition when saving draft message  
						
						
						
					 
					
						2017-04-25 18:16:55 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4d1308e138 
							
						 
					 
					
						
						
							
							fixed click area for pgp key in contact details  
						
						
						
					 
					
						2017-04-25 15:23:01 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e6eb58f2d7 
							
						 
					 
					
						
						
							
							send pgp signature when creating ad hoc conferences  
						
						
						
					 
					
						2017-04-25 15:22:31 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2cfa3ce288 
							
						 
					 
					
						
						
							
							limited offline support for pgp group chats  
						
						... 
						
						
						
						use pgp key from contact if not set in muc
fixes  #283  
						
					 
					
						2017-04-25 15:19:54 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							848c339c8d 
							
						 
					 
					
						
						
							
							make sure context is not null before setting content description on send button  
						
						
						
					 
					
						2017-04-25 14:11:45 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c837e0616a 
							
						 
					 
					
						
						
							
							make sure tag writer thread shuts down  
						
						
						
					 
					
						2017-04-22 10:08:51 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c93b1a86bb 
							
						 
					 
					
						
						
							
							version bump to 1.18.2 + changelog  
						
						
						
					 
					
						2017-04-21 18:55:53 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9f5a089d5c 
							
						 
					 
					
						
						
							
							reworked unique id generation for notification intents  
						
						
						
					 
					
						2017-04-21 15:13:08 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c33f4b704c 
							
						 
					 
					
						
						
							
							Merge branch 'android-auto-support' of  https://github.com/morgenroth/Conversations  into morgenroth-android-auto-support  
						
						
						
					 
					
						2017-04-20 13:03:18 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9cc37a7bdb 
							
						 
					 
					
						
						
							
							re-add redownload context menu entry for deleted files.  fixes   #2453  
						
						
						
					 
					
						2017-04-20 11:52:54 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ae85a9e87b 
							
						 
					 
					
						
						
							
							made nimbuzz work around work with newly created conferences as well  
						
						
						
					 
					
						2017-04-20 11:35:38 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							067daa81f4 
							
						 
					 
					
						
						
							
							Merge pull request  #2445  from SamWhited/send_content_description  
						
						... 
						
						
						
						Add content description to send button 
						
					 
					
						2017-04-17 12:56:36 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d86a4642e9 
							
						 
					 
					
						
						
							
							Merge pull request  #2448  from morgenroth/Android-wear-action-icons  
						
						... 
						
						
						
						Add reply button in wear design 
						
					 
					
						2017-04-17 12:54:35 +02:00 
						 
				 
			
				
					
						
							
							
								Johannes Morgenroth 
							
						 
					 
					
						
						
						
						
							
						
						
							a4454bcff2 
							
						 
					 
					
						
						
							
							Add reply button in wear design  
						
						... 
						
						
						
						The existing reply button for Android wear has been re-used from the action
bar. Instead of a 'send' icon, a 'reply' icon better matches the intended
action. Moreover, action icons for Android wear are solid white instead of
half transparent. 
						
					 
					
						2017-04-17 12:19:14 +02:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							4a915c60e9 
							
						 
					 
					
						
						
							
							Add content description to send button  
						
						... 
						
						
						
						This can be used by screen readers and other accessibility aids. 
						
					 
					
						2017-04-16 16:37:32 -05:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6c34763d32 
							
						 
					 
					
						
						
							
							transform aesgcm:// links back to https:// before connecting through Tor  
						
						... 
						
						
						
						fixes  #2444  
					
						2017-04-16 08:44:26 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1ac0c2f453 
							
						 
					 
					
						
						
							
							show 'try again' button when remote server wasn't found in previously active muc  
						
						
						
					 
					
						2017-04-15 17:18:15 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							483304c697 
							
						 
					 
					
						
						
							
							recognize muc self presence on nimbuzz.com  
						
						... 
						
						
						
						Apparently nimbuzz.com doesn't include status code 110 in muc self presence
It does however include the full real jid in the presence’s item.
We can use that as a work around to detect a self presence. 
						
					 
					
						2017-04-15 15:14:12 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c86134e523 
							
						 
					 
					
						
						
							
							version bump to 1.18.1 + changelog  
						
						
						
					 
					
						2017-04-15 15:10:24 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d220d9db05 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2017-04-15 15:09:50 +02:00 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d4c2b12f95 
							
						 
					 
					
						
						
							
							Merge pull request  #2437  from cijo7/f1  
						
						... 
						
						
						
						Removed unused imports from the entire project. 
						
					 
					
						2017-04-12 20:52:06 +02:00 
						 
				 
			
				
					
						
							
							
								cijo-saju 
							
						 
					 
					
						
						
						
						
							
						
						
							3467a67e75 
							
						 
					 
					
						
						
							
							Removed unused imports from entire project.  
						
						
						
					 
					
						2017-04-12 20:24:36 +05:30 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							03fff3179e 
							
						 
					 
					
						
						
							
							Merge pull request  #2431  from cijo7/f1  
						
						... 
						
						
						
						Minor code clean up 
						
					 
					
						2017-04-08 10:18:05 +02:00 
						 
				 
			
				
					
						
							
							
								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 
							
						 
					 
					
						
						
						
						
							
						
						
							65b3655a8b 
							
						 
					 
					
						
						
							
							version bump to 1.18.0 + changelog  
						
						
						
					 
					
						2017-04-06 14:05:50 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							06d1e1752c 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2017-04-06 12:01:17 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							3b3121b9c5 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2017-04-05 21:00:16 +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