Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								e11277c70f 
								
							 
						 
						
							
							
								
								use base64 instead of base36 when creating random strings  
							
							 
							
							
							
						 
						
							2017-07-30 11:39:47 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								01b207d44d 
								
							 
						 
						
							
							
								
								avoid empty strings when figuring out display name  
							
							 
							
							
							
						 
						
							2017-07-30 11:39:16 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								f5da4791ad 
								
							 
						 
						
							
							
								
								avoid unnecessary roster sync in OMEMO code. fixed startup performance regression  
							
							 
							
							
							
						 
						
							2017-07-29 13:50:32 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								837c212931 
								
							 
						 
						
							
							
								
								refresh omemo activity after failing to fetch keys due to lack of ids  
							
							 
							
							
							
						 
						
							2017-07-28 18:37:07 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								ad601e47c8 
								
							 
						 
						
							
							
								
								fixed roster items w/o subscription (request) not being shown  
							
							 
							
							
							
						 
						
							2017-07-28 18:34:55 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								ea6289c02e 
								
							 
						 
						
							
							
								
								pulled translations from transifex  
							
							 
							
							
							
						 
						
							2017-07-26 13:23:40 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								d6e51288c3 
								
							 
						 
						
							
							
								
								Merge pull request  #2564  from yushijinhun/fix-decryption-blocked  
							
							 
							
							... 
							
							
							
							Give up PGP decryption when intent is cancelled 
							
						 
						
							2017-07-25 09:20:51 +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
							
						 
						
							 
							
							
							
							
								
							
							
								432598f896 
								
							 
						 
						
							
							
								
								Merge branch 'bugfixes'  
							
							 
							
							
							
						 
						
							2017-07-23 07:53:09 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								c8bd5bc1f5 
								
							 
						 
						
							
							
								
								made OF selfSigned() workaround only available >=kitkat  
							
							 
							
							... 
							
							
							
							this undos 8a729061d5 . as it turns out 4.1
