Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8e4df80619 
							
						 
					 
					
						
						
							
							Merge branch 'patch-1' of  https://github.com/Kandr0s/Conversations  into Kandr0s-patch-1  
						
						 
						
						
						
					 
					
						2017-11-13 14:51:56 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3faf951f47 
							
						 
					 
					
						
						
							
							disable swipe to left to dismiss conversation  
						
						 
						
						
						
					 
					
						2017-11-13 14:51:45 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kandr0s 
							
						 
					 
					
						
						
						
						
							
						
						
							308f451959 
							
						 
					 
					
						
						
							
							Show Drawable if Location/File/Voice  
						
						 
						
						
						
					 
					
						2017-11-13 13:39:06 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bc9da1fbf4 
							
						 
					 
					
						
						
							
							remove prosody push from blacklist  
						
						 
						
						
						
					 
					
						2017-11-12 19:22:39 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							513795fdf8 
							
						 
					 
					
						
						
							
							use view context instead activity to show toast in ConversationFragment  
						
						 
						
						
						
					 
					
						2017-11-10 20:18:47 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							949d3280d3 
							
						 
					 
					
						
						
							
							open links in new tabs  
						
						 
						
						
						
					 
					
						2017-11-09 20:49:44 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a5c33abe88 
							
						 
					 
					
						
						
							
							MessageAdapter: code cleanup  
						
						 
						
						
						
					 
					
						2017-11-09 20:23:31 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							459cf09f06 
							
						 
					 
					
						
						
							
							FileProvider: attempt to work with sd cards  
						
						 
						
						
						
					 
					
						2017-11-08 20:34:08 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e393de6832 
							
						 
					 
					
						
						
							
							disable auto fill on edit message box  
						
						 
						
						
						
					 
					
						2017-11-08 13:25:38 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2e3b5de6b6 
							
						 
					 
					
						
						
							
							do not quote quotes  
						
						 
						
						
						
					 
					
						2017-11-07 22:22:28 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e5210bbaa0 
							
						 
					 
					
						
						
							
							brought back 'copy to clipboard' and 'quote' context menu options  
						
						 
						
						
						
					 
					
						2017-11-07 15:58:27 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							49b4153fb5 
							
						 
					 
					
						
						
							
							make keyword styling work in quotes  
						
						 
						
						
						
					 
					
						2017-11-07 13:23:49 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							22c37bd430 
							
						 
					 
					
						
						
							
							changed text styling to keep the keyword  
						
						 
						
						
						
					 
					
						2017-11-06 23:44:00 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							af3c9be700 
							
						 
					 
					
						
						
							
							fix take photo with pending keys  
						
						 
						
						
						
					 
					
						2017-11-06 17:27:48 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							aa10b9ff05 
							
						 
					 
					
						
						
							
							code refactoring to provide shorter account enabled check  
						
						 
						
						
						
					 
					
						2017-11-06 13:57:25 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4d896cc3ab 
							
						 
					 
					
						
						
							
							initialize emoji compat in share activity  
						
						 
						
						
						
					 
					
						2017-11-06 12:16:55 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c262cd5d6e 
							
						 
					 
					
						
						
							
							support for basic IM styling  
						
						 
						
						
						
					 
					
						2017-11-05 21:34:40 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7984100e54 
							
						 
					 
					
						
						
							
							delete unneeded class  
						
						 
						
						
						
					 
					
						2017-11-05 16:32:57 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							435d1ef5bd 
							
						 
					 
					
						
						
							
							SASL: don't prefer PLAIN auth over DIGEST-MD5 for nimbuzz.com  
						
						 
						
						
						
					 
					
						2017-11-05 16:21:59 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3205d763cf 
							
						 
					 
					
						
						
							
							MessageAdapter: Display emojis slightly larger in text  
						
						 
						
						
						
					 
					
						2017-10-28 13:15:31 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							82e5a28f49 
							
						 
					 
					
						
						
							
							Sharing: request permission  
						
						 
						
						
						
					 
					
						2017-10-27 17:25:01 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							dc5d504edd 
							
						 
					 
					
						
						
							
							MessageAdapter: round file sizes  
						
						 
						
						
						
					 
					
						2017-10-27 11:35:19 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							73db0bd19f 
							
						 
					 
					
						
						
							
							MessageAdapter: Do not display muc whispers as emoji only  
						
						 
						
						
						
					 
					
						2017-10-26 18:41:40 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							48baf56622 
							
						 
					 
					
						
						
							
							save message drafts across restarts.  fixes   #2642  
						
						 
						
						
						
					 
					
						2017-10-01 22:52:21 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							874c1f4c74 
							
						 
					 
					
						
						
							
							MessageAdapter: trim but don't replace all whitespaces before displaying emoji message  
						
						 
						
						
						
					 
					
						2017-10-01 10:42:01 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f0e48c8af5 
							
						 
					 
					
						
						
							
							use own algorithm to count emoji instead of using emoji-java  
						
						 
						
						
						
					 
					
						2017-09-29 22:56:17 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							42b4528d03 
							
						 
					 
					
						
						
							
							use emoji compat  
						
						 
						
						
						
					 
					
						2017-09-29 19:44:30 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							acd4b149f5 
							
						 
					 
					
						
						
							
							slight refactoring in MessageAdapter  
						
						 
						
						
						
					 
					
						2017-09-27 10:21:00 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c3dcc74b23 
							
						 
					 
					
						
						
							
							select presence if necessary when resending file  
						
						 
						
						
						
					 
					
						2017-09-22 11:14:56 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2eb7197e04 
							
						 
					 
					
						
						
							
							removed unnecessary padding restrictions around emoji messages  
						
						 
						
						
						
					 
					
						2017-09-20 21:04:41 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							20b14091d6 
							
						 
					 
					
						
						
							
							play audio files inline  
						
						 
						
						
						
					 
					
						2017-09-20 15:35:35 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							acc78145db 
							
						 
					 
					
						
						
							
							unified share with menu.  fixes   #2630  
						
						 
						
						
						
					 
					
						2017-09-19 16:28:01 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							dbd489cbcb 
							
						 
					 
					
						
						
							
							show correct tooltip when long pressing start conversations.  fixes   #2635  
						
						 
						
						
						
					 
					
						2017-09-19 10:43:25 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d4c16b5a85 
							
						 
					 
					
						
						
							
							added dedicated 'record video' attachment button.  fixes   #2592  
						
						 
						
						... 
						
						
						
						thank you @BlauerHunger 
						
					 
					
						2017-09-18 11:51:47 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							22a058ff61 
							
						 
					 
					
						
						
							
							show block menu after long press on allow/add back  
						
						 
						
						
						
					 
					
						2017-09-11 09:53:14 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5cc92acbee 
							
						 
					 
					
						
						
							
							use 'partial' in server info if publish-options is n/a  
						
						 
						
						... 
						
						
						
						fixes  #2621  
						
					 
					
						2017-09-09 13:34:51 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0f39ad0f04 
							
						 
					 
					
						
						
							
							make filtered list item activity survive roations  
						
						 
						
						
						
					 
					
						2017-08-28 18:30:39 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ccb47c5727 
							
						 
					 
					
						
						
							
							get rid of uneccessary 'own omemo fingerprint' string.  fixes   #2599  
						
						 
						
						
						
					 
					
						2017-08-28 18:15:39 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							617425e7ff 
							
						 
					 
					
						
						
							
							link jid in trust keys activity to contact details  
						
						 
						
						
						
					 
					
						2017-08-24 10:09:16 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							26f7702c39 
							
						 
					 
					
						
						
							
							request storage permission when sending gif.  fixes   #2589  
						
						 
						
						
						
					 
					
						2017-08-22 16:51:42 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e0fa820436 
							
						 
					 
					
						
						
							
							improved error messages on missing omemo keys  
						
						 
						
						
						
					 
					
						2017-08-21 14:08:20 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4ed74eafc8 
							
						 
					 
					
						
						
							
							reset attempt counts on enable  
						
						 
						
						
						
					 
					
						2017-08-12 22:17:49 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							699e845e6d 
							
						 
					 
					
						
						
							
							default input type to numbers on captcha dialog  
						
						 
						
						
						
					 
					
						2017-08-12 22:17:24 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0da2f1ed3f 
							
						 
					 
					
						
						
							
							prevent users from editing their account jid after successful login  
						
						 
						
						
						
					 
					
						2017-08-10 22:34:03 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c3cbb21133 
							
						 
					 
					
						
						
							
							cache some information generated from body like isEmojiOnly, fileParams and isGeoUri  
						
						 
						
						
						
					 
					
						2017-08-03 13:24:41 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7bcf173866 
							
						 
					 
					
						
						
							
							remove all whitespaces in emoji only messages  
						
						 
						
						
						
					 
					
						2017-08-03 10:55:14 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							82c5924434 
							
						 
					 
					
						
						
							
							display messages that only contain emoji slightly larger  
						
						 
						
						
						
					 
					
						2017-07-30 22:04:58 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								yushijinhun 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							48147b7fd1 
							
						 
					 
					
						
						
							
							Give up PGP decryption when intent is cancelled  
						
						 
						
						... 
						
						
						
						When receiving a PGP message which is not encrypted with YOUR key,
OpenKeychain shows a dialog, which tells you the private key to decrypt
the message is unavailable. However, Conversations won't give up
decrypting the message. So whether the subsequent messages are
decryptable or not, the decryption is blocked at the current message.
The commit fixes the bug in this way: Give up the current message when
the decryption intent is cancelled, so that subsequent messages can be
handled. 
						
					 
					
						2017-07-25 15:09:18 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							74cde1d60a 
							
						 
					 
					
						
						
							
							incorporate support for publish-options into server info  
						
						 
						
						
						
					 
					
						2017-07-18 12:51:15 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ef980ff5cf 
							
						 
					 
					
						
						
							
							show date separators.  fixes   #2271  
						
						 
						
						
						
					 
					
						2017-07-04 11:01:20 +02:00