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 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								22ca8200fa
								
							
						 | 
						
							
							
								
								Merge branch 'master' of github.com:siacs/Conversations
							
							
							
							
							
						 | 
						
							2016-11-25 16:58:37 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								988cce6320
								
							
						 | 
						
							
							
								
								Merge pull request #2147 from licaon-kter/patch-5
							
							
							
							
							
							
							
							Typo in Readme 
							
						 | 
						
							2016-11-25 16:57:43 +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 | 
						
					
				
					
						
							
							
								 
								licaon-kter
							
						 | 
						
							
							
							
							
							
								
							
							
								6320a3ca7c
								
							
						 | 
						
							
							
								
								Typo in Readme
							
							
							
							
							
						 | 
						
							2016-11-24 18:35:10 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								43fd5e5fe6
								
							
						 | 
						
							
							
								
								Merge pull request #2146 from licaon-kter/patch-4
							
							
							
							
							
							
							
							Add FAQ about the new trust concept 
							
						 | 
						
							2016-11-24 15:39:51 +01:00 | 
						
					
				
					
						
							
							
								 
								licaon-kter
							
						 | 
						
							
							
							
							
							
								
							
							
								84a4f4d66d
								
							
						 | 
						
							
							
								
								Add FAQ about the new trust concept
							
							
							
							
							
						 | 
						
							2016-11-24 15:17:02 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								a87f7903c6
								
							
						 | 
						
							
							
								
								always force close a connection when disabling from error state
							
							
							
							
							
						 | 
						
							2016-11-24 12:44:24 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								1e59a9517a
								
							
						 | 
						
							
							
								
								bumped gradle to 1.15.0-beta
							
							
							
							
							
						 | 
						
							2016-11-24 12:06:15 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								568d6c8392
								
							
						 | 
						
							
							
								
								Merge branch 'master' of github.com:siacs/Conversations
							
							
							
							
							
						 | 
						
							2016-11-20 00:39:25 +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 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								a7ee8f8a74
								
							
						 | 
						
							
							
								
								use lower case otr fingerprints for comparison
							
							
							
							
							
						 | 
						
							2016-11-18 13:13:29 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								9d9a9e63ad
								
							
						 | 
						
							
							
								
								removed some very verbose logging from axolotl service
							
							
							
							
							
						 | 
						
							2016-11-18 13:03:02 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								99a41265b8
								
							
						 | 
						
							
							
								
								lower casing fingerprints when parsing URI
							
							
							
							
							
						 | 
						
							2016-11-18 13:02:33 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								7ec38bd202
								
							
						 | 
						
							
							
								
								added section to FAQ about default encryption
							
							
							
							
							
						 | 
						
							2016-11-18 12:03:02 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								211354ee26
								
							
						 | 
						
							
							
								
								put omemo fingerprint in own uri (qr code / nfc)
							
							
							
							
							
						 | 
						
							2016-11-17 22:28:45 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								7e2e42cb11
								
							
						 | 
						
							
							
								
								parse omemo fingerprints from uris
							
							
							
							
							
						 | 
						
							2016-11-17 20:09:42 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								3f3b360eee
								
							
						 | 
						
							
							
								
								fixed back and forth between Welcome- and EditAccountActivity
							
							
							
							
							
						 | 
						
							2016-11-17 11:40:29 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								ad9a8c2281
								
							
						 | 
						
							
							
								
								use base64.nowrap for omemo keys
							
							
							
							
							
						 | 
						
							2016-11-17 10:58:44 +01:00 |