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 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4cddf31ad2 
							
						 
					 
					
						
						
							
							properly handle onNewIntent() in StartConversations activity  
						
						... 
						
						
						
						* fixes a glitch a caused xmpp uris not to open when activiy was already started 
						
					 
					
						2017-02-28 11:48:28 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1f4c5ff97c 
							
						 
					 
					
						
						
							
							properly trim() incoming imto: uris  
						
						
						
					 
					
						2017-02-27 22:48:25 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c7ec82679f 
							
						 
					 
					
						
						
							
							Merge branch 'master' of github.com:siacs/Conversations  
						
						
						
					 
					
						2017-02-24 20:00:54 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8e0e81a603 
							
						 
					 
					
						
						
							
							bump notification priority to high as per android design guidelines  
						
						
						
					 
					
						2017-02-24 19:59:13 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0c0ff882a9 
							
						 
					 
					
						
						
							
							make x509 verification node world readable  
						
						
						
					 
					
						2017-02-24 19:58:46 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a28116753a 
							
						 
					 
					
						
						
							
							Merge pull request  #2315  from licaon-kter/lecagy-typo  
						
						... 
						
						
						
						Fix a typo in legacy 
						
					 
					
						2017-02-19 18:43:21 +01:00 
						 
				 
			
				
					
						
							
							
								licaon-kter 
							
						 
					 
					
						
						
						
						
							
						
						
							d3dd80eec9 
							
						 
					 
					
						
						
							
							Fix a typo in legacy  
						
						
						
					 
					
						2017-02-19 15:47:57 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0d00ff0c15 
							
						 
					 
					
						
						
							
							migrate domain and host exemption into seperate class  
						
						
						
					 
					
						2017-02-19 13:05:40 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							abaabae853 
							
						 
					 
					
						
						
							
							only change actionbar display options when changed  
						
						
						
					 
					
						2017-02-18 18:08:37 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c69ad8f52c 
							
						 
					 
					
						
						
							
							npe checks  
						
						
						
					 
					
						2017-02-17 10:26:42 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cf9ab4d302 
							
						 
					 
					
						
						
							
							synchronize modifications of output stream in tag writer  
						
						
						
					 
					
						2017-02-17 10:26:12 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4f0e1b71c0 
							
						 
					 
					
						
						
							
							explicitly turn off vibration when disabled.  fixes   #1255  
						
						
						
					 
					
						2017-02-16 13:31:26 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							caa16a8517 
							
						 
					 
					
						
						
							
							experimental mam legacy compat layer  
						
						
						
					 
					
						2017-02-15 16:42:35 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6e62b62b80 
							
						 
					 
					
						
						
							
							respond to xep-0184 requests in muc pms  
						
						
						
					 
					
						2017-02-15 12:09:36 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c7e95d105c 
							
						 
					 
					
						
						
							
							fixed behaviour in message parser when doing mam catchup  
						
						
						
					 
					
						2017-02-15 00:08:49 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bb249e0881 
							
						 
					 
					
						
						
							
							only extract stanza-id from live messages when disco feature is set  
						
						
						
					 
					
						2017-02-14 23:16:51 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b90a1fe1db 
							
						 
					 
					
						
						
							
							bump mam namespace  
						
						
						
					 
					
						2017-02-14 17:19:45 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2665c3a1e0 
							
						 
					 
					
						
						
							
							rethink mam catchup strategies  
						
						
						
					 
					
						2017-02-14 16:50:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9116782cdc 
							
						 
					 
					
						
						
							
							fixed adhoc conference creation behaviour. properly show errors.  fixes   #2290  
						
						
						
					 
					
						2017-02-13 17:32:26 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c8f97be68e 
							
						 
					 
					
						
						
							
							only force close tagwriter before creating a new one  
						
						
						
					 
					
						2017-02-13 13:01:00 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6b81ff70e5 
							
						 
					 
					
						
						
							
							clear avatar cache when system name changes  
						
						
						
					 
					
						2017-02-10 20:26:21 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							edb3f57242 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2017-02-10 14:19:36 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							54ae8abcb7 
							
						 
					 
					
						
						
							
							add no_padding, no_wrap to file upload slots  
						
						
						
					 
					
						2017-02-10 13:50:20 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							82385e38f6 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2017-02-09 20:14:44 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							55e9067b27 
							
						 
					 
					
						
						
							
							do not auto link non-http URLs  
						
						
						
					 
					
						2017-02-09 20:14:36 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c76b073b8e 
							
						 
					 
					
						
						
							
							do not sync thumbnail creation on cache.  fixes   #2283  
						
						
						
					 
					
						2017-02-09 14:32:50 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f60dd98d3c 
							
						 
					 
					
						
						
							
							only count push as available when sm is to avoid race conditions  
						
						
						
					 
					
						2017-02-08 16:52:35 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d9e2ab62b2 
							
						 
					 
					
						
						
							
							add index to message.conversationUuid  
						
						
						
					 
					
						2017-02-07 21:17:08 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							24fab162e2 
							
						 
					 
					
						
						
							
							renamed omemo:// to aesgcm://  
						
						
						
					 
					
						2017-02-07 20:07:57 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							71ad18beb9 
							
						 
					 
					
						
						
							
							support omemo:// style urls  
						
						
						
					 
					
						2017-02-07 19:32:12 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c37117b940 
							
						 
					 
					
						
						
							
							update copyright information  
						
						
						
					 
					
						2017-02-07 19:31:54 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6be3ae8ef0 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2017-02-07 17:57:24 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e35ada4997 
							
						 
					 
					
						
						
							
							only store messages up to a length of 1M chars  
						
						
						
					 
					
						2017-02-07 17:45:01 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6313c3c92e 
							
						 
					 
					
						
						
							
							Merge pull request  #2270  from moparisthebest/master  
						
						... 
						
						
						
						Stop Conversations force closing over sqlite errors due to long messages 
						
					 
					
						2017-02-07 17:35:25 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e459616123 
							
						 
					 
					
						
						
							
							fixed wording for not getting messages from server  
						
						
						
					 
					
						2017-02-07 14:03:48 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8ab166e817 
							
						 
					 
					
						
						
							
							fixed scrolling and async loading of message of new conversation start  
						
						
						
					 
					
						2017-02-07 14:03:23 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d7198bd68c 
							
						 
					 
					
						
						
							
							fixed rare npe when doing file migration  
						
						
						
					 
					
						2017-02-07 10:20:13 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6fc67d9a60 
							
						 
					 
					
						
						
							
							catch all throwables when working with content provider to retrieve mime  
						
						
						
					 
					
						2017-02-07 10:19:45 +01:00 
						 
				 
			
				
					
						
							
							
								moparisthebest 
							
						 
					 
					
						
						
						
						
							
						
						
							2a34ece571 
							
						 
					 
					
						
						
							
							Stop Conversations force closing over sqlite errors due to long messages  
						
						
						
					 
					
						2017-01-30 00:03:51 -05:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							53241f2ef1 
							
						 
					 
					
						
						
							
							add explicit encryption hints to outgoing messages  
						
						
						
					 
					
						2017-01-26 19:19:08 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c9e6d05fa0 
							
						 
					 
					
						
						
							
							use base64 encoding for file names uploaded with http  
						
						
						
					 
					
						2017-01-26 18:39:25 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bbceee7f61 
							
						 
					 
					
						
						
							
							pulled translation from transifex  
						
						
						
					 
					
						2017-01-26 12:35:34 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							40ee1a0bfc 
							
						 
					 
					
						
						
							
							reset messagesLoaded when changing retention settings  
						
						
						
					 
					
						2017-01-25 18:35:22 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a86b2fefd9 
							
						 
					 
					
						
						
							
							add database and file migrations for 1.16.0  
						
						
						
					 
					
						2017-01-25 13:22:20 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f2d9539d90 
							
						 
					 
					
						
						
							
							share uri for bookmark direclty from Start Conversation  
						
						
						
					 
					
						2017-01-25 00:15:50 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							66457c9f2e 
							
						 
					 
					
						
						
							
							transcode videos before sharing. change storage location  
						
						
						
					 
					
						2017-01-24 20:17:36 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9b6ae6d75f 
							
						 
					 
					
						
						
							
							configurable local message retention period. (untested)  
						
						
						
					 
					
						2017-01-23 17:14:30 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4c6ef3b24e 
							
						 
					 
					
						
						
							
							cleaning up crypto targets when conference member is getting removed  
						
						
						
					 
					
						2017-01-22 18:58:49 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b48bf39e08 
							
						 
					 
					
						
						
							
							change behaviour of back button to close finish activity.  fixes   #704  
						
						
						
					 
					
						2017-01-22 18:26:47 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d53c813408 
							
						 
					 
					
						
						
							
							make sure to set open conversations after connection with background service  
						
						
						
					 
					
						2017-01-22 13:08:21 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b72d7ec8d0 
							
						 
					 
					
						
						
							
							make sure to properly stop tagwriter  
						
						
						
					 
					
						2017-01-22 12:54:39 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							96a6460744 
							
						 
					 
					
						
						
							
							don't quote text when '>' is followed by numeber  
						
						
						
					 
					
						2017-01-21 11:07:23 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							780d1daf7e 
							
						 
					 
					
						
						
							
							fixed some issues around ibb  
						
						
						
					 
					
						2017-01-20 22:37:50 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5faa05ca19 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2017-01-20 15:02:19 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							97ba0a0d49 
							
						 
					 
					
						
						
							
							write text in bold when highlighted in received muc message  
						
						
						
					 
					
						2017-01-20 14:54:59 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cb9c4d4327 
							
						 
					 
					
						
						
							
							disable automatic foreground enabler.  fixes   #2239  
						
						
						
					 
					
						2017-01-20 14:21:59 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c324f0c8df 
							
						 
					 
					
						
						
							
							modified highlight nick behaviour to better work with quotes  
						
						
						
					 
					
						2017-01-20 13:45:09 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							59f82cbd34 
							
						 
					 
					
						
						
							
							fixed regression introduced in previous commit.  
						
						
						
					 
					
						2017-01-20 13:44:29 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							143ad48be1 
							
						 
					 
					
						
						
							
							don't prematurly mark conversation as read during activity start.  fixes   #2245  
						
						
						
					 
					
						2017-01-20 10:43:50 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1dcf804618 
							
						 
					 
					
						
						
							
							fixed pgp encrypted text quick sharing.  fixes   #2237  
						
						
						
					 
					
						2017-01-17 15:56:21 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ac2eee8e81 
							
						 
					 
					
						
						
							
							Merge pull request  #2233  from SamWhited/scram-sha-2  
						
						... 
						
						
						
						Add SCRAM-SHA-2 support 
						
					 
					
						2017-01-16 13:14:48 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							764026b87e 
							
						 
					 
					
						
						
							
							fixed behaviour with non-default encryption masks  
						
						
						
					 
					
						2017-01-16 13:09:36 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							bfc2cffc2f 
							
						 
					 
					
						
						
							
							Add SCRAM-SHA-2 support  
						
						
						
					 
					
						2017-01-15 23:43:44 -06:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f7c5a5c42e 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2017-01-15 19:22:18 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d028f4b398 
							
						 
					 
					
						
						
							
							refactored whispermessage processing  
						
						
						
					 
					
						2017-01-15 18:54:47 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b085426d22 
							
						 
					 
					
						
						
							
							fixed linkifier  
						
						
						
					 
					
						2017-01-15 18:54:15 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a71e3d0653 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2017-01-14 18:10:18 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8f39a594ff 
							
						 
					 
					
						
						
							
							partially improved logging for receiving omemo messages  
						
						
						
					 
					
						2017-01-14 18:10:04 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b2e9b4aeb1 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2017-01-12 23:28:30 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8e025cbb9e 
							
						 
					 
					
						
						
							
							show doze warning when push is running on prosody  
						
						
						
					 
					
						2017-01-12 23:22:02 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1876b444fa 
							
						 
					 
					
						
						
							
							refactor getServerIdentity() to parse disco result directly  
						
						
						
					 
					
						2017-01-12 23:17:52 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c03e3b5965 
							
						 
					 
					
						
						
							
							don't include 'before' reference in mam queries bound by timestamp  
						
						
						
					 
					
						2017-01-12 20:56:55 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fd7216b6a0 
							
						 
					 
					
						
						
							
							finish of backlog only for one particular account  
						
						
						
					 
					
						2017-01-12 20:56:27 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							585a538340 
							
						 
					 
					
						
						
							
							don't show key tile in contact details when there are no keys  
						
						
						
					 
					
						2017-01-12 20:50:53 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b050ff2576 
							
						 
					 
					
						
						
							
							only call UI thread from downloading thread every 250ms  
						
						
						
					 
					
						2017-01-12 16:02:09 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bfacc180c5 
							
						 
					 
					
						
						
							
							don't allow to purge keys. offer distrut instead  
						
						
						
					 
					
						2017-01-12 15:59:13 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2c1d3ef968 
							
						 
					 
					
						
						
							
							fixed avatar republish missing the mime type  
						
						
						
					 
					
						2017-01-12 12:20:10 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f0c3b31a42 
							
						 
					 
					
						
						
							
							treat omemo keys >= 32 bytes as containing auth tag. add config flag to put auth tag in key  
						
						
						
					 
					
						2017-01-09 21:47:07 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a1cb855739 
							
						 
					 
					
						
						
							
							adding prekey='true' to omemo messages if applicable  
						
						
						
					 
					
						2017-01-09 20:20:02 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ef4ed90811 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2017-01-09 19:54:44 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							39bb8ad05f 
							
						 
					 
					
						
						
							
							automatically bookmark private, non-anonymous mucs where inviter is trusted.  fixes   #2035   #937  
						
						
						
					 
					
						2017-01-09 19:54:27 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a994d8f847 
							
						 
					 
					
						
						
							
							fixed typo in variable name  
						
						
						
					 
					
						2017-01-09 18:05:58 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b19572ba8c 
							
						 
					 
					
						
						
							
							use 7.1 web url pattern matching on old platforms as well.  fixes   #2228  
						
						
						
					 
					
						2017-01-09 17:58:11 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d192c529e0 
							
						 
					 
					
						
						
							
							add spaces to otr fingerprints copied to clipboard.  fixes   #2226  
						
						
						
					 
					
						2017-01-09 17:57:37 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b116926bb1 
							
						 
					 
					
						
						
							
							unify getFileUri across share and open intents  
						
						
						
					 
					
						2017-01-09 17:00:08 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							39c8867ed7 
							
						 
					 
					
						
						
							
							add more punctuations to message preview  
						
						
						
					 
					
						2017-01-06 20:56:44 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4a299920dc 
							
						 
					 
					
						
						
							
							add overlay to indicate that image is gif  
						
						
						
					 
					
						2017-01-03 14:05:10 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							470d244414 
							
						 
					 
					
						
						
							
							Merge branch 'feature-gboardgifs' of  https://github.com/illegalprime/Conversations  into illegalprime-feature-gboardgifs  
						
						
						
					 
					
						2017-01-03 11:44:14 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2bb7bc1455 
							
						 
					 
					
						
						
							
							show offline contacts as grayed out in conference details  
						
						
						
					 
					
						2017-01-03 11:40:29 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Eden 
							
						 
					 
					
						
						
						
						
							
						
						
							5a670c88b0 
							
						 
					 
					
						
						
							
							Do not compress GIFs, allow GBoard to send GIFs  
						
						
						
					 
					
						2017-01-01 16:16:35 -05:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fa70bd7536 
							
						 
					 
					
						
						
							
							disable automatic foreground service activation if related config paramaters are set to zero  
						
						
						
					 
					
						2016-12-30 20:24:35 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b8b2051f4c 
							
						 
					 
					
						
						
							
							get rid of unecessary config debug paramater that has been replaced by exepert setting  
						
						
						
					 
					
						2016-12-30 20:23:50 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8c34bb3c6f 
							
						 
					 
					
						
						
							
							hide inactive devices by default in contact details  
						
						
						
					 
					
						2016-12-30 13:17:45 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							40a9f70478 
							
						 
					 
					
						
						
							
							always open account details when scanning one of our own keys.  fixes   #2211  
						
						
						
					 
					
						2016-12-29 12:50:18 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fcd9ab17fe 
							
						 
					 
					
						
						
							
							don't throw assertion error when building session with same device id from other contact  
						
						
						
					 
					
						2016-12-28 22:15:24 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b8f67bfaa3 
							
						 
					 
					
						
						
							
							deduplicate corrected messages  
						
						
						
					 
					
						2016-12-26 15:13:38 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							82c2e89d21 
							
						 
					 
					
						
						
							
							stop using broken parallax distance in sliding pane layout  
						
						
						
					 
					
						2016-12-25 18:57:30 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c43f224e8b 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2016-12-23 21:22:16 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9972f5eabc 
							
						 
					 
					
						
						
							
							fixed npe cause by race condition when axolotl service isn't initialized  
						
						
						
					 
					
						2016-12-23 21:19:38 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							28c64c2bd1 
							
						 
					 
					
						
						
							
							skip empty lines in message preview. prevents indexoutofbounds exception  
						
						
						
					 
					
						2016-12-23 21:19:11 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d03c431137 
							
						 
					 
					
						
						
							
							use original message to parse pep  
						
						
						
					 
					
						2016-12-23 21:16:58 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f77afd9596 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2016-12-20 16:38:07 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b011d46ff2 
							
						 
					 
					
						
						
							
							don't show quoted text in message preview  
						
						
						
					 
					
						2016-12-20 16:35:08 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e5fff42b10 
							
						 
					 
					
						
						
							
							added omemo padding but disabled by Config.java flag  
						
						
						
					 
					
						2016-12-20 16:12:12 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fbbf1a37b4 
							
						 
					 
					
						
						
							
							disable removing of broken devices by default  
						
						
						
					 
					
						2016-12-18 11:49:27 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							dbda2afd6d 
							
						 
					 
					
						
						
							
							remove broken devices only once to prevent loops  
						
						
						
					 
					
						2016-12-18 11:47:42 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							87746ca2ba 
							
						 
					 
					
						
						
							
							remove own fetch errors from device announcement  
						
						
						
					 
					
						2016-12-16 17:12:26 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							da914ba09c 
							
						 
					 
					
						
						
							
							make sure to display encryption indicatior  
						
						
						
					 
					
						2016-12-16 11:30:51 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							75ee14cfdf 
							
						 
					 
					
						
						
							
							don't reconnect accout when system reports no internet connection  
						
						
						
					 
					
						2016-12-10 13:20:05 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							55b60f6b0f 
							
						 
					 
					
						
						
							
							don't correct a message if that would create a duplicate  
						
						
						
					 
					
						2016-12-09 20:03:48 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8abfbf82fa 
							
						 
					 
					
						
						
							
							use verified symbol instead of colored lock icons  
						
						
						
					 
					
						2016-12-09 18:46:32 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8eb292d16a 
							
						 
					 
					
						
						
							
							don't show unavailable quick actions in settings  
						
						
						
					 
					
						2016-12-06 23:44:39 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1739af2a41 
							
						 
					 
					
						
						
							
							fixed http resume  
						
						
						
					 
					
						2016-12-06 23:27:29 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cbc9c1fb20 
							
						 
					 
					
						
						
							
							add support for RFC7711 to MTM  
						
						
						
					 
					
						2016-12-05 21:52:44 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1e7b4030bb 
							
						 
					 
					
						
						
							
							show jid monospaced in verify dialog  
						
						
						
					 
					
						2016-12-04 13:39:08 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1a89915b31 
							
						 
					 
					
						
						
							
							disable 'show blocklist' if blocklist is empty.  fixes   #2164  
						
						
						
					 
					
						2016-12-03 23:49:00 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a5b3c579c4 
							
						 
					 
					
						
						
							
							redraw options menu after rotation in muc details.  fixes   #2161  
						
						
						
					 
					
						2016-12-03 23:25:31 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							56991bbaeb 
							
						 
					 
					
						
						
							
							add omemo fingerprints to web links as well  
						
						
						
					 
					
						2016-12-03 13:37:26 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6e289b8738 
							
						 
					 
					
						
						
							
							show warning dialog beforing verifying keys via a link  
						
						
						
					 
					
						2016-12-03 13:19:56 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							599f7dad2c 
							
						 
					 
					
						
						
							
							Merge branch 'feature-quotation' of  https://github.com/Mishiranu/Conversations  into Mishiranu-feature-quotation  
						
						
						
					 
					
						2016-12-02 14:01:26 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d4b1119240 
							
						 
					 
					
						
						
							
							default using internal storage to false  
						
						
						
					 
					
						2016-12-02 11:35:00 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6b0242523b 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/Fenisu/Conversations  into Fenisu-master  
						
						
						
					 
					
						2016-12-02 11:25:14 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5d4aa04e5d 
							
						 
					 
					
						
						
							
							support for jid escapting when displaying localpart only  
						
						
						
					 
					
						2016-12-01 20:49:18 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							58de10bcab 
							
						 
					 
					
						
						
							
							use prepped string when building axolotl session  
						
						
						
					 
					
						2016-12-01 20:48:39 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e127ba9361 
							
						 
					 
					
						
						
							
							don't use own jid joined from another client to generate muc title  
						
						
						
					 
					
						2016-12-01 19:57:40 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6e95ad4bdf 
							
						 
					 
					
						
						
							
							don't show share button before account is setup  
						
						
						
					 
					
						2016-12-01 13:07:18 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							168ad50ddd 
							
						 
					 
					
						
						
							
							only show contact related snackbars when conversation is single  
						
						
						
					 
					
						2016-12-01 12:50:40 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f0f2aab92d 
							
						 
					 
					
						
						
							
							made provider authorities relativ to deal with different package ids  
						
						
						
					 
					
						2016-12-01 12:09:49 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							96a992353b 
							
						 
					 
					
						
						
							
							avoid binding multiple times from BarcodeService  
						
						
						
					 
					
						2016-12-01 11:34:04 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a7ec23ef30 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2016-11-30 10:47:25 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1b9a91eb2f 
							
						 
					 
					
						
						
							
							renamed foreground service preference  
						
						
						
					 
					
						2016-11-30 10:45:39 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9d744add38 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2016-11-29 13:51:34 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9e7a54849d 
							
						 
					 
					
						
						
							
							better handle the case when same user is joined with multiple nicks in the same room  
						
						
						
					 
					
						2016-11-29 13:43:52 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							33e6d8a1ce 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2016-11-28 15:51:52 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e5d7357e6e 
							
						 
					 
					
						
						
							
							mark conversations as read after receiving blocklist push for that conversations  
						
						
						
					 
					
						2016-11-28 15:51:11 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							84a2fa0041 
							
						 
					 
					
						
						
							
							allow fingerprint verification via context menu  
						
						
						
					 
					
						2016-11-28 15:11:44 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bbe01c9a6a 
							
						 
					 
					
						
						
							
							add support for body paramater in xmpp uri  
						
						
						
					 
					
						2016-11-28 15:09:02 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fb6f0649c3 
							
						 
					 
					
						
						
							
							sent messages from unverified devices show red lock  
						
						
						
					 
					
						2016-11-28 15:08:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fdf19ae287 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2016-11-25 17:06:23 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d983f0bc71 
							
						 
					 
					
						
						
							
							fixed migrations from pre-btbv phase  
						
						
						
					 
					
						2016-11-25 17:04:23 +01:00 
						 
				 
			
				
					
						
							
							
								Mishiranu 
							
						 
					 
					
						
						
						
						
							
						
						
							f4a769080b 
							
						 
					 
					
						
						
							
							Add quotation support  
						
						
						
					 
					
						2016-11-25 17:06:43 +03:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f36dff485e 
							
						 
					 
					
						
						
							
							changed blind trust before verification summary to a slightly longer one  
						
						
						
					 
					
						2016-11-24 19:59:57 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a87f7903c6 
							
						 
					 
					
						
						
							
							always force close a connection when disabling from error state  
						
						
						
					 
					
						2016-11-24 12:44:24 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6a5d2e35b5 
							
						 
					 
					
						
						
							
							pulled translations from transifex  
						
						
						
					 
					
						2016-11-24 12:05:52 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cbd45d3ee5 
							
						 
					 
					
						
						
							
							changed design language to match BTBV proposal  
						
						... 
						
						
						
						* untrusted messages have red background