and 4.0 only break when checking if a cert is self signed. 
							
						 
						
							2017-07-23 07:47:39 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								2fc216bfc4 
								
							 
						 
						
							
							
								
								skip initial socket closing if thread was already interrupted  
							
							 
							
							
							
						 
						
							2017-07-21 08:30:16 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								74cde1d60a 
								
							 
						 
						
							
							
								
								incorporate support for publish-options into server info  
							
							 
							
							
							
						 
						
							2017-07-18 12:51:15 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								85dc0c284d 
								
							 
						 
						
							
							
								
								made omemo always available but in public mucs  
							
							 
							
							
							
						 
						
							2017-07-18 12:51:15 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								002dbf2e17 
								
							 
						 
						
							
							
								
								enable all encryption options  
							
							 
							
							
							
						 
						
							2017-07-18 12:51:15 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								da87eac48e 
								
							 
						 
						
							
							
								
								provide upgrade path for accounts with publish-options  
							
							 
							
							
							
						 
						
							2017-07-18 12:51:15 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								9a57673130 
								
							 
						 
						
							
							
								
								use publish-options instead of always pushing node configuration  
							
							 
							
							
							
						 
						
							2017-07-18 12:51:15 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								8d6b2074cb 
								
							 
						 
						
							
							
								
								let hasPendingFetches() return true when fetching device ids  
							
							 
							
							
							
						 
						
							2017-07-18 12:51:15 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								7a2856ac86 
								
							 
						 
						
							
							
								
								fetch required device ids on demand  
							
							 
							
							
							
						 
						
							2017-07-18 12:51:15 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								f7258d16e1 
								
							 
						 
						
							
							
								
								explicitly fetch device ids before building sessions in single mode conversation  
							
							 
							
							
							
						 
						
							2017-07-18 12:51:15 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								25e993693f 
								
							 
						 
						
							
							
								
								change access model of omemo pep nodes after every publish  
							
							 
							
							
							
						 
						
							2017-07-18 12:51:15 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								6c95897f09 
								
							 
						 
						
							
							
								
								fetch device ids for muc members w/o known devices  
							
							 
							
							
							
						 
						
							2017-07-18 12:51:15 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								2a198793b1 
								
							 
						 
						
							
							
								
								fixed otr jingle file size reporting  
							
							 
							
							
							
						 
						
							2017-07-18 12:43:53 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								8a729061d5 
								
							 
						 
						
							
							
								
								use CN-workaround for pre-kitkat  
							
							 
							
							
							
						 
						
							2017-07-17 23:13:55 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								8285a4fe1c 
								
							 
						 
						
							
							
								
								pulled translations from transifex  
							
							 
							
							
							
						 
						
							2017-07-17 22:06:56 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								217335703c 
								
							 
						 
						
							
							
								
								fix regression introduces with OF fix. properly fall back to common name  
							
							 
							
							
							
						 
						
							2017-07-17 21:11:15 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								0a20b87ebe 
								
							 
						 
						
							
							
								
								check length first in timestamp parser  
							
							 
							
							
							
						 
						
							2017-07-16 21:03:59 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								febee9863f 
								
							 
						 
						
							
							
								
								catch IllegalArgumentException caused by invalid custom hostname  
							
							 
							
							
							
						 
						
							2017-07-16 21:02:56 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								8afe7efc2c 
								
							 
						 
						
							
							
								
								workaround for OpenFire: check CN first in self signed certs  
							
							 
							
							... 
							
							
							
							The self signed certificates created by OpenFire (Not sure if other
certs are affected as well) will crash the Java/Android TLS stack when
accessing getSubjectAlternativeNames() on the the peer certificate.
This usually goes unnoticed in other applications since the
DefaultHostnameVerifier checkes the CN first. That however is a
violation of RFC6125 section 6.4.4 which requires us to check for the
existence of SAN first.
This commit adds a work around where in self signed certificates we
check for the CN first as well. (Avoiding the call to
getSubjectAlternativeNames()) 
							
						 
						
							2017-07-16 11:05:25 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								dfa17d1339 
								
							 
						 
						
							
							
								
								more migration fixes for updating from 1.6.0 to 1.19.3  
							
							 
							
							
							
						 
						
							2017-07-14 10:34:01 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								91119ab691 
								
							 
						 
						
							
							
								
								add reminder to remove minidns workarounds once those are fixed  
							
							 
							
							
							
						 
						
							2017-07-14 09:09:26 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								ea6b756c0f 
								
							 
						 
						
							
							
								
								fixed bug in db migrations when going from <15 to something recent  
							
							 
							
							
							
						 
						
							2017-07-13 19:28:16 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								3d0b127a8f 
								
							 
						 
						
							
							
								
								verify with hostname in direct tls connections  
							
							 
							
							
							
						 
						
							2017-07-13 19:27:43 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								7623accfd5 
								
							 
						 
						
							
							
								
								prefer DNS servers from VPNs  
							
							 
							
							
							
						 
						
							2017-07-12 22:19:45 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								45f92553c4 
								
							 
						 
						
							
							
								
								pulled translations from transifex  
							
							 
							
							
							
						 
						
							2017-07-12 11:54:05 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								ecc0ef45c5 
								
							 
						 
						
							
							
								
								disable foreground service if all accounts are disabled  
							
							 
							
							
							
						 
						
							2017-07-12 11:03:32 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								edb28ccb31 
								
							 
						 
						
							
							
								
								throw state changing exception on failed tls only if no more connection options left  
							
							 
							
							
							
						 
						
							2017-07-11 23:25:59 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								19c1484053 
								
							 
						 
						
							
							
								
								catch runtime exceptions from minidns  
							
							 
							
							
							
						 
						
							2017-07-11 23:24:09 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								8de81e0bc8 
								
							 
						 
						
							
							
								
								sync around Conversation.getLatestMessage()  
							
							 
							
							
							
						 
						
							2017-07-11 23:09:51 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								c5824a3b2a 
								
							 
						 
						
							
							
								
								catch all exceptions around minidns :(  
							
							 
							
							
							
						 
						
							2017-07-10 12:33:04 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								8415f27cac 
								
							 
						 
						
							
							
								
								pulled translations from transifex  
							
							 
							
							
							
						 
						
							2017-07-10 10:06:08 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								abf84e065d 
								
							 
						 
						
							
							
								
								made DNSEC hostname validation opt-in  
							
							 
							
							
							
						 
						
							2017-07-10 09:59:25 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								da00a58902 
								
							 
						 
						
							
							
								
								work around idn short comings in minidns  
							
							 
							
							
							
						 
						
							2017-07-10 08:50:01 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								7cbef529ae 
								
							 
						 
						
							
							
								
								resolve non-srv domains in resolver class as well  
							
							 
							
							... 
							
							
							
							this allows us to prefer ipv4 
							
						 
						
							2017-07-10 08:49:22 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								c400f74918 
								
							 
						 
						
							
							
								
								prefer ipv4 over ipv6  
							
							 
							
							
							
						 
						
							2017-07-09 19:05:23 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								67bc032ccc 
								
							 
						 
						
							
							
								
								fixed fallback to normal DNS query after DNSSEC failed  
							
							 
							
							
							
						 
						
							2017-07-09 18:03:26 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								7df0f3fd28 
								
							 
						 
						
							
							
								
								pulled translations from transifex  
							
							 
							
							
							
						 
						
							2017-07-05 11:29:42 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								ef980ff5cf 
								
							 
						 
						
							
							
								
								show date separators.  fixes   #2271  
							
							 
							
							
							
						 
						
							2017-07-04 11:01:20 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								2ada4d5cfe 
								
							 
						 
						
							
							
								
								allow users to send PMs in mucs w/o voice  
							
							 
							
							
							
						 
						
							2017-07-03 23:58:34 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								f2409ed95e 
								
							 
						 
						
							
							
								
								set focusable=false instead of enabled=false for rooms w/o voice  
							
							 
							
							
							
						 
						
							2017-07-03 19:55:21 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								5cac4397dd 
								
							 
						 
						
							
							
								
								catch state changing error when sending timeout to iq callbacks  
							
							 
							
							
							
						 
						
							2017-07-03 19:44:01 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								7cf360fabf 
								
							 
						 
						
							
							
								
								do not keep files in waiting when file size exceeds http upload limit in groups.  fixes   #2533  
							
							 
							
							
							
						 
						
							2017-07-01 19:31:48 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								2b9cdde558 
								
							 
						 
						
							
							
								
								refactored retrieval of default preferences  
							
							 
							
							
							
						 
						
							2017-07-01 13:41:24 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								7d4d5c437a 
								
							 
						 
						
							
							
								
								pulled translations from transifex  
							
							 
							
							
							
						 
						
							2017-06-30 21:28:02 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								311c99bb6d 
								
							 
						 
						
							
							
								
								put settings defaults into resource file  
							
							 
							
							
							
						 
						
							2017-06-30 21:22:35 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								4a2e222b34 
								
							 
						 
						
							
							
								
								deduplicate disco items before disco#info  
							
							 
							
							
							
						 
						
							2017-06-30 08:45:16 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								7c1e1132b0 
								
							 
						 
						
							
							
								
								make scan barcode icon survive rotations  
							
							 
							
							
							
						 
						
							2017-06-29 20:23:28 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								b2aae44645 
								
							 
						 
						
							
							
								
								show scan button in TrustKeys only if there is something to scan  
							
							 
							
							
							
						 
						
							2017-06-29 14:01:12 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								cbbf6f439b 
								
							 
						 
						
							
							
								
								add publish-options helper class  
							
							 
							
							
							
						 
						
							2017-06-27 22:50:39 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								59e39304dd 
								
							 
						 
						
							
							
								
								use DND instead of XA when phone is silent  
							
							 
							
							
							
						 
						
							2017-06-27 12:24:26 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								c85b3bbacc 
								
							 
						 
						
							
							
								
								revised resolver strategy  
							
							 
							
							
							
						 
						
							2017-06-26 14:03:38 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								6dad1c0dde 
								
							 
						 
						
							
							
								
								refactored resolver to fall back to DNS and use reliable method  
							
							 
							
							
							
						 
						
							2017-06-25 22:46:56 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								4faf0f2ec9 
								
							 
						 
						
							
							
								
								use ResolverApi.reliable(..)  
							
							 
							
							
							
						 
						
							2017-06-25 19:30:03 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								2c5250a82c 
								
							 
						 
						
							
							
								
								new resolver fall back to normal dns if dnssec verfication fails  
							
							 
							
							
							
						 
						
							2017-06-25 18:35:40 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								cbce73c301 
								
							 
						 
						
							
							
								
								fixed fingerprint trust (was messed up after library upgrade)  
							
							 
							
							
							
						 
						
							2017-06-25 18:18:13 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								24ab765e11 
								
							 
						 
						
							
							
								
								pulled translations from transifex  
							
							 
							
							
							
						 
						
							2017-06-25 16:01:37 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								6ec8e57fbb 
								
							 
						 
						
							
							
								
								change order of settings. move heads-up notifications up  
							
							 
							
							
							
						 
						
							2017-06-25 16:00:07 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								14fd41cd7f 
								
							 
						 
						
							
							
								
								fixed patterns source code url  
							
							 
							
							
							
						 
						
							2017-06-25 12:03:26 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								19b4207c3a 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/BlauerHunger/Conversations  into BlauerHunger-master  
							
							 
							
							
							
						 
						
							2017-06-24 16:16:34 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								d24022d755 
								
							 
						 
						
							
							
								
								cleanup nameWithoutVersion() code  
							
							 
							
							
							
						 
						
							2017-06-24 16:13:55 +02:00  
						
					 
				
					
						
							
							
								 
								Ferdinand Pöll
							
						 
						
							 
							
							
							
							
								
							
							
								f8e031ac86 
								
							 
						 
						
							
							
								
								Added preference to control Heads-up Notifications (turned off by default)  
							
							 
							
							
							
						 
						
							2017-06-24 15:38:16 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								5fd4169720 
								
							 
						 
						
							
							
								
								don't use version part of identity name in presence selection.  fixes   #2519  
							
							 
							
							
							
						 
						
							2017-06-23 14:51:08 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								3c90dbe723 
								
							 
						 
						
							
							
								
								fixed ip reporting for dns look ups  
							
							 
							
							
							
						 
						
							2017-06-22 00:09:59 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								2ed71df01a 
								
							 
						 
						
							
							
								
								also check for hostname in in certs if hostname is from trusted source  
							
							 
							
							
							
						 
						
							2017-06-21 23:40:01 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								2e380ed792 
								
							 
						 
						
							
							
								
								upgrade minidns. refactored dns utils  
							
							 
							
							
							
						 
						
							2017-06-21 23:28:01 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								5d9d725446 
								
							 
						 
						
							
							
								
								offer to open website if ibb offers oob redirect.  fixes   #2503  
							
							 
							
							
							
						 
						
							2017-06-19 20:02:41 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								95405fde5f 
								
							 
						 
						
							
							
								
								mark message as failed after canceling ft w/o transferable.  fixes   #2513  
							
							 
							
							
							
						 
						
							2017-06-19 13:23:20 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								24768d051d 
								
							 
						 
						
							
							
								
								upgrade to signal-protocol-java. thanks @ysangkok  
							
							 
							
							... 
							
							
							
							fixes  #1384 
closes  #2509  
							
						 
						
							2017-06-18 16:36:30 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								f67baab983 
								
							 
						 
						
							
							
								
								revised strategy for http upload read timeout  
							
							 
							
							
							
						 
						
							2017-06-18 16:32:01 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								a1fe8f1c87 
								
							 
						 
						
							
							
								
								make http upload read timeout depend on file size  
							
							 
							
							
							
						 
						
							2017-06-14 16:27:38 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								00bb527333 
								
							 
						 
						
							
							
								
								recreate settingsactivity when theme changed  
							
							 
							
							
							
						 
						
							2017-06-05 14:57:09 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								f7f6e8dfd5 
								
							 
						 
						
							
							
								
								make launching app shortcuts work with disabled accounts  
							
							 
							
							
							
						 
						
							2017-06-05 10:18:02 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								012f60be56 
								
							 
						 
						
							
							
								
								use proper alpha for dark themed icons  
							
							 
							
							
							
						 
						
							2017-06-04 00:05:02 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								51badfa721 
								
							 
						 
						
							
							
								
								enable forground service for sony smartphones by default  
							
							 
							
							
							
						 
						
							2017-06-02 13:00:20 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								e722ef6477 
								
							 
						 
						
							
							
								
								do not accept LMC for files  
							
							 
							
							
							
						 
						
							2017-06-02 13:00:02 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								612e0afa63 
								
							 
						 
						
							
							
								
								do not parse delay tag for unavailable presences when it comes form own server  
							
							 
							
							
							
						 
						
							2017-06-01 16:45:00 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								ed7882fe69 
								
							 
						 
						
							
							
								
								fix NPE when bookmark jid is null on creating suggestions  
							
							 
							
							
							
						 
						
							2017-06-01 16:44:35 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								3889c0eb01 
								
							 
						 
						
							
							
								
								use application/pgp-encrypted mime type when necessary for http upload  
							
							 
							
							
							
						 
						
							2017-06-01 07:35:18 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								9dcd0bf16b 
								
							 
						 
						
							
							
								
								'end this conversation afterwards' checked by default  
							
							 
							
							... 
							
							
							
							closes  #2364  #2382  
							
						 
						
							2017-05-31 19:58:54 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								2cf05528b4 
								
							 
						 
						
							
							
								
								add the 4 most frequently contacted contacts as app shortcuts  
							
							 
							
							
							
						 
						
							2017-05-31 16:45:51 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								7b271bcf67 
								
							 
						 
						
							
							
								
								pulled translations from transifex  
							
							 
							
							
							
						 
						
							2017-05-31 11:38:16 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								50f61a4d91 
								
							 
						 
						
							
							
								
								do not check if namespace equals prefix for attributes  
							
							 
							
							
							
						 
						
							2017-05-30 19:05:36 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								6ccdd1227e 
								
							 
						 
						
							
							
								
								parse all delayed tags. use min date  
							
							 
							
							
							
						 
						
							2017-05-30 08:39:04 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								e973117aed 
								
							 
						 
						
							
							
								
								deal with namespace attributes.  fixes   #2495  
							
							 
							
							
							
						 
						
							2017-05-30 08:38:33 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								3ece613a5d 
								
							 
						 
						
							
							
								
								rename resource on bind conflict  
							
							 
							
							
							
						 
						
							2017-05-25 14:40:59 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								fe29b51290 
								
							 
						 
						
							
							
								
								rename downgrade attack to downgraded sasl mechanism  
							
							 
							
							
							
						 
						
							2017-05-24 19:12:37 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								51d1223198 
								
							 
						 
						
							
							
								
								invoke statusChanged callback after syncronization  
							
							 
							
							
							
						 
						
							2017-05-19 15:28:25 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								5a5eb5bdd3 
								
							 
						 
						
							
							
								
								do not turn send button green unless history is caught up.  fixes   #1232  
							
							 
							
							
							
						 
						
							2017-05-19 13:39:44 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								7cd4ed78b2 
								
							 
						 
						
							
							
								
								synchronize on dedicated lock for catchup instead of account  
							
							 
							
							
							
						 
						
							2017-05-19 13:30:57 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								9fd6539534 
								
							 
						 
						
							
							
								
								clean up client cert selection code  
							
							 
							
							
							
						 
						
							2017-05-18 11:31:31 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								41b3df0d43 
								
							 
						 
						
							
							
								
								fall back to jingle only in 1:1.  fixes   #2482  
							
							 
							
							
							
						 
						
							2017-05-13 08:11:24 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								2f577097d1 
								
							 
						 
						
							
							
								
								work around for brokens ROMs that expose file uris as notification sound  
							
							 
							
							
							
						 
						
							2017-05-13 08:10:47 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								5056a28553 
								
							 
						 
						
							
							
								
								differentiate starttls failure and sasl failure  
							
							 
							
							
							
						 
						
							2017-05-13 08:08:05 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								91db2023d3 
								
							 
						 
						
							
							
								
								use mam reference instead of timestamp  
							
							 
							
							
							
						 
						
							2017-05-07 21:05:35 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								185dac6953 
								
							 
						 
						
							
							
								
								synchronize around adding query to query map  
							
							 
							
							
							
						 
						
							2017-05-07 15:47:18 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								b0a8da35db 
								
							 
						 
						
							
							
								
								add ability to distrust inactive/trusted keys  
							
							 
							
							
							
						 
						
							2017-05-06 18:38:23 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								0f2e60d576 
								
							 
						 
						
							
							
								
								pulled translations from transifex  
							
							 
							
							
							
						 
						
							2017-05-06 15:37:35 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								9a7d925b97 
								
							 
						 
						
							
							
								
								do not synchronize startXmpp() and sendPacket() on the same object as this can block the ui  
							
							 
							
							
							
						 
						
							2017-05-06 15:37:22 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								be371ac5df 
								
							 
						 
						
							
							
								
								reset resource after bind failure  
							
							 
							
							
							
						 
						
							2017-05-05 09:38:58 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								7b6d49f329 
								
							 
						 
						
							
							
								
								unified all account state exceptions  
							
							 
							
							
							
						 
						
							2017-05-05 09:33:05 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								404cf808b0 
								
							 
						 
						
							
							
								
								set catchup flag on mam only when doing that  
							
							 
							
							
							
						 
						
							2017-05-04 22:11:46 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								f98888d796 
								
							 
						 
						
							
							
								
								display open pgp key id in account details and allow to delete.  fixes   #2470  
							
							 
							
							
							
						 
						
							2017-05-04 13:02:46 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								839178b269 
								
							 
						 
						
							
							
								
								suggest bookmarked conferences servers in join conference dialog  
							
							 
							
							
							
						 
						
							2017-05-04 11:28:54 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								cc1402442a 
								
							 
						 
						
							
							
								
								don't load signed prekeys on startup  
							
							 
							
							
							
						 
						
							2017-05-04 11:03:58 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								f47cf7ae67 
								
							 
						 
						
							
							
								
								make jingle implementation send file hash when using ft5  
							
							 
							
							
							
						 
						
							2017-05-03 11:03:04 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								ef78721f94 
								
							 
						 
						
							
							
								
								fixed regression from previous commit and brought back 'select text'  
							
							 
							
							
							
						 
						
							2017-05-02 10:42:50 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								7c31a981bb 
								
							 
						 
						
							
							
								
								unified copy text and share with context menu entries  
							
							 
							
							
							
						 
						
							2017-04-30 21:03:44 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								cec9b9b35a 
								
							 
						 
						
							
							
								
								send read marker after reading message in android auto  
							
							 
							
							
							
						 
						
							2017-04-30 21:02:50 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								5cadc81de4 
								
							 
						 
						
							
							
								
								support for jingle ft:5.  fixes   #2458  
							
							 
							
							
							
						 
						
							2017-04-30 16:21:13 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								84baa3ae68 
								
							 
						 
						
							
							
								
								avoid race conditions when downloading files or decrypting pgp messages and waiting for sm catchup  
							
							 
							
							
							
						 
						
							2017-04-30 16:19:39 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								15e5ccd1f4 
								
							 
						 
						
							
							
								
								avoid race condition that lead to double notification sound  
							
							 
							
							
							
						 
						
							2017-04-30 13:59:45 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								1a72683b52 
								
							 
						 
						
							
							
								
								close http download connection after download  
							
							 
							
							
							
						 
						
							2017-04-29 22:59:36 +02:00  
						
					 
				
					
						
							
							
								 
								Johannes Morgenroth
							
						 
						
							 
							
							
							
							
								
							
							
								adff2baa4a 
								
							 
						 
						
							
							
								
								Add messages to Notification for Android Auto on Android M and older  
							
							 
							
							... 
							
							
							
							In the previous implementation for Android Auto, messages are only added
on Android N and above. In order to support older Android versions, the
messages need to be added always. 
							
						 
						
							2017-04-29 19:25:57 +02:00  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								a5e15d5a10 
								
							 
						 
						
							
							
								
								code cleanup: made conversation property final in message object  
							
							 
							
							
							
						 
						
							2017-04-26 12:43:52 +02:00  
						
					 
				
					
						
							
							
								 
								participante0
							
						 
						
							 
							
							
							
							
								
							
							
								48e3726071 
								
							 
						 
						
							
							
								
								Update strings.xml  
							
							 
							
							... 
							
							
							
							Added a comma. 
							
						 
						
							2017-04-25 18:06:03 -03:00  
						
					 
				
					
						
							
							
								 
								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  
						
					 
				
					
						
							
							
								 
								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
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								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
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								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
							
						 
						
							 
							
							
							
							
								
							
							
								e5f08a5eae 
								
							 
						 
						
							
							
								
								pulled translations from transifex  
							
							 
							
							
							
						 
						
							2017-03-20 11:07:27 +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
							
						 
						
							 
							
							
							
							
								
							
							
								ce336690e2 
								
							 
						 
						
							
							
								
								pulled translations from transifex  
							
							 
							
							
							
						 
						
							2017-03-17 13:19:37 +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
							
						 
						
							 
							
							
							
							
								
							
							
								ba32217152 
								
							 
						 
						
							
							
								
								pulled translations from transifex  
							
							 
							
							
							
						 
						
							2017-03-14 11:09:45 +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
							
						 
						
							 
							
							
							
							
								
							
							
								9c588ae9eb 
								
							 
						 
						
							
							
								
								pulled translations from transifex  
							
							 
							
							
							
						 
						
							2017-03-10 10:10:07 +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
							
						 
						
							 
							
							
							
							
								
							
							
								d56fb3cec2 
								
							 
						 
						
							
							
								
								pulled translations from transifex  
							
							 
							
							
							
						 
						
							2017-03-09 08:33:44 +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
							
						 
						
							 
							
							
							
							
								
							
							
								721250c7d9 
								
							 
						 
						
							
							
								
								pulled translations from transifex  
							
							 
							
							
							
						 
						
							2017-03-07 18:55:05 +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
							
						 
						
							 
							
							
							
							
								
							
							
								aa24a057fc 
								
							 
						 
						
							
							
								
								allow Conversations to access user trust store  
							
							 
							
							
							
						 
						
							2017-03-05 11:42:29 +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
							
						 
						
							 
							
							
							
							
								
							
							
								b0ada55b28 
								
							 
						 
						
							
							
								
								use min width of 32dp for swipe handle  
							
							 
							
							
							
						 
						
							2017-03-04 21:20:39 +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
							
						 
						
							 
							
							
							
							
								
							
							
								b86dd584dc 
								
							 
						 
						
							
							
								
								made swipe handle more unified and smaller across various screen sizes  
							
							 
							
							
							
						 
						
							2017-03-04 15:07:25 +01:00  
						
					 
				
					
						
							
							
								 
								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  
						
					 
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
						
							 
							
							
							
							
								
							
							
								469cf72e56 
								
							 
						 
						
							
							
								
								make notification icon size depend on 'Large Text' setting  
							
							 
							
							
							
						 
						
							2017-03-03 11:55:07 +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