* unverified message have normal background and red lock 
						
					 
					
						2016-11-24 11:29:26 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2ec7165381 
							
						 
					 
					
						
						
							
							update the conversations view (and the lock icon) after receiving device list  
						
						
						
					 
					
						2016-11-24 11:28:04 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							20d3a41b52 
							
						 
					 
					
						
						
							
							explictly scan for aztec and qr codes only  
						
						
						
					 
					
						2016-11-23 11:01:58 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							839ef8e14b 
							
						 
					 
					
						
						
							
							introduced blind trust before verification mode  
						
						... 
						
						
						
						read more about the concept on https://gultsch.de/trust.html  
						
					 
					
						2016-11-23 10:42:27 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4720ac94d3 
							
						 
					 
					
						
						
							
							Merge branch 'master' of github.com:siacs/Conversations  
						
						
						
					 
					
						2016-11-22 22:32:05 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							07fe434cc7 
							
						 
					 
					
						
						
							
							added share button to account details  
						
						
						
					 
					
						2016-11-22 22:31:46 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d2268c6a6f 
							
						 
					 
					
						
						
							
							show proper avatar for 'self' contact.  fixes   #2138  
						
						
						
					 
					
						2016-11-22 12:34:16 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d76b0a3104 
							
						 
					 
					
						
						
							
							offer verification directly from the trust keys screen  
						
						
						
					 
					
						2016-11-22 12:03:21 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1a7e0fd153 
							
						 
					 
					
						
						
							
							use aztec code instead of qr  
						
						
						
					 
					
						2016-11-21 12:01:01 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6631705aea 
							
						 
					 
					
						
						
							
							use constants for some preferences  
						
						
						
					 
					
						2016-11-21 11:03:38 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7b99346a4b 
							
						 
					 
					
						
						
							
							when swiping don't clean startup counter entirely. just don't count last startup  
						
						
						
					 
					
						2016-11-21 10:48:59 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1c31b96920 
							
						 
					 
					
						
						
							
							Merge pull request  #2130  from da2x/patch-2  
						
						... 
						
						
						
						Fix up the langauge in some Settings strings 
						
					 
					
						2016-11-20 00:39:57 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							64e8035f6d 
							
						 
					 
					
						
						
							
							introduced custom tls socket factory to make tls1.2 work for http connections  
						
						
						
					 
					
						2016-11-20 00:39:01 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b71aa6d3a4 
							
						 
					 
					
						
						
							
							remove omemo devices from annoucement after 7 days of inactivity  
						
						
						
					 
					
						2016-11-19 21:39:16 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2614706d39 
							
						 
					 
					
						
						
							
							don't show omemo keys by default in account details  
						
						
						
					 
					
						2016-11-19 21:32:40 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cb639f3fdd 
							
						 
					 
					
						
						
							
							don't use xmpp uri for self verification if account is disabled  
						
						
						
					 
					
						2016-11-19 21:31:41 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6362799d56 
							
						 
					 
					
						
						
							
							save last activation time in fingerprint status  
						
						
						
					 
					
						2016-11-19 13:34:54 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							40c747660d 
							
						 
					 
					
						
						
							
							removed some unecessary locking  
						
						
						
					 
					
						2016-11-19 13:34:27 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8132480b82 
							
						 
					 
					
						
						
							
							close socket after failed stream open  
						
						
						
					 
					
						2016-11-19 12:20:31 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3bf2876e09 
							
						 
					 
					
						
						
							
							check if thread was interrupted before doing operations on socket  
						
						
						
					 
					
						2016-11-19 10:44:40 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1820b163a1 
							
						 
					 
					
						
						
							
							fixed regression that would crash create contact dialog.  fixes   #2131  
						
						
						
					 
					
						2016-11-19 10:29:08 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Aleksandersen 
							
						 
					 
					
						
						
						
						
							
						
						
							965f73f95a 
							
						 
					 
					
						
						
							
							Fix up the langauge in some Settings strings  
						
						
						
					 
					
						2016-11-19 05:00:16 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2b9b3be3f1 
							
						 
					 
					
						
						
							
							show 'clear devices' button underneath own devices  
						
						
						
					 
					
						2016-11-18 21:49:52 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a86a36f570 
							
						 
					 
					
						
						
							
							removed some unecessary logging from omemo message generation  
						
						
						
					 
					
						2016-11-18 20:13:09 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							01f92ef4ee 
							
						 
					 
					
						
						
							
							lower own otr fingerprint  
						
						
						
					 
					
						2016-11-18 20:12:45 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d68b7cfcfc 
							
						 
					 
					
						
						
							
							issue ping after network change  
						
						
						
					 
					
						2016-11-18 14:00:05 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fef601b4ae 
							
						 
					 
					
						
						
							
							lower reconnection time  
						
						
						
					 
					
						2016-11-18 13:58:01 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0303c28ad9 
							
						 
					 
					
						
						
							
							synchronzie on xmpp service around all state changes  
						
						
						
					 
					
						2016-11-18 13:58:01 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1ed2445c1d 
							
						 
					 
					
						
						
							
							don't reset last connect time on network change  
						
						
						
					 
					
						2016-11-18 13:55:02 +01:00